diff --git a/mobile/.idea/assetWizardSettings.xml b/mobile/.idea/assetWizardSettings.xml index a0b1f7f..9adbf9d 100644 --- a/mobile/.idea/assetWizardSettings.xml +++ b/mobile/.idea/assetWizardSettings.xml @@ -79,6 +79,7 @@ @@ -91,8 +92,9 @@ @@ -124,7 +126,9 @@ @@ -303,6 +307,29 @@ + + + + + + + diff --git a/mobile/.idea/caches/deviceStreaming.xml b/mobile/.idea/caches/deviceStreaming.xml new file mode 100644 index 0000000..871d8b9 --- /dev/null +++ b/mobile/.idea/caches/deviceStreaming.xml @@ -0,0 +1,873 @@ + + + + + + \ No newline at end of file diff --git a/mobile/app/build.gradle.kts b/mobile/app/build.gradle.kts index 2296552..b39da02 100644 --- a/mobile/app/build.gradle.kts +++ b/mobile/app/build.gradle.kts @@ -32,8 +32,8 @@ android { applicationId = "com.odweta.solon" minSdk = 28 targetSdk = 34 - versionCode = 216 - versionName = "2.6.0" + versionCode = 217 + versionName = "2.6.1" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/mobile/app/src/main/java/com/odweta/solon/About.kt b/mobile/app/src/main/java/com/odweta/solon/About.kt index 61bd487..a989056 100644 --- a/mobile/app/src/main/java/com/odweta/solon/About.kt +++ b/mobile/app/src/main/java/com/odweta/solon/About.kt @@ -56,7 +56,7 @@ fun AboutScreen() { horizontalAlignment = Alignment.CenterHorizontally ) { Image( - painter = painterResource(R.drawable.solon_just_yellow), + painter = painterResource(R.drawable.solon_logo_3_0), contentDescription = "Solon logo", modifier = Modifier.size(200.dp) ) diff --git a/mobile/app/src/main/java/com/odweta/solon/SignIn.kt b/mobile/app/src/main/java/com/odweta/solon/SignIn.kt index c061ca3..9dcfa9b 100644 --- a/mobile/app/src/main/java/com/odweta/solon/SignIn.kt +++ b/mobile/app/src/main/java/com/odweta/solon/SignIn.kt @@ -165,7 +165,7 @@ fun SignInScreen() { horizontalAlignment = Alignment.CenterHorizontally ) { Image( - painter = painterResource(R.drawable.solon_just_yellow), + painter = painterResource(R.drawable.solon_logo_3_0), contentDescription = "Solon logo", modifier = Modifier.size(200.dp) ) diff --git a/mobile/app/src/main/java/com/odweta/solon/Splash.kt b/mobile/app/src/main/java/com/odweta/solon/Splash.kt index 619df60..583cb38 100644 --- a/mobile/app/src/main/java/com/odweta/solon/Splash.kt +++ b/mobile/app/src/main/java/com/odweta/solon/Splash.kt @@ -33,7 +33,7 @@ fun SplashScreen() { horizontalAlignment = Alignment.CenterHorizontally ) { Image( - painter = painterResource(R.drawable.solon_just_yellow), + painter = painterResource(R.drawable.solon_logo_3_0), contentDescription = "Solon logo", modifier = Modifier.size(200.dp) ) diff --git a/mobile/app/src/main/launcher-playstore.png b/mobile/app/src/main/launcher-playstore.png index 146aa5b..b5f79a1 100644 Binary files a/mobile/app/src/main/launcher-playstore.png and b/mobile/app/src/main/launcher-playstore.png differ diff --git a/mobile/app/src/main/launcher_monochrome-playstore.png b/mobile/app/src/main/launcher_monochrome-playstore.png new file mode 100644 index 0000000..66e1e3c Binary files /dev/null and b/mobile/app/src/main/launcher_monochrome-playstore.png differ diff --git a/mobile/app/src/main/res/mipmap-anydpi-v26/launcher.xml b/mobile/app/src/main/res/mipmap-anydpi-v26/launcher.xml index e85c285..8f2adea 100644 --- a/mobile/app/src/main/res/mipmap-anydpi-v26/launcher.xml +++ b/mobile/app/src/main/res/mipmap-anydpi-v26/launcher.xml @@ -1,5 +1,6 @@ - + + \ No newline at end of file diff --git a/mobile/app/src/main/res/mipmap-anydpi-v26/launcher_monochrome.xml b/mobile/app/src/main/res/mipmap-anydpi-v26/launcher_monochrome.xml new file mode 100644 index 0000000..332ccdf --- /dev/null +++ b/mobile/app/src/main/res/mipmap-anydpi-v26/launcher_monochrome.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/mobile/app/src/main/res/mipmap-anydpi-v26/launcher_monochrome_round.xml b/mobile/app/src/main/res/mipmap-anydpi-v26/launcher_monochrome_round.xml new file mode 100644 index 0000000..332ccdf --- /dev/null +++ b/mobile/app/src/main/res/mipmap-anydpi-v26/launcher_monochrome_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/mobile/app/src/main/res/mipmap-anydpi-v26/launcher_round.xml b/mobile/app/src/main/res/mipmap-anydpi-v26/launcher_round.xml index e85c285..9d3da32 100644 --- a/mobile/app/src/main/res/mipmap-anydpi-v26/launcher_round.xml +++ b/mobile/app/src/main/res/mipmap-anydpi-v26/launcher_round.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/mobile/app/src/main/res/mipmap-hdpi/launcher.webp b/mobile/app/src/main/res/mipmap-hdpi/launcher.webp index b26d325..5dae5b3 100644 Binary files a/mobile/app/src/main/res/mipmap-hdpi/launcher.webp and b/mobile/app/src/main/res/mipmap-hdpi/launcher.webp differ diff --git a/mobile/app/src/main/res/mipmap-hdpi/launcher_foreground.webp b/mobile/app/src/main/res/mipmap-hdpi/launcher_foreground.webp index cc3140d..25c7f7c 100644 Binary files a/mobile/app/src/main/res/mipmap-hdpi/launcher_foreground.webp and b/mobile/app/src/main/res/mipmap-hdpi/launcher_foreground.webp differ diff --git a/mobile/app/src/main/res/mipmap-hdpi/launcher_monochrome.webp b/mobile/app/src/main/res/mipmap-hdpi/launcher_monochrome.webp new file mode 100644 index 0000000..a749127 Binary files /dev/null and b/mobile/app/src/main/res/mipmap-hdpi/launcher_monochrome.webp differ diff --git a/mobile/app/src/main/res/mipmap-hdpi/launcher_monochrome_foreground.webp b/mobile/app/src/main/res/mipmap-hdpi/launcher_monochrome_foreground.webp new file mode 100644 index 0000000..4b05667 Binary files /dev/null and b/mobile/app/src/main/res/mipmap-hdpi/launcher_monochrome_foreground.webp differ diff --git a/mobile/app/src/main/res/mipmap-hdpi/launcher_monochrome_round.webp b/mobile/app/src/main/res/mipmap-hdpi/launcher_monochrome_round.webp new file mode 100644 index 0000000..45a1efe Binary files /dev/null and b/mobile/app/src/main/res/mipmap-hdpi/launcher_monochrome_round.webp differ diff --git a/mobile/app/src/main/res/mipmap-hdpi/launcher_round.webp b/mobile/app/src/main/res/mipmap-hdpi/launcher_round.webp index 9a43594..9f3a260 100644 Binary files a/mobile/app/src/main/res/mipmap-hdpi/launcher_round.webp and b/mobile/app/src/main/res/mipmap-hdpi/launcher_round.webp differ diff --git a/mobile/app/src/main/res/mipmap-mdpi/launcher.webp b/mobile/app/src/main/res/mipmap-mdpi/launcher.webp index 08618de..ed51816 100644 Binary files a/mobile/app/src/main/res/mipmap-mdpi/launcher.webp and b/mobile/app/src/main/res/mipmap-mdpi/launcher.webp differ diff --git a/mobile/app/src/main/res/mipmap-mdpi/launcher_foreground.webp b/mobile/app/src/main/res/mipmap-mdpi/launcher_foreground.webp index 04ffdb9..ead50d9 100644 Binary files a/mobile/app/src/main/res/mipmap-mdpi/launcher_foreground.webp and b/mobile/app/src/main/res/mipmap-mdpi/launcher_foreground.webp differ diff --git a/mobile/app/src/main/res/mipmap-mdpi/launcher_monochrome.webp b/mobile/app/src/main/res/mipmap-mdpi/launcher_monochrome.webp new file mode 100644 index 0000000..abaec64 Binary files /dev/null and b/mobile/app/src/main/res/mipmap-mdpi/launcher_monochrome.webp differ diff --git a/mobile/app/src/main/res/mipmap-mdpi/launcher_monochrome_foreground.webp b/mobile/app/src/main/res/mipmap-mdpi/launcher_monochrome_foreground.webp new file mode 100644 index 0000000..69c670a Binary files /dev/null and b/mobile/app/src/main/res/mipmap-mdpi/launcher_monochrome_foreground.webp differ diff --git a/mobile/app/src/main/res/mipmap-mdpi/launcher_monochrome_round.webp b/mobile/app/src/main/res/mipmap-mdpi/launcher_monochrome_round.webp new file mode 100644 index 0000000..be6b996 Binary files /dev/null and b/mobile/app/src/main/res/mipmap-mdpi/launcher_monochrome_round.webp differ diff --git a/mobile/app/src/main/res/mipmap-mdpi/launcher_round.webp b/mobile/app/src/main/res/mipmap-mdpi/launcher_round.webp index 3989f68..da05277 100644 Binary files a/mobile/app/src/main/res/mipmap-mdpi/launcher_round.webp and b/mobile/app/src/main/res/mipmap-mdpi/launcher_round.webp differ diff --git a/mobile/app/src/main/res/mipmap-xhdpi/launcher.webp b/mobile/app/src/main/res/mipmap-xhdpi/launcher.webp index 482bef5..2a912b5 100644 Binary files a/mobile/app/src/main/res/mipmap-xhdpi/launcher.webp and b/mobile/app/src/main/res/mipmap-xhdpi/launcher.webp differ diff --git a/mobile/app/src/main/res/mipmap-xhdpi/launcher_foreground.webp b/mobile/app/src/main/res/mipmap-xhdpi/launcher_foreground.webp index e480e1d..1bc6a74 100644 Binary files a/mobile/app/src/main/res/mipmap-xhdpi/launcher_foreground.webp and b/mobile/app/src/main/res/mipmap-xhdpi/launcher_foreground.webp differ diff --git a/mobile/app/src/main/res/mipmap-xhdpi/launcher_monochrome.webp b/mobile/app/src/main/res/mipmap-xhdpi/launcher_monochrome.webp new file mode 100644 index 0000000..a44d974 Binary files /dev/null and b/mobile/app/src/main/res/mipmap-xhdpi/launcher_monochrome.webp differ diff --git a/mobile/app/src/main/res/mipmap-xhdpi/launcher_monochrome_foreground.webp b/mobile/app/src/main/res/mipmap-xhdpi/launcher_monochrome_foreground.webp new file mode 100644 index 0000000..f2e4b87 Binary files /dev/null and b/mobile/app/src/main/res/mipmap-xhdpi/launcher_monochrome_foreground.webp differ diff --git a/mobile/app/src/main/res/mipmap-xhdpi/launcher_monochrome_round.webp b/mobile/app/src/main/res/mipmap-xhdpi/launcher_monochrome_round.webp new file mode 100644 index 0000000..0423072 Binary files /dev/null and b/mobile/app/src/main/res/mipmap-xhdpi/launcher_monochrome_round.webp differ diff --git a/mobile/app/src/main/res/mipmap-xhdpi/launcher_round.webp b/mobile/app/src/main/res/mipmap-xhdpi/launcher_round.webp index 4e9495b..dae4f64 100644 Binary files a/mobile/app/src/main/res/mipmap-xhdpi/launcher_round.webp and b/mobile/app/src/main/res/mipmap-xhdpi/launcher_round.webp differ diff --git a/mobile/app/src/main/res/mipmap-xxhdpi/launcher.webp b/mobile/app/src/main/res/mipmap-xxhdpi/launcher.webp index 1e7802d..753ad73 100644 Binary files a/mobile/app/src/main/res/mipmap-xxhdpi/launcher.webp and b/mobile/app/src/main/res/mipmap-xxhdpi/launcher.webp differ diff --git a/mobile/app/src/main/res/mipmap-xxhdpi/launcher_foreground.webp b/mobile/app/src/main/res/mipmap-xxhdpi/launcher_foreground.webp index 8ec7548..1e8b5b8 100644 Binary files a/mobile/app/src/main/res/mipmap-xxhdpi/launcher_foreground.webp and b/mobile/app/src/main/res/mipmap-xxhdpi/launcher_foreground.webp differ diff --git a/mobile/app/src/main/res/mipmap-xxhdpi/launcher_monochrome.webp b/mobile/app/src/main/res/mipmap-xxhdpi/launcher_monochrome.webp new file mode 100644 index 0000000..4e57148 Binary files /dev/null and b/mobile/app/src/main/res/mipmap-xxhdpi/launcher_monochrome.webp differ diff --git a/mobile/app/src/main/res/mipmap-xxhdpi/launcher_monochrome_foreground.webp b/mobile/app/src/main/res/mipmap-xxhdpi/launcher_monochrome_foreground.webp new file mode 100644 index 0000000..5ff7fd4 Binary files /dev/null and b/mobile/app/src/main/res/mipmap-xxhdpi/launcher_monochrome_foreground.webp differ diff --git a/mobile/app/src/main/res/mipmap-xxhdpi/launcher_monochrome_round.webp b/mobile/app/src/main/res/mipmap-xxhdpi/launcher_monochrome_round.webp new file mode 100644 index 0000000..87eed79 Binary files /dev/null and b/mobile/app/src/main/res/mipmap-xxhdpi/launcher_monochrome_round.webp differ diff --git a/mobile/app/src/main/res/mipmap-xxhdpi/launcher_round.webp b/mobile/app/src/main/res/mipmap-xxhdpi/launcher_round.webp index 56cfcca..7b3aac3 100644 Binary files a/mobile/app/src/main/res/mipmap-xxhdpi/launcher_round.webp and b/mobile/app/src/main/res/mipmap-xxhdpi/launcher_round.webp differ diff --git a/mobile/app/src/main/res/mipmap-xxxhdpi/launcher.webp b/mobile/app/src/main/res/mipmap-xxxhdpi/launcher.webp index bfadc1a..229d966 100644 Binary files a/mobile/app/src/main/res/mipmap-xxxhdpi/launcher.webp and b/mobile/app/src/main/res/mipmap-xxxhdpi/launcher.webp differ diff --git a/mobile/app/src/main/res/mipmap-xxxhdpi/launcher_foreground.webp b/mobile/app/src/main/res/mipmap-xxxhdpi/launcher_foreground.webp index 2545e9f..be70484 100644 Binary files a/mobile/app/src/main/res/mipmap-xxxhdpi/launcher_foreground.webp and b/mobile/app/src/main/res/mipmap-xxxhdpi/launcher_foreground.webp differ diff --git a/mobile/app/src/main/res/mipmap-xxxhdpi/launcher_monochrome.webp b/mobile/app/src/main/res/mipmap-xxxhdpi/launcher_monochrome.webp new file mode 100644 index 0000000..026aba5 Binary files /dev/null and b/mobile/app/src/main/res/mipmap-xxxhdpi/launcher_monochrome.webp differ diff --git a/mobile/app/src/main/res/mipmap-xxxhdpi/launcher_monochrome_foreground.webp b/mobile/app/src/main/res/mipmap-xxxhdpi/launcher_monochrome_foreground.webp new file mode 100644 index 0000000..b4c461e Binary files /dev/null and b/mobile/app/src/main/res/mipmap-xxxhdpi/launcher_monochrome_foreground.webp differ diff --git a/mobile/app/src/main/res/mipmap-xxxhdpi/launcher_monochrome_round.webp b/mobile/app/src/main/res/mipmap-xxxhdpi/launcher_monochrome_round.webp new file mode 100644 index 0000000..5b1d264 Binary files /dev/null and b/mobile/app/src/main/res/mipmap-xxxhdpi/launcher_monochrome_round.webp differ diff --git a/mobile/app/src/main/res/mipmap-xxxhdpi/launcher_round.webp b/mobile/app/src/main/res/mipmap-xxxhdpi/launcher_round.webp index d233d9e..cba23a2 100644 Binary files a/mobile/app/src/main/res/mipmap-xxxhdpi/launcher_round.webp and b/mobile/app/src/main/res/mipmap-xxxhdpi/launcher_round.webp differ diff --git a/mobile/app/src/main/res/values/launcher_background.xml b/mobile/app/src/main/res/values/launcher_background.xml new file mode 100644 index 0000000..14cf0b9 --- /dev/null +++ b/mobile/app/src/main/res/values/launcher_background.xml @@ -0,0 +1,4 @@ + + + #000000 + \ No newline at end of file diff --git a/mobile/app/src/main/res/values/launcher_monochrome_background.xml b/mobile/app/src/main/res/values/launcher_monochrome_background.xml new file mode 100644 index 0000000..ddf4b45 --- /dev/null +++ b/mobile/app/src/main/res/values/launcher_monochrome_background.xml @@ -0,0 +1,4 @@ + + + #000000 + \ No newline at end of file diff --git a/mobile/gradle/libs.versions.toml b/mobile/gradle/libs.versions.toml index d5a5d58..452e959 100644 --- a/mobile/gradle/libs.versions.toml +++ b/mobile/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] accompanistCoil = "0.30.1" -agp = "8.7.2" +agp = "8.13.0" coilCompose = "2.4.0" glide = "4.16.0" kotlin = "2.0.0" diff --git a/mobile/gradle/wrapper/gradle-wrapper.properties b/mobile/gradle/wrapper/gradle-wrapper.properties index 48dc78b..6f3b24e 100644 --- a/mobile/gradle/wrapper/gradle-wrapper.properties +++ b/mobile/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Oct 17 19:11:18 CEST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists