Dev

.github/workflows/gradle_build.yml

@@ -10,11 +10,6 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Configure SSH for private submodules
-        uses: webfactory/ssh-agent@v0.9.0
-        with:
-          ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
-
       - name: Checkout code
         uses: actions/checkout@v4
         with:

build.gradle

@@ -3,7 +3,7 @@ ext.compileSdkVersion = 34
 ext.minSdkVersion = 33
 ext.targetSdkVersion = 30
 ext.buildToolsVersion = "34.0.0"
-version = '4.0.2'
+version = '4.1.1'
 
 buildscript {
     repositories {
@@ -13,6 +13,7 @@ buildscript {
 
     dependencies {
         classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20'
     }
 }
 

gradle.properties

@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4096M
 android.useAndroidX=true
 android.enableJetifier=true

sensorhub-android-app/build.gradle

@@ -82,6 +82,13 @@ android {
             java.srcDirs = ['src']
             res.srcDirs = ['res']
             assets.srcDirs = ['assets']
+            resources.srcDirs = ['src/main/resources']
+        }
+    }
+
+    applicationVariants.all { variant ->
+        variant.outputs.all {
+            outputFileName = "osh-android-${variant.versionName}-${variant.name}.apk"
         }
     }
 

sensorhub-android-app/res/color/bottom_nav_selector.xml

@@ -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>

sensorhub-android-app/res/layout/activity_app_status.xml

@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"

sensorhub-android-app/res/layout/activity_edit_server_profile.xml

@@ -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"
@@ -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"
@@ -180,7 +180,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:inputType="text"
-                            android:singleLine="true" />
+                            android:singleLine="true"
+                            android:text="/sensorhub/api"/>
                     </com.google.android.material.textfield.TextInputLayout>
 
                     <com.google.android.material.materialswitch.MaterialSwitch
@@ -213,7 +214,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"

sensorhub-android-app/res/layout/activity_main.xml

@@ -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"

sensorhub-android-app/res/layout/fragment_dashboard.xml

@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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>

sensorhub-android-app/res/layout/item_datastream.xml

@@ -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>

sensorhub-android-app/res/layout/item_faq_entry.xml

@@ -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"
@@ -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" />
 
@@ -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>
@@ -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" />

sensorhub-android-app/res/layout/item_sensor_group.xml

@@ -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>

sensorhub-android-app/res/layout/item_server_profile.xml

@@ -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"