Skip to content
This repository has been archived by the owner on Mar 18, 2024. It is now read-only.

Commit

Permalink
Updated jetpack compose to 1.1.0-beta02
Browse files Browse the repository at this point in the history
and updated other dependencies
  • Loading branch information
AnkitSuda committed Nov 14, 2021
1 parent 2d19181 commit b6edc55
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 16 deletions.
20 changes: 10 additions & 10 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ android {
}
composeOptions {
kotlinCompilerExtensionVersion compose_version
kotlinCompilerVersion '1.5.30'
kotlinCompilerVersion '1.5.31'
}
packagingOptions {
resources {
Expand All @@ -55,35 +55,35 @@ android {

dependencies {

implementation 'androidx.core:core-ktx:1.6.0'
implementation 'androidx.core:core-ktx:1.7.0'
// implementation 'androidx.appcompat:appcompat:1.3.1'
// implementation 'com.google.android.material:material:1.4.0'
implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.compose.material:material:$compose_version"
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
implementation 'androidx.activity:activity-compose:1.3.1'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.0'
implementation 'androidx.activity:activity-compose:1.4.0'
implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
implementation "androidx.compose.material:material-icons-extended:$compose_version"

implementation 'com.jakewharton.timber:timber:5.0.1'

//Hilt
implementation "com.google.dagger:hilt-android:2.38.1"
kapt "com.google.dagger:hilt-compiler:2.38.1"
implementation "com.google.dagger:hilt-android:2.40"
kapt "com.google.dagger:hilt-compiler:2.40"
// Navigation Compose Hilt Integration : Navigation Compose Hilt Integration
implementation 'androidx.hilt:hilt-navigation-compose:1.0.0-alpha03'

//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-alpha10"
implementation "androidx.navigation:navigation-compose:2.4.0-beta02"

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"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.4.0"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.0"

def accompanistVersion = "0.19.0"
def accompanistVersion = "0.21.2-beta"
implementation "com.google.accompanist:accompanist-pager:$accompanistVersion"
implementation "com.google.accompanist:accompanist-pager-indicators:$accompanistVersion"
implementation "com.google.accompanist:accompanist-insets:$accompanistVersion"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.ankitsuda.rebound.ui.components

import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.ExperimentalAnimationApi
import androidx.compose.animation.core.FiniteAnimationSpec
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.slideIn
import androidx.compose.animation.slideOut
Expand Down Expand Up @@ -225,8 +226,8 @@ fun TopSearchBar(
)
AnimatedVisibility(
visible = value.isNotEmpty(),
enter = slideIn({ IntOffset(clearBtnWidth, 0) }),
exit = slideOut({ IntOffset(clearBtnWidth, 0) }),
// enter = slideIn({ IntOffset(clearBtnWidth, 0) }),
// exit = slideOut({ IntOffset(clearBtnWidth, 0) }),
modifier = Modifier
.align(Alignment.CenterVertically)
) {
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

buildscript {
ext {
compose_version = '1.0.3'
compose_version = '1.1.0-beta02'
}
repositories {
google()
Expand All @@ -12,9 +12,9 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:7.0.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.30"
classpath 'com.google.dagger:hilt-android-gradle-plugin:2.38.1'
classpath 'com.android.tools.build:gradle:7.0.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31"
classpath 'com.google.dagger:hilt-android-gradle-plugin:2.40'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down

0 comments on commit b6edc55

Please sign in to comment.