Upgraded to compose version 1.0.3

AnkitSuda · Oct 1, 2021 · 9fd73ed · 9fd73ed
1 parent ce9d11a
commit 9fd73ed
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -44,7 +44,7 @@ android {
     }
     composeOptions {
         kotlinCompilerExtensionVersion compose_version
-        kotlinCompilerVersion '1.5.21'
+        kotlinCompilerVersion '1.5.30'
     }
     packagingOptions {
         resources {
@@ -77,13 +77,13 @@ dependencies {
 //navigation
     implementation "androidx.navigation:navigation-fragment-ktx:2.3.5"
     implementation "androidx.navigation:navigation-ui-ktx:2.3.5"
-    implementation "androidx.navigation:navigation-compose:2.4.0-alpha09"
+    implementation "androidx.navigation:navigation-compose:2.4.0-alpha10"
 
     implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.3.1"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
 
-    def accompanistVersion = "0.18.0"
+    def accompanistVersion = "0.19.0"
     implementation "com.google.accompanist:accompanist-pager:$accompanistVersion"
     implementation "com.google.accompanist:accompanist-pager-indicators:$accompanistVersion"
     implementation "com.google.accompanist:accompanist-insets:$accompanistVersion"

diff --git a/app/src/main/java/com/ankitsuda/rebound/ui/screens/exercise/ExerciseDetailScreen.kt b/app/src/main/java/com/ankitsuda/rebound/ui/screens/exercise/ExerciseDetailScreen.kt
@@ -51,9 +51,10 @@ fun ExerciseDetailScreen(
         "About"
     )
     val pagerState = rememberPagerState(
-        pageCount = tabData.size,
-        initialOffscreenLimit = 2,
-        infiniteLoop = false,
+
+//        pageCount = tabData.size,
+//        initialOffscreenLimit = 2,
+//        infiniteLoop = false,
         initialPage = 0,
     )
     val tabIndex = pagerState.currentPage
@@ -116,6 +117,7 @@ fun ExerciseDetailScreen(
         HorizontalPager(
             state = pagerState,
             verticalAlignment = Alignment.Top,
+            count = 3,
         ) { index ->
             when (index) {
                 0 -> {

diff --git a/app/src/main/java/com/ankitsuda/rebound/ui/screens/exercises/ExercisesScreen.kt b/app/src/main/java/com/ankitsuda/rebound/ui/screens/exercises/ExercisesScreen.kt
@@ -52,9 +52,9 @@ fun ExercisesScreen(
     val tabData = arrayListOf<Any>("All").apply { addAll(allMuscles) }
 
     val pagerState = rememberPagerState(
-        pageCount = tabData.size,
-        initialOffscreenLimit = 2,
-        infiniteLoop = false,
+//        pageCount = tabData.size,
+//        initialOffscreenLimit = 2,
+//        infiniteLoop = false,
         initialPage = 0,
     )
     val tabIndex = pagerState.currentPage
@@ -148,6 +148,7 @@ fun ExercisesScreen(
         HorizontalPager(
             state = pagerState,
             verticalAlignment = Alignment.Top,
+            count = tabData.size,
         ) { index ->
             LazyColumn(
                 modifier = Modifier

diff --git a/app/src/main/java/com/ankitsuda/rebound/ui/theme/Theme.kt b/app/src/main/java/com/ankitsuda/rebound/ui/theme/Theme.kt
@@ -97,7 +97,7 @@ fun ReboundThemeWrapper(
         ),
     )
 
-    val typography = TypographyInter
+//    val typography = TypographyInter
 
     // Getting instance of systemUiController
     val systemUiController = rememberSystemUiController()

diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@
 
 buildscript {
     ext {
-        compose_version = '1.0.2'
+        compose_version = '1.0.3'
     }
     repositories {
         google()
@@ -13,7 +13,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:7.0.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.30"
         classpath 'com.google.dagger:hilt-android-gradle-plugin:2.38.1'
 
         // NOTE: Do not place your application dependencies here; they belong