Skip to content

Commit 09311f9

Browse files
yogeshpaliyalyogeshpaliyal
committed
Merge branch 'creating_library'
2 parents 78d8885 + f9cdf8a commit 09311f9

File tree

29 files changed

+259
-54
lines changed

29 files changed

+259
-54
lines changed

‎.idea/gradle.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ android {
3636
dependencies {
3737
def lifecycle_version = "2.2.0"
3838
implementation fileTree(dir: 'libs', include: ['*.jar'])
39+
40+
implementation project(':universal_adapter')
41+
3942
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
4043
implementation 'androidx.appcompat:appcompat:1.0.2'
4144
implementation 'androidx.core:core-ktx:1.0.2'

‎app/src/main/java/com/techpaliyal/androidkotlinmvvm/model/BasicModel.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.techpaliyal.androidkotlinmvvm.model
22

3+
import com.yogeshpaliyal.universal_adapter.model.BaseDiffUtil
4+
35
/**
46
* @author Yogesh Paliyal
57
* Created Date : 9 January 2020

‎app/src/main/java/com/techpaliyal/androidkotlinmvvm/model/MultiSelectModel.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
package com.techpaliyal.androidkotlinmvvm.model
22

3+
import com.yogeshpaliyal.universal_adapter.model.BaseDiffUtil
4+
35
data class MultiSelectModel(val name :String, var isChecked: Boolean): BaseDiffUtil

‎app/src/main/java/com/techpaliyal/androidkotlinmvvm/model/UserModel.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.techpaliyal.androidkotlinmvvm.model
22

3-
data class UserModel(var name: String,var address: String = "",var image: String) : BaseDiffUtil{
3+
import com.yogeshpaliyal.universal_adapter.model.BaseDiffUtil
4+
5+
data class UserModel(var name: String,var address: String = "",var image: String) : BaseDiffUtil {
46
override fun getDiffId(): Any? {
57
return name
68
}

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,15 @@ import android.content.Intent
55
import androidx.appcompat.app.AppCompatActivity
66
import android.os.Bundle
77
import android.widget.Toast
8-
import androidx.databinding.DataBindingUtil
98
import androidx.lifecycle.Observer
10-
import androidx.lifecycle.ViewModelProviders
119
import com.techpaliyal.androidkotlinmvvm.R
12-
import com.techpaliyal.androidkotlinmvvm.data.Resource
1310
import com.techpaliyal.androidkotlinmvvm.databinding.ActivityListingBinding
1411
import com.techpaliyal.androidkotlinmvvm.listeners.BasicListener
1512
import com.techpaliyal.androidkotlinmvvm.model.BasicModel
16-
import com.techpaliyal.androidkotlinmvvm.ui.adapter.UniversalRecyclerAdapter
1713
import com.techpaliyal.androidkotlinmvvm.ui.view_model.BasicListingActivityViewModel
1814
import com.techpaliyal.androidkotlinmvvm.ui.view_model.initViewModel
15+
import com.yogeshpaliyal.universal_adapter.adapter.UniversalRecyclerAdapter
16+
import com.yogeshpaliyal.universal_adapter.utils.Resource
1917

2018
/**
2119
* @author Yogesh Paliyal

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ import androidx.lifecycle.Observer
99
import com.techpaliyal.androidkotlinmvvm.R
1010
import com.techpaliyal.androidkotlinmvvm.databinding.ActivityListingBinding
1111
import com.techpaliyal.androidkotlinmvvm.listeners.BasicListener
12-
import com.techpaliyal.androidkotlinmvvm.model.BasicModel
1312
import com.techpaliyal.androidkotlinmvvm.model.UserModel
14-
import com.techpaliyal.androidkotlinmvvm.ui.adapter.UniversalRecyclerAdapter
1513
import com.techpaliyal.androidkotlinmvvm.ui.view_model.LoadingListingViewModel
1614
import com.techpaliyal.androidkotlinmvvm.ui.view_model.initViewModel
15+
import com.yogeshpaliyal.universal_adapter.adapter.UniversalRecyclerAdapter
1716

1817
class LoadingListingActivity : AppCompatActivity() {
1918
lateinit var binding: ActivityListingBinding
@@ -34,8 +33,8 @@ class LoadingListingActivity : AppCompatActivity() {
3433
private val mAdapter by lazy {
3534
UniversalRecyclerAdapter<UserModel>(
3635
R.layout.item_user,
37-
resourceShimmer = R.layout.layout_loading_full_page,
38-
defaultShimmerItems = 1,
36+
resourceLoading = R.layout.layout_loading_full_page,
37+
defaultLoadingItems = 1,
3938
mListener = object : BasicListener<UserModel> {
4039
override fun onClick(model: UserModel) {
4140
Toast.makeText(this@LoadingListingActivity, model.name, Toast.LENGTH_SHORT)

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,16 @@ package com.techpaliyal.androidkotlinmvvm.ui.activity
33
import android.content.Context
44
import android.content.Intent
55
import android.os.Bundle
6-
import android.widget.Toast
76
import androidx.appcompat.app.AppCompatActivity
87
import androidx.lifecycle.Observer
9-
import androidx.lifecycle.ViewModelProviders
108
import com.techpaliyal.androidkotlinmvvm.R
11-
import com.techpaliyal.androidkotlinmvvm.data.Resource
129
import com.techpaliyal.androidkotlinmvvm.databinding.ActivityListingBinding
1310
import com.techpaliyal.androidkotlinmvvm.listeners.BasicListener
14-
import com.techpaliyal.androidkotlinmvvm.model.BasicModel
1511
import com.techpaliyal.androidkotlinmvvm.model.MultiSelectModel
16-
import com.techpaliyal.androidkotlinmvvm.ui.adapter.UniversalRecyclerAdapter
17-
import com.techpaliyal.androidkotlinmvvm.ui.view_model.BasicListingActivityViewModel
1812
import com.techpaliyal.androidkotlinmvvm.ui.view_model.MultiSelectListingActivityViewModel
1913
import com.techpaliyal.androidkotlinmvvm.ui.view_model.initViewModel
14+
import com.yogeshpaliyal.universal_adapter.adapter.UniversalRecyclerAdapter
15+
import com.yogeshpaliyal.universal_adapter.utils.Resource
2016

2117
/**
2218
* @author Yogesh Paliyal

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,13 @@ import android.widget.Toast
77
import androidx.appcompat.app.AppCompatActivity
88
import androidx.lifecycle.Observer
99
import com.techpaliyal.androidkotlinmvvm.R
10-
import com.techpaliyal.androidkotlinmvvm.data.Resource
11-
import com.techpaliyal.androidkotlinmvvm.data.Status
1210
import com.techpaliyal.androidkotlinmvvm.databinding.ActivityListingBinding
1311
import com.techpaliyal.androidkotlinmvvm.extensions.setupPagination
1412
import com.techpaliyal.androidkotlinmvvm.listeners.BasicListener
15-
import com.techpaliyal.androidkotlinmvvm.model.BasicModel
1613
import com.techpaliyal.androidkotlinmvvm.model.UserModel
17-
import com.techpaliyal.androidkotlinmvvm.ui.adapter.UniversalRecyclerAdapter
1814
import com.techpaliyal.androidkotlinmvvm.ui.view_model.LoadingListingViewModel
1915
import com.techpaliyal.androidkotlinmvvm.ui.view_model.initViewModel
16+
import com.yogeshpaliyal.universal_adapter.adapter.UniversalRecyclerAdapter
2017

2118
class PaginationListingActivity : AppCompatActivity() {
2219
lateinit var binding: ActivityListingBinding
@@ -37,8 +34,8 @@ class PaginationListingActivity : AppCompatActivity() {
3734
private val mAdapter by lazy {
3835
UniversalRecyclerAdapter<UserModel>(
3936
R.layout.item_user,
40-
resourceShimmer = R.layout.item_user_shimmer,
41-
defaultShimmerItems = 5,
37+
resourceLoading = R.layout.item_user_shimmer,
38+
defaultLoadingItems = 5,
4239
loaderFooter = R.layout.item_loading_more,
4340
mListener = object : BasicListener<UserModel> {
4441
override fun onClick(model: UserModel) {

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ import androidx.lifecycle.Observer
99
import com.techpaliyal.androidkotlinmvvm.R
1010
import com.techpaliyal.androidkotlinmvvm.databinding.ActivityListingBinding
1111
import com.techpaliyal.androidkotlinmvvm.listeners.BasicListener
12-
import com.techpaliyal.androidkotlinmvvm.model.BasicModel
1312
import com.techpaliyal.androidkotlinmvvm.model.UserModel
14-
import com.techpaliyal.androidkotlinmvvm.ui.adapter.UniversalRecyclerAdapter
1513
import com.techpaliyal.androidkotlinmvvm.ui.view_model.LoadingListingViewModel
1614
import com.techpaliyal.androidkotlinmvvm.ui.view_model.initViewModel
15+
import com.yogeshpaliyal.universal_adapter.adapter.UniversalRecyclerAdapter
1716

1817
class ShimmerListingActivity : AppCompatActivity() {
1918
lateinit var binding: ActivityListingBinding
@@ -33,8 +32,8 @@ class ShimmerListingActivity : AppCompatActivity() {
3332

3433
private val mAdapter by lazy {
3534
UniversalRecyclerAdapter<UserModel>(
36-
R.layout.item_user, resourceShimmer = R.layout.item_user_shimmer,
37-
defaultShimmerItems = 5,
35+
R.layout.item_user, resourceLoading = R.layout.item_user_shimmer,
36+
defaultLoadingItems = 5,
3837
mListener = object : BasicListener<UserModel> {
3938
override fun onClick(model: UserModel) {
4039
Toast.makeText(this@ShimmerListingActivity, model.name, Toast.LENGTH_SHORT)

0 commit comments

Comments
 (0)