update lib

CarGuo · Jul 23, 2019 · 84da3dc · 84da3dc
1 parent 08274e3
commit 84da3dc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -79,6 +79,13 @@ android {
         enabled = true
     }
 
+    android {
+        compileOptions {
+            sourceCompatibility 1.8
+            targetCompatibility 1.8
+        }
+    }
+
     signingConfigs {
         debug {
             storeFile file("../gsygithubapp-debug.jks")
@@ -129,12 +136,12 @@ dependencies {
     implementation "androidx.recyclerview:recyclerview:${android_support}"
     implementation "androidx.appcompat:appcompat:$androidx_appcompat"
     implementation "androidx.legacy:legacy-support-v4:$android_other_version"
+    implementation "androidx.annotation:annotation:$android_other_version"
     implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
     kapt 'androidx.lifecycle:lifecycle-compiler:2.0.0'
     implementation 'androidx.room:room-runtime:2.1.0'
     kapt 'androidx.room:room-compiler:2.1.0'
-    implementation "com.google.android.material:material:$android_other_version"
-    implementation "androidx.annotation:annotation:$android_other_version"
+    implementation "com.google.android.material:material:1.1.0-alpha08"
 
 
     //constraint
@@ -230,7 +237,7 @@ dependencies {
     implementation "com.orhanobut:dialogplus:${dialogplus_version}"
 
     ///Drawer
-    implementation "com.mikepenz:materialdrawer:7.0.0-beta01"
+    implementation "com.mikepenz:materialdrawer:7.0.0-rc03"
 
     ///lottie
     implementation "com.airbnb.android:lottie:${lottie_version}"

diff --git a/app/src/main/java/com/shuyu/github/kotlin/module/main/MainDrawerController.kt b/app/src/main/java/com/shuyu/github/kotlin/module/main/MainDrawerController.kt
@@ -95,6 +95,7 @@ class MainDrawerController(private val activity: Activity, toolbar: Toolbar,
                 )
                 .addDrawerItems(
                         PrimaryDrawerItem().withName(R.string.LoginOut)
+                                .withTextColorRes(R.color.red)
                                 .withOnDrawerItemClickListener(object : Drawer.OnDrawerItemClickListener {
                                     override fun onItemClick(view: View?, position: Int, drawerItem: IDrawerItem<*>): Boolean {
                                         loginRepository.logout(view!!.context)
@@ -103,7 +104,8 @@ class MainDrawerController(private val activity: Activity, toolbar: Toolbar,
                                     }
                                 })
                 )
-                .withAccountHeader(AccountHeaderBuilder().withActivity(activity)
+                .withAccountHeader(AccountHeaderBuilder()
+                        .withActivity(activity)
                         .addProfiles(ProfileDrawerItem().withName(globalModel.userObservable.login)
                                 .withSelected(false)
                                 .withTextColorRes(R.color.white)

diff --git a/build.gradle b/build.gradle
@@ -19,7 +19,7 @@ buildscript {
     ext.dagger_version = '2.23.2'
     ext.iconics_version = '4.0.1-b01'
     ext.okhttp3_version = '3.10.0'
-    ext.textfiled_box_version = '1.4.4'
+    ext.textfiled_box_version = '1.4.5'
     ext.lifecycle_version = '1.1.1'
     ext.spinkit_version = '1.2.0'
     ext.gradle_version = '3.3.0'