Skip to content

Commit aa119fb

Browse files
committed
Add backHandler to the PagerContent and clean up gradle
1 parent dea428e commit aa119fb

File tree

6 files changed

+24
-16
lines changed

6 files changed

+24
-16
lines changed

app/build.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,12 @@ android {
5151
}
5252
}
5353

54+
kotlin {
55+
sourceSets.configureEach {
56+
kotlin.srcDir("$buildDir/generated/ksp/$name/kotlin/")
57+
}
58+
}
59+
5460
dependencies {
5561
// core modules
5662
implementation(project(":core-designsystem"))

app/src/main/kotlin/io/getstream/whatsappclone/navigation/WhatsAppPagerContent.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@
1616

1717
package io.getstream.whatsappclone.navigation
1818

19+
import android.app.Activity
20+
import androidx.activity.compose.BackHandler
1921
import androidx.compose.runtime.Composable
22+
import androidx.compose.ui.platform.LocalContext
2023
import androidx.hilt.navigation.compose.hiltViewModel
2124
import io.getstream.whatsappclone.calls.WhatsAppCalls
2225
import io.getstream.whatsappclone.camera.WhatsAppCamera
@@ -28,6 +31,11 @@ fun WhatsAppPagerContent(
2831
page: Int,
2932
composeNavigator: AppComposeNavigator
3033
) {
34+
val activity = (LocalContext.current as? Activity)
35+
BackHandler {
36+
activity?.finish()
37+
}
38+
3139
when (page) {
3240
WhatsAppPage.Camera.index -> WhatsAppCamera()
3341
WhatsAppPage.Chats.index -> WhatsAppChannels(composeNavigator = composeNavigator)

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ subprojects {
1818

1919
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().all {
2020
kotlinOptions.freeCompilerArgs += listOf(
21-
"-Xskip-prerelease-check",
2221
"-Xopt-in=kotlin.RequiresOptIn",
2322
"-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
2423
"-Xopt-in=com.google.accompanist.pager.ExperimentalPagerApi",
Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
object Configurations {
2-
const val compileSdk = 32
3-
const val targetSdk = 32
4-
const val minSdk = 21
5-
const val majorVersion = 1
6-
const val minorVersion = 0
7-
const val patchVersion = 0
8-
const val versionName = "$majorVersion.$minorVersion.$patchVersion"
9-
const val versionCode = 1
10-
const val snapshotVersionName = "$majorVersion.$minorVersion.${patchVersion + 1}-SNAPSHOT"
2+
const val compileSdk = 32
3+
const val targetSdk = 32
4+
const val minSdk = 21
5+
const val majorVersion = 1
6+
const val minorVersion = 0
7+
const val patchVersion = 0
8+
const val versionName = "$majorVersion.$minorVersion.$patchVersion"
9+
const val versionCode = 1
1110
}

core-navigation/src/main/kotlin/io/getstream/whatsappclone/navigation/Navigator.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,4 +80,6 @@ abstract class AppComposeNavigator : Navigator() {
8080
navigateUp()
8181
}
8282
}
83+
84+
fun canNavUp(navController: NavController): Boolean = navController.backQueue.isNotEmpty()
8385
}

core-uistate/build.gradle.kts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ android {
2626
}
2727
}
2828

29-
kotlin {
30-
sourceSets.configureEach {
31-
kotlin.srcDir("$buildDir/generated/ksp/$name/kotlin/")
32-
}
33-
}
34-
3529
dependencies {
3630
implementation(project(":core-model"))
3731

0 commit comments

Comments
 (0)