Skip to content

Commit 6fa399b

Browse files
d4rkend4rken
committed
Update material design and bump target API to 34
1 parent e285410 commit 6fa399b

16 files changed

+623
-154
lines changed

‎app/src/gplay/res/layout/upgrade_fragment.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
style="@style/Widget.Material3.CardView.Elevated"
4646
android:layout_width="match_parent"
4747
android:layout_height="wrap_content"
48-
android:layout_marginTop="8dp">
48+
android:layout_marginTop="8dp"
49+
android:backgroundTint="?colorTertiaryContainer">
4950

5051
<com.google.android.material.textview.MaterialTextView
5152
style="@style/TextAppearance.Material3.BodyMedium"

‎app/src/main/res/drawable/ic_chevron_right_24.xml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:tint="?attr/colorControlNormal"
5+
android:viewportWidth="24"
6+
android:viewportHeight="24">
7+
<path
8+
android:fillColor="@android:color/white"
9+
android:pathData="M8.59,16.58L13.17,12L8.59,7.41L10,6L16,12L10,18L8.59,16.58Z" />
10+
</vector>

‎app/src/main/res/layout/dashboard_device_apps_item.xml

+12-1
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,23 @@
55
style="@style/DashboardDeviceInfoRow"
66
android:layout_width="match_parent"
77
android:layout_height="wrap_content"
8-
android:background="?selectableItemBackground">
8+
android:background="?selectableItemBackground"
9+
android:paddingStart="0dp">
10+
11+
<ImageView
12+
android:id="@+id/tap_indicator"
13+
android:layout_width="16dp"
14+
android:layout_height="16dp"
15+
android:src="@drawable/ic_chevron_right_24"
16+
app:layout_constraintBottom_toBottomOf="parent"
17+
app:layout_constraintStart_toStartOf="parent"
18+
app:layout_constraintTop_toTopOf="parent" />
919

1020
<ImageView
1121
android:id="@+id/wifi_icon"
1222
android:layout_width="20dp"
1323
android:layout_height="20dp"
24+
android:layout_marginStart="16dp"
1425
android:src="@drawable/ic_baseline_apps_24"
1526
app:layout_constraintBottom_toBottomOf="@id/apps_secondary"
1627
app:layout_constraintStart_toStartOf="parent"

‎app/src/main/res/layout/dashboard_device_item.xml

+1-16
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
android:layout_height="wrap_content"
7777
android:visibility="gone"
7878
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
79-
app:layout_constraintBottom_toTopOf="@id/click_hint"
79+
app:layout_constraintBottom_toBottomOf="parent"
8080
app:layout_constraintEnd_toEndOf="parent"
8181
app:layout_constraintStart_toStartOf="parent"
8282
app:layout_constraintTop_toBottomOf="@id/device_subtitle"
@@ -85,21 +85,6 @@
8585
tools:listitem="@layout/dashboard_device_power_item"
8686
tools:visibility="visible" />
8787

88-
<com.google.android.material.textview.MaterialTextView
89-
android:id="@+id/click_hint"
90-
style="@style/TextAppearance.Material3.LabelSmall"
91-
android:layout_width="match_parent"
92-
android:layout_height="wrap_content"
93-
app:layout_constraintTop_toBottomOf="@id/module_data_list"
94-
android:layout_marginBottom="8dp"
95-
android:gravity="center"
96-
android:layout_marginTop="2dp"
97-
android:text="@string/dashboard_click_hint"
98-
android:textSize="8sp"
99-
app:layout_constraintBottom_toBottomOf="parent"
100-
app:layout_constraintEnd_toEndOf="parent"
101-
app:layout_constraintStart_toStartOf="parent" />
102-
10388
</androidx.constraintlayout.widget.ConstraintLayout>
10489

10590
</com.google.android.material.card.MaterialCardView>

‎app/src/main/res/layout/dashboard_fragment.xml

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
android:layout_gravity="bottom|end"
4848
android:layout_margin="24dp"
4949
android:contentDescription="@string/general_refresh_action"
50+
app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior"
5051
app:srcCompat="@drawable/ic_baseline_refresh_24" />
5152

5253
</androidx.coordinatorlayout.widget.CoordinatorLayout>

‎app/src/main/res/layout/dashboard_upgrade_item.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
style="@style/DashboardCardItem"
55
android:layout_width="match_parent"
66
android:layout_height="wrap_content"
7-
android:backgroundTint="?colorSecondaryContainer">
7+
android:layout_marginBottom="32dp"
8+
android:backgroundTint="?colorTertiaryContainer">
89

910
<androidx.constraintlayout.widget.ConstraintLayout
1011
android:layout_width="match_parent"
@@ -47,7 +48,7 @@
4748

4849
<com.google.android.material.button.MaterialButton
4950
android:id="@+id/upgrade_action"
50-
style="@style/Widget.Material3.Button.TonalButton"
51+
style="@style/Widget.Material3.FloatingActionButton.Tertiary"
5152
android:layout_width="wrap_content"
5253
android:layout_height="wrap_content"
5354
android:layout_marginTop="8dp"

‎app/src/main/res/values-es/strings.xml

-3
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,13 @@
1919
<string name="general_sync_action">Sincronizar</string>
2020
<string name="general_select_server_label">Seleccionar un servidor</string>
2121
<string name="general_quota_label">Cuota</string>
22-
<string name="general_tap_hint_msg">Toca para ver más opciones</string>
2322
<string name="general_upgrade_action">Actualizar</string>
2423
<string name="general_donate_action">Donar</string>
2524
<string name="general_check_action">Comprobar</string>
2625
<string name="general_internal_not_available_msg">La conexión a Internet no está disponible</string>
2726
<string name="general_refresh_action">Actualizar</string>
2827
<string name="general_continue">Continuar</string>
2928

30-
<string name="dashboard_click_hint">Se puede hacer clic en algunas entradas para ver más detalles.</string>
31-
3229
<string name="debug_debuglog_size_label">Tamaño</string>
3330
<string name="debug_debuglog_size_compressed_label">Tamaño comprimido</string>
3431
<string name="debug_notification_channel_label">Notificaciones sobre la depuración</string>

‎app/src/main/res/values-night/colors.xml

+146-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,150 @@
11
<resources>
22
<color name="colorUpgraded">#2962ff</color>
33

4-
<color name="widgetBackground">@color/md_theme_dark_background</color>
5-
<color name="widgetOnBackground">@color/md_theme_dark_onBackground</color>
6-
<color name="widgetPrimary">@color/md_theme_dark_primary</color>
7-
<color name="widgetOnPrimary">@color/md_theme_dark_onPrimary</color>
4+
<color name="md_theme_primary">#95D5A7</color>
5+
<color name="md_theme_onPrimary">#00391D</color>
6+
<color name="md_theme_primaryContainer">#11512E</color>
7+
<color name="md_theme_onPrimaryContainer">#B1F1C2</color>
8+
<color name="md_theme_secondary">#B6CCB9</color>
9+
<color name="md_theme_onSecondary">#223527</color>
10+
<color name="md_theme_secondaryContainer">#384B3C</color>
11+
<color name="md_theme_onSecondaryContainer">#D2E8D4</color>
12+
<color name="md_theme_tertiary">#A2CDDA</color>
13+
<color name="md_theme_onTertiary">#023640</color>
14+
<color name="md_theme_tertiaryContainer">#214C57</color>
15+
<color name="md_theme_onTertiaryContainer">#BEEAF7</color>
16+
<color name="md_theme_error">#FFB4AB</color>
17+
<color name="md_theme_onError">#690005</color>
18+
<color name="md_theme_errorContainer">#93000A</color>
19+
<color name="md_theme_onErrorContainer">#FFDAD6</color>
20+
<color name="md_theme_background">#101510</color>
21+
<color name="md_theme_onBackground">#DFE4DD</color>
22+
<color name="md_theme_surface">#101510</color>
23+
<color name="md_theme_onSurface">#DFE4DD</color>
24+
<color name="md_theme_surfaceVariant">#414942</color>
25+
<color name="md_theme_onSurfaceVariant">#C0C9BF</color>
26+
<color name="md_theme_outline">#8B938A</color>
27+
<color name="md_theme_outlineVariant">#414942</color>
28+
<color name="md_theme_scrim">#000000</color>
29+
<color name="md_theme_inverseSurface">#DFE4DD</color>
30+
<color name="md_theme_inverseOnSurface">#2C322D</color>
31+
<color name="md_theme_inversePrimary">#2D6A44</color>
32+
<color name="md_theme_primaryFixed">#B1F1C2</color>
33+
<color name="md_theme_onPrimaryFixed">#00210E</color>
34+
<color name="md_theme_primaryFixedDim">#95D5A7</color>
35+
<color name="md_theme_onPrimaryFixedVariant">#11512E</color>
36+
<color name="md_theme_secondaryFixed">#D2E8D4</color>
37+
<color name="md_theme_onSecondaryFixed">#0D1F13</color>
38+
<color name="md_theme_secondaryFixedDim">#B6CCB9</color>
39+
<color name="md_theme_onSecondaryFixedVariant">#384B3C</color>
40+
<color name="md_theme_tertiaryFixed">#BEEAF7</color>
41+
<color name="md_theme_onTertiaryFixed">#001F26</color>
42+
<color name="md_theme_tertiaryFixedDim">#A2CDDA</color>
43+
<color name="md_theme_onTertiaryFixedVariant">#214C57</color>
44+
<color name="md_theme_surfaceDim">#101510</color>
45+
<color name="md_theme_surfaceBright">#353A36</color>
46+
<color name="md_theme_surfaceContainerLowest">#0A0F0B</color>
47+
<color name="md_theme_surfaceContainerLow">#181D18</color>
48+
<color name="md_theme_surfaceContainer">#1C211C</color>
49+
<color name="md_theme_surfaceContainerHigh">#262B27</color>
50+
<color name="md_theme_surfaceContainerHighest">#313631</color>
51+
<color name="md_theme_primary_mediumContrast">#9AD9AB</color>
52+
<color name="md_theme_onPrimary_mediumContrast">#001B0B</color>
53+
<color name="md_theme_primaryContainer_mediumContrast">#619E74</color>
54+
<color name="md_theme_onPrimaryContainer_mediumContrast">#000000</color>
55+
<color name="md_theme_secondary_mediumContrast">#BAD0BD</color>
56+
<color name="md_theme_onSecondary_mediumContrast">#071A0E</color>
57+
<color name="md_theme_secondaryContainer_mediumContrast">#819684</color>
58+
<color name="md_theme_onSecondaryContainer_mediumContrast">#000000</color>
59+
<color name="md_theme_tertiary_mediumContrast">#A7D2DE</color>
60+
<color name="md_theme_onTertiary_mediumContrast">#00191F</color>
61+
<color name="md_theme_tertiaryContainer_mediumContrast">#6D97A3</color>
62+
<color name="md_theme_onTertiaryContainer_mediumContrast">#000000</color>
63+
<color name="md_theme_error_mediumContrast">#FFBAB1</color>
64+
<color name="md_theme_onError_mediumContrast">#370001</color>
65+
<color name="md_theme_errorContainer_mediumContrast">#FF5449</color>
66+
<color name="md_theme_onErrorContainer_mediumContrast">#000000</color>
67+
<color name="md_theme_background_mediumContrast">#101510</color>
68+
<color name="md_theme_onBackground_mediumContrast">#DFE4DD</color>
69+
<color name="md_theme_surface_mediumContrast">#101510</color>
70+
<color name="md_theme_onSurface_mediumContrast">#F7FCF5</color>
71+
<color name="md_theme_surfaceVariant_mediumContrast">#414942</color>
72+
<color name="md_theme_onSurfaceVariant_mediumContrast">#C5CDC3</color>
73+
<color name="md_theme_outline_mediumContrast">#9DA59C</color>
74+
<color name="md_theme_outlineVariant_mediumContrast">#7D857D</color>
75+
<color name="md_theme_scrim_mediumContrast">#000000</color>
76+
<color name="md_theme_inverseSurface_mediumContrast">#DFE4DD</color>
77+
<color name="md_theme_inverseOnSurface_mediumContrast">#262B27</color>
78+
<color name="md_theme_inversePrimary_mediumContrast">#12522F</color>
79+
<color name="md_theme_primaryFixed_mediumContrast">#B1F1C2</color>
80+
<color name="md_theme_onPrimaryFixed_mediumContrast">#001507</color>
81+
<color name="md_theme_primaryFixedDim_mediumContrast">#95D5A7</color>
82+
<color name="md_theme_onPrimaryFixedVariant_mediumContrast">#003F20</color>
83+
<color name="md_theme_secondaryFixed_mediumContrast">#D2E8D4</color>
84+
<color name="md_theme_onSecondaryFixed_mediumContrast">#031509</color>
85+
<color name="md_theme_secondaryFixedDim_mediumContrast">#B6CCB9</color>
86+
<color name="md_theme_onSecondaryFixedVariant_mediumContrast">#273A2C</color>
87+
<color name="md_theme_tertiaryFixed_mediumContrast">#BEEAF7</color>
88+
<color name="md_theme_onTertiaryFixed_mediumContrast">#001419</color>
89+
<color name="md_theme_tertiaryFixedDim_mediumContrast">#A2CDDA</color>
90+
<color name="md_theme_onTertiaryFixedVariant_mediumContrast">#0B3C46</color>
91+
<color name="md_theme_surfaceDim_mediumContrast">#101510</color>
92+
<color name="md_theme_surfaceBright_mediumContrast">#353A36</color>
93+
<color name="md_theme_surfaceContainerLowest_mediumContrast">#0A0F0B</color>
94+
<color name="md_theme_surfaceContainerLow_mediumContrast">#181D18</color>
95+
<color name="md_theme_surfaceContainer_mediumContrast">#1C211C</color>
96+
<color name="md_theme_surfaceContainerHigh_mediumContrast">#262B27</color>
97+
<color name="md_theme_surfaceContainerHighest_mediumContrast">#313631</color>
98+
<color name="md_theme_primary_highContrast">#EFFFEF</color>
99+
<color name="md_theme_onPrimary_highContrast">#000000</color>
100+
<color name="md_theme_primaryContainer_highContrast">#9AD9AB</color>
101+
<color name="md_theme_onPrimaryContainer_highContrast">#000000</color>
102+
<color name="md_theme_secondary_highContrast">#EFFFEF</color>
103+
<color name="md_theme_onSecondary_highContrast">#000000</color>
104+
<color name="md_theme_secondaryContainer_highContrast">#BAD0BD</color>
105+
<color name="md_theme_onSecondaryContainer_highContrast">#000000</color>
106+
<color name="md_theme_tertiary_highContrast">#F4FCFF</color>
107+
<color name="md_theme_onTertiary_highContrast">#000000</color>
108+
<color name="md_theme_tertiaryContainer_highContrast">#A7D2DE</color>
109+
<color name="md_theme_onTertiaryContainer_highContrast">#000000</color>
110+
<color name="md_theme_error_highContrast">#FFF9F9</color>
111+
<color name="md_theme_onError_highContrast">#000000</color>
112+
<color name="md_theme_errorContainer_highContrast">#FFBAB1</color>
113+
<color name="md_theme_onErrorContainer_highContrast">#000000</color>
114+
<color name="md_theme_background_highContrast">#101510</color>
115+
<color name="md_theme_onBackground_highContrast">#DFE4DD</color>
116+
<color name="md_theme_surface_highContrast">#101510</color>
117+
<color name="md_theme_onSurface_highContrast">#FFFFFF</color>
118+
<color name="md_theme_surfaceVariant_highContrast">#414942</color>
119+
<color name="md_theme_onSurfaceVariant_highContrast">#F5FDF3</color>
120+
<color name="md_theme_outline_highContrast">#C5CDC3</color>
121+
<color name="md_theme_outlineVariant_highContrast">#C5CDC3</color>
122+
<color name="md_theme_scrim_highContrast">#000000</color>
123+
<color name="md_theme_inverseSurface_highContrast">#DFE4DD</color>
124+
<color name="md_theme_inverseOnSurface_highContrast">#000000</color>
125+
<color name="md_theme_inversePrimary_highContrast">#003218</color>
126+
<color name="md_theme_primaryFixed_highContrast">#B5F6C6</color>
127+
<color name="md_theme_onPrimaryFixed_highContrast">#000000</color>
128+
<color name="md_theme_primaryFixedDim_highContrast">#9AD9AB</color>
129+
<color name="md_theme_onPrimaryFixedVariant_highContrast">#001B0B</color>
130+
<color name="md_theme_secondaryFixed_highContrast">#D6EDD8</color>
131+
<color name="md_theme_onSecondaryFixed_highContrast">#000000</color>
132+
<color name="md_theme_secondaryFixedDim_highContrast">#BAD0BD</color>
133+
<color name="md_theme_onSecondaryFixedVariant_highContrast">#071A0E</color>
134+
<color name="md_theme_tertiaryFixed_highContrast">#C2EEFB</color>
135+
<color name="md_theme_onTertiaryFixed_highContrast">#000000</color>
136+
<color name="md_theme_tertiaryFixedDim_highContrast">#A7D2DE</color>
137+
<color name="md_theme_onTertiaryFixedVariant_highContrast">#00191F</color>
138+
<color name="md_theme_surfaceDim_highContrast">#101510</color>
139+
<color name="md_theme_surfaceBright_highContrast">#353A36</color>
140+
<color name="md_theme_surfaceContainerLowest_highContrast">#0A0F0B</color>
141+
<color name="md_theme_surfaceContainerLow_highContrast">#181D18</color>
142+
<color name="md_theme_surfaceContainer_highContrast">#1C211C</color>
143+
<color name="md_theme_surfaceContainerHigh_highContrast">#262B27</color>
144+
<color name="md_theme_surfaceContainerHighest_highContrast">#313631</color>
145+
146+
<color name="widgetBackground">@color/md_theme_background</color>
147+
<color name="widgetOnBackground">@color/md_theme_onBackground</color>
148+
<color name="widgetPrimary">@color/md_theme_primary</color>
149+
<color name="widgetOnPrimary">@color/md_theme_onPrimary</color>
8150
</resources>

0 commit comments

Comments
 (0)