Merge pull request #20 from nicholasrout/feature/androidx-update

ricknout · web-flow · commit 22b6f6b6fea4 · 2018-11-06T18:38:16.000+02:00
Update AndroidX and Material Components
diff --git a/app/build.gradle b/app/build.gradle
@@ -43,17 +43,17 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation project(':info')
     implementation project(':common')
-    implementation "androidx.emoji:emoji:$androidx_version"
-    implementation "androidx.emoji:emoji-bundled:$androidx_version"
-    implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
-    implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
+    implementation "androidx.emoji:emoji:$emoji_version"
+    implementation "androidx.emoji:emoji-bundled:$emoji_version"
     implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
     kapt "androidx.lifecycle:lifecycle-compiler:$lifecycle_version"
     implementation "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
     implementation "android.arch.navigation:navigation-fragment-ktx:$navigation_version"
     implementation "android.arch.navigation:navigation-ui-ktx:$navigation_version"
     implementation "android.arch.work:work-runtime-ktx:$work_version"
+    implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
+    implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
     implementation "com.google.dagger:dagger:$dagger_version"
     kapt "com.google.dagger:dagger-compiler:$dagger_version"
     implementation "com.google.dagger:dagger-android:$dagger_version"
diff --git a/app/src/main/java/com/ricknout/rugbyranker/MainActivity.kt b/app/src/main/java/com/ricknout/rugbyranker/MainActivity.kt
@@ -5,18 +5,14 @@ import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.ViewModelProviders
 import androidx.navigation.findNavController
 import androidx.navigation.ui.setupWithNavController
-import com.ricknout.rugbyranker.common.ui.OnBackPressedListener
-import com.ricknout.rugbyranker.common.ui.OnBackPressedProvider
 import com.ricknout.rugbyranker.ui.rankings.MensRankingsViewModel
 import com.ricknout.rugbyranker.ui.rankings.WomensRankingsViewModel
 import dagger.android.support.DaggerAppCompatActivity
 import kotlinx.android.synthetic.main.activity_main.*
 import me.saket.fluidresize.sample.FluidContentResizer
 import javax.inject.Inject
 
-class MainActivity : DaggerAppCompatActivity(), OnBackPressedProvider {
-
-    private var onBackPressedListener: OnBackPressedListener? = null
+class MainActivity : DaggerAppCompatActivity() {
 
     @Inject
     lateinit var viewModelFactory: ViewModelProvider.Factory
@@ -61,18 +57,8 @@ class MainActivity : DaggerAppCompatActivity(), OnBackPressedProvider {
         FluidContentResizer.listen(this)
     }
 
-    override fun setOnBackPressedListener(onBackPressedListener: OnBackPressedListener?) {
-        this.onBackPressedListener = onBackPressedListener
-    }
-
     override fun onBackPressed() {
         if (FluidContentResizer.isAnimating()) return
-        val onBackPressedHandled = onBackPressedListener?.onBackPressed() ?: false
-        if (!onBackPressedHandled) super.onBackPressed()
-    }
-
-    override fun onDestroy() {
-        onBackPressedListener = null
-        super.onDestroy()
+        super.onBackPressed()
     }
 }
diff --git a/app/src/main/java/com/ricknout/rugbyranker/ui/rankings/RankingsFragment.kt b/app/src/main/java/com/ricknout/rugbyranker/ui/rankings/RankingsFragment.kt
@@ -1,6 +1,5 @@
 package com.ricknout.rugbyranker.ui.rankings
 
-import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -25,8 +24,6 @@ import androidx.emoji.text.EmojiCompat
 import com.ricknout.rugbyranker.ui.common.MatchResultListAdapter
 import com.ricknout.rugbyranker.common.ui.BackgroundClickOnItemTouchListener
 import com.ricknout.rugbyranker.ui.common.WorldRugbyRankingListAdapter
-import com.ricknout.rugbyranker.common.ui.OnBackPressedListener
-import com.ricknout.rugbyranker.common.ui.OnBackPressedProvider
 import com.ricknout.rugbyranker.common.ui.SimpleTextWatcher
 import com.ricknout.rugbyranker.util.FlagUtils
 import androidx.core.content.getSystemService
@@ -37,7 +34,7 @@ import com.ricknout.rugbyranker.vo.RankingsType
 import kotlinx.android.synthetic.main.fragment_rankings.*
 import kotlinx.android.synthetic.main.include_add_edit_match_bottom_sheet.*
 
-class RankingsFragment : DaggerFragment(), OnBackPressedListener {
+class RankingsFragment : DaggerFragment() {
 
     @Inject
     lateinit var viewModelFactory: ViewModelProvider.Factory
@@ -102,6 +99,7 @@ class RankingsFragment : DaggerFragment(), OnBackPressedListener {
         setupSnackbars()
         setupViewModel()
         setupSwipeRefreshLayout()
+        setupOnBackPressed()
         setTitle()
     }
 
@@ -322,6 +320,20 @@ class RankingsFragment : DaggerFragment(), OnBackPressedListener {
         }
     }
 
+    private fun setupOnBackPressed() {
+        requireActivity().addOnBackPressedCallback {
+            if (::bottomSheetBehavior.isInitialized && bottomSheetBehavior.state == BottomSheetBehavior.STATE_EXPANDED) {
+                if (bottomSheetBehavior.isHideable && bottomSheetBehavior.skipCollapsed) {
+                    bottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN
+                } else {
+                    bottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
+                }
+                return@addOnBackPressedCallback true
+            }
+            false
+        }
+    }
+
     private fun hasMatchResults() = viewModel.hasMatchResults()
 
     private fun getMatchResultCount() = viewModel.getMatchResultCount()
@@ -508,24 +520,6 @@ class RankingsFragment : DaggerFragment(), OnBackPressedListener {
         viewModel.endEditMatchResult()
     }
 
-    override fun onBackPressed(): Boolean {
-        if (::bottomSheetBehavior.isInitialized && bottomSheetBehavior.state == BottomSheetBehavior.STATE_EXPANDED) {
-            if (bottomSheetBehavior.isHideable && bottomSheetBehavior.skipCollapsed) {
-                bottomSheetBehavior.state = BottomSheetBehavior.STATE_HIDDEN
-            } else {
-                bottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
-            }
-            return true
-        }
-        return super.onBackPressed()
-    }
-
-    override fun onAttach(context: Context?) {
-        super.onAttach(context)
-        (context as? OnBackPressedProvider ?: throw ClassCastException("$context must implement OnBackPressedProvider"))
-                .setOnBackPressedListener(this)
-    }
-
     private fun hideSoftInput() {
         val imm: InputMethodManager? = requireContext().getSystemService()
         imm?.hideSoftInputFromWindow(view?.rootView?.windowToken, 0)
diff --git a/app/src/main/res/layout/include_add_edit_match_bottom_sheet.xml b/app/src/main/res/layout/include_add_edit_match_bottom_sheet.xml
@@ -11,6 +11,7 @@
     android:background="@drawable/bg_bottom_sheet"
     android:clickable="true"
     android:focusable="true"
+    android:theme="@style/RugbyRankerTheme.Secondary"
     app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
     app:behavior_hideable="true"
     app:behavior_peekHeight="@dimen/height_peek"
@@ -93,7 +94,6 @@
                 android:layout_marginTop="@dimen/spacing_standard"
                 android:layout_marginEnd="@dimen/spacing_standard"
                 android:hint="@string/hint_home_team"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 app:layout_constraintTop_toBottomOf="@id/addEditMatchPeekGuideline"
                 app:layout_constraintStart_toStartOf="@id/startGuideline"
                 app:layout_constraintEnd_toStartOf="@id/homePointsTextInputLayout">
@@ -115,7 +115,6 @@
                 android:layout_width="@dimen/width_points"
                 android:layout_height="0dp"
                 android:hint="@string/hint_points"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 app:layout_constraintTop_toTopOf="@id/homeTeamTextInputLayout"
                 app:layout_constraintBottom_toBottomOf="@id/homeTeamTextInputLayout"
                 app:layout_constraintEnd_toEndOf="@id/endGuideline">
@@ -136,7 +135,6 @@
                 android:layout_marginTop="@dimen/spacing_standard"
                 android:layout_marginEnd="@dimen/spacing_standard"
                 android:hint="@string/hint_away_team"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 app:layout_constraintTop_toBottomOf="@id/homeTeamTextInputLayout"
                 app:layout_constraintStart_toStartOf="@id/startGuideline"
                 app:layout_constraintEnd_toStartOf="@id/awayPointsTextInputLayout">
@@ -158,7 +156,6 @@
                 android:layout_width="@dimen/width_points"
                 android:layout_height="0dp"
                 android:hint="@string/hint_points"
-                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 app:layout_constraintTop_toTopOf="@id/awayTeamTextInputLayout"
                 app:layout_constraintBottom_toBottomOf="@id/awayTeamTextInputLayout"
                 app:layout_constraintEnd_toEndOf="@id/endGuideline">
diff --git a/build.gradle b/build.gradle
@@ -4,13 +4,20 @@ buildscript {
     ext.target_sdk_version = 28
     ext.gradle_build_tools_version = '3.3.0-beta02'
     ext.kotlin_version = '1.3.0'
-    ext.androidx_version = '1.0.0'
+    ext.androidx_core_version = '1.1.0-alpha01'
+    ext.androidx_core_ktx_version = '1.0.1'
+    ext.androidx_activity_version = '1.0.0-alpha01'
+    ext.androidx_fragment_version = '1.1.0-alpha01'
     ext.constraintlayout_version = "2.0.0-alpha2"
-    ext.retrofit_version = "2.4.0"
+    ext.recyclerview_version = '1.0.0'
+    ext.emoji_version = '1.0.0'
+    ext.browser_version = '1.0.0'
+    ext.material_version = "1.1.0-alpha01"
     ext.lifecycle_version = "2.0.0"
     ext.room_version = "2.1.0-alpha02"
     ext.navigation_version = "1.0.0-alpha07"
     ext.work_version = "1.0.0-alpha10"
+    ext.retrofit_version = "2.4.0"
     ext.dagger_version = '2.16'
     ext.oss_licenses_plugin_version = "0.9.3"
     ext.play_services_oss_licenses_version = "16.0.1"
diff --git a/common/build.gradle b/common/build.gradle
@@ -21,11 +21,13 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    api "androidx.appcompat:appcompat:$androidx_version"
-    api "androidx.recyclerview:recyclerview:$androidx_version"
+    api "androidx.core:core:$androidx_core_version"
+    api "androidx.core:core-ktx:$androidx_core_ktx_version"
+    api "androidx.activity:activity-ktx:$androidx_activity_version"
+    api "androidx.fragment:fragment-ktx:$androidx_fragment_version"
     api "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
-    api "com.google.android.material:material:$androidx_version"
-    api "androidx.core:core-ktx:$androidx_version"
+    api "androidx.recyclerview:recyclerview:$recyclerview_version"
+    api "com.google.android.material:material:$material_version"
     testImplementation "junit:junit:$test_junit_version"
     androidTestImplementation "androidx.test:runner:$test_runner_version"
     androidTestImplementation "androidx.test.espresso:espresso-core:$test_espresso_version"
diff --git a/common/src/main/java/com/ricknout/rugbyranker/common/ui/OnBackPressedListener.kt b/common/src/main/java/com/ricknout/rugbyranker/common/ui/OnBackPressedListener.kt
diff --git a/common/src/main/java/com/ricknout/rugbyranker/common/ui/OnBackPressedProvider.kt b/common/src/main/java/com/ricknout/rugbyranker/common/ui/OnBackPressedProvider.kt
diff --git a/common/src/main/res/values-v23/styles.xml b/common/src/main/res/values-v23/styles.xml
@@ -3,14 +3,16 @@
     <style name="RugbyRankerTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
         <item name="colorPrimary">@color/color_primary</item>
         <item name="colorPrimaryDark">@color/color_primary_dark</item>
+        <item name="colorSecondary">@color/color_secondary</item>
+        <item name="colorOnSecondary">@color/white</item>
         <item name="colorAccent">@color/color_secondary</item>
         <item name="android:windowBackground">@color/color_window_background</item>
         <item name="android:statusBarColor">@color/color_status_bar</item>
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:navigationBarColor">@color/color_navigation_bar</item>
         <item name="bottomNavigationStyle">@style/RugbyRankerBottomNavigationView</item>
-        <item name="materialButtonStyle">@style/RugbyRankerMaterialButton</item>
-        <item name="floatingActionButtonStyle">@style/RugbyRankerFloatingActionButton</item>
+        <item name="textAppearanceButton">@style/RugbyRankerTextAppearance.Button</item>
+        <item name="textInputStyle">@style/RugbyRankerTextInputLayout</item>
         <item name="android:fontFamily">@font/rajdhani</item>
         <item name="fontFamily">@font/rajdhani</item>
     </style>
diff --git a/common/src/main/res/values/styles.xml b/common/src/main/res/values/styles.xml
@@ -3,17 +3,24 @@
     <style name="RugbyRankerTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
         <item name="colorPrimary">@color/color_primary</item>
         <item name="colorPrimaryDark">@color/color_primary_dark</item>
+        <item name="colorSecondary">@color/color_secondary</item>
+        <item name="colorOnSecondary">@color/white</item>
         <item name="colorAccent">@color/color_secondary</item>
         <item name="android:windowBackground">@color/color_window_background</item>
         <item name="android:statusBarColor">@color/color_status_bar</item>
         <item name="android:navigationBarColor">@color/color_navigation_bar</item>
         <item name="bottomNavigationStyle">@style/RugbyRankerBottomNavigationView</item>
-        <item name="materialButtonStyle">@style/RugbyRankerMaterialButton</item>
-        <item name="floatingActionButtonStyle">@style/RugbyRankerFloatingActionButton</item>
+        <item name="textAppearanceButton">@style/RugbyRankerTextAppearance.Button</item>
+        <item name="textInputStyle">@style/RugbyRankerTextInputLayout</item>
         <item name="android:fontFamily">@font/rajdhani</item>
         <item name="fontFamily">@font/rajdhani</item>
     </style>
 
+    <style name="RugbyRankerTheme.Secondary">
+        <item name="colorPrimary">@color/color_secondary</item>
+        <item name="colorPrimaryDark">@color/color_secondary_dark</item>
+    </style>
+
     <style name="RugbyRankerTheme.Launcher">
         <item name="android:windowBackground">@drawable/bg_launcher</item>
         <item name="android:navigationBarColor">@color/color_navigation_bar_launcher</item>
@@ -25,12 +32,12 @@
 
     <style name="RugbyRankerTextAppearance.Caption" parent="@style/TextAppearance.MaterialComponents.Caption" />
 
-    <style name="RugbyRankerTextAppearance.Chip" parent="TextAppearance.MaterialComponents.Chip">
-        <item name="android:fontFamily">@font/rajdhani</item>
+    <style name="RugbyRankerTextAppearance.Button" parent="TextAppearance.MaterialComponents.Button">
+        <item name="android:textAllCaps">false</item>
     </style>
 
-    <style name="RugbyRankerMaterialButton" parent="Widget.MaterialComponents.Button">
-        <item name="android:textAllCaps">false</item>
+    <style name="RugbyRankerTextAppearance.Chip" parent="TextAppearance.MaterialComponents.Chip">
+        <item name="android:fontFamily">@font/rajdhani</item>
     </style>
 
     <style name="RugbyRankerMaterialButton.TextButton.DoublePadding" parent="Widget.MaterialComponents.Button.TextButton">
@@ -39,14 +46,12 @@
         <item name="android:paddingEnd">@dimen/spacing_double</item>
     </style>
 
-    <style name="RugbyRankerFloatingActionButton" parent="Widget.MaterialComponents.FloatingActionButton">
-        <item name="android:tint">@color/color_fab_tint</item>
-    </style>
-
     <style name="RugbyRankerChip" parent="Widget.MaterialComponents.Chip.Action">
         <item name="android:textAppearance">@style/RugbyRankerTextAppearance.Chip</item>
-        <item name="android:textColor">@color/white</item>
-        <item name="chipBackgroundColor">?attr/colorAccent</item>
+        <item name="android:textColor">?attr/colorOnSecondary</item>
+        <item name="chipBackgroundColor">?attr/colorSecondary</item>
     </style>
 
+    <style name="RugbyRankerTextInputLayout" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox" />
+
 </resources>
diff --git a/info/build.gradle b/info/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation project(':common')
-    implementation "androidx.browser:browser:$androidx_version"
+    implementation "androidx.browser:browser:$browser_version"
     implementation "com.google.android.gms:play-services-oss-licenses:$play_services_oss_licenses_version"
     testImplementation "junit:junit:$test_junit_version"
     androidTestImplementation "androidx.test:runner:$test_runner_version"
diff --git a/info/src/main/res/layout/fragment_info.xml b/info/src/main/res/layout/fragment_info.xml
@@ -41,7 +41,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:theme="@style/RugbyRankerTheme.Secondary">
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/howAreWorldRugbyRankingsCalculatedButton"
