Enhanced styling in Dashboard, Dashboard_chart (not perfect yet). Fixed Gauge styling. Fixed Bottom navigation in chart, gauge.

Author: Takehiro

androidapp/app/src/main/java/com/cantech/cannect/Dashboard_chart.java

@@ -22,6 +22,7 @@
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.Spinner;
+import android.widget.TextView;
 import android.widget.Toast;
 
 
@@ -40,6 +41,8 @@
 
 
 public class Dashboard_chart extends AppCompatActivity {
+    SharedPref sharedPref;
+    String spinnerTextColor;
 
     StringBuilder messages;
     DataParsing dataParsing;
@@ -62,6 +65,16 @@ public class Dashboard_chart extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        //load saved theme state
+        sharedPref = new SharedPref(this);
+        //set theme
+        if(sharedPref.loadDarkModeState()==true){
+            setTheme(R.style.darkTheme);
+            spinnerTextColor = "#FFFFFF";
+        }else{
+            setTheme(R.style.AppTheme);
+            spinnerTextColor = "#000000";
+        }
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_dashboard_chart);
 
@@ -98,6 +111,7 @@ protected void onCreate(Bundle savedInstanceState) {
             public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
                 toDisplay = adapterView.getItemAtPosition(i).toString();
                 reDesignChart(lineDataSet, toDisplay);
+                ((TextView) view).setTextColor(Color.parseColor(spinnerTextColor));
             }
 
             @Override
@@ -193,6 +207,10 @@ public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
                         startActivity(new Intent(getApplicationContext(),Dashboard_gauge.class));
                         overridePendingTransition(0,0);
                         return true;
+                    case R.id.DOF:
+                        startActivity(new Intent(getApplicationContext(),FrictionCircle.class));
+                        overridePendingTransition(0,0);
+                        return true;
                 }
                 return false;
             }

androidapp/app/src/main/java/com/cantech/cannect/Dashboard_gauge.java

@@ -175,6 +175,10 @@ public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
                         return true;
                     case R.id.Gauge:
                         return true;
+                    case R.id.DOF:
+                        startActivity(new Intent(getApplicationContext(),FrictionCircle.class));
+                        overridePendingTransition(0,0);
+                        return true;
                 }
                 return false;
             }

androidapp/app/src/main/res/layout/activity_dashboard.xml

@@ -17,11 +17,12 @@
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/bottom_navigation"
-        app:itemBackground="?attr/barcolor"
+        android:id="@id/bottom_navigation"
+        app:itemBackground="@color/colorPrimary"
         app:itemTextColor="@drawable/selector"
         app:itemIconTint="@drawable/selector"
         app:menu="@menu/menu_navigation"
-        android:layout_alignParentBottom="true"/>
+        android:layout_alignParentBottom="true"
+        tools:ignore="MissingConstraints" />
 
 </RelativeLayout>

androidapp/app/src/main/res/layout/activity_dashboard_gauge.xml

@@ -9,23 +9,11 @@
     android:background="?attr/backgroundcolor"
     tools:context=".Dashboard_gauge">
 
-    <TextView
-
-        android:id="@+id/gauge_view"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:text="Vehicle DashBoard"
-        android:textColor="#000"
-        android:textStyle="bold"
-        android:textSize="30sp"/>
-
     <GridLayout
         android:id="@+id/grid_layout_gauge"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_above="@+id/bottom_navigation"
-        android:layout_below="@+id/gauge_view"
         android:rowCount="2"
         android:columnCount="2">