Skip to content

Commit 688e280

Browse files
WSTxdaWSTxda
committed
fix: About layout buttons and colors
- Horizontal scroll for Morphe buttons to support low DPI screens - Text colors in used libraries list - Small changes
1 parent a6c764a commit 688e280

File tree

8 files changed

+53
-44
lines changed

8 files changed

+53
-44
lines changed

play-services-core/microg-ui-tools/src/main/res/drawable/preference_background_bottom.xml renamed to play-services-core/microg-ui-tools/src/main/res/drawable/about_background_bottom.xml

File renamed without changes.

play-services-core/microg-ui-tools/src/main/res/drawable/preference_background_top.xml renamed to play-services-core/microg-ui-tools/src/main/res/drawable/about_background_top.xml

File renamed without changes.

‎play-services-core/microg-ui-tools/src/main/res/layout/about_app.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
android:clickable="true"
77
android:focusable="true"
88
android:layout_height="wrap_content"
9-
android:background="@drawable/preference_background_top"
9+
android:background="@drawable/about_background_top"
1010
android:padding="20dp">
1111

1212
<com.google.android.material.imageview.ShapeableImageView

‎play-services-core/microg-ui-tools/src/main/res/layout/about_morphe.xml‎

Lines changed: 48 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
xmlns:tools="http://schemas.android.com/tools"
44
android:layout_width="match_parent"
55
android:layout_height="wrap_content"
6-
android:background="@drawable/preference_background_bottom"
6+
android:background="@drawable/about_background_bottom"
77
android:padding="20dp">
88

99
<com.google.android.material.imageview.ShapeableImageView
1010
android:id="@+id/morphe_logo"
1111
android:layout_width="48dp"
1212
android:layout_height="48dp"
13-
android:src="@drawable/ic_morphe_logo"
1413
android:background="?attr/colorSurface"
14+
android:src="@drawable/ic_morphe_logo"
1515
app:layout_constraintStart_toStartOf="parent"
1616
app:layout_constraintTop_toTopOf="parent"
1717
app:shapeAppearanceOverlay="@style/ShapeAppearance.Material3.Corner.Full"
@@ -42,50 +42,60 @@
4242
app:layout_constraintTop_toBottomOf="@id/morphe_name"
4343
tools:text="@string/morphe_description" />
4444

45-
<com.google.android.material.button.MaterialButtonGroup
46-
android:id="@+id/morphe_buttons"
47-
android:layout_width="wrap_content"
45+
<HorizontalScrollView
46+
android:id="@+id/morphe_buttons_scroll"
47+
android:layout_width="0dp"
4848
android:layout_height="wrap_content"
4949
android:layout_marginTop="16dp"
50-
android:spacing="0dp"
50+
android:clipToPadding="false"
51+
android:overScrollMode="never"
52+
android:scrollbarSize="1dp"
5153
app:layout_constraintBottom_toBottomOf="parent"
54+
app:layout_constraintEnd_toEndOf="parent"
5255
app:layout_constraintStart_toStartOf="@id/morphe_summary"
5356
app:layout_constraintTop_toBottomOf="@id/morphe_summary">
5457

55-
<com.google.android.material.button.MaterialButton
56-
android:id="@+id/morphe_github"
57-
style="@style/Widget.Material3Expressive.Button.IconButton.Outlined"
58-
android:layout_width="60dp"
58+
<com.google.android.material.button.MaterialButtonGroup
59+
android:id="@+id/morphe_buttons"
60+
android:layout_width="wrap_content"
5961
android:layout_height="wrap_content"
60-
app:icon="@drawable/ic_github"
61-
app:iconGravity="textStart"
62-
app:strokeColor="?attr/colorOutline" />
62+
android:spacing="0dp">
6363

64-
<com.google.android.material.button.MaterialButton
65-
android:id="@+id/morphe_x"
66-
style="@style/Widget.Material3Expressive.Button.IconButton.Outlined"
67-
android:layout_width="60dp"
68-
android:layout_height="wrap_content"
69-
app:icon="@drawable/ic_x"
70-
app:iconGravity="textStart"
71-
app:strokeColor="?attr/colorOutline" />
64+
<com.google.android.material.button.MaterialButton
65+
android:id="@+id/morphe_github"
66+
style="@style/Widget.Material3Expressive.Button.IconButton.Outlined"
67+
android:layout_width="60dp"
68+
android:layout_height="wrap_content"
69+
app:icon="@drawable/ic_github"
70+
app:iconGravity="textStart"
71+
app:strokeColor="?attr/colorOutline" />
7272

73-
<com.google.android.material.button.MaterialButton
74-
android:id="@+id/morphe_reddit"
75-
style="@style/Widget.Material3Expressive.Button.IconButton.Outlined"
76-
android:layout_width="60dp"
77-
android:layout_height="wrap_content"
78-
app:icon="@drawable/ic_reddit"
79-
app:iconGravity="textStart"
80-
app:strokeColor="?attr/colorOutline" />
73+
<com.google.android.material.button.MaterialButton
74+
android:id="@+id/morphe_x"
75+
style="@style/Widget.Material3Expressive.Button.IconButton.Outlined"
76+
android:layout_width="60dp"
77+
android:layout_height="wrap_content"
78+
app:icon="@drawable/ic_x"
79+
app:iconGravity="textStart"
80+
app:strokeColor="?attr/colorOutline" />
8181

82-
<com.google.android.material.button.MaterialButton
83-
android:id="@+id/morphe_website"
84-
style="@style/Widget.Material3Expressive.Button.IconButton.Outlined"
85-
android:layout_width="60dp"
86-
android:layout_height="wrap_content"
87-
app:icon="@drawable/ic_website"
88-
app:iconGravity="textStart"
89-
app:strokeColor="?attr/colorOutline" />
90-
</com.google.android.material.button.MaterialButtonGroup>
82+
<com.google.android.material.button.MaterialButton
83+
android:id="@+id/morphe_reddit"
84+
style="@style/Widget.Material3Expressive.Button.IconButton.Outlined"
85+
android:layout_width="60dp"
86+
android:layout_height="wrap_content"
87+
app:icon="@drawable/ic_reddit"
88+
app:iconGravity="textStart"
89+
app:strokeColor="?attr/colorOutline" />
90+
91+
<com.google.android.material.button.MaterialButton
92+
android:id="@+id/morphe_website"
93+
style="@style/Widget.Material3Expressive.Button.IconButton.Outlined"
94+
android:layout_width="60dp"
95+
android:layout_height="wrap_content"
96+
app:icon="@drawable/ic_website"
97+
app:iconGravity="textStart"
98+
app:strokeColor="?attr/colorOutline" />
99+
</com.google.android.material.button.MaterialButtonGroup>
100+
</HorizontalScrollView>
91101
</androidx.constraintlayout.widget.ConstraintLayout>

‎play-services-core/microg-ui-tools/src/main/res/layout/about_root.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
android:paddingTop="24dp"
3434
android:paddingEnd="16dp"
3535
android:paddingBottom="12dp"
36-
android:text="Libraries"
36+
android:text="@string/about_root_libraries"
3737
android:textAppearance="?attr/textAppearanceLabelLarge"
3838
android:textColor="?attr/colorPrimary" />
3939

‎play-services-core/microg-ui-tools/src/main/res/layout/library_item.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
android:layout_marginStart="16dp"
3737
android:maxLines="2"
3838
android:textAppearance="?attr/textAppearanceTitleMedium"
39-
android:textColor="?attr/colorOnSecondaryContainer"
4039
app:layout_constraintBottom_toTopOf="@android:id/text2"
4140
app:layout_constraintEnd_toEndOf="parent"
4241
app:layout_constraintStart_toEndOf="@id/icon"
@@ -52,7 +51,7 @@
5251
android:ellipsize="marquee"
5352
android:maxLines="10"
5453
android:textAppearance="?attr/textAppearanceBodyMedium"
55-
android:textColor="?attr/colorSecondary"
54+
android:textColor="?android:textColorSecondary"
5655
app:layout_constraintBottom_toBottomOf="parent"
5756
app:layout_constraintEnd_toEndOf="parent"
5857
app:layout_constraintStart_toStartOf="@android:id/text1"

‎play-services-core/src/main/res/layout/preference_material_bottom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
android:layout_height="wrap_content"
66
android:layout_marginStart="?attr/listPreferredItemPaddingStart"
77
android:layout_marginEnd="?attr/listPreferredItemPaddingEnd"
8-
android:background="@drawable/preference_background_bottom"
8+
android:background="@drawable/about_background_bottom"
99
android:clickable="true"
1010
android:focusable="true"
1111
android:padding="16dp">

‎play-services-core/src/main/res/layout/preference_material_top.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
android:layout_marginStart="?attr/listPreferredItemPaddingStart"
77
android:layout_marginEnd="?attr/listPreferredItemPaddingEnd"
88
android:layout_marginBottom="2dp"
9-
android:background="@drawable/preference_background_top"
9+
android:background="@drawable/about_background_top"
1010
android:clickable="true"
1111
android:focusable="true"
1212
android:padding="16dp">

0 commit comments

Comments
 (0)