Migrate remaining screens to Compose

app/build.gradle

@@ -117,9 +117,6 @@ android {
     }
 
     buildFeatures {
-        // We need to keep this enabled because submodules use it
-        dataBinding true
-
         viewBinding true
     }
 
@@ -165,10 +162,7 @@ dependencies {
     implementation project(':base')
     implementation project(':base-android')
     implementation project(':common-ui-view')
-    implementation project(':common-epoxy')
     implementation project(':common-imageloading')
-    implementation project(':common-databinding')
-    implementation project(':common-entrygrid')
     implementation project(':data')
     implementation project(':data-android')
     implementation project(':trakt')

app/src/main/java/app/tivi/home/MainActivityViewModel.kt

@@ -20,7 +20,6 @@ import androidx.hilt.lifecycle.ViewModelInject
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import app.tivi.domain.interactors.UpdateUserDetails
-import app.tivi.domain.invoke
 import app.tivi.domain.observers.ObserveTraktAuthState
 import app.tivi.domain.observers.ObserveUserDetails
 import app.tivi.trakt.TraktAuthState
@@ -47,7 +46,7 @@ class MainActivityViewModel @ViewModelInject constructor(
                 if (state == TraktAuthState.LOGGED_IN) refreshMe()
             }
         }
-        observeTraktAuthState()
+        observeTraktAuthState(Unit)
     }
 
     private fun refreshMe() {

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

@@ -22,14 +22,8 @@
     </style>
 
     <style name="Base.Theme.Tivi" parent="Platform.Theme.Tivi">
-        <item name="actionBarTheme">@style/ThemeOverlay.Tivi.ActionBar</item>
-
         <item name="windowActionModeOverlay">true</item>
 
-        <!-- Default widget styles -->
-        <item name="toolbarStyle">@style/Widget.Tivi.Toolbar</item>
-        <item name="appBarLayoutStyle">@style/Widget.MaterialComponents.AppBarLayout.Surface</item>
-
         <!-- Type styles -->
         <item name="textAppearanceHeadline1">@style/TextAppearance.Tivi.Headline1</item>
         <item name="textAppearanceHeadline2">@style/TextAppearance.Tivi.Headline2</item>
@@ -78,16 +72,6 @@
         <item name="android:windowLightStatusBar">@bool/use_light_status_bar</item>
     </style>
 
-    <style name="Theme.Tivi.ShowDetails" parent="Theme.Tivi.Immerse">
-        <item name="android:windowLightStatusBar">@bool/use_light_status_bar</item>
-    </style>
-
     <style name="Theme.Tivi.Settings" />
 
-    <style name="ThemeOverlay.Tivi.ActionBar" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar" />
-
-    <style name="ThemeOverlay.Tivi.Primary" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
-        <item name="android:textColorPrimary">?attr/colorOnPrimary</item>
-    </style>
-
 </resources>

buildSrc/src/main/java/app/tivi/buildsrc/dependencies.kt

@@ -54,20 +54,19 @@ object Libs {
 
     object Insetter {
         private const val version = "0.3.1"
-        const val dbx = "dev.chrisbanes:insetter-dbx:$version"
         const val ktx = "dev.chrisbanes:insetter-ktx:$version"
     }
 
     object Accompanist {
-        private const val version = "0.3.3.compose-6964664-SNAPSHOT"
+        private const val version = "0.3.4.compose-6989480-SNAPSHOT"
         const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
         const val insets = "dev.chrisbanes.accompanist:accompanist-insets:$version"
     }
 
     object Mdc {
         const val material = "com.google.android.material:material:1.1.0"
-        const val composeThemeAdapter = "com.github.material-components:material-components-android-compose-theme-adapter:dev_alpha07-SNAPSHOT"
-        // const val composeThemeAdapter = "com.google.android.material:compose-theme-adapter:1.0.0-alpha05"
+        // const val composeThemeAdapter = "com.google.android.material:compose-theme-adapter:1.0.0-alpha07"
+        const val composeThemeAdapter = "com.github.material-components:material-components-android-compose-theme-adapter:dev_alpha08-SNAPSHOT"
     }
 
     object Google {
@@ -82,14 +81,14 @@ object Libs {
     }
 
     object Kotlin {
-        private const val version = "1.4.10"
+        private const val version = "1.4.20"
         const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
         const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
         const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
     }
 
     object Coroutines {
-        private const val version = "1.4.0"
+        private const val version = "1.4.1"
         const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
         const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
         const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"
@@ -100,9 +99,7 @@ object Libs {
         const val browser = "androidx.browser:browser:1.0.0"
         const val collection = "androidx.collection:collection-ktx:1.1.0"
         const val palette = "androidx.palette:palette:1.0.0"
-        const val recyclerview = "androidx.recyclerview:recyclerview:1.2.0-alpha06"
         const val emoji = "androidx.emoji:emoji:1.1.0"
-        const val swiperefresh = "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
 
         object Navigation {
             private const val version = "2.3.1"
@@ -133,9 +130,14 @@ object Libs {
         const val archCoreTesting = "androidx.arch.core:core-testing:2.1.0"
 
         object Paging {
-            private const val version = "2.1.2"
+            // Need to use alpha07 due to:
+            // - https://issuetracker.google.com/issues/173717820
+            // - https://issuetracker.google.com/issues/173435602
+            private const val version = "3.0.0-alpha07"
             const val common = "androidx.paging:paging-common-ktx:$version"
             const val runtime = "androidx.paging:paging-runtime-ktx:$version"
+
+            const val compose = "androidx.paging:paging-compose:1.0.0-alpha02"
         }
 
         const val preference = "androidx.preference:preference:1.1.1"
@@ -166,7 +168,7 @@ object Libs {
         }
 
         object Compose {
-            const val snapshot = "6964664"
+            const val snapshot = "6989480"
             const val version = "1.0.0-SNAPSHOT"
 
             @get:JvmStatic
@@ -186,7 +188,7 @@ object Libs {
 
             const val animation = "androidx.compose.animation:animation:$version"
 
-            const val tooling = "androidx.ui:ui-tooling:$version"
+            const val tooling = "androidx.compose.ui:ui-tooling:$version"
             const val test = "androidx.compose.ui:ui-test-junit4:${version}"
         }
 
@@ -224,14 +226,6 @@ object Libs {
         const val loggingInterceptor = "com.squareup.okhttp3:logging-interceptor:$version"
     }
 
-    object Epoxy {
-        private const val version = "4.1.0"
-        const val epoxy = "com.airbnb.android:epoxy:$version"
-        const val paging = "com.airbnb.android:epoxy-paging:$version"
-        const val dataBinding = "com.airbnb.android:epoxy-databinding:$version"
-        const val processor = "com.airbnb.android:epoxy-processor:$version"
-    }
-
     object Coil {
         private const val version = "1.0.0"
         const val coil = "io.coil-kt:coil:$version"