Skip to content

Commit

Permalink
- popBackStackImmediate
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mycoola
Mycoola committed May 5, 2019
1 parent 6b8abbd commit 220e2b9
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 44 deletions.
54 changes: 27 additions & 27 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,53 +55,53 @@ dependencies {
implementation 'androidx.multidex:multidex:2.0.1'

implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.appcompat:appcompat:1.1.0-alpha02'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
implementation 'androidx.room:room-runtime:2.1.0-alpha04'
annotationProcessor 'androidx.room:room-compiler:2.1.0-alpha04'
testImplementation 'androidx.room:room-testing:2.1.0-alpha04'
implementation 'androidx.appcompat:appcompat:1.1.0-alpha04'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha5'
implementation 'androidx.room:room-runtime:2.1.0-alpha07'
annotationProcessor 'androidx.room:room-compiler:2.1.0-alpha07'
testImplementation 'androidx.room:room-testing:2.1.0-alpha07'

implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0-alpha02'
implementation 'androidx.lifecycle:lifecycle-common-java8:2.1.0-alpha02'
implementation 'androidx.lifecycle:lifecycle-reactivestreams:2.1.0-alpha02'
testImplementation "androidx.arch.core:core-testing:2.0.0"
implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0-alpha04'
implementation 'androidx.lifecycle:lifecycle-common-java8:2.1.0-alpha04'
implementation 'androidx.lifecycle:lifecycle-reactivestreams:2.1.0-alpha04'
testImplementation 'androidx.arch.core:core-testing:2.0.1'

implementation 'com.google.android.gms:play-services-maps:16.1.0'

implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha02'
implementation 'com.google.android.material:material:1.1.0-alpha03'
implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha04'
implementation 'com.google.android.material:material:1.1.0-alpha06'


implementation 'com.google.firebase:firebase-core:16.0.7'
implementation 'com.google.firebase:firebase-auth:16.1.0'
implementation 'com.google.firebase:firebase-database:16.0.6'
implementation 'com.google.firebase:firebase-messaging:17.4.0'
implementation 'com.google.firebase:firebase-auth:16.1.0'
implementation 'com.google.firebase:firebase-core:16.0.8'
implementation 'com.google.firebase:firebase-auth:16.2.1'
implementation 'com.google.firebase:firebase-database:16.1.0'
implementation 'com.google.firebase:firebase-messaging:17.6.0'
implementation 'com.google.firebase:firebase-auth:16.2.1'


implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.21'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
implementation 'com.google.android.material:material:1.1.0-alpha03'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.31'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha5'
implementation 'com.google.android.material:material:1.1.0-alpha06'

// architecture components
implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0-alpha02'
implementation 'androidx.lifecycle:lifecycle-runtime:2.1.0-alpha02'
implementation 'androidx.room:room-runtime:2.1.0-alpha04'
implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0-alpha04'
implementation 'androidx.lifecycle:lifecycle-runtime:2.1.0-alpha04'
implementation 'androidx.room:room-runtime:2.1.0-alpha07'
implementation 'androidx.paging:paging-runtime:2.1.0'
kapt 'androidx.lifecycle:lifecycle-compiler:2.1.0-alpha02'
kapt 'androidx.room:room-compiler:2.1.0-alpha04'
kapt 'androidx.lifecycle:lifecycle-compiler:2.1.0-alpha04'
kapt 'androidx.room:room-compiler:2.1.0-alpha07'

// retrofit
implementation 'com.squareup.retrofit2:retrofit:2.5.0'
implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
implementation 'com.squareup.retrofit2:retrofit-mock:2.5.0'
implementation 'com.squareup.okhttp3:logging-interceptor:3.12.1'
implementation 'com.squareup.okhttp3:logging-interceptor:3.14.1'

// testing
testImplementation 'junit:junit:4.13-beta-2'
androidTestImplementation 'androidx.test:runner:1.1.2-alpha01'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.2-alpha01'
androidTestImplementation 'androidx.test:runner:1.2.0-alpha05'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0-alpha05'


}
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.5.0-alpha05'
classpath 'com.android.tools.build:gradle:3.5.0-alpha13'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.21"
classpath 'com.google.gms:google-services:4.2.0'

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Jan 28 11:13:44 EET 2019
#Sun May 05 13:31:09 EET 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-rc-1-all.zip
26 changes: 13 additions & 13 deletions liband/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,30 +33,30 @@ dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.appcompat:appcompat:1.1.0-alpha02'
implementation 'com.google.android.material:material:1.1.0-alpha03'
implementation 'androidx.appcompat:appcompat:1.1.0-alpha04'
implementation 'com.google.android.material:material:1.1.0-alpha06'
implementation 'androidx.vectordrawable:vectordrawable:1.1.0-alpha01'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha5'
implementation 'com.squareup.picasso:picasso:2.71828'
implementation 'com.squareup.retrofit2:retrofit:2.5.0'
implementation 'com.squareup.okhttp:okhttp:2.7.5'
implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
implementation 'com.squareup.retrofit2:adapter-rxjava:2.5.0'
implementation 'com.squareup.okhttp3:logging-interceptor:3.12.1'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.21'
implementation 'com.squareup.okhttp3:logging-interceptor:3.14.1'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.31'
implementation 'com.intuit.sdp:sdp-android:1.0.6'
implementation 'com.intuit.ssp:ssp-android:1.0.6'
implementation 'androidx.room:room-runtime:2.1.0-alpha04'
implementation 'com.github.bumptech.glide:glide:4.8.0'
implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha02'
implementation 'androidx.room:room-runtime:2.1.0-alpha07'
implementation 'com.github.bumptech.glide:glide:4.9.0'
implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha04'
implementation 'com.google.android.gms:play-services-base:16.1.0'
implementation 'com.google.android.gms:play-services-maps:16.1.0'
annotationProcessor 'androidx.room:room-compiler:2.1.0-alpha04'
annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0'
annotationProcessor 'androidx.room:room-compiler:2.1.0-alpha07'
annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
testImplementation 'junit:junit:4.13-beta-2'
testImplementation 'androidx.room:room-testing:2.1.0-alpha04'
androidTestImplementation 'androidx.test:runner:1.1.2-alpha01'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.2-alpha01'
testImplementation 'androidx.room:room-testing:2.1.0-alpha07'
androidTestImplementation 'androidx.test:runner:1.2.0-alpha05'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0-alpha05'
}
repositories {
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion liband/src/main/java/com/liband/BaseActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ abstract class BaseActivity : AppCompatActivity(), View.OnClickListener {

fun replaceFragment(containerViewId: Int, fragment: Fragment) {
val manager = supportFragmentManager
manager.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
manager.popBackStackImmediate(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
val transaction = manager.beginTransaction()
transaction.replace(containerViewId, fragment, fragment.javaClass.simpleName)
transaction.commitAllowingStateLoss()
Expand Down

0 comments on commit 220e2b9

Please sign in to comment.