diff --git a/.fleet/settings.json b/.fleet/settings.json new file mode 100644 index 0000000..7b945d7 --- /dev/null +++ b/.fleet/settings.json @@ -0,0 +1,3 @@ +{ + "run.destination.stop.already.running": "Always" +} \ No newline at end of file diff --git a/composeApp/src/androidMain/kotlin/net/agorise/kee/MainActivity.kt b/composeApp/src/androidMain/kotlin/net/agorise/kee/MainActivity.kt index 9453f2e..067bc25 100644 --- a/composeApp/src/androidMain/kotlin/net/agorise/kee/MainActivity.kt +++ b/composeApp/src/androidMain/kotlin/net/agorise/kee/MainActivity.kt @@ -3,6 +3,7 @@ package net.agorise.kee import android.os.Bundle import androidx.activity.ComponentActivity import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge import cafe.adriel.voyager.navigator.Navigator import net.agorise.kee.ui.screen.home.HomeScreen @@ -10,6 +11,8 @@ class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContent { Navigator(HomeScreen()) } diff --git a/composeApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml b/composeApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml index 2b068d1..fdf8dc6 100644 --- a/composeApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml +++ b/composeApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml @@ -1,30 +1,15 @@ - - - - - - - - + android:width="912dp" + android:height="1053.1dp" + android:viewportWidth="912" + android:viewportHeight="1053.1"> + android:pathData="M841.2,748.6v0.4l-385.2,222.4 -385.2,-222.4V304.2l385.2,-222.4 385.2,222.4v0.4l70.8,-40.9v-0.4L456,0 0,263.3v526.6l456,263.3 456,-263.3v-0.4l-70.8,-40.9z" + android:fillColor="@color/primary"/> + + \ No newline at end of file diff --git a/composeApp/src/androidMain/res/drawable/ic_launcher_background.xml b/composeApp/src/androidMain/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9..0000000 --- a/composeApp/src/androidMain/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml b/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml index eca70cf..e34d5ac 100644 --- a/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,6 @@ - + + \ No newline at end of file diff --git a/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml b/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml index eca70cf..e34d5ac 100644 --- a/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,6 @@ - + + \ No newline at end of file diff --git a/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher.png b/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index a571e60..0000000 Binary files a/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher_round.png b/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 61da551..0000000 Binary files a/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher.png b/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index c41dd28..0000000 Binary files a/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png b/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index db5080a..0000000 Binary files a/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher.png b/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index 6dba46d..0000000 Binary files a/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png b/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index da31a87..0000000 Binary files a/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png b/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 15ac681..0000000 Binary files a/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png b/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index b216f2d..0000000 Binary files a/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png b/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index f25a419..0000000 Binary files a/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.png b/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index e96783c..0000000 Binary files a/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/composeApp/src/androidMain/res/values/colors.xml b/composeApp/src/androidMain/res/values/colors.xml new file mode 100644 index 0000000..3ca13ae --- /dev/null +++ b/composeApp/src/androidMain/res/values/colors.xml @@ -0,0 +1,5 @@ + + + #7E4895 + #F8D8FF + \ No newline at end of file diff --git a/composeApp/src/commonMain/composeResources/drawable/logo-dero.xml b/composeApp/src/commonMain/composeResources/drawable/logo-kee.xml similarity index 100% rename from composeApp/src/commonMain/composeResources/drawable/logo-dero.xml rename to composeApp/src/commonMain/composeResources/drawable/logo-kee.xml diff --git a/composeApp/src/commonMain/kotlin/net/agorise/kee/ui/screen/importaccount/ImportAccountScreen.kt b/composeApp/src/commonMain/kotlin/net/agorise/kee/ui/screen/importaccount/ImportAccountScreen.kt index bfa9d30..1cf39a6 100644 --- a/composeApp/src/commonMain/kotlin/net/agorise/kee/ui/screen/importaccount/ImportAccountScreen.kt +++ b/composeApp/src/commonMain/kotlin/net/agorise/kee/ui/screen/importaccount/ImportAccountScreen.kt @@ -9,7 +9,7 @@ import androidx.compose.ui.unit.dp import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.navigator.LocalNavigator import kee.composeapp.generated.resources.Res -import kee.composeapp.generated.resources.logo_dero +import kee.composeapp.generated.resources.logo_kee import net.agorise.kee.ui.component.topappbar.KeeTopAppBar import net.agorise.kee.ui.screen.home.HomeScreen import org.jetbrains.compose.resources.ExperimentalResourceApi @@ -40,18 +40,18 @@ private fun ImportAccountScreenContent() { ) { var recoveryText by remember { mutableStateOf("") } val recoveryWords = recoveryText.split(" ").filter { it.isNotBlank() } - + Icon( - imageVector = vectorResource(Res.drawable.logo_dero), + imageVector = vectorResource(Res.drawable.logo_kee), contentDescription = null, tint = MaterialTheme.colorScheme.primary, - modifier = Modifier.size(60.dp) + modifier = Modifier.padding(top = 16.dp).size(80.dp) ) Text("Enter your recovery words below") OutlinedTextField( value = recoveryText, onValueChange = { recoveryText = it }, - minLines = 3, + minLines = 5, modifier = Modifier.fillMaxWidth() ) Button( diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index fd0bbc3..643f12b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] agp = "8.2.0" android-compileSdk = "34" -android-minSdk = "24" +android-minSdk = "26" android-targetSdk = "34" androidx-activityCompose = "1.8.2" compose = "1.6.2"