UI improvements

WSTxda · Feb 26, 2025 · 1d51d89 · 1d51d89
1 parent dde07d1
commit 1d51d89
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 22 deletions.
diff --git a/app/src/main/java/com/wstxda/gsl/fragments/PreferenceFragment.kt b/app/src/main/java/com/wstxda/gsl/fragments/PreferenceFragment.kt
@@ -10,12 +10,7 @@ import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreferenceCompat
 import com.wstxda.gsl.R
-import com.wstxda.gsl.shortcuts.AssistantShortcut
-import com.wstxda.gsl.shortcuts.GamesShortcut
-import com.wstxda.gsl.shortcuts.LensShortcut
-import com.wstxda.gsl.shortcuts.MusicSearchShortcut
-import com.wstxda.gsl.shortcuts.PasswordManagerShortcut
-import com.wstxda.gsl.shortcuts.WeatherShortcut
+import com.wstxda.gsl.shortcuts.*
 import com.wstxda.gsl.ui.SettingsActivity
 import com.wstxda.gsl.utils.TileManager
 

diff --git a/app/src/main/java/com/wstxda/gsl/utils/TileManager.kt b/app/src/main/java/com/wstxda/gsl/utils/TileManager.kt
@@ -8,8 +8,8 @@ import android.graphics.drawable.Icon
 import android.os.Build
 import android.view.View
 import com.google.android.material.snackbar.Snackbar
-import com.wstxda.gsl.R
 import com.wstxda.gsl.services.MusicSearchTileService
+import com.wstxda.gsl.R
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors
 import java.util.function.Consumer

diff --git a/app/src/main/res/layout/bottom_sheet_assistant.xml b/app/src/main/res/layout/bottom_sheet_assistant.xml
@@ -7,8 +7,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingStart="12dp"
-        android:paddingEnd="12dp"
+        android:paddingHorizontal="16dp"
         android:paddingBottom="24dp">
 
         <com.google.android.material.bottomsheet.BottomSheetDragHandleView
@@ -21,7 +20,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/title"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:gravity="center"
             android:text="@string/assistant_game_title"
@@ -30,16 +29,14 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/drag_handler" />
 
-        <com.google.android.material.circularreveal.cardview.CircularRevealCardView
+        <com.google.android.material.card.MaterialCardView
             android:id="@+id/summary_card"
             style="?attr/materialCardViewFilledStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
             android:layout_marginTop="24dp"
-            android:layout_marginEnd="5dp"
-            android:layout_marginBottom="8dp"
-            app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
+            app:cardBackgroundColor="?attr/colorSurfaceContainer"
+            app:contentPadding="16dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/title">
@@ -48,29 +45,27 @@
                 android:id="@+id/summary"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:padding="16dp"
                 android:text="@string/assistant_game_summary"
                 android:textAppearance="?attr/textAppearanceBodyMedium" />
-        </com.google.android.material.circularreveal.cardview.CircularRevealCardView>
+        </com.google.android.material.card.MaterialCardView>
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/setup_button"
-            style="?attr/materialIconButtonFilledStyle"
+            style="@style/Widget.Material3.Button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
+            android:layout_marginTop="18dp"
             android:text="@string/assistant_setup_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/summary_card" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/cancel_button"
-            style="?attr/materialIconButtonFilledTonalStyle"
+            style="@style/Widget.Material3.Button.TonalButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="2dp"
             android:text="@string/assistant_cancel_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml
@@ -13,6 +13,7 @@
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">false</item>
         <item name="android:windowLightNavigationBar">false</item>
+        <item name="android:enforceNavigationBarContrast">false</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <!-- layout padding -->
         <item name="android:listPreferredItemPaddingLeft">17dp</item>

diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
@@ -13,6 +13,7 @@
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:enforceNavigationBarContrast">false</item>
         <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
         <!-- layout padding -->
         <item name="android:listPreferredItemPaddingLeft">17dp</item>