no comment

app/src/main/java/de/jg_cody/Teraplex/MainActivity.java

@@ -1,10 +1,14 @@
 package de.jg_cody.Teraplex;
 
+import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.view.Menu;
+import android.widget.Button;
+import android.widget.Toast;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.navigation.NavigationView;
@@ -20,10 +24,11 @@ import androidx.appcompat.widget.Toolbar;
 import de.jg_cody.Teraplex.ui.Konsole.KonsoleFragment;
 import de.jg_cody.Teraplex.ui.home.HomeFragment;
 
+
+
 public class MainActivity extends AppCompatActivity {
 
-
+    private AppBarConfiguration mAppBarConfiguration;
-private AppBarConfiguration mAppBarConfiguration;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -38,22 +43,25 @@ private AppBarConfiguration mAppBarConfiguration;
             @Override
             public void onClick(View view) {
                 try {
-                    Log.d("I","ACTION BUTTON CLICKED");
+                    Log.d("I", "ACTION BUTTON CLICKED");
                     SSH_connection.executeRemoteCommand(HomeFragment.ip, HomeFragment.user, HomeFragment.password, KonsoleFragment.command);
                 } catch (Exception e) {
-                }}
+                }
+            }
         });
         DrawerLayout drawer = findViewById(R.id.drawer_layout);
         NavigationView navigationView = findViewById(R.id.nav_view);
         // Passing each menu ID as a set of Ids because each
         // menu should be considered as top level destinations.
         mAppBarConfiguration = new AppBarConfiguration.Builder(
-                R.id.nav_home, R.id.nav_badezimmer, R.id.nav_kueche, R.id.nav_wohnzimmer, R.id.nav_schlafzimmer, R.id.nav_flur, R.id.nav_toilette, R.id.nav_konsole)
+                R.id.nav_home, R.id.nav_badezimmer, R.id.nav_kueche, R.id.nav_zeitsteuerung, R.id.nav_schlafzimmer, R.id.nav_flur, R.id.nav_credits, R.id.nav_konsole)
                 .setOpenableLayout(drawer)
                 .build();
         NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment);
         NavigationUI.setupActionBarWithNavController(this, navController, mAppBarConfiguration);
         NavigationUI.setupWithNavController(navigationView, navController);
+
+
     }
 
     @Override
@@ -77,4 +85,5 @@ private AppBarConfiguration mAppBarConfiguration;
         startMain.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         startActivity(startMain);
     }
-    }
+
+}

app/src/main/java/de/jg_cody/Teraplex/ui/Credits/CreditsFragment.java

@@ -1,4 +1,4 @@
-package de.jg_cody.Teraplex.ui.Toilette;
+package de.jg_cody.Teraplex.ui.Credits;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -14,17 +14,17 @@ import androidx.lifecycle.ViewModelProvider;
 
 import de.jg_cody.Teraplex.R;
 
-public class ToiletteFragment extends Fragment {
+public class CreditsFragment extends Fragment {
 
-    private ToiletteViewModel toiletteViewModel;
+    private CreditsViewModel creditsViewModel;
 
     public View onCreateView(@NonNull LayoutInflater inflater,
                              ViewGroup container, Bundle savedInstanceState) {
-        toiletteViewModel =
+        creditsViewModel =
-                new ViewModelProvider(this).get(ToiletteViewModel.class);
+                new ViewModelProvider(this).get(CreditsViewModel.class);
-        View root = inflater.inflate(R.layout.fragment_toilette, container, false);
+        View root = inflater.inflate(R.layout.fragment_credits, container, false);
         final TextView textView = root.findViewById(R.id.text_toilette);
-        toiletteViewModel.getText().observe(getViewLifecycleOwner(), new Observer<String>() {
+        creditsViewModel.getText().observe(getViewLifecycleOwner(), new Observer<String>() {
             @Override
             public void onChanged(@Nullable String s) {
                 textView.setText(s);

app/src/main/java/de/jg_cody/Teraplex/ui/Credits/CreditsViewModel.java

@@ -1,16 +1,16 @@
-package de.jg_cody.Teraplex.ui.Toilette;
+package de.jg_cody.Teraplex.ui.Credits;
 
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
 
-public class ToiletteViewModel extends ViewModel {
+public class CreditsViewModel extends ViewModel {
 
     private MutableLiveData<String> mText;
 
-    public ToiletteViewModel() {
+    public CreditsViewModel() {
         mText = new MutableLiveData<>();
-        mText.setValue("Toilette");
+        mText.setValue("CREDITS");
     }
 
     public LiveData<String> getText() {

app/src/main/java/de/jg_cody/Teraplex/ui/Flur/FlurViewModel.java

@@ -10,7 +10,7 @@ public class FlurViewModel extends ViewModel {
 
     public FlurViewModel() {
         mText = new MutableLiveData<>();
-        mText.setValue("Flur");
+        mText.setValue("FLUR");
     }
 
     public LiveData<String> getText() {

app/src/main/java/de/jg_cody/Teraplex/ui/Konsole/KonsoleViewModel.java

@@ -10,7 +10,7 @@ public class KonsoleViewModel extends ViewModel {
 
     public KonsoleViewModel() {
         mText = new MutableLiveData<>();
-        mText.setValue("Konsole");
+        mText.setValue("KONSOLE");
     }
 
     public LiveData<String> getText() {

app/src/main/java/de/jg_cody/Teraplex/ui/Schlafzimmer/SchlafzimmerFragment.java

@@ -9,6 +9,7 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
+import android.widget.TimePicker;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;

app/src/main/java/de/jg_cody/Teraplex/ui/Schlafzimmer/SchlafzimmerViewModel.java

@@ -10,7 +10,7 @@ public class SchlafzimmerViewModel extends ViewModel {
 
     public SchlafzimmerViewModel() {
         mText = new MutableLiveData<>();
-        mText.setValue("Schlafzimmer");
+        mText.setValue("SCHLAFZIMMER");
     }
 
     public LiveData<String> getText() {

app/src/main/java/de/jg_cody/Teraplex/ui/badezimmer/BadezimmerViewModel.java

@@ -10,7 +10,7 @@ public class BadezimmerViewModel extends ViewModel {
 
     public BadezimmerViewModel() {
         mText = new MutableLiveData<>();
-        mText.setValue("Badezimmer");
+        mText.setValue("BADEZIMMER");
     }
 
     public LiveData<String> getText() {

app/src/main/java/de/jg_cody/Teraplex/ui/home/HomeFragment.java

@@ -30,6 +30,8 @@ public class HomeFragment extends Fragment {
     Button loginButton;
     Button wlan_aus_Button;
     Button wlan_an_Button;
+    Button kodian;
+    Button kodiaus;
 
 
     private HomeViewModel homeViewModel;
@@ -106,6 +108,32 @@ public class HomeFragment extends Fragment {
                 }
             }
         });
+        kodiaus = (Button) root.findViewById(R.id.kodiaus);
+        kodiaus.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                try {
+                    Toast.makeText(getContext(), "Lampe wird ausgeschaltet...", Toast.LENGTH_SHORT).show();
+                    SSH_connection.executeRemoteCommand(ip, user, password, "sudo /root/raspberry-remote/send 11111 3 0");
+                } catch (Exception e) {
+                }
+            }
+
+        });
+        kodian = (Button) root.findViewById(R.id.kodian);
+        kodian.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                try {
+                    Toast.makeText(getContext(), "Lampe wird angeschaltet...", Toast.LENGTH_SHORT).show();
+                    SSH_connection.executeRemoteCommand(ip, user, password, "sudo /root/raspberry-remote/send 11111 3 1");
+                } catch (Exception e) {
+                }
+            }
+
+        });
         return root;
     }
 }

app/src/main/java/de/jg_cody/Teraplex/ui/intro/IntroViewModel.java

@@ -10,7 +10,7 @@ public class IntroViewModel extends ViewModel {
 
     public IntroViewModel() {
         mText = new MutableLiveData<>();
-        mText.setValue("Intro");
+        mText.setValue("INTRO");
     }
 
     public LiveData<String> getText() {

app/src/main/java/de/jg_cody/Teraplex/ui/kueche/KuecheViewModel.java

@@ -10,7 +10,7 @@ public class KuecheViewModel extends ViewModel {
 
     public KuecheViewModel() {
         mText = new MutableLiveData<>();
-        mText.setValue("Küche");
+        mText.setValue("KÜCHE");
     }
 
     public LiveData<String> getText() {

app/src/main/java/de/jg_cody/Teraplex/ui/wohnzimmer/WohnzimmerFragment.java

@@ -1,35 +0,0 @@
-package de.jg_cody.Teraplex.ui.wohnzimmer;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProvider;
-
-import de.jg_cody.Teraplex.R;
-
-public class WohnzimmerFragment extends Fragment {
-
-    private WohnzimmerViewModel wohnzimmerViewModel;
-
-    public View onCreateView(@NonNull LayoutInflater inflater,
-                             ViewGroup container, Bundle savedInstanceState) {
-        wohnzimmerViewModel =
-                new ViewModelProvider(this).get(WohnzimmerViewModel.class);
-        View root = inflater.inflate(R.layout.fragment_wohnzimmer, container, false);
-        final TextView textView = root.findViewById(R.id.text_wohnzimmer);
-        wohnzimmerViewModel.getText().observe(getViewLifecycleOwner(), new Observer<String>() {
-            @Override
-            public void onChanged(@Nullable String s) {
-                textView.setText(s);
-            }
-        });
-        return root;
-    }
-}

app/src/main/java/de/jg_cody/Teraplex/ui/zeitsteuerung/ZeitsteuerungFragment.java

@@ -0,0 +1,39 @@
+package de.jg_cody.Teraplex.ui.zeitsteuerung;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import android.widget.TimePicker;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProvider;
+
+import de.jg_cody.Teraplex.R;
+
+public class ZeitsteuerungFragment extends Fragment {
+
+    private ZeitsteuerungViewModel zeitsteuerungViewModel;
+    TimePicker timePicker;
+
+    public View onCreateView(@NonNull LayoutInflater inflater,
+                             ViewGroup container, Bundle savedInstanceState) {
+        zeitsteuerungViewModel =
+                new ViewModelProvider(this).get(ZeitsteuerungViewModel.class);
+        View root = inflater.inflate(R.layout.fragment_zeitsteuerung, container, false);
+        final TextView textView = root.findViewById(R.id.text_zeitsteuerung);
+        zeitsteuerungViewModel.getText().observe(getViewLifecycleOwner(), new Observer<String>() {
+            @Override
+            public void onChanged(@Nullable String s) {
+                textView.setText(s);
+            }
+        });
+        TimePicker timePicker = (TimePicker) root.findViewById(R.id.timePicker);
+        timePicker.setIs24HourView(true);
+        return root;
+    }
+}

app/src/main/java/de/jg_cody/Teraplex/ui/zeitsteuerung/ZeitsteuerungViewModel.java

@@ -1,16 +1,16 @@
-package de.jg_cody.Teraplex.ui.wohnzimmer;
+package de.jg_cody.Teraplex.ui.zeitsteuerung;
 
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
 
-public class WohnzimmerViewModel extends ViewModel {
+public class ZeitsteuerungViewModel extends ViewModel {
 
     private MutableLiveData<String> mText;
 
-    public WohnzimmerViewModel() {
+    public ZeitsteuerungViewModel() {
         mText = new MutableLiveData<>();
-        mText.setValue("Wohnzimmer");
+        mText.setValue("WOHNZIMMER");
     }
 
     public LiveData<String> getText() {

app/src/main/res/drawable/desktop_access_disabled_black_24dp.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M23,16c0,1.1 -0.9,2 -2,2h-1l-2,-2h3L21,4L6,4L4,2h17c1.1,0 2,0.9 2,2v12zM17.5,18l-2,-2zM14.9,18l6,6 1.3,-1.3 -4.7,-4.7 -2,-2L1.2,1.8 0,3.1l1,1L1,16c0,1.1 0.9,2 2,2h7v2L8,20v2h8v-2h-2v-2h0.9zM3,16L3,6.1l9.9,9.9L3,16z"
+      android:fillColor="#000000"/>
+</vector>

app/src/main/res/drawable/desktop_windows_black_24dp.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21,2L3,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h7v2L8,20v2h8v-2h-2v-2h7c1.1,0 2,-0.9 2,-2L23,4c0,-1.1 -0.9,-2 -2,-2zM21,16L3,16L3,4h18v12z"
+      android:fillColor="#000000"/>
+</vector>

app/src/main/res/drawable/kodi.xml

@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="225"
+    android:viewportHeight="225">
+  <path
+      android:pathData="M90,20.5l-19.5,19.5 -0.3,42.8c-0.3,42.5 0.1,48.2 3,48.2 0.8,-0 19.9,-18.6 42.6,-41.3 38.3,-38.4 41.2,-41.5 41.2,-44.7 0,-3.1 -1.8,-5.2 -20.3,-23.7 -18.6,-18.6 -20.5,-20.3 -23.7,-20.3 -3.2,-0 -5.1,1.6 -23,19.5z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M176.5,69.9c-1.6,1 -11.4,10.4 -21.7,20.8 -18.9,19.1 -20.4,21.2 -17.9,25.1 0.5,0.8 9.8,10.3 20.7,21.3 18.3,18.4 20.1,19.9 23.3,19.9 3.3,-0 5.1,-1.5 23.2,-19.8 10.8,-11 20,-20.9 20.4,-22.1 0.4,-1.2 0.4,-3.2 0.1,-4.4 -0.8,-3.1 -39.5,-41.5 -42.6,-42.2 -1.6,-0.3 -3.6,0.2 -5.5,1.4z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M19.7,90.8c-14.6,14.7 -19.7,20.4 -19.7,22.2 0,1.8 5,7.4 19.2,21.7 10.6,10.6 19.8,19.3 20.4,19.3 0.7,-0 1.5,-0.7 1.8,-1.6 0.3,-0.9 0.6,-19 0.6,-40.4 0,-30.8 -0.3,-39 -1.3,-39.8 -1,-0.9 -5.7,3.3 -21,18.6z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M89.3,156.3c-18.5,18.5 -20.3,20.6 -20.3,23.7 0,3.1 1.8,5.2 20.3,23.7 19.3,19.4 20.4,20.3 24.1,20.3 3.7,-0 4.8,-0.9 22.3,-18.2 20.2,-20.1 22.9,-23.4 21.8,-27.6 -0.4,-1.7 -7.8,-9.7 -20.8,-22.4 -18.4,-18 -20.5,-19.8 -23.7,-19.8 -3.2,-0 -5.1,1.7 -23.7,20.3z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+</vector>

app/src/main/res/drawable/kodi_aus_1_.xml

@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="225"
+    android:viewportHeight="225">
+  <path
+      android:pathData="M90.1,20.4l-19.4,19.4 -0.5,7.2 -0.5,7.2 -26.1,-26.1 -26.1,-26.1 -6.9,6.9 -6.9,7 33.1,33.6 33.2,33.7 0,21.3c0,20.9 0.7,26.5 3.2,26.5 0.7,-0 6.1,-4.8 12,-10.7l10.8,-10.8 56,56 56,56 7,-7 7,-7 -44.7,-45c-24.7,-24.7 -49.7,-50.1 -55.8,-56.2l-11,-11.3 23.3,-23.3c21.2,-21.3 23.2,-23.6 23.2,-26.7 0,-3.1 -1.8,-5.2 -20.3,-23.7 -18.6,-18.6 -20.5,-20.3 -23.7,-20.3 -3.2,-0 -5.1,1.6 -22.9,19.4z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M176.5,69.9c-1.6,1 -11.4,10.4 -21.7,20.8 -18.9,19.1 -20.4,21.2 -17.9,25.1 0.5,0.8 9.8,10.3 20.7,21.3 18.3,18.4 20.1,19.9 23.3,19.9 3.3,-0 5.1,-1.5 23.2,-19.8 10.8,-11 20,-20.9 20.4,-22.1 0.4,-1.2 0.4,-3.2 0.1,-4.4 -0.8,-3.1 -39.5,-41.5 -42.6,-42.2 -1.6,-0.3 -3.6,0.2 -5.5,1.4z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M19.7,90.8c-14.6,14.7 -19.7,20.4 -19.7,22.2 0,1.8 5,7.4 19.2,21.7 10.6,10.6 19.8,19.3 20.4,19.3 0.7,-0 1.5,-0.7 1.8,-1.6 0.3,-0.9 0.6,-19 0.6,-40.4 0,-30.8 -0.3,-39 -1.3,-39.8 -1,-0.9 -5.7,3.3 -21,18.6z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+  <path
+      android:pathData="M89.3,156.3c-18.5,18.5 -20.3,20.6 -20.3,23.7 0,3.1 1.8,5.2 20.3,23.7 19.3,19.4 20.4,20.3 24.1,20.3 3.7,-0 4.8,-0.9 22.3,-18.2 20.2,-20.1 22.9,-23.4 21.8,-27.6 -0.4,-1.7 -7.8,-9.7 -20.8,-22.4 -18.4,-18 -20.5,-19.8 -23.7,-19.8 -3.2,-0 -5.1,1.7 -23.7,20.3z"
+      android:fillColor="#000000"
+      android:strokeColor="#00000000"/>
+</vector>

app/src/main/res/layout/app_bar_main.xml

@@ -23,8 +23,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
+        android:layout_margin="@dimen/fab_margin"/>
-        app:srcCompat="?android:attr/fingerprintAuthDrawable" />
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"

app/src/main/res/layout/fragment_credits.xml

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.Credits.CreditsFragment"
+    android:background="@drawable/background">
+
+    <TextView
+        android:id="@+id/madeby"
+        android:layout_width="193dp"
+        android:layout_height="33dp"
+        android:layout_marginTop="250dp"
+        android:gravity="center_horizontal"
+        android:text="made by"
+        android:textAlignment="center"
+        android:textColor="#FFFFFF"
+        android:textSize="18sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/supportedby"
+        android:layout_width="193dp"
+        android:layout_height="33dp"
+        android:layout_marginTop="150dp"
+        android:gravity="center_horizontal"
+        android:text="supported by"
+        android:textAlignment="center"
+        android:textColor="#FFFFFF"
+        android:textSize="18sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/madeby" />
+
+    <TextView
+        android:id="@+id/MatzeZ"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:text="Matze Z."
+        android:textAlignment="center"
+        android:textColor="#FFFFFF"
+        android:textSize="18sp"
+        app:layout_constraintEnd_toStartOf="@+id/JulianG"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/madeby" />
+
+    <TextView
+        android:id="@+id/JulianG"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:text="Julian G."
+        android:textAlignment="center"
+        android:textColor="#FFFFFF"
+        android:textSize="18sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/MatzeZ"
+        app:layout_constraintTop_toBottomOf="@+id/madeby" />
+
+    <TextView
+        android:id="@+id/julianG"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:text="jg-cody.de"
+        android:textAlignment="center"
+        android:textColor="#FFFFFF"
+        android:textSize="18sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/MatzeZ"
+        app:layout_constraintTop_toBottomOf="@+id/JulianG" />
+
+    <TextView
+        android:id="@+id/supporter1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:text="graphite-official.de"
+        android:textAlignment="center"
+        android:textColor="#FFFFFF"
+        android:textSize="18sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.509"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/supportedby" />
+
+    <TextView
+        android:id="@+id/text_toilette"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:gravity="center_horizontal"
+        android:textAlignment="center"
+        android:textColor="#FFFFFF"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <ImageView
+        android:id="@+id/imageView3"
+        android:layout_width="117dp"
+        android:layout_height="56dp"
+        android:src="@drawable/jg_cody_white"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/MatzeZ"
+        app:layout_constraintTop_toBottomOf="@+id/julianG" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_home.xml

@@ -16,7 +16,7 @@
         android:textAlignment="center"
         android:textColor="#FFFFFF"
         android:textSize="20sp"
-        app:layout_constraintBottom_toTopOf="@+id/ipInput"
+        app:layout_constraintBottom_toTopOf="@+id/login_data"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -51,7 +51,7 @@
         android:layout_height="wrap_content"
         android:backgroundTint="#FFFFFF"
         android:ems="10"
-        android:hint="IP-Adresse"
+        android:hint="@string/login_ipadresse"
         android:inputType="text"
         android:textColor="#FFFFFF"
         android:textColorHint="#FFFFFF"
@@ -66,7 +66,7 @@
         android:layout_height="wrap_content"
         android:backgroundTint="#FFFFFF"
         android:ems="10"
-        android:hint="Benutzername"
+        android:hint="@string/login_benutzername"
         android:inputType="textEmailAddress"
         android:textColor="#FFFFFF"
         android:textColorHint="#FFFFFF"
@@ -74,7 +74,8 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.497"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.434" />
 
     <EditText
         android:id="@+id/passwordInput"
@@ -82,7 +83,7 @@
         android:layout_height="wrap_content"
         android:backgroundTint="#FFFFFF"
         android:ems="10"
-        android:hint="Passwort"
+        android:hint="@string/login_passwort"
         android:inputType="textPassword"
         android:textColor="#FFFFFF"
         android:textColorHint="#FFFFFF"
@@ -113,6 +114,18 @@
         app:layout_constraintStart_toEndOf="@+id/wlan_aus"
         app:layout_constraintTop_toBottomOf="@+id/textView5" />
 
+    <Button
+        android:id="@+id/kodian"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:hapticFeedbackEnabled="true"
+        android:text="AN"
+        app:icon="@drawable/kodi"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.483"
+        app:layout_constraintStart_toEndOf="@+id/wlan_aus"
+        app:layout_constraintTop_toBottomOf="@+id/textView7" />
+
     <Button
         android:id="@+id/wlan_aus"
         android:layout_width="wrap_content"
@@ -124,21 +137,48 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView5" />
 
+    <Button
+        android:id="@+id/kodiaus"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:hapticFeedbackEnabled="true"
+        android:text="AUS"
+        app:icon="@drawable/kodi_aus_1_"
+        app:layout_constraintEnd_toStartOf="@+id/wlan_an"
+        app:layout_constraintHorizontal_bias="0.496"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView7" />
+
     <TextView
         android:id="@+id/textView5"
         android:layout_width="376dp"
         android:layout_height="28dp"
-        android:layout_marginBottom="100dp"
         android:gravity="center_horizontal"
         android:text="WLAN"
         android:textAlignment="center"
         android:textColor="#FFFFFF"
         android:textSize="20sp"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/textView7"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.542"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/loginButton" />
+        app:layout_constraintTop_toBottomOf="@+id/loginButton"
+        app:layout_constraintVertical_bias="0.33" />
+
+    <TextView
+        android:id="@+id/textView7"
+        android:layout_width="376dp"
+        android:layout_height="28dp"
+        android:layout_marginBottom="116dp"
+        android:gravity="center_horizontal"
+        android:text="KODI"
+        android:textAlignment="center"
+        android:textColor="#FFFFFF"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.485"
+        app:layout_constraintStart_toStartOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
 

app/src/main/res/layout/fragment_toilette.xml

@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.Toilette.ToiletteFragment"
-    android:background="@drawable/background">
-
-    <TextView
-        android:id="@+id/text_toilette"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:gravity="center_horizontal"
-        android:textAlignment="center"
-        android:textColor="#FFFFFF"
-        android:textSize="20sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <TextView
-        android:id="@+id/textView3"
-        android:layout_width="193dp"
-        android:layout_height="33dp"
-        android:layout_marginTop="200dp"
-        android:text="Raumtemperatur in °C"
-        android:textAlignment="center"
-        android:textColor="#FFFFFF"
-        android:textSize="18sp"
-        app:layout_constraintBottom_toTopOf="@+id/seekBar"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:gravity="center_horizontal" />
-
-    <TextView
-        android:id="@+id/textView4"
-        android:layout_width="193dp"
-        android:layout_height="33dp"
-        android:text="Elektrogeräte EIN/AUS"
-        android:textAlignment="center"
-        android:textColor="#FFFFFF"
-        android:textSize="18sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:gravity="center_horizontal" />
-
-    <SeekBar
-        android:id="@+id/seekBar1"
-        android:layout_width="300dp"
-        android:layout_height="wrap_content"
-        android:indeterminate="false"
-        android:max="100"
-        android:progress="0"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView3" />
-
-    <TextView
-        android:id="@+id/textview1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/seekBar1"
-        android:layout_alignLeft="@+id/seekBar1"
-        android:textSize="20dp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/textView4"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/seekBar1" />
-
-    <Switch
-        android:id="@+id/switch1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="50dp"
-        android:layout_marginLeft="50dp"
-        android:text="Steckdose 1 "
-        android:textColor="#FFFFFF"
-        app:layout_constraintBottom_toTopOf="@+id/switch3"
-        app:layout_constraintEnd_toStartOf="@+id/switch2"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView4" />
-
-    <Switch
-        android:id="@+id/switch3"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="50dp"
-        android:layout_marginLeft="50dp"
-        android:layout_marginBottom="200dp"
-        android:text="Steckdose 3 "
-        android:textColor="#FFFFFF"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/switch4"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/switch1" />
-
-    <Switch
-        android:id="@+id/switch2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="50dp"
-        android:layout_marginRight="50dp"
-        android:text="Steckdose 2 "
-        android:textColor="#FFFFFF"
-        app:layout_constraintBottom_toTopOf="@+id/switch4"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/switch1"
-        app:layout_constraintTop_toBottomOf="@+id/textView4" />
-
-    <Switch
-        android:id="@+id/switch4"
-        android:layout_width="129dp"
-        android:layout_height="22dp"
-        android:layout_marginEnd="50dp"
-        android:layout_marginRight="50dp"
-        android:layout_marginBottom="200dp"
-        android:text="Steckdose 4 "
-        android:textColor="#FFFFFF"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/switch3"
-        app:layout_constraintTop_toBottomOf="@+id/switch2" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_wohnzimmer.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.wohnzimmer.WohnzimmerFragment"
-    android:background="@drawable/background">
-
-
-    <TextView
-        android:id="@+id/text_wohnzimmer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:gravity="center_horizontal"
-        android:textAlignment="center"
-        android:textColor="#FFFFFF"
-        android:textSize="20sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <TimePicker
-        android:id="@+id/timePicker"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:timePickerMode="clock"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="1.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_zeitsteuerung.xml

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".ui.zeitsteuerung.ZeitsteuerungFragment"
+    android:background="@drawable/background">
+
+
+    <EditText
+        android:id="@+id/befehlInput2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:backgroundTint="#FFFFFF"
+        android:ems="10"
+        android:inputType="text"
+        android:textColor="#FFFFFF"
+        android:textColorHint="#FFFFFF"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.497"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView8" />
+
+    <TextView
+        android:id="@+id/textView8"
+        android:layout_width="253dp"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:text="KOMMANDO"
+        android:textAlignment="center"
+        android:textColor="#FFFFFF"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toTopOf="@+id/befehlInput"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.506"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/timePicker" />
+
+    <TextView
+        android:id="@+id/textView10"
+        android:layout_width="253dp"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:text="ZEITGESTEUERTE KOMMANDOS"
+        android:textAlignment="center"
+        android:textColor="#FFFFFF"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toTopOf="@+id/timePicker"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.506"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <Button
+        android:id="@+id/sendtimedcommand"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:hapticFeedbackEnabled="true"
+        android:text="SEND TIMED COMMAND"
+        app:icon="@drawable/send_24px"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/befehlInput2" />
+
+    <TextView
+        android:id="@+id/text_zeitsteuerung"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="8dp"
+        android:gravity="center_horizontal"
+        android:textAlignment="center"
+        android:textColor="#FFFFFF"
+        android:textSize="20sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <TimePicker
+        android:id="@+id/timePicker"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:amPmTextColor="#FFFFFF"
+        android:numbersSelectorColor="@color/white"
+        android:timePickerMode="spinner"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.496"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/nav_header_main.xml

@@ -15,11 +15,11 @@
 
     <ImageView
         android:id="@+id/imageView"
-        android:layout_width="245dp"
+        android:layout_width="wrap_content"
-        android:layout_height="75dp"
+        android:layout_height="80dp"
         android:contentDescription="@string/nav_header_desc"
         android:paddingTop="@dimen/nav_header_vertical_spacing"
-        app:srcCompat="@drawable/teraplex_sidebar" />
+        app:srcCompat="@drawable/logo_teraplex_ausgeschrieben_alpha_und_weis" />
 
     <TextView
         android:layout_width="match_parent"

app/src/main/res/menu/activity_main_drawer.xml

@@ -10,24 +10,26 @@
             android:title="@string/menu_home" />
         <item
             android:id="@+id/nav_konsole"
-            android:title="Konsole" />
+            android:title="@string/menu_konsole" />
+        <item
+            android:id="@+id/nav_zeitsteuerung"
+            android:title="@string/menu_zeitsteuerung" />
+        <item
+            android:title="-----------------------------------------------------------------------------" />
         <item
             android:id="@+id/nav_badezimmer"
-            android:title="Badezimmer" />
+            android:title="@string/menu_badezimmer" />
         <item
             android:id="@+id/nav_kueche"
-            android:title="Küche" />
+            android:title="@string/menu_küche" />
-        <item
-            android:id="@+id/nav_wohnzimmer"
-            android:title="Wohnzimmer" />
         <item
             android:id="@+id/nav_schlafzimmer"
-            android:title="Schlafzimmer" />
+            android:title="@string/menu_schlafzimmer" />
         <item
             android:id="@+id/nav_flur"
-            android:title="Flur" />
+            android:title="@string/menu_flur" />
         <item
-            android:id="@+id/nav_toilette"
+            android:id="@+id/nav_credits"
-            android:title="Toilette" />
+            android:title="@string/menu_credits" />
     </group>
 </menu>

app/src/main/res/menu/main.xml

@@ -3,15 +3,27 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:id="@+id/logout"
+        android:id="@+id/sprache"
         android:icon="@drawable/ic_menu_share"
         android:orderInCategory="100"
-        android:title="LOGOUT"
+        android:title="@string/menu_sprache"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/credits"
+        android:icon="@drawable/ic_menu_share"
+        android:orderInCategory="100"
+        android:title="@string/menu_credits"
         app:showAsAction="never" />
     <item
         android:id="@+id/exit"
         android:icon="@drawable/logout_24px"
         android:orderInCategory="100"
-        android:title="EXIT"
+        android:title="@string/menu_schliessen"
-        app:showAsAction="always|never|collapseActionView" />
+        app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/logout"
+        android:icon="@drawable/ic_menu_share"
+        android:orderInCategory="100"
+        android:title="@string/menu_logout"
+        app:showAsAction="never" />
 </menu>

app/src/main/res/navigation/mobile_navigation.xml

@@ -9,48 +9,48 @@
     <fragment
         android:id="@+id/nav_home"
         android:name="de.jg_cody.Teraplex.ui.home.HomeFragment"
-        android:label="Home"
+        android:label="@string/menu_home"
         tools:layout="@layout/fragment_home" />
 
     <fragment
         android:id="@+id/nav_konsole"
         android:name="de.jg_cody.Teraplex.ui.Konsole.KonsoleFragment"
-        android:label="Konsole"
+        android:label="@string/menu_konsole"
         tools:layout="@layout/fragment_konsole" />
 
     <fragment
         android:id="@+id/nav_badezimmer"
         android:name="de.jg_cody.Teraplex.ui.badezimmer.BadezimmerFragment"
-        android:label="Badezimmer"
+        android:label="@string/menu_badezimmer"
         tools:layout="@layout/fragment_badezimmer" />
 
     <fragment
         android:id="@+id/nav_kueche"
         android:name="de.jg_cody.Teraplex.ui.kueche.KuecheFragment"
-        android:label="Küche"
+        android:label="@string/menu_küche"
         tools:layout="@layout/fragment_kueche" />
 
     <fragment
-        android:id="@+id/nav_wohnzimmer"
+        android:id="@+id/nav_zeitsteuerung"
-        android:name="de.jg_cody.Teraplex.ui.wohnzimmer.WohnzimmerFragment"
+        android:name="de.jg_cody.Teraplex.ui.zeitsteuerung.ZeitsteuerungFragment"
-        android:label="Wohnzimmer"
+        android:label="@string/menu_zeitsteuerung"
-        tools:layout="@layout/fragment_wohnzimmer" />
+        tools:layout="@layout/fragment_zeitsteuerung" />
 
     <fragment
         android:id="@+id/nav_schlafzimmer"
         android:name="de.jg_cody.Teraplex.ui.Schlafzimmer.SchlafzimmerFragment"
-        android:label="Schlafzimmer"
+        android:label="@string/menu_schlafzimmer"
         tools:layout="@layout/fragment_schlafzimmer" />
 
     <fragment
         android:id="@+id/nav_flur"
         android:name="de.jg_cody.Teraplex.ui.Flur.FlurFragment"
-        android:label="Flur"
+        android:label="@string/menu_flur"
         tools:layout="@layout/fragment_flur" />
 
     <fragment
-        android:id="@+id/nav_toilette"
+        android:id="@+id/nav_credits"
-        android:name="de.jg_cody.Teraplex.ui.Toilette.ToiletteFragment"
+        android:name="de.jg_cody.Teraplex.ui.Credits.CreditsFragment"
-        android:label="Toilette"
+        android:label="@string/menu_credits"
-        tools:layout="@layout/fragment_toilette" />
+        tools:layout="@layout/fragment_credits" />
 </navigation>

app/src/main/res/values/strings.xml

@@ -11,10 +11,21 @@
     <string name="SSH_Command">Navigation header</string>
     <string name="action_logout">logout</string>
 
-    <string name="menu_home">Home</string>
+    <string name="login_ipadresse">IP-ADRESSE</string>
-    <string name="menu_gallery">Gallery</string>
+    <string name="login_benutzername">BENUTZERNAME</string>
-    <string name="menu_kueche">Kueche</string>
+    <string name="login_passwort">PASSWORT</string>
-    <string name="menu_wohnzimmer">Wohnzimmer</string>
+
-    <string name="menu_schlafzimmer">Schlafzimmer</string>
+    <string name="menu_home">HOME</string>
-    <string name="menu_toilette">Toilette</string>
+    <string name="menu_konsole">KONSOLE</string>
+    <string name="menu_kueche">KÜCHE</string>
+    <string name="menu_zeitsteuerung">ZEITSTEUERUNG</string>
+    <string name="menu_schlafzimmer">SCHLAFZIMMER</string>
+    <string name="menu_flur">FLUR</string>
+    <string name="menu_küche">KÜCHE</string>
+    <string name="menu_credits">CREDITS</string>
+    <string name="menu_logout">LOGOUT</string>
+    <string name="menu_sprache">SPRACHE</string>
+    <string name="menu_schliessen">SCHLIESSEN</string>
+    <string name="menu_badezimmer">BADEZIMMER</string>
+
 </resources>

app/src/main/res/values/themes.xml

@@ -4,7 +4,7 @@
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_500</item>
         <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/white</item>
+        <item name="colorOnPrimary">@color/black</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>
         <item name="colorSecondaryVariant">@color/teal_700</item>