Skip to content

Update datastream status card #85

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
+419 −152
Merged

Update datastream status card #85

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
79a688b
update datastream status card
kalynstricklin Jul 7, 2026
e4edbfc
remove func call
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
0 ...pp/res/drawable/status_dot_background.xml → ...ub-android-app/res/drawable/ic_circle.xml
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions sensorhub-android-app/res/layout/activity_app_status.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
android:id="@+id/sos_status_dot"
android:layout_width="@dimen/status_dot_size"
android:layout_height="@dimen/status_dot_size"
android:background="@drawable/status_dot_background" />
android:background="@drawable/ic_circle" />

<LinearLayout
android:layout_width="0dp"
Expand Down Expand Up @@ -105,7 +105,7 @@
android:id="@+id/consys_status_dot"
android:layout_width="@dimen/status_dot_size"
android:layout_height="@dimen/status_dot_size"
android:background="@drawable/status_dot_background" />
android:background="@drawable/ic_circle" />

<LinearLayout
android:layout_width="0dp"
Expand Down Expand Up @@ -155,7 +155,7 @@
android:id="@+id/discovery_status_dot"
android:layout_width="@dimen/status_dot_size"
android:layout_height="@dimen/status_dot_size"
android:background="@drawable/status_dot_background" />
android:background="@drawable/ic_circle" />

<LinearLayout
android:layout_width="0dp"
Expand Down Expand Up @@ -205,7 +205,7 @@
android:id="@+id/http_status_dot"
android:layout_width="@dimen/status_dot_size"
android:layout_height="@dimen/status_dot_size"
android:background="@drawable/status_dot_background" />
android:background="@drawable/ic_circle" />

<LinearLayout
android:layout_width="0dp"
Expand Down Expand Up @@ -255,7 +255,7 @@
android:id="@+id/sensor_status_dot"
android:layout_width="@dimen/status_dot_size"
android:layout_height="@dimen/status_dot_size"
android:background="@drawable/status_dot_background" />
android:background="@drawable/ic_circle" />

<LinearLayout
android:layout_width="0dp"
Expand Down Expand Up @@ -305,7 +305,7 @@
android:id="@+id/storage_status_dot"
android:layout_width="@dimen/status_dot_size"
android:layout_height="@dimen/status_dot_size"
android:background="@drawable/status_dot_background" />
android:background="@drawable/ic_circle" />

<LinearLayout
android:layout_width="0dp"
Expand Down
7 changes: 4 additions & 3 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 @@ -46,7 +46,7 @@
android:id="@+id/video_status_dot"
android:layout_width="10dp"
android:layout_height="10dp"
android:background="@drawable/status_dot_background" />
android:background="@drawable/ic_circle" />

<LinearLayout
android:layout_width="0dp"
Expand Down Expand Up @@ -113,7 +113,7 @@
android:id="@+id/meshtastic_status_dot"
android:layout_width="10dp"
android:layout_height="10dp"
android:background="@drawable/status_dot_background" />
android:background="@drawable/ic_circle" />

<LinearLayout
android:layout_width="0dp"
Expand Down Expand Up @@ -231,6 +231,7 @@
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:src="@drawable/ic_play"
style="@style/AppFAB" />
app:tint="@android:color/white"
app:backgroundTint="@color/md_theme_surfaceVariant" />

</androidx.coordinatorlayout.widget.CoordinatorLayout>
28 changes: 28 additions & 0 deletions sensorhub-android-app/res/layout/item_datastream.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
android:paddingStart="44dp"
android:paddingEnd="@dimen/info_card_padding"
android:paddingTop="4dp"
android:paddingBottom="4dp">

<TextView
android:id="@+id/datastream_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textColor="@color/md_theme_onSurfaceVariant"
android:textSize="12sp" />

<TextView
android:id="@+id/datastream_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="11sp"
android:fontFamily="monospace" />

</LinearLayout>
52 changes: 52 additions & 0 deletions sensorhub-android-app/res/layout/item_sensor_group.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">

<LinearLayout
android:id="@+id/sensor_group_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
android:paddingStart="20dp"
android:paddingEnd="14dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:background="?attr/selectableItemBackground">

<ImageView
android:id="@+id/sensor_group_arrow"
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_chevron_right"
app:tint="@color/md_theme_onSurfaceVariant"
android:scaleType="centerInside" />

<TextView
android:id="@+id/sensor_group_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginStart="8dp"
android:textColor="@color/md_theme_onSurface"
android:textSize="13sp"
android:fontFamily="sans-serif-medium" />
<View
android:id="@+id/server_status_dot"
android:layout_width="8dp"
android:layout_height="8dp"
android:background="@drawable/ic_circle" />
</LinearLayout>

<LinearLayout
android:id="@+id/sensor_group_streams"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone" />

</LinearLayout>
91 changes: 46 additions & 45 deletions 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 @@ -2,16 +2,15 @@
<com.google.android.material.card.MaterialCardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/server_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/info_card_margin"
android:layout_marginEnd="@dimen/info_card_margin"
android:layout_marginTop="6dp"
app:cardCornerRadius="@dimen/card_corner_radius"
app:cardElevation="@dimen/card_elevation"
app:cardBackgroundColor="@color/md_theme_background"
app:strokeColor="@color/md_theme_outline"
app:strokeWidth="0dp">
android:layout_marginHorizontal="16dp"
android:layout_marginTop="8dp"
app:cardCornerRadius="16dp"
app:cardElevation="2dp"
app:strokeWidth="1dp"
app:strokeColor="?attr/colorOutlineVariant">

<LinearLayout
android:layout_width="match_parent"
Expand All @@ -22,68 +21,70 @@
android:id="@+id/server_status_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:paddingStart="@dimen/info_card_padding"
android:paddingEnd="4dp"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:background="?attr/selectableItemBackground">
android:orientation="horizontal"
android:padding="16dp">

<View
android:id="@+id/server_status_dot"
android:layout_width="10dp"
android:layout_height="10dp"
android:background="@drawable/status_dot_background" />
<ImageButton
android:id="@+id/btn_toggle_server_details"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginEnd="12dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="Expand"
android:scaleType="centerInside"
android:src="@drawable/ic_chevron_right" />

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_weight="1"
android:orientation="vertical"
android:layout_marginStart="12dp">
android:orientation="vertical">

<TextView
android:id="@+id/server_status_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/md_theme_onSurface"
android:textSize="14sp"
android:fontFamily="sans-serif-medium" />
android:textAppearance="?attr/textAppearanceTitleMedium"
android:textColor="?attr/colorOnSurface"/>

<TextView
android:id="@+id/server_status_mode"
android:id="@+id/server_status_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/md_theme_onSurfaceVariant"
android:textSize="11sp"
android:layout_marginTop="1dp" />

android:layout_marginTop="2dp"
android:textAppearance="?attr/textAppearanceBodySmall"
android:textColor="?attr/colorOnSurfaceVariant"/>
</LinearLayout>

<ImageButton
android:id="@+id/btn_toggle_server_details"
android:layout_width="36dp"
android:layout_height="36dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:src="@drawable/ic_expand_more"
android:scaleType="centerInside"
android:contentDescription="Toggle details" />
<View
android:id="@+id/server_overall_status_dot"
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_marginStart="12dp"
android:background="@drawable/ic_circle" />

</LinearLayout>

<TextView
<View
android:id="@+id/server_divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?attr/colorOutlineVariant"
android:visibility="gone"/>

<LinearLayout
android:id="@+id/server_status_details"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="@dimen/info_card_padding"
android:paddingEnd="@dimen/info_card_padding"
android:paddingBottom="@dimen/info_card_padding"
android:textColor="@color/md_theme_onSurface"
android:textSize="13sp"
android:fontFamily="sans-serif"
android:orientation="vertical"
android:paddingBottom="8dp"
android:visibility="gone" />

</LinearLayout>

</com.google.android.material.card.MaterialCardView>
</com.google.android.material.card.MaterialCardView>
13 changes: 5 additions & 8 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 @@ -9,7 +9,6 @@
<item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
<item name="preferenceCategoryStyle">@style/PreferenceCategoryNoPadding</item>

<!-- COLOR SYSTEM -->
<item name="colorPrimary">@color/md_theme_primary</item>
<item name="colorOnPrimary">@color/md_theme_onPrimary</item>
<item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item>
Expand Down Expand Up @@ -41,13 +40,11 @@

<item name="colorOutline">@color/md_theme_outline</item>

<!-- SYSTEM UI -->
<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">true</item>
<item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>

<!-- COMPONENT THEMING -->
<item name="toolbarStyle">@style/AppToolbar</item>
<item name="materialCardViewStyle">@style/AppCard</item>
<item name="materialButtonStyle">@style/AppButton</item>
Expand All @@ -57,6 +54,7 @@

</style>


<style name="AppDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
<item name="colorSurface">@color/dialog_bg</item>
<item name="android:backgroundTint">@color/dialog_bg</item>
Expand All @@ -68,15 +66,15 @@
<item name="android:textColorSecondary">@android:color/white</item>
</style>


<!-- =========================
TOOLBAR STYLE
========================= -->
<style name="AppToolbar" parent="Widget.Material3.Toolbar">
<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>

<item name="android:elevation">0dp</item>
</style>

<style name="ToolbarTitle">
Expand All @@ -91,8 +89,7 @@
<item name="cardCornerRadius">16dp</item>
<item name="cardElevation">0dp</item>
<item name="cardBackgroundColor">@color/surface_card</item>
<item name="strokeColor">@color/md_theme_outline</item>
<item name="strokeWidth">1dp</item>
<item name="strokeWidth">0dp</item>
</style>

<style name="AppCard.Accent" parent="AppCard">
Expand Down
Loading
Loading