Merge pull request #17 from yogeshpaliyal/improvement/builder

Improvement in builder pattern

Author: yogeshpaliyal

.idea/misc.xml

@@ -40,17 +40,23 @@ dependencies {
     implementation project(':universal_adapter')
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    testImplementation 'junit:junit:4.13.1'
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test:core-ktx:1.4.0'
+    androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.3'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+
+    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
 
     //todo step 2   
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'com.google.android.material:material:1.4.0'
     implementation 'com.makeramen:roundedimageview:2.3.0'
     // ViewModel
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"

app/build.gradle

@@ -0,0 +1,11 @@
+package com.techpaliyal.androidkotlinmvvm
+
+import android.view.View
+import androidx.test.espresso.FailureHandler
+import org.hamcrest.Matcher
+
+class CustomFailureHandler: FailureHandler {
+    override fun handle(error: Throwable?, viewMatcher: Matcher<View>?) {
+        assert(false)
+    }
+}

app/src/androidTest/java/com/techpaliyal/androidkotlinmvvm/CustomFailureHandler.kt

@@ -0,0 +1,74 @@
+package com.techpaliyal.androidkotlinmvvm.ui.activity
+
+import androidx.test.espresso.Espresso.*
+import androidx.test.espresso.FailureHandler
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.techpaliyal.androidkotlinmvvm.R
+import org.junit.Assert.*
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class MainActivityTest(){
+
+    @Rule
+    @JvmField
+    public var activityScenarioRule = ActivityScenarioRule(MainActivity::class.java)
+
+    @Before
+    fun before(){
+       /* setFailureHandler(FailureHandler { error, viewMatcher ->
+
+        })*/
+    }
+
+    @Test
+    fun launchBasicActivity(){
+        onView(withId(R.id.btnBasicListing)).perform(click()).withFailureHandler { error, viewMatcher ->  }
+
+
+    }
+
+    @Test
+    fun launchMultiSelectActivity(){
+        onView(withId(R.id.btnMultiSelect)).perform(click()).withFailureHandler { error, viewMatcher ->  }
+
+
+    }
+
+    @Test
+    fun launchLoadingActivity(){
+        onView(withId(R.id.btnLoadingListing)).perform(click()).withFailureHandler { error, viewMatcher ->  }
+    }
+
+    @Test
+    fun launchShimmerActivity(){
+        onView(withId(R.id.btnShimmerListing)).perform(click()).withFailureHandler { error, viewMatcher ->  }
+    }
+
+
+    @Test
+    fun launchPaginationActivity(){
+        onView(withId(R.id.btnPaginationListing)).perform(click()).withFailureHandler { error, viewMatcher ->  }
+    }
+
+    @Test
+    fun launchBindingAdapterActivity(){
+        onView(withId(R.id.btnBindingAdapter)).perform(click()).withFailureHandler { error, viewMatcher ->  }
+    }
+
+    @Test
+    fun launchMultipleViewsActivity(){
+        onView(withId(R.id.btnMultipleViews)).perform(click()).withFailureHandler { error, viewMatcher ->  }
+        onView(withId(R.id.btnSchoolListing)).perform(click()).withFailureHandler { error, viewMatcher ->  }
+        pressBack()
+        onView(withId(R.id.btnChatListing)).perform(click()).withFailureHandler { error, viewMatcher ->  }
+        pressBack()
+    }
+
+}

app/src/androidTest/java/com/techpaliyal/androidkotlinmvvm/ui/activity/MainActivityTest.kt

@@ -38,7 +38,10 @@ class BasicListingActivity : AppCompatActivity() {
         }
     }
 
-    private val mAdapter by lazy {
+    /**
+     * Old Builder way
+     */
+   /* private val mAdapter by lazy {
         UniversalRecyclerAdapter.Builder<BasicModel>(
             lifecycleOwner = this,
             content = UniversalAdapterViewType.Content(
@@ -50,6 +53,21 @@ class BasicListingActivity : AppCompatActivity() {
                     }
                 })
         ).build()
+    }*/
+
+    /**
+     * New Builder Way
+     */
+    private val mAdapter by lazy{
+        UniversalRecyclerAdapter.Builder<BasicModel>()
+            .setLifecycleOwner(this)
+            .setContent(R.layout.item_simple, object : BasicListener<BasicModel> {
+                override fun onClick(model: BasicModel) {
+                    Toast.makeText(this@BasicListingActivity, model.name, Toast.LENGTH_SHORT)
+                        .show()
+                }
+            })
+            .build()
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/techpaliyal/androidkotlinmvvm/ui/activity/BasicListingActivity.kt

@@ -57,9 +57,6 @@ class ShimmerListingActivity : AppCompatActivity() {
                     }
                 }),
             loading = UniversalAdapterViewType.Loading(resourceLoading = R.layout.item_user_shimmer),
-            loadingFooter = UniversalAdapterViewType.LoadingFooter(),
-            noData = UniversalAdapterViewType.NoData(),
-            error = UniversalAdapterViewType.Error()
         ).build()
     }
 

app/src/main/java/com/techpaliyal/androidkotlinmvvm/ui/activity/ShimmerListingActivity.kt

@@ -21,30 +21,30 @@ sealed class UniversalAdapterViewType {
 
     data class Loading<T>(
         @LayoutRes
-        val resourceLoading: Int? = null,
+        val resourceLoading: Int,
         val defaultLoadingItems: Int = 5,
         val additionalParams : HashMap<Int,Any>?= null,
         val customBindingMapping: ((itemBinding: ViewDataBinding, item: T) -> Unit)? = null
     )
 
     data class LoadingFooter<T>(
         @LayoutRes
-        val loaderFooter: Int? = null,
+        val loaderFooter: Int,
         val additionalParams : HashMap<Int,Any>?= null,
         val customBindingMapping: ((itemBinding: ViewDataBinding, item: T) -> Unit)? = null
     )
 
     data class NoData<T>(
         @LayoutRes
-        val noDataLayout: Int? = null,
+        val noDataLayout: Int,
         val listener: Any? = null,
         val additionalParams : HashMap<Int,Any>?= null,
         val customBindingMapping: ((itemBinding: ViewDataBinding, item: String?) -> Unit)? = null
     )
 
     data class Error<T>(
         @LayoutRes
-        val errorLayout: Int? = null,
+        val errorLayout: Int,
         val listener: Any? = null,
         val additionalParams : HashMap<Int,Any>?= null,
         val customBindingMapping: ((itemBinding: ViewDataBinding, message: String?) -> Unit)? = null