Skip to content

Commit

Permalink
Update material design and bump target API to 34
Browse files Browse the repository at this point in the history
  • Loading branch information
@d4rken
d4rken committed Sep 2, 2024
1 parent e285410 commit 7bf2373
Show file tree
Hide file tree
Showing 16 changed files with 623 additions and 154 deletions.
3 changes: 2 additions & 1 deletion app/src/gplay/res/layout/upgrade_fragment.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
style="@style/Widget.Material3.CardView.Elevated"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp">
android:layout_marginTop="8dp"
android:backgroundTint="?colorTertiaryContainer">

<com.google.android.material.textview.MaterialTextView
style="@style/TextAppearance.Material3.BodyMedium"
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/res/drawable/ic_chevron_right_24.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="?attr/colorControlNormal"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M8.59,16.58L13.17,12L8.59,7.41L10,6L16,12L10,18L8.59,16.58Z" />
</vector>
13 changes: 12 additions & 1 deletion app/src/main/res/layout/dashboard_device_apps_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,23 @@
style="@style/DashboardDeviceInfoRow"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?selectableItemBackground">
android:background="?selectableItemBackground"
android:paddingStart="0dp">

<ImageView
android:id="@+id/tap_indicator"
android:layout_width="16dp"
android:layout_height="16dp"
android:src="@drawable/ic_chevron_right_24"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<ImageView
android:id="@+id/wifi_icon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginStart="16dp"
android:src="@drawable/ic_baseline_apps_24"
app:layout_constraintBottom_toBottomOf="@id/apps_secondary"
app:layout_constraintStart_toStartOf="parent"
Expand Down
17 changes: 1 addition & 16 deletions app/src/main/res/layout/dashboard_device_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
android:layout_height="wrap_content"
android:visibility="gone"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintBottom_toTopOf="@id/click_hint"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/device_subtitle"
Expand All @@ -85,21 +85,6 @@
tools:listitem="@layout/dashboard_device_power_item"
tools:visibility="visible" />

<com.google.android.material.textview.MaterialTextView
android:id="@+id/click_hint"
style="@style/TextAppearance.Material3.LabelSmall"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/module_data_list"
android:layout_marginBottom="8dp"
android:gravity="center"
android:layout_marginTop="2dp"
android:text="@string/dashboard_click_hint"
android:textSize="8sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>

</com.google.android.material.card.MaterialCardView>
1 change: 1 addition & 0 deletions app/src/main/res/layout/dashboard_fragment.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
android:layout_gravity="bottom|end"
android:layout_margin="24dp"
android:contentDescription="@string/general_refresh_action"
app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior"
app:srcCompat="@drawable/ic_baseline_refresh_24" />

</androidx.coordinatorlayout.widget.CoordinatorLayout>
5 changes: 3 additions & 2 deletions app/src/main/res/layout/dashboard_upgrade_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
style="@style/DashboardCardItem"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:backgroundTint="?colorSecondaryContainer">
android:layout_marginBottom="32dp"
android:backgroundTint="?colorTertiaryContainer">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
Expand Down Expand Up @@ -47,7 +48,7 @@

<com.google.android.material.button.MaterialButton
android:id="@+id/upgrade_action"
style="@style/Widget.Material3.Button.TonalButton"
style="@style/Widget.Material3.FloatingActionButton.Tertiary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values-es/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,13 @@
<string name="general_sync_action">Sincronizar</string>
<string name="general_select_server_label">Seleccionar un servidor</string>
<string name="general_quota_label">Cuota</string>
<string name="general_tap_hint_msg">Toca para ver más opciones</string>
<string name="general_upgrade_action">Actualizar</string>
<string name="general_donate_action">Donar</string>
<string name="general_check_action">Comprobar</string>
<string name="general_internal_not_available_msg">La conexión a Internet no está disponible</string>
<string name="general_refresh_action">Actualizar</string>
<string name="general_continue">Continuar</string>

<string name="dashboard_click_hint">Se puede hacer clic en algunas entradas para ver más detalles.</string>

<string name="debug_debuglog_size_label">Tamaño</string>
<string name="debug_debuglog_size_compressed_label">Tamaño comprimido</string>
<string name="debug_notification_channel_label">Notificaciones sobre la depuración</string>
Expand Down
150 changes: 146 additions & 4 deletions app/src/main/res/values-night/colors.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,150 @@
<resources>
<color name="colorUpgraded">#2962ff</color>

<color name="widgetBackground">@color/md_theme_dark_background</color>
<color name="widgetOnBackground">@color/md_theme_dark_onBackground</color>
<color name="widgetPrimary">@color/md_theme_dark_primary</color>
<color name="widgetOnPrimary">@color/md_theme_dark_onPrimary</color>
<color name="md_theme_primary">#95D5A7</color>
<color name="md_theme_onPrimary">#00391D</color>
<color name="md_theme_primaryContainer">#11512E</color>
<color name="md_theme_onPrimaryContainer">#B1F1C2</color>
<color name="md_theme_secondary">#B6CCB9</color>
<color name="md_theme_onSecondary">#223527</color>
<color name="md_theme_secondaryContainer">#384B3C</color>
<color name="md_theme_onSecondaryContainer">#D2E8D4</color>
<color name="md_theme_tertiary">#A2CDDA</color>
<color name="md_theme_onTertiary">#023640</color>
<color name="md_theme_tertiaryContainer">#214C57</color>
<color name="md_theme_onTertiaryContainer">#BEEAF7</color>
<color name="md_theme_error">#FFB4AB</color>
<color name="md_theme_onError">#690005</color>
<color name="md_theme_errorContainer">#93000A</color>
<color name="md_theme_onErrorContainer">#FFDAD6</color>
<color name="md_theme_background">#101510</color>
<color name="md_theme_onBackground">#DFE4DD</color>
<color name="md_theme_surface">#101510</color>
<color name="md_theme_onSurface">#DFE4DD</color>
<color name="md_theme_surfaceVariant">#414942</color>
<color name="md_theme_onSurfaceVariant">#C0C9BF</color>
<color name="md_theme_outline">#8B938A</color>
<color name="md_theme_outlineVariant">#414942</color>
<color name="md_theme_scrim">#000000</color>
<color name="md_theme_inverseSurface">#DFE4DD</color>
<color name="md_theme_inverseOnSurface">#2C322D</color>
<color name="md_theme_inversePrimary">#2D6A44</color>
<color name="md_theme_primaryFixed">#B1F1C2</color>
<color name="md_theme_onPrimaryFixed">#00210E</color>
<color name="md_theme_primaryFixedDim">#95D5A7</color>
<color name="md_theme_onPrimaryFixedVariant">#11512E</color>
<color name="md_theme_secondaryFixed">#D2E8D4</color>
<color name="md_theme_onSecondaryFixed">#0D1F13</color>
<color name="md_theme_secondaryFixedDim">#B6CCB9</color>
<color name="md_theme_onSecondaryFixedVariant">#384B3C</color>
<color name="md_theme_tertiaryFixed">#BEEAF7</color>
<color name="md_theme_onTertiaryFixed">#001F26</color>
<color name="md_theme_tertiaryFixedDim">#A2CDDA</color>
<color name="md_theme_onTertiaryFixedVariant">#214C57</color>
<color name="md_theme_surfaceDim">#101510</color>
<color name="md_theme_surfaceBright">#353A36</color>
<color name="md_theme_surfaceContainerLowest">#0A0F0B</color>
<color name="md_theme_surfaceContainerLow">#181D18</color>
<color name="md_theme_surfaceContainer">#1C211C</color>
<color name="md_theme_surfaceContainerHigh">#262B27</color>
<color name="md_theme_surfaceContainerHighest">#313631</color>
<color name="md_theme_primary_mediumContrast">#9AD9AB</color>
<color name="md_theme_onPrimary_mediumContrast">#001B0B</color>
<color name="md_theme_primaryContainer_mediumContrast">#619E74</color>
<color name="md_theme_onPrimaryContainer_mediumContrast">#000000</color>
<color name="md_theme_secondary_mediumContrast">#BAD0BD</color>
<color name="md_theme_onSecondary_mediumContrast">#071A0E</color>
<color name="md_theme_secondaryContainer_mediumContrast">#819684</color>
<color name="md_theme_onSecondaryContainer_mediumContrast">#000000</color>
<color name="md_theme_tertiary_mediumContrast">#A7D2DE</color>
<color name="md_theme_onTertiary_mediumContrast">#00191F</color>
<color name="md_theme_tertiaryContainer_mediumContrast">#6D97A3</color>
<color name="md_theme_onTertiaryContainer_mediumContrast">#000000</color>
<color name="md_theme_error_mediumContrast">#FFBAB1</color>
<color name="md_theme_onError_mediumContrast">#370001</color>
<color name="md_theme_errorContainer_mediumContrast">#FF5449</color>
<color name="md_theme_onErrorContainer_mediumContrast">#000000</color>
<color name="md_theme_background_mediumContrast">#101510</color>
<color name="md_theme_onBackground_mediumContrast">#DFE4DD</color>
<color name="md_theme_surface_mediumContrast">#101510</color>
<color name="md_theme_onSurface_mediumContrast">#F7FCF5</color>
<color name="md_theme_surfaceVariant_mediumContrast">#414942</color>
<color name="md_theme_onSurfaceVariant_mediumContrast">#C5CDC3</color>
<color name="md_theme_outline_mediumContrast">#9DA59C</color>
<color name="md_theme_outlineVariant_mediumContrast">#7D857D</color>
<color name="md_theme_scrim_mediumContrast">#000000</color>
<color name="md_theme_inverseSurface_mediumContrast">#DFE4DD</color>
<color name="md_theme_inverseOnSurface_mediumContrast">#262B27</color>
<color name="md_theme_inversePrimary_mediumContrast">#12522F</color>
<color name="md_theme_primaryFixed_mediumContrast">#B1F1C2</color>
<color name="md_theme_onPrimaryFixed_mediumContrast">#001507</color>
<color name="md_theme_primaryFixedDim_mediumContrast">#95D5A7</color>
<color name="md_theme_onPrimaryFixedVariant_mediumContrast">#003F20</color>
<color name="md_theme_secondaryFixed_mediumContrast">#D2E8D4</color>
<color name="md_theme_onSecondaryFixed_mediumContrast">#031509</color>
<color name="md_theme_secondaryFixedDim_mediumContrast">#B6CCB9</color>
<color name="md_theme_onSecondaryFixedVariant_mediumContrast">#273A2C</color>
<color name="md_theme_tertiaryFixed_mediumContrast">#BEEAF7</color>
<color name="md_theme_onTertiaryFixed_mediumContrast">#001419</color>
<color name="md_theme_tertiaryFixedDim_mediumContrast">#A2CDDA</color>
<color name="md_theme_onTertiaryFixedVariant_mediumContrast">#0B3C46</color>
<color name="md_theme_surfaceDim_mediumContrast">#101510</color>
<color name="md_theme_surfaceBright_mediumContrast">#353A36</color>
<color name="md_theme_surfaceContainerLowest_mediumContrast">#0A0F0B</color>
<color name="md_theme_surfaceContainerLow_mediumContrast">#181D18</color>
<color name="md_theme_surfaceContainer_mediumContrast">#1C211C</color>
<color name="md_theme_surfaceContainerHigh_mediumContrast">#262B27</color>
<color name="md_theme_surfaceContainerHighest_mediumContrast">#313631</color>
<color name="md_theme_primary_highContrast">#EFFFEF</color>
<color name="md_theme_onPrimary_highContrast">#000000</color>
<color name="md_theme_primaryContainer_highContrast">#9AD9AB</color>
<color name="md_theme_onPrimaryContainer_highContrast">#000000</color>
<color name="md_theme_secondary_highContrast">#EFFFEF</color>
<color name="md_theme_onSecondary_highContrast">#000000</color>
<color name="md_theme_secondaryContainer_highContrast">#BAD0BD</color>
<color name="md_theme_onSecondaryContainer_highContrast">#000000</color>
<color name="md_theme_tertiary_highContrast">#F4FCFF</color>
<color name="md_theme_onTertiary_highContrast">#000000</color>
<color name="md_theme_tertiaryContainer_highContrast">#A7D2DE</color>
<color name="md_theme_onTertiaryContainer_highContrast">#000000</color>
<color name="md_theme_error_highContrast">#FFF9F9</color>
<color name="md_theme_onError_highContrast">#000000</color>
<color name="md_theme_errorContainer_highContrast">#FFBAB1</color>
<color name="md_theme_onErrorContainer_highContrast">#000000</color>
<color name="md_theme_background_highContrast">#101510</color>
<color name="md_theme_onBackground_highContrast">#DFE4DD</color>
<color name="md_theme_surface_highContrast">#101510</color>
<color name="md_theme_onSurface_highContrast">#FFFFFF</color>
<color name="md_theme_surfaceVariant_highContrast">#414942</color>
<color name="md_theme_onSurfaceVariant_highContrast">#F5FDF3</color>
<color name="md_theme_outline_highContrast">#C5CDC3</color>
<color name="md_theme_outlineVariant_highContrast">#C5CDC3</color>
<color name="md_theme_scrim_highContrast">#000000</color>
<color name="md_theme_inverseSurface_highContrast">#DFE4DD</color>
<color name="md_theme_inverseOnSurface_highContrast">#000000</color>
<color name="md_theme_inversePrimary_highContrast">#003218</color>
<color name="md_theme_primaryFixed_highContrast">#B5F6C6</color>
<color name="md_theme_onPrimaryFixed_highContrast">#000000</color>
<color name="md_theme_primaryFixedDim_highContrast">#9AD9AB</color>
<color name="md_theme_onPrimaryFixedVariant_highContrast">#001B0B</color>
<color name="md_theme_secondaryFixed_highContrast">#D6EDD8</color>
<color name="md_theme_onSecondaryFixed_highContrast">#000000</color>
<color name="md_theme_secondaryFixedDim_highContrast">#BAD0BD</color>
<color name="md_theme_onSecondaryFixedVariant_highContrast">#071A0E</color>
<color name="md_theme_tertiaryFixed_highContrast">#C2EEFB</color>
<color name="md_theme_onTertiaryFixed_highContrast">#000000</color>
<color name="md_theme_tertiaryFixedDim_highContrast">#A7D2DE</color>
<color name="md_theme_onTertiaryFixedVariant_highContrast">#00191F</color>
<color name="md_theme_surfaceDim_highContrast">#101510</color>
<color name="md_theme_surfaceBright_highContrast">#353A36</color>
<color name="md_theme_surfaceContainerLowest_highContrast">#0A0F0B</color>
<color name="md_theme_surfaceContainerLow_highContrast">#181D18</color>
<color name="md_theme_surfaceContainer_highContrast">#1C211C</color>
<color name="md_theme_surfaceContainerHigh_highContrast">#262B27</color>
<color name="md_theme_surfaceContainerHighest_highContrast">#313631</color>

<color name="widgetBackground">@color/md_theme_background</color>
<color name="widgetOnBackground">@color/md_theme_onBackground</color>
<color name="widgetPrimary">@color/md_theme_primary</color>
<color name="widgetOnPrimary">@color/md_theme_onPrimary</color>
</resources>
Loading

0 comments on commit 7bf2373

Please sign in to comment.