Skip to content

Update theme #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kalynstricklin merged 2 commits into from
Jul 7, 2026
Merged

Update theme #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc411ba
updated switches to use material switch, updated back arrow + bottom …
kalynstricklin Jul 7, 2026
8cb780e
updated theme
kalynstricklin Jul 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sensorhub-android-app/res/color/bottom_nav_selector.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/md_theme_onPrimary" android:state_checked="true" />
<item android:color="@color/bottom_nav_unselected" />
<item android:color="@color/md_theme_primary" android:state_checked="true" />
<item android:color="@color/md_theme_onSurfaceVariant" />
</selector>
6 changes: 3 additions & 3 deletions sensorhub-android-app/res/layout/activity_edit_server_profile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
app:cardCornerRadius="@dimen/card_corner_radius"
app:cardElevation="0dp"
app:strokeColor="@color/md_theme_outline"
app:strokeWidth="1dp">
app:strokeWidth="0dp">

<LinearLayout
android:layout_width="match_parent"
Expand Down Expand Up @@ -95,7 +95,7 @@
app:cardCornerRadius="@dimen/card_corner_radius"
app:cardElevation="0dp"
app:strokeColor="@color/md_theme_outline"
app:strokeWidth="1dp">
app:strokeWidth="0dp">

<LinearLayout
android:layout_width="match_parent"
Expand Down Expand Up @@ -213,7 +213,7 @@
app:cardCornerRadius="@dimen/card_corner_radius"
app:cardElevation="0dp"
app:strokeColor="@color/md_theme_outline"
app:strokeWidth="1dp">
app:strokeWidth="0dp">

<LinearLayout
android:layout_width="match_parent"
Expand Down
2 changes: 1 addition & 1 deletion sensorhub-android-app/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
android:id="@+id/bottom_nav"
android:layout_width="match_parent"
android:layout_height="75dp"
android:background="@color/md_theme_secondaryContainer"
android:background="@color/md_theme_background"
app:itemIconTint="@color/bottom_nav_selector"
app:itemTextColor="@color/bottom_nav_selector"
app:menu="@menu/bottom_nav_menu"
Expand Down
4 changes: 2 additions & 2 deletions sensorhub-android-app/res/layout/fragment_dashboard.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
app:cardElevation="@dimen/card_elevation"
app:cardBackgroundColor="@color/md_theme_background"
app:strokeColor="@color/status_started"
app:strokeWidth="1dp">
app:strokeWidth="0dp">

<LinearLayout
android:layout_width="match_parent"
Expand Down Expand Up @@ -100,7 +100,7 @@
app:cardElevation="@dimen/card_elevation"
app:cardBackgroundColor="@color/md_theme_background"
app:strokeColor="@color/md_theme_outline"
app:strokeWidth="1dp">
app:strokeWidth="0dp">

<LinearLayout
android:layout_width="match_parent"
Expand Down
8 changes: 4 additions & 4 deletions sensorhub-android-app/res/layout/item_faq_entry.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
android:layout_marginBottom="8dp"
app:cardCornerRadius="@dimen/card_corner_radius"
app:cardElevation="@dimen/card_elevation"
app:cardBackgroundColor="@color/md_theme_surface">
app:cardBackgroundColor="@color/dialog_bg">

<LinearLayout
android:layout_width="match_parent"
Expand All @@ -26,7 +26,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="@color/md_theme_onSurface"
android:textColor="@android:color/white"
android:textSize="15sp"
android:fontFamily="sans-serif-medium" />

Expand All @@ -36,7 +36,7 @@
android:layout_height="24dp"
android:layout_marginStart="8dp"
android:src="@drawable/ic_expand_more"
app:tint="@color/md_theme_onSurfaceVariant"
app:tint="@android:color/white"
android:contentDescription="Expand" />

</LinearLayout>
Expand All @@ -46,7 +46,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:textColor="@color/md_theme_onSurfaceVariant"
android:textColor="@android:color/white"
android:textSize="14sp"
android:lineSpacingExtra="4dp"
android:visibility="gone" />
Expand Down
3 changes: 1 addition & 2 deletions sensorhub-android-app/res/layout/item_server_profile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
app:cardCornerRadius="@dimen/card_corner_radius"
app:cardElevation="0dp"
app:cardBackgroundColor="@color/surface_card"
app:strokeColor="@color/md_theme_outline"
app:strokeWidth="1dp">
app:strokeWidth="0dp">

<LinearLayout
android:layout_width="match_parent"
Expand Down
2 changes: 1 addition & 1 deletion sensorhub-android-app/res/layout/item_server_status.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
app:cardElevation="@dimen/card_elevation"
app:cardBackgroundColor="@color/md_theme_background"
app:strokeColor="@color/md_theme_outline"
app:strokeWidth="1dp">
app:strokeWidth="0dp">

<LinearLayout
android:layout_width="match_parent"
Expand Down
6 changes: 2 additions & 4 deletions sensorhub-android-app/res/layout/pref_switch_bottom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,10 @@
android:layout_marginTop="2dp" />
</LinearLayout>

<Switch
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/switchWidget"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="false"
android:clickable="false"
android:thumbTint="@color/switch_thumb_selector"
android:trackTint="@color/switch_track_selector" />
android:clickable="false" />
</LinearLayout>
6 changes: 2 additions & 4 deletions sensorhub-android-app/res/layout/pref_switch_mid.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,10 @@
android:layout_marginTop="2dp" />
</LinearLayout>

<Switch
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/switchWidget"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="false"
android:clickable="false"
android:thumbTint="@color/switch_thumb_selector"
android:trackTint="@color/switch_track_selector" />
android:clickable="false" />
</LinearLayout>
6 changes: 2 additions & 4 deletions sensorhub-android-app/res/layout/pref_switch_top.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,10 @@
android:layout_marginTop="2dp" />
</LinearLayout>

<Switch
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/switchWidget"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="false"
android:clickable="false"
android:thumbTint="@color/switch_thumb_selector"
android:trackTint="@color/switch_track_selector" />
android:clickable="false" />
</LinearLayout>
7 changes: 2 additions & 5 deletions sensorhub-android-app/res/layout/preference_switch_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,13 @@
android:textAlignment="viewStart" />
</LinearLayout>

<Switch
<com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/switchWidget"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="false"
android:clickable="false"
android:paddingStart="0dp"
android:paddingEnd="0dp"
android:thumbTint="@color/switch_thumb_selector"
android:trackTint="@color/switch_track_selector"
/>
android:paddingEnd="0dp" />

</LinearLayout>
77 changes: 39 additions & 38 deletions sensorhub-android-app/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,73 +1,74 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<color name="md_theme_primary">#D35400</color>
<color name="md_theme_primary">#E64A19</color>
<color name="md_theme_onPrimary">#FFFFFF</color>

<color name="md_theme_primaryContainer">#24160A</color>
<color name="md_theme_onPrimaryContainer">#E6B89C</color>
<color name="md_theme_primaryContainer">#4E1700</color>
<color name="md_theme_onPrimaryContainer">#FFCCBC</color>

<color name="md_theme_primaryDark">#C24E00</color>
<color name="md_theme_primaryDark">#BF360C</color>

<color name="md_theme_secondary">#9A9A9A</color>
<color name="md_theme_secondary">#9E9E9E</color>
<color name="md_theme_onSecondary">#0A0A0A</color>

<color name="md_theme_secondaryContainer">#242424</color>
<color name="md_theme_onSecondaryContainer">#F5F5F5</color>
<color name="md_theme_secondaryContainer">#424242</color>
<color name="md_theme_onSecondaryContainer">#E0E0E0</color>

<color name="md_theme_tertiary">#B84A0D</color>
<color name="md_theme_tertiary">#FF7043</color>
<color name="md_theme_onTertiary">#FFFFFF</color>

<color name="md_theme_tertiaryContainer">#1C0A00</color>
<color name="md_theme_onTertiaryContainer">#E6B89C</color>
<color name="md_theme_tertiaryContainer">#4E1700</color>
<color name="md_theme_onTertiaryContainer">#FFCCBC</color>

<color name="md_theme_error">#CF6679</color>
<color name="md_theme_onError">#1C0006</color>

<color name="md_theme_errorContainer">#4A0011</color>
<color name="md_theme_onErrorContainer">#FFB3BA</color>
<color name="md_theme_errorContainer">#93000A</color>
<color name="md_theme_onErrorContainer">#FFDAD6</color>

<color name="md_theme_background">#0A0A0A</color>
<color name="md_theme_background">#121212</color>

<color name="md_theme_onBackground">#F5F5F5</color>
<color name="md_theme_onBackground">#E0E0E0</color>

<color name="md_theme_surface">#141414</color>
<color name="md_theme_onSurface">#F5F5F5</color>
<color name="md_theme_surface">#1E1E1E</color>
<color name="md_theme_onSurface">#E0E0E0</color>

<color name="md_theme_surfaceVariant">#1C1C1C</color>
<color name="md_theme_onSurfaceVariant">#9A9A9A</color>
<color name="md_theme_surfaceVariant">#2C2C2C</color>
<color name="md_theme_onSurfaceVariant">#BDBDBD</color>

<color name="md_theme_outline">#2E2E2E</color>
<color name="md_theme_outline">#616161</color>

<color name="surface_base">#0A0A0A</color>
<color name="surface_low">#141414</color>
<color name="surface_card">#1C1C1C</color>
<color name="surface_elevated">#242424</color>
<color name="surface_base">#E64A19</color>
<color name="surface_low">#1E1E1E</color>
<color name="surface_card">#2C2C2C</color>
<color name="surface_elevated">#333333</color>

<color name="text_primary">#F5F5F5</color>
<color name="text_secondary">#9A9A9A</color>
<color name="text_muted">#5A5A5A</color>
<color name="text_primary">#E0E0E0</color>
<color name="text_secondary">#BDBDBD</color>
<color name="text_muted">#757575</color>

<!-- Subtle Orange System -->
<color name="accent_orange">#D35400</color>
<color name="accent_orange_dark">#C24E00</color>
<color name="accent_orange_dim">#1AD35400</color>
<color name="accent_orange">#E64A19</color>
<color name="accent_orange_dark">#BF360C</color>
<color name="accent_orange_dim">#1AE64A19</color>

<color name="toolbar_bg">#141414</color>
<color name="toolbar_title">#F5F5F5</color>
<color name="toolbar_bg">#E64A19</color>
<color name="toolbar_title">#FFFFFF</color>

<color name="bottom_nav_bg">#141414</color>
<color name="bottom_nav_selected">#D35400</color>
<color name="bottom_nav_unselected">#6A6A6A</color>
<color name="bottom_nav_bg">#1E1E1E</color>
<color name="bottom_nav_selected">#E64A19</color>
<color name="bottom_nav_unselected">#757575</color>

<color name="status_started">#4CAF50</color>
<color name="status_stopped">#F44336</color>
<color name="status_stopped">#EF5350</color>
<color name="status_initializing">#FF9800</color>
<color name="status_unknown">#5A5A5A</color>
<color name="status_unknown">#757575</color>

<color name="overlay_light">#1AFFFFFF</color>
<color name="overlay_dark">#99000000</color>

<color name="card_info_bg">#1C1C1C</color>
<color name="card_info_bg">#212121</color>
<color name="dialog_bg">#212121</color>

</resources>
</resources>
30 changes: 23 additions & 7 deletions sensorhub-android-app/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!-- =========================
APP THEME (Material 3 Dark)
========================= -->
<style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">
<style name="AppTheme" parent="Theme.Material3.DayNight.NoActionBar">

<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
<item name="preferenceCategoryStyle">@style/PreferenceCategoryNoPadding</item>
Expand Down Expand Up @@ -45,16 +45,28 @@
<item name="android:statusBarColor">@color/surface_base</item>
<item name="android:navigationBarColor">@color/surface_low</item>
<item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
<item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
<item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>

<!-- COMPONENT THEMING -->
<item name="toolbarStyle">@style/AppToolbar</item>
<item name="materialCardViewStyle">@style/AppCard</item>
<item name="materialButtonStyle">@style/AppButton</item>
<item name="textInputStyle">@style/AppTextInput</item>
<item name="materialAlertDialogTheme">@style/AppDialog</item>
<item name="alertDialogTheme">@style/AppDialog</item>

</style>

<style name="AppDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
<item name="colorSurface">@color/dialog_bg</item>
<item name="android:backgroundTint">@color/dialog_bg</item>
<item name="android:windowBackground">@color/dialog_bg</item>
<item name="colorOnSurface">@android:color/white</item>
<item name="colorOnSurfaceVariant">@android:color/white</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:textColorPrimary">@android:color/white</item>
<item name="android:textColorSecondary">@android:color/white</item>
</style>

<!-- =========================
TOOLBAR STYLE
Expand All @@ -63,6 +75,8 @@
<item name="android:background">@color/toolbar_bg</item>
<item name="titleTextAppearance">@style/ToolbarTitle</item>
<item name="android:elevation">0dp</item>
<item name="navigationIconTint">@color/toolbar_title</item>

</style>

<style name="ToolbarTitle">
Expand Down Expand Up @@ -90,8 +104,9 @@
<style name="AppButton" parent="Widget.Material3.Button">
<item name="cornerRadius">100dp</item>
<item name="android:textAllCaps">false</item>
<item name="backgroundTint">@color/md_theme_primaryContainer</item>
<item name="android:textColor">@color/md_theme_primary</item>
<item name="backgroundTint">@color/md_theme_primary</item>
<item name="android:textColor">@color/md_theme_onPrimary</item>
<item name="iconTint">@color/md_theme_onPrimary</item>
</style>

<style name="AppButton.Outline" parent="Widget.Material3.Button.OutlinedButton">
Expand All @@ -108,8 +123,8 @@
</style>

<style name="AppButton.Icon" parent="Widget.Material3.Button.IconButton">
<item name="android:backgroundTint">@color/surface_elevated</item>
<item name="iconTint">@color/text_secondary</item>
<item name="android:backgroundTint">@color/md_theme_primary</item>
<item name="iconTint">@color/md_theme_onPrimary</item>
</style>


Expand Down Expand Up @@ -214,6 +229,8 @@
<item name="android:textStyle">bold</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:textSize">16sp</item>
<item name="android:paddingBottom">10dp</item>

</style>

<style name="PreferenceSummary" parent="TextAppearance.Material3.BodyMedium">
Expand Down Expand Up @@ -249,5 +266,4 @@
<item name="strokeColor">@color/accent_orange_dim</item>
<item name="cornerRadius">18px</item>
</style>

</resources>
Loading
Loading