Skip to content

Commit 9b6df90

Browse files
committed
Small refactoring, released to maven central
1 parent d8c11fb commit 9b6df90

File tree

26 files changed

+221
-29
lines changed

26 files changed

+221
-29
lines changed

.gitignore

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,39 @@
55
.DS_Store
66
/build
77
/captures
8+
9+
10+
# Built application files
11+
*.apk
12+
*.ap_
13+
14+
# Files for the Dalvik VM
15+
*.dex
16+
17+
# Java class files
18+
*.class
19+
20+
# Generated files
21+
bin/
22+
gen/
23+
24+
# Gradle files
25+
.gradle/
26+
build/
27+
/*/build/
28+
29+
# Local configuration file (sdk path, etc)
30+
local.properties
31+
32+
# Proguard folder generated by Eclipse
33+
proguard/
34+
35+
# Log Files
36+
*.log
37+
38+
# Crashlytics configuations
39+
com_crashlytics_export_strings.xml
40+
*.iml
41+
.idea
42+
/app/*.iml
43+
gradle.properties

app/build.gradle

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'com.android.databinding'
33

4+
repositories {
5+
jcenter()
6+
mavenCentral()
7+
// for snapshots only
8+
// maven {
9+
// url "https://oss.sonatype.org/content/repositories/snapshots"
10+
// }
11+
}
12+
413
android {
514
compileSdkVersion 22
615
buildToolsVersion '22.0.1'
@@ -18,16 +27,20 @@ android {
1827
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1928
}
2029
}
30+
31+
lintOptions {
32+
abortOnError false
33+
}
34+
2135
}
2236

2337
dependencies {
2438
compile fileTree(dir: 'libs', include: ['*.jar'])
25-
26-
compile 'com.android.support:appcompat-v7:22.+'
27-
compile 'com.android.support:recyclerview-v7:22.+'
28-
compile 'com.android.support:support-annotations:+'
29-
39+
compile 'com.android.support:appcompat-v7:22.2.0'
40+
compile 'com.android.support:recyclerview-v7:22.2.0'
41+
compile 'com.android.support:support-annotations:22.2.0'
42+
compile 'net.droidlabs.mvvm:recyclerview:0.0.2'
3043

3144
testCompile 'junit:junit:4.12'
3245
testCompile 'org.mockito:mockito-core:1.10.19'
33-
}
46+
}

app/src/main/java/net/droidlabs/mvvmdemo/adapter/binder/SuperUserBinder.java renamed to app/src/main/java/net/droidlabs/mvvmdemo/binder/SuperUserBinder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package net.droidlabs.mvvmdemo.adapter.binder;
1+
package net.droidlabs.mvvmdemo.binder;
22

3+
import net.droidlabs.mvvm.recyclerview.adapter.binder.ConditionalDataBinder;
34
import net.droidlabs.mvvmdemo.viewmodel.SuperUserViewModel;
45
import net.droidlabs.mvvmdemo.viewmodel.UserViewModel;
56

app/src/main/java/net/droidlabs/mvvmdemo/adapter/binder/UserBinder.java renamed to app/src/main/java/net/droidlabs/mvvmdemo/binder/UserBinder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package net.droidlabs.mvvmdemo.adapter.binder;
1+
package net.droidlabs.mvvmdemo.binder;
22

3+
import net.droidlabs.mvvm.recyclerview.adapter.binder.ConditionalDataBinder;
34
import net.droidlabs.mvvmdemo.viewmodel.UserViewModel;
45

56
public class UserBinder extends ConditionalDataBinder<UserViewModel>

app/src/main/java/net/droidlabs/mvvmdemo/view/UsersView.java

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
import android.text.Editable;
99
import android.view.View;
1010
import android.widget.EditText;
11+
import net.droidlabs.mvvm.recyclerview.adapter.binder.CompositeItemBinder;
12+
import net.droidlabs.mvvm.recyclerview.adapter.binder.ItemBinder;
13+
import net.droidlabs.mvvmdemo.BR;
1114
import net.droidlabs.mvvmdemo.R;
12-
import net.droidlabs.mvvmdemo.adapter.binder.CompositeItemBinder;
13-
import net.droidlabs.mvvmdemo.adapter.binder.ItemBinder;
14-
import net.droidlabs.mvvmdemo.adapter.binder.SuperUserBinder;
15-
import net.droidlabs.mvvmdemo.adapter.binder.UserBinder;
15+
import net.droidlabs.mvvmdemo.binder.SuperUserBinder;
16+
import net.droidlabs.mvvmdemo.binder.UserBinder;
1617
import net.droidlabs.mvvmdemo.databinding.UsersViewBinding;
1718
import net.droidlabs.mvvmdemo.model.User;
1819
import net.droidlabs.mvvmdemo.viewmodel.SuperUserViewModel;
@@ -46,6 +47,14 @@ protected void onCreate(Bundle savedInstanceState)
4647

4748
public View.OnClickListener onButtonClick()
4849
{
50+
binding.activityUsersRecycler.setOnClickListener(new View.OnClickListener()
51+
{
52+
@Override
53+
public void onClick(View v)
54+
{
55+
// do some magic
56+
}
57+
});
4958
return new View.OnClickListener()
5059
{
5160
@Override
@@ -59,8 +68,8 @@ public void onClick(View v)
5968
public ItemBinder<UserViewModel> itemViewBinder()
6069
{
6170
return new CompositeItemBinder<UserViewModel>(
62-
new SuperUserBinder(com.android.databinding.library.baseAdapters.BR.user, R.layout.item_super_user),
63-
new UserBinder(com.android.databinding.library.baseAdapters.BR.user, R.layout.item_user)
71+
new SuperUserBinder(BR.user, R.layout.item_super_user),
72+
new UserBinder(BR.user, R.layout.item_user)
6473
);
6574
}
6675
}

app/src/main/java/net/droidlabs/mvvmdemo/viewmodel/UsersViewModel.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,5 @@ public void addUser(String name, String surname)
1919
{
2020
this.users.add(new UserViewModel(new User(name, surname)));
2121
}
22+
2223
}

app/src/main/res/layout/users_view.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
android:layout_weight="1"
4747
android:id="@+id/users_view_lastname"/>
4848

49+
4950
<Button
5051
android:layout_width="0dp"
5152
android:layout_height="match_parent"

app/src/main/res/values/colors.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<color name="primary">#FF5722</color>
4+
<color name="primary_dark">#E64A19</color>
5+
<color name="primary_light">#FFCCBC</color>
6+
<color name="accent">#8BC34A</color>
7+
<color name="primary_text">#212121</color>
8+
<color name="secondary_text">#727272</color>
9+
<color name="icons">#FFFFFF</color>
10+
<color name="divider">#B6B6B6</color>
11+
</resources>

app/src/main/res/values/styles.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
<!-- Base application theme. -->
44
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
55
<!-- Customize your theme here. -->
6+
7+
<item name="colorPrimary">@color/primary</item>
8+
<item name="colorPrimaryDark">@color/primary_dark</item>
9+
<item name="colorAccent">@color/accent</item>
610
</style>
711

812
</resources>

build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2-
32
buildscript {
43
repositories {
54
jcenter()
@@ -12,9 +11,8 @@ buildscript {
1211
// in the individual module build.gradle files
1312
}
1413
}
15-
1614
allprojects {
1715
repositories {
1816
jcenter()
1917
}
20-
}
18+
}

0 commit comments

Comments
 (0)