agorise/kee-wallet
agorise/kee-wallet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Styling improvements

Browse source 
- Configure app edge to edge for better status bar appearance.
- Set minSdk to 26.
- Set launcher icon using Kee icon.
- Minor UI improvements to Import Account screen.
This commit is contained in:
Severiano Jaramillo 2024-03-06 20:31:24 -06:00
parent 3368f38a45
commit b5a724137a
20 changed files with 33 additions and 205 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.fleet/settings.json Normal file
View file

@ -0,0 +1,3 @@
{
"run.destination.stop.already.running": "Always"
}

3
composeApp/src/androidMain/kotlin/net/agorise/kee/MainActivity.kt
View file

@ -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())
}

39
composeApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml
View file

@ -1,30 +1,15 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="85.84757"
android:endY="92.4963"
android:startX="42.9492"
android:startY="49.59793"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
android:width="912dp"
android:height="1053.1dp"
android:viewportWidth="912"
android:viewportHeight="1053.1">
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
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"/>
<path
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"/>
<path
android:pathData="M699.2,488H464.5a38.2,38.2 0,0 0,-13.4 2.5,140.8 140.8,0 1,0 0,72.3 38.2,38.2 0,0 0,13.4 2.5H553v46.9a38.6,38.6 0,0 0,77.2 0v-46.9h9.1v32.8a38.6,38.6 0,0 0,77.2 0v-37a38.6,38.6 0,0 0,-17.4 -73ZM315,599.3a72.7,72.7 0,1 1,72.7 -72.7A72.7,72.7 0,0 1,315 599.3Z"
android:fillColor="@color/primary"/>
</vector>

170
composeApp/src/androidMain/res/drawable/ic_launcher_background.xml
View file

@ -1,170 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillColor="#3DDC84"
android:pathData="M0,0h108v108h-108z" />
<path
android:fillColor="#00000000"
android:pathData="M9,0L9,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,0L19,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M29,0L29,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M39,0L39,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M49,0L49,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M59,0L59,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M69,0L69,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M79,0L79,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M89,0L89,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M99,0L99,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,9L108,9"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,19L108,19"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,29L108,29"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,39L108,39"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,49L108,49"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,59L108,59"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,69L108,69"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,79L108,79"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,89L108,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,99L108,99"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,29L89,29"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,39L89,39"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,49L89,49"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,59L89,59"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,69L89,69"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,79L89,79"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M29,19L29,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M39,19L39,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M49,19L49,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M59,19L59,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M69,19L69,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M79,19L79,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
</vector>

3
composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<background android:drawable="@color/primary_container" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>

3
composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<background android:drawable="@color/primary_container" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>

BIN
composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.5 KiB

BIN
composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher_round.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 5.2 KiB

BIN
composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.6 KiB

BIN
composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.3 KiB

BIN
composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4.8 KiB

BIN
composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 7.3 KiB

BIN
composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 7.7 KiB

BIN
composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 10 KiB

BIN
composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 16 KiB

5
composeApp/src/androidMain/res/values/colors.xml Normal file
View file

@ -0,0 +1,5 @@
<resources>
<!-- These colors are only used for the launcher icon -->
<color name="primary">#7E4895</color>
<color name="primary_container">#F8D8FF</color>
</resources>

0
composeApp/src/commonMain/composeResources/drawable/logo-dero.xml → composeApp/src/commonMain/composeResources/drawable/logo-kee.xml
View file

10
composeApp/src/commonMain/kotlin/net/agorise/kee/ui/screen/importaccount/ImportAccountScreen.kt
View file

@ -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(

2
gradle/libs.versions.toml
View file

@ -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"