Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@X1nto
X1nto committed Aug 13, 2023
1 parent f59bba8 commit d3f7574
Show file tree
Hide file tree
Showing 7 changed files with 130 additions and 122 deletions.
25 changes: 18 additions & 7 deletions app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ android {
}

composeOptions {
kotlinCompilerExtensionVersion = "1.4.7"
kotlinCompilerExtensionVersion = "1.5.0"
}

packaging {
Expand Down Expand Up @@ -87,7 +87,7 @@ dependencies {
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1")
implementation("androidx.activity:activity-compose:1.7.2")

val composeBom = platform("androidx.compose:compose-bom:2023.05.01")
val composeBom = platform("androidx.compose:compose-bom:2023.08.00")
implementation(composeBom)
implementation("androidx.compose.foundation:foundation")
implementation("androidx.compose.material:material-icons-extended")
Expand All @@ -97,28 +97,39 @@ dependencies {
debugImplementation("androidx.compose.ui:ui-tooling")
debugImplementation("androidx.compose.ui:ui-test-manifest")

val cameraxVersion = "1.2.2"
implementation("androidx.emoji2:emoji2-views-helper") {
version {
strictly("1.4.0-beta05")
}
}
implementation("androidx.emoji2:emoji2") {
version {
strictly("1.4.0-beta05")
}
}

val cameraxVersion = "1.2.3"
implementation("androidx.camera:camera-core:$cameraxVersion")
implementation("androidx.camera:camera-camera2:$cameraxVersion")
implementation("androidx.camera:camera-view:$cameraxVersion")
implementation("androidx.camera:camera-lifecycle:$cameraxVersion")

val roomVersion = "2.5.0"
val roomVersion = "2.5.2"
implementation("androidx.room:room-common:$roomVersion")
implementation("androidx.room:room-ktx:$roomVersion")
ksp("androidx.room:room-compiler:$roomVersion")

implementation("androidx.datastore:datastore-preferences:1.0.0")

implementation("com.github.X1nto.taxi:taxi:1.3.0")
implementation("dev.olshevski.navigation:reimagined:1.5.0-beta01")

implementation("commons-codec:commons-codec:1.15")

implementation("com.google.zxing:core:3.5.0")

implementation("io.coil-kt:coil-compose:2.3.0")
implementation("io.coil-kt:coil-compose:2.4.0")

implementation("io.insert-koin:koin-androidx-compose:3.4.3")
implementation("io.insert-koin:koin-androidx-compose:3.4.5")

val accompanistVersion = "0.30.1"
implementation("com.google.accompanist:accompanist-systemuicontroller:$accompanistVersion")
Expand Down
183 changes: 89 additions & 94 deletions app/src/main/java/com/xinto/mauth/ui/MainActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@ import android.os.Bundle
import android.view.WindowManager
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.animation.AnimatedContentScope
import androidx.compose.animation.AnimatedContentTransitionScope
import androidx.compose.animation.core.Spring
import androidx.compose.animation.core.spring
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.with
import androidx.compose.animation.togetherWith
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Modifier
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
Expand All @@ -31,9 +30,11 @@ import com.xinto.mauth.ui.screen.home.HomeScreen
import com.xinto.mauth.ui.screen.qrscan.QrScanScreen
import com.xinto.mauth.ui.screen.settings.SettingsScreen
import com.xinto.mauth.ui.theme.MauthTheme
import com.xinto.taxi.BackstackNavigator
import com.xinto.taxi.Taxi
import com.xinto.taxi.rememberBackstackNavigator
import dev.olshevski.navigation.reimagined.AnimatedNavHost
import dev.olshevski.navigation.reimagined.navigate
import dev.olshevski.navigation.reimagined.pop
import dev.olshevski.navigation.reimagined.rememberNavController
import dev.olshevski.navigation.reimagined.replaceAll
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach
import org.koin.android.ext.android.inject
Expand Down Expand Up @@ -68,102 +69,96 @@ class MainActivity : ComponentActivity() {
modifier = Modifier.fillMaxSize(),
color = MaterialTheme.colorScheme.background
) {
val navigator =
rememberBackstackNavigator<MauthDestination>(MauthDestination.Home)
val navigator = rememberNavController<MauthDestination>(MauthDestination.Home)

LaunchedEffect(intent.data) {
val accountInfo = parseUriToAccountInfo(intent.data.toString())
if (accountInfo != null) {
navigator.push(MauthDestination.AddAccount(accountInfo))
navigator.navigate(MauthDestination.AddAccount(accountInfo))
}
}

Main(navigator)
}
}
}
}
}

@Composable
fun Main(navigator: BackstackNavigator<MauthDestination>) {
Taxi(
navigator = navigator,
transitionSpec = {
when {
targetState.isFullscreenDialog -> {
slideIntoContainer(
towards = AnimatedContentScope.SlideDirection.Up,
animationSpec = spring(
dampingRatio = Spring.DampingRatioLowBouncy,
stiffness = Spring.StiffnessLow
)
) with fadeOut()
}
initialState.isFullscreenDialog -> {
fadeIn() with slideOutOfContainer(
towards = AnimatedContentScope.SlideDirection.Down,
animationSpec = spring(
stiffness = Spring.StiffnessVeryLow
)
)
}
else -> fadeIn() with fadeOut()
}
}
) { screen ->
when (screen) {
is MauthDestination.Home -> {
HomeScreen(
onAddAccountManually = {
navigator.push(MauthDestination.AddAccount(DomainAccountInfo.DEFAULT))
},
onAddAccountViaScanning = {
navigator.push(MauthDestination.QrScanner)
},
onAddAccountFromImage = {
navigator.push(MauthDestination.AddAccount(it))
},
onSettingsClick = {
navigator.push(MauthDestination.Settings)
},
onAccountEdit = {
navigator.push(MauthDestination.EditAccount(it))
}
)
}
is MauthDestination.QrScanner -> {
QrScanScreen(
onBack = {
navigator.pop()
},
onScan = {
navigator.replace(MauthDestination.AddAccount(it))
}
)
}
is MauthDestination.Settings -> {
SettingsScreen(
onBack = {
navigator.pop()
}
)
}
is MauthDestination.AddAccount -> {
AddAccountScreen(
prefilled = screen.params,
onExit = {
navigator.pop()
}
)
}
is MauthDestination.EditAccount -> {
EditAccountScreen(
id = screen.id,
onExit = {
navigator.pop()
AnimatedNavHost(
controller = navigator,
transitionSpec = { action, initial, target ->
when {
target.isFullscreenDialog -> {
slideIntoContainer(
towards = AnimatedContentTransitionScope.SlideDirection.Up,
animationSpec = spring(
dampingRatio = Spring.DampingRatioLowBouncy,
stiffness = Spring.StiffnessLow
)
) togetherWith fadeOut()
}
initial.isFullscreenDialog -> {
fadeIn() togetherWith slideOutOfContainer(
towards = AnimatedContentTransitionScope.SlideDirection.Down,
animationSpec = spring(
stiffness = Spring.StiffnessVeryLow
)
)
}
else -> fadeIn() togetherWith fadeOut()
}
}
) { screen ->
when (screen) {
is MauthDestination.Home -> {
HomeScreen(
onAddAccountManually = {
navigator.navigate(MauthDestination.AddAccount(DomainAccountInfo.DEFAULT))
},
onAddAccountViaScanning = {
navigator.navigate(MauthDestination.QrScanner)
},
onAddAccountFromImage = {
navigator.navigate(MauthDestination.AddAccount(it))
},
onSettingsClick = {
navigator.navigate(MauthDestination.Settings)
},
onAccountEdit = {
navigator.navigate(MauthDestination.EditAccount(it))
}
)
}
is MauthDestination.QrScanner -> {
QrScanScreen(
onBack = {
navigator.pop()
},
onScan = {
navigator.replaceAll(MauthDestination.AddAccount(it))
}
)
}
is MauthDestination.Settings -> {
SettingsScreen(
onBack = {
navigator.pop()
}
)
}
is MauthDestination.AddAccount -> {
AddAccountScreen(
prefilled = screen.params,
onExit = {
navigator.pop()
}
)
}
is MauthDestination.EditAccount -> {
EditAccountScreen(
id = screen.id,
onExit = {
navigator.pop()
}
)
}
}
}
)
}
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions app/src/main/java/com/xinto/mauth/ui/navigation/MauthDestination.kt
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
package com.xinto.mauth.ui.navigation

import android.os.Parcelable
import com.xinto.mauth.domain.account.model.DomainAccountInfo
import com.xinto.taxi.Destination
import kotlinx.parcelize.Parcelize
import java.util.*
import java.util.UUID

sealed class MauthDestination(val isFullscreenDialog: Boolean = false) : Destination {
sealed class MauthDestination(val isFullscreenDialog: Boolean = false) : Parcelable {
@Parcelize
object Home : MauthDestination()
data object Home : MauthDestination()

@Parcelize
object QrScanner : MauthDestination()
data object QrScanner : MauthDestination()

@Parcelize
class AddAccount(
data class AddAccount(
val params: DomainAccountInfo
) : MauthDestination(isFullscreenDialog = true)

@Parcelize
class EditAccount(
data class EditAccount(
val id: UUID,
) : MauthDestination(isFullscreenDialog = true)

@Parcelize
object Settings : MauthDestination()
data object Settings : MauthDestination()
}
7 changes: 4 additions & 3 deletions app/src/main/java/com/xinto/mauth/ui/screen/account/state/AccountScreenSuccess.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,10 @@ fun AccountScreenSuccess(
AnimatedContent(
targetState = type,
transitionSpec = {
slideIntoContainer(AnimatedContentScope.SlideDirection.Up) + fadeIn() with
slideOutOfContainer(AnimatedContentScope.SlideDirection.Up) + fadeOut()
}
slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Up) + fadeIn() with
slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Up) + fadeOut()
},
label = "HOTP/TOTP"
) {
when (it) {
OtpType.Totp -> {
Expand Down
11 changes: 6 additions & 5 deletions app/src/main/java/com/xinto/mauth/ui/screen/home/component/HomeAccountCard.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,14 @@ private fun RealtimeInformation(
targetState = code,
transitionSpec = {
if (initialState.first == targetState.first) {
slideIntoContainer(AnimatedContentScope.SlideDirection.Up) + fadeIn() with
slideOutOfContainer(AnimatedContentScope.SlideDirection.Up) + fadeOut()
slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Up) + fadeIn() with
slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Up) + fadeOut()
} else {
slideIntoContainer(AnimatedContentScope.SlideDirection.Down) + fadeIn() with
slideOutOfContainer(AnimatedContentScope.SlideDirection.Down) + fadeOut()
slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Down) + fadeIn() with
slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Down) + fadeOut()
}
}
},
label = "Code"
) { (show, code) ->
val showAwareCode = if (show) code else "•".repeat(code.length)
Text(showAwareCode, style = MaterialTheme.typography.titleLarge)
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/xinto/mauth/ui/screen/home/component/HomeBottomBar.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ fun HomeBottomBar(
AnimatedContent(
targetState = isSelectionActive,
transitionSpec = {
slideIntoContainer(AnimatedContentScope.SlideDirection.Up) + fadeIn() with
slideOutOfContainer(AnimatedContentScope.SlideDirection.Up) + fadeOut()
slideIntoContainer(AnimatedContentTransitionScope.SlideDirection.Up) + fadeIn() with
slideOutOfContainer(AnimatedContentTransitionScope.SlideDirection.Up) + fadeOut()
},
label = "Actions"
) { isSelectionActive ->
Expand Down
6 changes: 3 additions & 3 deletions build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id("com.android.application") version "8.0.2" apply false
kotlin("android") version "1.8.21" apply false
id("com.google.devtools.ksp") version "1.8.21-1.0.11" apply false
id("com.android.application") version "8.1.0" apply false
kotlin("android") version "1.9.0" apply false
id("com.google.devtools.ksp") version "1.9.0-1.0.13" apply false
}

0 comments on commit d3f7574

Please sign in to comment.