Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #27

Merged
merged 2 commits into from
Aug 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion landingPage/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ <h1> 1SecMail </h1>
</a>
</li>
<li>
<a href="https://apps.apple.com/us/app/feedflow-rss-reader/id6447210518" class="btn-platform">
<a href="#willaddhere" class="btn-platform">
<i>
<svg xmlns="http://www.w3.org/2000/svg" width="29.719" height="36.367" viewBox="0 0 29.719 36.367">
<g data-name="Group 1128">
Expand Down
1 change: 1 addition & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ pluginManagement {

id("com.android.application").version(agpVersion)
id("com.android.library").version(agpVersion)
id ("org.gradle.toolchains.foojay-resolver-convention").version("0.4.0")

id("org.jetbrains.compose").version(composeVersion)
kotlin("plugin.serialization").version(kotlinVersion)
Expand Down
14 changes: 14 additions & 0 deletions shared/src/commonMain/kotlin/App.kt
Original file line number Diff line number Diff line change
@@ -1,15 +1,29 @@
import androidx.compose.animation.ExperimentalAnimationApi
import androidx.compose.material.MaterialTheme
import androidx.compose.runtime.*
import androidx.compose.runtime.saveable.rememberSaveable
import cafe.adriel.voyager.navigator.Navigator
import cafe.adriel.voyager.transitions.FadeTransition
import model.DialogProps
import screens.SplashScreen

@OptIn(ExperimentalAnimationApi::class)
@Composable
fun App() {
var isBackPressed by rememberSaveable { mutableStateOf(false) }
if (isBackPressed) showDialog(
"exit app ?",
"do you really want to exit app ?",
DialogProps("yes") {
exitApp()
},
DialogProps("no") {
isBackPressed = false
}
)
MaterialTheme {
Navigator(SplashScreen(), onBackPressed = {
isBackPressed = it.key == "homeScreen"
false
}) {
FadeTransition(it)
Expand Down