Update layout things

WSTxda · Dec 21, 2024 · f29333b · f29333b
1 parent 9ecaceb
commit f29333b
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 41 deletions.
diff --git a/play-services-base/core/src/main/res/layout/preference_app_heading.xml b/play-services-base/core/src/main/res/layout/preference_app_heading.xml
@@ -10,20 +10,20 @@
     style="?attr/materialCardViewFilledStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="17dp"
+    android:layout_margin="16dp"
     android:clickable="true"
     android:focusable="true"
-    app:cardBackgroundColor="?colorSurfaceContainer"
+    app:cardBackgroundColor="?colorSurfaceContainerLow"
     app:cardCornerRadius="28dp">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingStart="20dp"
-        android:paddingTop="20dp"
-        android:paddingEnd="20dp"
-        android:paddingBottom="16dp">
+        android:paddingStart="24dp"
+        android:paddingTop="24dp"
+        android:paddingEnd="24dp"
+        android:paddingBottom="18dp">
 
         <ImageView
             android:id="@android:id/icon"

diff --git a/play-services-core/microg-ui-tools/src/main/res/drawable/ic_update.xml b/play-services-core/microg-ui-tools/src/main/res/drawable/ic_update.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M480,840Q405,840 339.5,811.5Q274,783 225.5,734.5Q177,686 148.5,620.5Q120,555 120,480Q120,405 148.5,339.5Q177,274 225.5,225.5Q274,177 339.5,148.5Q405,120 480,120Q562,120 635.5,155Q709,190 760,254L760,200Q760,183 771.5,171.5Q783,160 800,160Q817,160 828.5,171.5Q840,183 840,200L840,360Q840,377 828.5,388.5Q817,400 800,400L640,400Q623,400 611.5,388.5Q600,377 600,360Q600,343 611.5,331.5Q623,320 640,320L710,320Q669,264 609,232Q549,200 480,200Q363,200 281.5,281.5Q200,363 200,480Q200,597 281.5,678.5Q363,760 480,760Q575,760 650,703Q725,646 749,556Q754,540 767,532Q780,524 796,526Q813,528 823,540.5Q833,553 829,568Q800,687 703,763.5Q606,840 480,840ZM520,464L620,564Q631,575 631,592Q631,609 620,620Q609,631 592,631Q575,631 564,620L452,508Q446,502 443,494.5Q440,487 440,479L440,320Q440,303 451.5,291.5Q463,280 480,280Q497,280 508.5,291.5Q520,303 520,320L520,464Z" />
+</vector>
diff --git a/play-services-core/microg-ui-tools/src/main/res/layout/about_root.xml b/play-services-core/microg-ui-tools/src/main/res/layout/about_root.xml
@@ -1,4 +1,4 @@
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -16,24 +16,23 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            app:cardBackgroundColor="?colorSurfaceContainer"
+            app:cardBackgroundColor="?colorSurfaceContainerLow"
             app:cardCornerRadius="28dp">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:paddingStart="20dp"
-                android:paddingTop="20dp"
-                android:paddingEnd="20dp"
-                android:paddingBottom="16dp">
+                android:paddingStart="24dp"
+                android:paddingTop="24dp"
+                android:paddingEnd="24dp"
+                android:paddingBottom="20dp">
 
                 <ImageView
                     android:id="@android:id/icon"
                     android:layout_width="48dp"
                     android:layout_height="48dp"
                     android:layout_gravity="center_horizontal"
-                    android:importantForAccessibility="no"
                     android:src="@android:drawable/sym_def_app_icon" />
 
                 <TextView
@@ -42,9 +41,6 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:layout_marginTop="12dp"
-                    android:ellipsize="marquee"
-                    android:gravity="center"
-                    android:singleLine="false"
                     android:text="@string/about_root_title"
                     android:textAppearance="?attr/textAppearanceTitleLarge" />
 
@@ -71,11 +67,14 @@
 
                 <Button
                     android:id="@+id/btnCheckUpdates"
+                    style="@style/Widget.Material3.Button.TonalButton.Icon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="bottom|center"
                     android:layout_marginTop="12dp"
-                    android:text="@string/check_updates" />
+                    android:text="@string/check_updates"
+                    app:icon="@drawable/ic_update"
+                    app:iconPadding="8dp" />
             </LinearLayout>
         </com.google.android.material.card.MaterialCardView>
 
@@ -99,4 +98,4 @@
             android:layout_marginEnd="7dp"
             android:orientation="vertical" />
     </LinearLayout>
-</ScrollView>
+</androidx.core.widget.NestedScrollView>
diff --git a/play-services-core/microg-ui-tools/src/main/res/layout/settings_activity.xml b/play-services-core/microg-ui-tools/src/main/res/layout/settings_activity.xml
@@ -25,8 +25,7 @@
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        app:liftOnScrollColor="?colorSurface">
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar"
@@ -38,9 +37,7 @@
             app:expandedTitleMarginEnd="@dimen/expanded_title_margin_end"
             app:expandedTitleMarginStart="@dimen/expanded_title_margin_start"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
-            app:maxLines="2"
-            app:scrimVisibleHeightTrigger="@dimen/scrim_visible_height_trigger"
-            app:titleCollapseMode="scale">
+            app:maxLines="2">
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/toolbar"

diff --git a/play-services-core/microg-ui-tools/src/main/res/values/dimens.xml b/play-services-core/microg-ui-tools/src/main/res/values/dimens.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="scrim_visible_height_trigger">137dp</dimen>
     <dimen name="expanded_title_margin_bottom">24dp</dimen>
     <dimen name="expanded_title_margin_start">24dp</dimen>
     <dimen name="expanded_title_margin_end">24dp</dimen>

diff --git a/play-services-core/src/main/res/drawable/ic_profile_device.xml b/play-services-core/src/main/res/drawable/ic_profile_device.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M160,800Q127,800 103.5,776.5Q80,753 80,720L80,160Q80,127 103.5,103.5Q127,80 160,80L360,80Q393,80 416.5,103.5Q440,127 440,160L440,360L360,360L360,280L160,280L160,600L440,600L440,720Q440,753 416.5,776.5Q393,800 360,800L160,800ZM600,880Q567,880 543.5,856.5Q520,833 520,800L520,600L600,600L600,680L800,680L800,360L520,360L520,240Q520,207 543.5,183.5Q567,160 600,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,800Q880,833 856.5,856.5Q833,880 800,880L600,880ZM160,680L160,720Q160,720 160,720Q160,720 160,720L360,720Q360,720 360,720Q360,720 360,720L360,680L160,680ZM600,760L600,800Q600,800 600,800Q600,800 600,800L800,800Q800,800 800,800Q800,800 800,800L800,760L600,760ZM160,200L360,200L360,160Q360,160 360,160Q360,160 360,160L160,160Q160,160 160,160Q160,160 160,160L160,200ZM600,280L800,280L800,240Q800,240 800,240Q800,240 800,240L600,240Q600,240 600,240Q600,240 600,240L600,280ZM320,520Q303,520 291.5,508.5Q280,497 280,480Q280,463 291.5,451.5Q303,440 320,440Q337,440 348.5,451.5Q360,463 360,480Q360,497 348.5,508.5Q337,520 320,520ZM480,520Q463,520 451.5,508.5Q440,497 440,480Q440,463 451.5,451.5Q463,440 480,440Q497,440 508.5,451.5Q520,463 520,480Q520,497 508.5,508.5Q497,520 480,520ZM640,520Q623,520 611.5,508.5Q600,497 600,480Q600,463 611.5,451.5Q623,440 640,440Q657,440 668.5,451.5Q680,463 680,480Q680,497 668.5,508.5Q657,520 640,520ZM160,680L160,680L160,720Q160,720 160,720Q160,720 160,720L160,720Q160,720 160,720Q160,720 160,720L160,680ZM600,760L600,760L600,800Q600,800 600,800Q600,800 600,800L600,800Q600,800 600,800Q600,800 600,800L600,760ZM160,200L160,160Q160,160 160,160Q160,160 160,160L160,160Q160,160 160,160Q160,160 160,160L160,200ZM600,280L600,240Q600,240 600,240Q600,240 600,240L600,240Q600,240 600,240Q600,240 600,240L600,280Z"
-      tools:ignore="VectorPath" />
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M280,920Q247,920 223.5,896.5Q200,873 200,840L200,120Q200,87 223.5,63.5Q247,40 280,40L680,40Q713,40 736.5,63.5Q760,87 760,120L760,840Q760,873 736.5,896.5Q713,920 680,920L280,920ZM280,800L280,840Q280,840 280,840Q280,840 280,840L680,840Q680,840 680,840Q680,840 680,840L680,800L280,800ZM280,720L680,720L680,240L280,240L280,720ZM280,160L680,160L680,120Q680,120 680,120Q680,120 680,120L280,120Q280,120 280,120Q280,120 280,120L280,160ZM280,160L280,120Q280,120 280,120Q280,120 280,120L280,120Q280,120 280,120Q280,120 280,120L280,160ZM280,800L280,800L280,840Q280,840 280,840Q280,840 280,840L280,840Q280,840 280,840Q280,840 280,840L280,800Z" />
 </vector>
diff --git a/play-services-core/src/main/res/drawable/ic_youtube_history.xml b/play-services-core/src/main/res/drawable/ic_youtube_history.xml
@@ -8,6 +8,6 @@
     android:viewportHeight="960">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M480,840Q354,840 257,763.5Q160,687 131,568Q127,553 137,540.5Q147,528 164,526Q180,524 193,532Q206,540 211,556Q235,646 310,703Q385,760 480,760Q597,760 678.5,678.5Q760,597 760,480Q760,363 678.5,281.5Q597,200 480,200Q411,200 351,232Q291,264 250,320L320,320Q337,320 348.5,331.5Q360,343 360,360Q360,377 348.5,388.5Q337,400 320,400L160,400Q143,400 131.5,388.5Q120,377 120,360L120,200Q120,183 131.5,171.5Q143,160 160,160Q177,160 188.5,171.5Q200,183 200,200L200,254Q251,190 324.5,155Q398,120 480,120Q555,120 620.5,148.5Q686,177 734.5,225.5Q783,274 811.5,339.5Q840,405 840,480Q840,555 811.5,620.5Q783,686 734.5,734.5Q686,783 620.5,811.5Q555,840 480,840ZM520,464L620,564Q631,575 631,592Q631,609 620,620Q609,631 592,631Q575,631 564,620L452,508Q446,502 443,494.5Q440,487 440,479L440,320Q440,303 451.5,291.5Q463,280 480,280Q497,280 508.5,291.5Q520,303 520,320L520,464Z"
+        android:pathData="M480,200Q411,200 351,232Q291,264 250,320L320,320Q337,320 348.5,331.5Q360,343 360,360Q360,377 348.5,388.5Q337,400 320,400L160,400Q143,400 131.5,388.5Q120,377 120,360L120,200Q120,183 131.5,171.5Q143,160 160,160Q177,160 188.5,171.5Q200,183 200,200L200,254Q251,190 324.5,155Q398,120 480,120Q555,120 620.5,148Q686,176 735,225Q777,267 804,322Q831,377 838,440Q840,457 828,468Q816,479 799,479Q782,479 770.5,468Q759,457 757,440Q750,394 730,354Q710,314 678,282Q640,244 589.5,222Q539,200 480,200ZM164,526Q180,524 193,532Q206,540 211,556Q233,637 296,691Q359,745 442,756Q463,759 472,771.5Q481,784 481,798Q481,814 470.5,827Q460,840 441,838Q330,825 245.5,752.5Q161,680 132,573Q127,556 137,542Q147,528 164,526ZM520,464L568,512Q582,526 580.5,541.5Q579,557 568,568Q557,579 541.5,580.5Q526,582 512,568L452,508Q446,502 443,494.5Q440,487 440,479L440,320Q440,303 451.5,291.5Q463,280 480,280Q497,280 508.5,291.5Q520,303 520,320L520,464ZM751,960Q737,960 726.5,951Q716,942 713,928L707,900Q695,895 684.5,889.5Q674,884 663,876L634,885Q621,889 608.5,884Q596,879 589,868L581,854Q574,842 576,828Q578,814 589,805L611,786Q609,773 609,760Q609,747 611,734L589,715Q578,706 576,692.5Q574,679 581,667L590,652Q597,641 609,636Q621,631 634,635L663,644Q674,636 684.5,630.5Q695,625 707,620L713,591Q716,577 726.5,568.5Q737,560 751,560L767,560Q781,560 791.5,569Q802,578 805,592L811,620Q823,625 834,631.5Q845,638 855,646L882,637Q896,632 909,637Q922,642 929,654L937,668Q944,680 942,694Q940,708 929,717L907,736Q909,749 909,761Q909,773 907,786L929,805Q940,814 942,827.5Q944,841 937,853L928,868Q921,879 909,884Q897,889 884,885L855,876Q844,884 833.5,889.5Q823,895 811,900L805,929Q802,943 791.5,951.5Q781,960 767,960L751,960ZM759,840Q792,840 815.5,816.5Q839,793 839,760Q839,727 815.5,703.5Q792,680 759,680Q726,680 702.5,703.5Q679,727 679,760Q679,793 702.5,816.5Q726,840 759,840Z"
         tools:ignore="VectorPath" />
 </vector>
diff --git a/play-services-core/src/main/res/layout/preference_material_card_view.xml b/play-services-core/src/main/res/layout/preference_material_card_view.xml
@@ -6,17 +6,17 @@
     style="?attr/materialCardViewFilledStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="17dp"
+    android:layout_margin="16dp"
     android:clickable="true"
     android:focusable="true"
     app:cardBackgroundColor="?colorSecondaryContainer"
-    app:cardCornerRadius="12dp">
+    app:cardCornerRadius="18dp">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="16dp">
+        android:padding="22dp">
 
         <TextView
             android:id="@android:id/title"

diff --git a/play-services-core/src/main/res/layout/settings_root_activity.xml b/play-services-core/src/main/res/layout/settings_root_activity.xml
@@ -13,8 +13,7 @@
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        app:liftOnScrollColor="?colorSurface">
+        android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
             android:id="@+id/collapsing_toolbar"
@@ -25,9 +24,7 @@
             app:expandedTitleMarginEnd="@dimen/settings_expanded_title_margin_end"
             app:expandedTitleMarginStart="@dimen/settings_expanded_title_margin_start"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
-            app:maxLines="2"
-            app:scrimVisibleHeightTrigger="@dimen/settings_scrim_visible_height_trigger"
-            app:titleCollapseMode="scale">
+            app:maxLines="2">
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/toolbar"

diff --git a/play-services-core/src/main/res/values/dimens.xml b/play-services-core/src/main/res/values/dimens.xml
@@ -6,7 +6,6 @@
 
     <dimen name="settings_dialog_corner_radius">28dp</dimen>
 
-    <dimen name="settings_scrim_visible_height_trigger">137dp</dimen>
     <dimen name="settings_expanded_title_margin_bottom">24dp</dimen>
     <dimen name="settings_expanded_title_margin_start">24dp</dimen>
     <dimen name="settings_expanded_title_margin_end">24dp</dimen>

diff --git a/play-services-core/src/main/res/values/themes.xml b/play-services-core/src/main/res/values/themes.xml
@@ -90,6 +90,7 @@
 
     <style name="Component.Snackbar" parent="Widget.Material3.Snackbar">
         <item name="android:layout_margin">24dp</item>
+        <item name="animationMode">slide</item>
     </style>
 
     <style name="Settings.CategoryPreference" parent="@style/Preference.Category.Material">