Merge pull request #23 from MateusRodCosta/dev

Version 1.2.2
MateusRodCosta · May 9, 2024 · ad938f4 · ad938f4
2 parents 8d89b68 + 6c1ab7f
commit ad938f4
Show file tree

Hide file tree

Showing 15 changed files with 50 additions and 34 deletions.
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/README.md b/README.md
@@ -13,8 +13,8 @@ Or download the latest APK from the [Releases Section](https://github.com/Mateus
 
 ## Screenshots
 
-<img src="https://raw.githubusercontent.com/MateusRodCosta/Share2Storage/main/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" width="270">
-<img src="https://raw.githubusercontent.com/MateusRodCosta/Share2Storage/main/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png" width="270">
+<img src="https://raw.githubusercontent.com/MateusRodCosta/Share2Storage/main/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png" width="270" alt="Main Screen">
+<img src="https://raw.githubusercontent.com/MateusRodCosta/Share2Storage/main/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png" width="270" alt="Details Screen">
 
 ## License
 

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -22,8 +22,8 @@ android {
         applicationId = "com.mateusrodcosta.apps.share2storage"
         minSdk = 26
         targetSdk = 34
-        versionCode = 18
-        versionName = "1.2.1"
+        versionCode = 19
+        versionName = "1.2.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -83,6 +83,7 @@ android {
 
 dependencies {
     implementation(libs.bundles.androidx.ktx)
+    implementation(libs.androidx.core.splashscreen)
 
     val composeBom = platform(libs.compose.bom)
     implementation(composeBom)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -8,11 +8,12 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@android:style/Theme.Material.NoActionBar"
+        android:theme="@style/Theme.App"
         android:enableOnBackInvokedCallback="true">
 
         <activity
             android:name=".MainActivity"
+            android:theme="@style/Theme.App.Starting"
             android:exported="true">
 
             <intent-filter>

diff --git a/app/src/main/kotlin/com/mateusrodcosta/apps/share2storage/DetailsActivity.kt b/app/src/main/kotlin/com/mateusrodcosta/apps/share2storage/DetailsActivity.kt
@@ -25,10 +25,10 @@ import android.util.Log
 import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.ActivityResultLauncher
 import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
 import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
+import androidx.core.view.WindowCompat
 import androidx.preference.PreferenceManager
 import com.mateusrodcosta.apps.share2storage.model.UriData
 import com.mateusrodcosta.apps.share2storage.screens.DetailsScreen
@@ -47,8 +47,10 @@ class DetailsActivity : ComponentActivity() {
 
     @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
-        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+        val windowInsetsController = WindowCompat.getInsetsController(window, window.decorView)
+        windowInsetsController.isAppearanceLightNavigationBars = true
 
         getPreferences()
         handleIntent(intent)

diff --git a/app/src/main/kotlin/com/mateusrodcosta/apps/share2storage/MainActivity.kt b/app/src/main/kotlin/com/mateusrodcosta/apps/share2storage/MainActivity.kt
@@ -21,10 +21,11 @@ import android.os.Bundle
 import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
 import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import androidx.core.view.WindowCompat
 import com.mateusrodcosta.apps.share2storage.screens.AppNavigation
 import com.mateusrodcosta.apps.share2storage.screens.SettingsViewModel
 
@@ -44,8 +45,11 @@ class MainActivity : ComponentActivity() {
 
     @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
-        enableEdgeToEdge()
+        installSplashScreen()
         super.onCreate(savedInstanceState)
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+        val windowInsetsController = WindowCompat.getInsetsController(window, window.decorView)
+        windowInsetsController.isAppearanceLightNavigationBars = true
 
         settingsViewModel.initializeWithContext(applicationContext)
         settingsViewModel.assignSaveLocationDirIntent(getSaveLocationDirIntent)

diff --git a/app/src/main/kotlin/com/mateusrodcosta/apps/share2storage/screens/MainScreen.kt b/app/src/main/kotlin/com/mateusrodcosta/apps/share2storage/screens/MainScreen.kt
@@ -255,7 +255,7 @@ fun AboutRowWithURL(
 }
 
 @Composable
-fun GenericRow(onClick: () -> Unit = {}, content: @Composable() (RowScope.() -> Unit)) {
+fun GenericRow(onClick: () -> Unit = {}, content: @Composable (RowScope.() -> Unit)) {
     Box(modifier = Modifier
         .fillMaxWidth()
         .clickable { onClick() }) {

diff --git a/app/src/main/kotlin/com/mateusrodcosta/apps/share2storage/screens/SettingsScreen.kt b/app/src/main/kotlin/com/mateusrodcosta/apps/share2storage/screens/SettingsScreen.kt
@@ -25,7 +25,6 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width

diff --git a/app/src/main/kotlin/com/mateusrodcosta/apps/share2storage/ui/theme/Theme.kt b/app/src/main/kotlin/com/mateusrodcosta/apps/share2storage/ui/theme/Theme.kt
@@ -91,8 +91,7 @@ private val DarkColors = darkColorScheme(
 
 @Composable
 fun AppTheme(
-    useDarkTheme: Boolean = isSystemInDarkTheme(),
-    content: @Composable() () -> Unit
+    useDarkTheme: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit
 ) {
     val colors = if (!useDarkTheme) {
         LightColors
@@ -101,7 +100,6 @@ fun AppTheme(
     }
 
     MaterialTheme(
-        colorScheme = colors,
-        content = content
+        colorScheme = colors, content = content
     )
 }
diff --git a/app/src/main/res/drawable/launch_background.xml b/app/src/main/res/drawable/launch_background.xml
diff --git a/...ain/res/values/ic_launcher_background.xml → app/src/main/res/values/colors.xml b/...ain/res/values/ic_launcher_background.xml → app/src/main/res/values/colors.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="ic_launcher_background">#FFFFFF</color>
+    <color name="splash_screen_background">#000000</color>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Theme.App" parent="@android:style/Theme.Material.Light.NoActionBar">
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">false</item>
+    </style>
+    <style name="Theme.App.Starting" parent="Theme.SplashScreen.IconBackground">
+        <item name="windowSplashScreenBackground">@color/splash_screen_background</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
+        <item name="windowSplashScreenIconBackgroundColor">@color/ic_launcher_background</item>
+        <item name="postSplashScreenTheme">@style/Theme.App</item>
+    </style>
+</resources>
diff --git a/fastlane/metadata/android/en-US/changelogs/19.txt b/fastlane/metadata/android/en-US/changelogs/19.txt
@@ -0,0 +1,3 @@
+• Updated dependencies
+• Support splash screen for pre-Android 12
+• Status bar icons should now be white
diff --git a/fastlane/metadata/android/pt-BR/changelogs/19.txt b/fastlane/metadata/android/pt-BR/changelogs/19.txt
@@ -0,0 +1,3 @@
+• Dependências atualizadas
+• Adicionado suporte a tela de abertura para versões do Android pre-12
+• Os ícones da barra de status agora são brancos
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,11 +1,12 @@
 [versions]
-agp = "8.3.1"
-kotlin = "1.9.22"
-androidxComposeCompiler = "1.5.10"
-ktx = "1.12.0"
+agp = "8.4.0"
+kotlin = "1.9.23"
+androidxComposeCompiler = "1.5.13"
+ktx = "1.13.1"
 preference-ktx = "1.2.1"
-composeBom = "2024.03.00"
-activityCompose = "1.8.2"
+splashscreen = "1.0.1"
+composeBom = "2024.05.00"
+activityCompose = "1.9.0"
 navigationCompose = "2.7.7"
 junit = "4.13.2"
 androidxTestRunner = "1.5.2"
@@ -14,6 +15,7 @@ androidxTestRules = "1.5.0"
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "ktx" }
 androidx-preference-ktx = { group = "androidx.preference", name = "preference-ktx", version.ref = "preference-ktx" }
+androidx-core-splashscreen = { group = "androidx.core", name = "core-splashscreen", version.ref = "splashscreen" }
 compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
 compose-material3 = { group = "androidx.compose.material3", name = "material3" }
 compose-material3-window-size-classes = { group = "androidx.compose.material3", name = "material3-window-size-class" }