From 4bc3832218c6791dce14fe6774394024e79886fa Mon Sep 17 00:00:00 2001 From: JG-Cody Date: Wed, 10 Mar 2021 21:13:55 +0100 Subject: [PATCH] SSH was working :( SSH is connected to InputFields --- app/src/main/AndroidManifest.xml | 10 ++ .../de/jg_cody/Terraplex/MainActivity.java | 22 +++-- .../Terraplex/ui/home/HomeViewModel.java | 2 +- app/src/main/res/layout/activity_main.xml | 6 +- app/src/main/res/layout/app_bar_main.xml | 3 +- app/src/main/res/layout/content_main.xml | 3 +- .../main/res/layout/fragment_badezimmer.xml | 3 +- app/src/main/res/layout/fragment_flur.xml | 3 +- app/src/main/res/layout/fragment_home.xml | 29 +++--- app/src/main/res/layout/fragment_kueche.xml | 3 +- .../main/res/layout/fragment_schlafzimmer.xml | 3 +- app/src/main/res/layout/fragment_toilette.xml | 3 +- .../main/res/layout/fragment_wohnzimmer.xml | 98 +------------------ app/src/main/res/layout/nav_header_main.xml | 3 +- .../main/res/menu/activity_main_drawer.xml | 6 +- app/src/main/res/menu/main.xml | 3 +- .../main/res/navigation/mobile_navigation.xml | 11 ++- app/src/main/res/values-night/themes.xml | 2 +- app/src/main/res/values/colors.xml | 2 +- 19 files changed, 79 insertions(+), 136 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b5bf32b..e1a6381 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,6 +10,16 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.Terraplex"> + + + + + + + (); - mText.setValue("Servus Cody, Willkommen in deiner HOMEAUTOMATIONS-APP"); + mText.setValue("Welcome to your HOMEAUTOMATION-APP"); } public LiveData getText() { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 1848abb..dd4f7d8 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,6 @@ - - \ No newline at end of file + + diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml index fc77fef..dcde9c8 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -1,5 +1,6 @@ - - - - - + android:background="@drawable/background" + tools:context=".ui.home.HomeFragment"> + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@+id/text_home" /> - \ No newline at end of file + + + diff --git a/app/src/main/res/layout/fragment_kueche.xml b/app/src/main/res/layout/fragment_kueche.xml index 1c23687..f57a246 100644 --- a/app/src/main/res/layout/fragment_kueche.xml +++ b/app/src/main/res/layout/fragment_kueche.xml @@ -1,5 +1,6 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml index 12de209..f6c2777 100644 --- a/app/src/main/res/layout/nav_header_main.xml +++ b/app/src/main/res/layout/nav_header_main.xml @@ -1,5 +1,6 @@ - - @@ -7,6 +8,9 @@ + diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml index c91f9eb..6777ca5 100644 --- a/app/src/main/res/menu/main.xml +++ b/app/src/main/res/menu/main.xml @@ -1,5 +1,6 @@ - - + + @color/teal_200 @color/teal_200 - @color/black + @color/white ?attr/colorPrimaryVariant diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index d73e7b3..c585ba4 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,6 +1,6 @@ - #FC8686 + #EE0000 #EE0000 #B30000 #DA0303