Skip to content

Commit 462745c

Browse files
manneohlundmanneohlund
authored
Merge pull request #14 from manneohlund/rc-4.1.0
Rc 4.1.0
2 parents 0489f54 + aadf949 commit 462745c

26 files changed

+330
-181
lines changed

‎.travis.yml

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
language: android
2-
dist: trusty
32
android:
43
components:
54
# Uncomment the lines below if you want to
@@ -8,17 +7,15 @@ android:
87
- platform-tools
98
- extra-android-support
109
- build-tools-29.0.2
11-
- build-tools-28.0.3
1210
- android-29
13-
- android-28
11+
- sys-img-armeabi-v7a-android-18
1412
licenses:
1513
- 'android-sdk-preview-license-52d11cd2'
1614
- 'android-sdk-license-.+'
1715
- 'google-gdk-license-.+'
1816
before_install:
19-
- yes | sdkmanager "platforms;android-28"
17+
- yes | sdkmanager "platforms;android-29"
2018
- yes | sdkmanager "build-tools;29.0.2"
21-
- yes | sdkmanager "build-tools;28.0.3"
2219
jdk:
2320
- oraclejdk8
2421
before_script:

‎README.md

+20-20
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,31 @@ This library will make it easy and painless to map your data item with a target
1212
# Features
1313

1414
###### OnViewEventListener
15-
* Smart <b>OnClick</b> / <b>OnLongClickListener</b> <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.0.0/sample/src/main/java/smartrecycleradapter/feature/SimpleItemOnClickOnLongClickActivity.kt" target="_blank">SimpleItemOnClickOnLongClickActivity</a></sup>
16-
* State holding with <b>OnItemSelectedListener</b> <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.0.0/sample/src/main/java/smartrecycleradapter/feature/MultipleViewTypesResolverActivity.kt" target="_blank">MultipleViewTypesResolverActivity</a></sup>
17-
* Custom View Events <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.0.0/sample/src/main/java/smartrecycleradapter/feature/CustomViewEventActivity.kt" target="_blank">CustomViewEventActivity</a></sup>
15+
* Smart <b>OnClick</b> / <b>OnLongClickListener</b> <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.1.0/sample/src/main/java/smartrecycleradapter/feature/SimpleItemOnClickOnLongClickActivity.kt" target="_blank">SimpleItemOnClickOnLongClickActivity</a></sup>
16+
* State holding with <b>OnItemSelectedListener</b> <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.1.0/sample/src/main/java/smartrecycleradapter/feature/MultipleViewTypesResolverActivity.kt" target="_blank">MultipleViewTypesResolverActivity</a></sup>
17+
* Custom View Events <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.1.0/sample/src/main/java/smartrecycleradapter/feature/CustomViewEventActivity.kt" target="_blank">CustomViewEventActivity</a></sup>
1818
###### ItemTouchHelper Swipe, Drag & Drop extensions
19-
* Drag & drop <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.0.0/sample/src/main/java/smartrecycleradapter/feature/DragAndDropItemActivity.kt" target="_blank">DragAndDropItemActivity</a></sup>
20-
* Drag & drop with handle <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.0.0/sample/src/main/java/smartrecycleradapter/feature/DragAndDropHandleItemActivity.kt" target="_blank">DragAndDropHandleItemActivity</a></sup>
21-
* Swipe to remove item <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.0.0/sample/src/main/java/smartrecycleradapter/feature/SwipeRemoveItemActivity.kt" target="_blank">SwipeRemoveItemActivity</a></sup>
22-
* Drag & drop, Swipe, View Events <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.0.0/sample/src/main/java/smartrecycleradapter/feature/MultipleEventsAndExtensionsActivity.kt" target="_blank">MultipleEventsAndExtensionsActivity</a></sup>
23-
* Grid + Drag & drop <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.0.0/sample/src/main/java/smartrecycleradapter/feature/GridActivity.kt" target="_blank">GridActivity</a></sup>
19+
* Drag & drop <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.1.0/sample/src/main/java/smartrecycleradapter/feature/DragAndDropItemActivity.kt" target="_blank">DragAndDropItemActivity</a></sup>
20+
* Drag & drop with handle <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.1.0/sample/src/main/java/smartrecycleradapter/feature/DragAndDropHandleItemActivity.kt" target="_blank">DragAndDropHandleItemActivity</a></sup>
21+
* Swipe to remove item <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.1.0/sample/src/main/java/smartrecycleradapter/feature/SwipeRemoveItemActivity.kt" target="_blank">SwipeRemoveItemActivity</a></sup>
22+
* Drag & drop, Swipe, View Events <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.1.0/sample/src/main/java/smartrecycleradapter/feature/MultipleEventsAndExtensionsActivity.kt" target="_blank">MultipleEventsAndExtensionsActivity</a></sup>
23+
* Grid + Drag & drop <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.1.0/sample/src/main/java/smartrecycleradapter/feature/GridActivity.kt" target="_blank">GridActivity</a></sup>
2424
###### ViewTypeResolver
25-
* Multiple ViewHolder types resolver <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.0.0/sample/src/main/java/smartrecycleradapter/feature/MultipleViewTypesResolverActivity.kt" target="_blank">MultipleViewTypesResolverActivity</a></sup>
25+
* Multiple ViewHolder types resolver <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.1.0/sample/src/main/java/smartrecycleradapter/feature/MultipleViewTypesResolverActivity.kt" target="_blank">MultipleViewTypesResolverActivity</a></sup>
2626
###### SmartStateHolder
27-
* Multiple items select <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.0.0/sample/src/main/java/smartrecycleradapter/feature/MultiSelectItemsActivity.kt" target="_blank">MultiSelectItemsActivity</a></sup>
28-
* Single RadioButton select <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.0.0/sample/src/main/java/smartrecycleradapter/feature/SingleSelectRadioButtonItemActivity.kt" target="_blank">SingleSelectRadioButtonItemActivity</a></sup>
29-
* Multiple CheckBox select <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.0.0/sample/src/main/java/smartrecycleradapter/feature/MultiSelectCheckBoxItemsActivity.kt" target="_blank">MultiSelectCheckBoxItemsActivity</a></sup>
30-
* Multiple Switch select <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.0.0/sample/src/main/java/smartrecycleradapter/feature/MultiSelectSwitchItemsActivity.kt" target="_blank">MultiSelectSwitchItemsActivity</a></sup>
31-
* Multiple Expandable items <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.0.0/sample/src/main/java/smartrecycleradapter/feature/MultipleExpandableItemActivity.kt" target="_blank">MultipleExpandableItemActivity</a></sup>
32-
* Single Expandable item <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.0.0/sample/src/main/java/smartrecycleradapter/feature/SingleExpandableItemActivity.kt" target="_blank">SingleExpandableItemActivity</a></sup>
27+
* Multiple items select <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.1.0/sample/src/main/java/smartrecycleradapter/feature/MultiSelectItemsActivity.kt" target="_blank">MultiSelectItemsActivity</a></sup>
28+
* Single RadioButton select <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.1.0/sample/src/main/java/smartrecycleradapter/feature/SingleSelectRadioButtonItemActivity.kt" target="_blank">SingleSelectRadioButtonItemActivity</a></sup>
29+
* Multiple CheckBox select <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.1.0/sample/src/main/java/smartrecycleradapter/feature/MultiSelectCheckBoxItemsActivity.kt" target="_blank">MultiSelectCheckBoxItemsActivity</a></sup>
30+
* Multiple Switch select <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.1.0/sample/src/main/java/smartrecycleradapter/feature/MultiSelectSwitchItemsActivity.kt" target="_blank">MultiSelectSwitchItemsActivity</a></sup>
31+
* Multiple Expandable items <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.1.0/sample/src/main/java/smartrecycleradapter/feature/MultipleExpandableItemActivity.kt" target="_blank">MultipleExpandableItemActivity</a></sup>
32+
* Single Expandable item <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.1.0/sample/src/main/java/smartrecycleradapter/feature/SingleExpandableItemActivity.kt" target="_blank">SingleExpandableItemActivity</a></sup>
3333
###### Nested adapter
34-
* Nested SmartRecyclerAdapter <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.0.0/sample/src/main/java/smartrecycleradapter/feature/NestedSmartRecyclerAdaptersActivity.kt" target="_blank">NestedSmartRecyclerAdaptersActivity</a></sup>
34+
* Nested SmartRecyclerAdapter <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.1.0/sample/src/main/java/smartrecycleradapter/feature/NestedSmartRecyclerAdaptersActivity.kt" target="_blank">NestedSmartRecyclerAdaptersActivity</a></sup>
3535
###### Pagination
36-
* Endless scroll <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.0.0/sample/src/main/java/smartrecycleradapter/feature/EndlessScrollActivity.kt" target="_blank">EndlessScrollActivity</a></sup>
37-
* Endless scroll with load more button <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.0.0/sample/src/main/java/smartrecycleradapter/feature/EndlessScrollLoadMoreButtonActivity.kt" target="_blank">EndlessScrollLoadMoreButtonActivity</a></sup>
36+
* Endless scroll <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.1.0/sample/src/main/java/smartrecycleradapter/feature/EndlessScrollActivity.kt" target="_blank">EndlessScrollActivity</a></sup>
37+
* Endless scroll with load more button <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.1.0/sample/src/main/java/smartrecycleradapter/feature/EndlessScrollLoadMoreButtonActivity.kt" target="_blank">EndlessScrollLoadMoreButtonActivity</a></sup>
3838
###### DiffUtil
39-
* Diff Util extension <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.0.0/sample/src/main/java/smartrecycleradapter/feature/DiffUtilActivity.kt" target="_blank">DiffUtilActivity</a></sup>
39+
* Diff Util extension <sup><a href="https://github.com/manneohlund/smart-recycler-adapter/blob/4.1.0/sample/src/main/java/smartrecycleradapter/feature/DiffUtilActivity.kt" target="_blank">DiffUtilActivity</a></sup>
4040

4141
#### Release overview
4242

@@ -48,7 +48,7 @@ This library will make it easy and painless to map your data item with a target
4848
Add `jcenter()` or `maven { url "https://dl.bintray.com/manneohlund/maven" }` to your `build.gradle` under `repositories`
4949
```groovy
5050
dependencies {
51-
implementation 'io.github.manneohlund:smart-recycler-adapter:4.0.0'
51+
implementation 'io.github.manneohlund:smart-recycler-adapter:4.1.0'
5252
}
5353
```
5454

‎build.gradle

+8-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,17 @@
22

33
ext {
44
ARTIFACT_NAME = 'smart-recycler-adapter'
5-
VERSION_CODE = 10
6-
VERSION_NAME = '4.0.0'
5+
VERSION_CODE = 11
6+
VERSION_NAME = '4.1.0'
77
TARGET_SDK_VERSION = 28
88
BUILD_TOOLS_VERSION = '29.0.2'
99
MIN_SDK_VERSION = 14
10+
11+
appcompat_version = '1.1.0'
12+
recyclerview_version = '1.1.0'
13+
material_version = '1.2.0-alpha03'
14+
constraintlayout_version = '1.1.3'
15+
annotation_version = '1.1.0'
1016
}
1117

1218
buildscript {

‎sample/build.gradle

+9-7
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,13 @@ android {
3636
shrinkResources true
3737
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
3838
signingConfig signingConfigs.release
39+
resValue "string", "app_name", "SmartAdapter"
3940
}
4041
debug {
4142
applicationIdSuffix ".debug"
4243
debuggable true
4344
minifyEnabled false
45+
resValue "string", "app_name", "Debug"
4446
}
4547
beta {
4648
initWith debug
@@ -50,6 +52,7 @@ android {
5052
shrinkResources true
5153
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
5254
matchingFallbacks = ['debug']
55+
resValue "string", "app_name", "Beta"
5356
}
5457
}
5558

@@ -81,17 +84,16 @@ dependencies {
8184
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
8285
testImplementation 'junit:junit:4.12'
8386

84-
implementation 'androidx.annotation:annotation:1.1.0'
85-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
86-
implementation 'androidx.appcompat:appcompat:1.0.2'
87-
implementation 'com.google.android.material:material:1.0.0'
88-
implementation 'androidx.recyclerview:recyclerview:1.0.0'
89-
implementation 'com.google.android.material:material:1.1.0-alpha09'
87+
implementation "androidx.annotation:annotation:$annotation_version"
88+
implementation "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
89+
implementation "androidx.appcompat:appcompat:$appcompat_version"
90+
implementation "androidx.recyclerview:recyclerview:$recyclerview_version"
91+
implementation "com.google.android.material:material:$material_version"
9092

9193
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
9294

9395
implementation 'com.github.bumptech.glide:glide:4.9.0'
9496

95-
//implementation 'io.github.manneohlund:smart-recycler-adapter:3.0.0'
97+
//implementation 'io.github.manneohlund:smart-recycler-adapter:4.1.0'
9698
implementation project(':smartadapter')
9799
}

‎sample/src/main/AndroidManifest.xml

+20-40
Original file line numberDiff line numberDiff line change
@@ -13,87 +13,67 @@
1313
android:theme="@style/AppTheme">
1414
<activity
1515
android:name=".feature.SimpleItemActivity"
16-
android:theme="@style/AppTheme.NoActionBar">
17-
</activity>
16+
android:theme="@style/AppTheme.NoActionBar" />
1817
<activity
1918
android:name=".feature.SimpleItemOnClickOnLongClickActivity"
20-
android:theme="@style/AppTheme.NoActionBar">
21-
</activity>
19+
android:theme="@style/AppTheme.NoActionBar" />
2220
<activity
2321
android:name=".feature.CustomViewEventActivity"
24-
android:theme="@style/AppTheme.NoActionBar">
25-
</activity>
22+
android:theme="@style/AppTheme.NoActionBar" />
2623
<activity
2724
android:name=".feature.MultipleViewTypesResolverActivity"
28-
android:theme="@style/AppTheme.NoActionBar">
29-
</activity>
25+
android:theme="@style/AppTheme.NoActionBar" />
3026
<activity
3127
android:name=".feature.DragAndDropItemActivity"
32-
android:theme="@style/AppTheme.NoActionBar">
33-
</activity>
28+
android:theme="@style/AppTheme.NoActionBar" />
3429
<activity
3530
android:name=".feature.DragAndDropHandleItemActivity"
36-
android:theme="@style/AppTheme.NoActionBar">
37-
</activity>
31+
android:theme="@style/AppTheme.NoActionBar" />
3832
<activity
3933
android:name=".feature.SwipeRemoveItemActivity"
40-
android:theme="@style/AppTheme.NoActionBar">
41-
</activity>
34+
android:theme="@style/AppTheme.NoActionBar" />
4235
<activity
4336
android:name=".feature.MultipleEventsAndExtensionsActivity"
44-
android:theme="@style/AppTheme.NoActionBar">
45-
</activity>
37+
android:theme="@style/AppTheme.NoActionBar" />
4638
<activity
4739
android:name=".feature.GridActivity"
48-
android:theme="@style/AppTheme.NoActionBar">
49-
</activity>
40+
android:theme="@style/AppTheme.NoActionBar" />
5041
<activity
5142
android:name=".feature.MultiSelectItemsActivity"
52-
android:theme="@style/AppTheme.NoActionBar">
53-
</activity>
43+
android:theme="@style/AppTheme.NoActionBar" />
5444
<activity
5545
android:name=".feature.SingleSelectRadioButtonItemActivity"
56-
android:theme="@style/AppTheme.NoActionBar">
57-
</activity>
46+
android:theme="@style/AppTheme.NoActionBar" />
5847
<activity
5948
android:name=".feature.MultiSelectCheckBoxItemsActivity"
60-
android:theme="@style/AppTheme.NoActionBar">
61-
</activity>
49+
android:theme="@style/AppTheme.NoActionBar" />
6250
<activity
6351
android:name=".feature.MultiSelectSwitchItemsActivity"
64-
android:theme="@style/AppTheme.NoActionBar">
65-
</activity>
52+
android:theme="@style/AppTheme.NoActionBar" />
6653
<activity
6754
android:name=".feature.NestedSmartRecyclerAdaptersActivity"
68-
android:theme="@style/AppTheme.NoActionBar">
69-
</activity>
55+
android:theme="@style/AppTheme.NoActionBar" />
7056
<activity
7157
android:name=".feature.EndlessScrollActivity"
72-
android:theme="@style/AppTheme.NoActionBar">
73-
</activity>
58+
android:theme="@style/AppTheme.NoActionBar" />
7459
<activity
7560
android:name=".feature.EndlessScrollLoadMoreButtonActivity"
76-
android:theme="@style/AppTheme.NoActionBar">
77-
</activity>
61+
android:theme="@style/AppTheme.NoActionBar" />
7862
<activity
7963
android:name=".feature.DiffUtilActivity"
80-
android:theme="@style/AppTheme.NoActionBar">
81-
</activity>
64+
android:theme="@style/AppTheme.NoActionBar" />
8265
<activity
8366
android:name=".feature.MultipleExpandableItemActivity"
84-
android:theme="@style/AppTheme.NoActionBar">
85-
</activity>
67+
android:theme="@style/AppTheme.NoActionBar" />
8668
<activity
8769
android:name=".feature.SingleExpandableItemActivity"
88-
android:theme="@style/AppTheme.NoActionBar">
89-
</activity>
70+
android:theme="@style/AppTheme.NoActionBar" />
9071
<activity
9172
android:name=".MovieCategoryDetailsActivity"
9273
android:label="@string/title_activity_movie_category_details"
9374
android:theme="@style/AppTheme.NoActionBar" />
9475
<activity
95-
android:name=".DemoActivity"
96-
android:label="SmartRecyclerAdapters">
76+
android:name=".DemoActivity">
9777
<intent-filter>
9878
<action android:name="android.intent.action.VIEW" />
9979
<action android:name="android.intent.action.MAIN" />

0 commit comments

Comments
 (0)