diff --git a/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java b/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java index 92ac1d0..16b0bff 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java +++ b/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java @@ -42,7 +42,6 @@ import androidx.appcompat.widget.Toolbar; import androidx.core.view.GravityCompat; import androidx.drawerlayout.widget.DrawerLayout; import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentTransaction; import androidx.navigation.NavController; import androidx.navigation.Navigation; import androidx.navigation.fragment.NavHostFragment; @@ -65,7 +64,6 @@ import java.util.Map; import java.util.Objects; import java.util.Set; -import de.jg_cody.Teraplex.ui.Credits.CreditsFragment; import de.jg_cody.Teraplex.ui.Einstellungen.EinstellungenFragment; import de.jg_cody.Teraplex.ui.Flur.FlurFragment; import de.jg_cody.Teraplex.ui.rooms.ListAdapter; @@ -380,20 +378,16 @@ public class MainActivity extends AppCompatActivity { public void menurighttopeinstellungen(MenuItem i) { - EinstellungenFragment pef = new EinstellungenFragment(); - FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); - transaction.replace(R.id.nav_host_fragment, pef).setPrimaryNavigationFragment(pef); - transaction.addToBackStack(null); - transaction.commit(); + Fragment currentFragment = getSupportFragmentManager().findFragmentById(R.id.nav_host_fragment); + NavHostFragment nhf = (NavHostFragment) currentFragment; + nhf.getChildFragmentManager().beginTransaction().replace(R.id.nav_host_fragment, new EinstellungenFragment()).commit(); Objects.requireNonNull(getSupportActionBar()).setTitle(R.string.menu_settings); } - public void menurighttopcredits(MenuItem i) { - CreditsFragment pef = new CreditsFragment(); - FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); - transaction.replace(R.id.nav_host_fragment, pef).setPrimaryNavigationFragment(pef); - transaction.addToBackStack(null); - transaction.commit(); + public void menurighttopabout(MenuItem i) { + Fragment currentFragment = getSupportFragmentManager().findFragmentById(R.id.nav_host_fragment); + NavHostFragment nhf = (NavHostFragment) currentFragment; + nhf.getChildFragmentManager().beginTransaction().replace(R.id.nav_host_fragment, new EinstellungenFragment()).commit(); Objects.requireNonNull(getSupportActionBar()).setTitle(R.string.menu_about); } @@ -402,7 +396,7 @@ public class MainActivity extends AppCompatActivity { startActivity(in); } - public void menurighttopschliessen(MenuItem i) { + public void menurighttopcloseapp(MenuItem i) { if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { finishAffinity(); } else { diff --git a/app/src/main/res/layout/fragment_einstellungen.xml b/app/src/main/res/layout/fragment_einstellungen.xml index 42dc6ed..90ca3d1 100644 --- a/app/src/main/res/layout/fragment_einstellungen.xml +++ b/app/src/main/res/layout/fragment_einstellungen.xml @@ -56,7 +56,7 @@ android:layout_marginEnd="10dp" android:layout_marginRight="10dp" android:gravity="center_horizontal|left" - android:text="@string/hintergrund" + android:text="@string/background" android:textAlignment="center" android:textColor="@color/mtrl_btn_text_color_selector" android:textSize="18sp" @@ -93,7 +93,7 @@ android:layout_marginEnd="10dp" android:layout_marginRight="10dp" android:gravity="center_horizontal|left" - android:text="@string/sprache" + android:text="@string/language" android:textAlignment="center" android:textColor="@color/mtrl_btn_text_color_selector" android:textSize="18sp" @@ -111,7 +111,7 @@ android:layout_marginEnd="10dp" android:layout_marginRight="10dp" android:gravity="center_horizontal|left" - android:text="@string/einstellungen_zurücksetzen" + android:text="@string/reset_settings" android:textAlignment="center" android:textColor="@color/mtrl_btn_text_color_selector" android:textSize="18sp" @@ -128,7 +128,7 @@ android:layout_marginEnd="50dp" android:layout_marginRight="50dp" android:background="@drawable/button_round" - android:text="@string/button_zurücksetzen" + android:text="@string/button_reset" app:backgroundTint="@null" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/divider3" /> @@ -210,7 +210,7 @@ android:layout_marginEnd="50dp" android:layout_marginRight="50dp" android:background="@drawable/button_round" - android:text="@string/sprache" + android:text="@string/language" app:backgroundTint="@null" app:layout_constraintBottom_toTopOf="@+id/divider3" app:layout_constraintEnd_toEndOf="parent" @@ -224,7 +224,7 @@ android:layout_marginEnd="50dp" android:layout_marginRight="50dp" android:background="@drawable/button_round" - android:text="@string/button_hintergrund_wählen" + android:text="@string/button_choose_background" app:backgroundTint="@null" app:layout_constraintBottom_toTopOf="@+id/divider" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 47d33ea..18684fa 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -91,7 +91,7 @@ android:layout_marginTop="25dp" android:backgroundTint="@color/mtrl_btn_text_color_selector" android:ems="10" - android:hint="@string/login_ipadresse" + android:hint="@string/login_ipaddress" android:inputType="text" android:textColor="@color/mtrl_btn_text_color_selector" android:textColorHint="@color/mtrl_btn_text_color_selector" @@ -106,7 +106,7 @@ android:layout_height="wrap_content" android:backgroundTint="@color/mtrl_btn_text_color_selector" android:ems="10" - android:hint="@string/login_benutzername" + android:hint="@string/login_username" android:inputType="textEmailAddress" android:singleLine="false" android:textColor="@color/mtrl_btn_text_color_selector" @@ -122,7 +122,7 @@ android:layout_height="wrap_content" android:backgroundTint="@color/mtrl_btn_text_color_selector" android:ems="10" - android:hint="@string/login_passwort" + android:hint="@string/login_password" android:inputType="textPassword" android:textColor="@color/mtrl_btn_text_color_selector" android:textColorHint="@color/mtrl_btn_text_color_selector" @@ -169,7 +169,7 @@ android:drawableRight="@drawable/signal_wifi_off_24px" android:drawableTint="@color/mtrl_btn_text_color_selector" android:hapticFeedbackEnabled="true" - android:text="@string/aus" + android:text="@string/off" app:backgroundTint="@null" app:layout_constraintBottom_toBottomOf="@+id/textView5" app:layout_constraintStart_toEndOf="@+id/textView5" @@ -185,7 +185,7 @@ android:drawableRight="@drawable/kodi_aus_1_" android:drawableTint="@color/mtrl_btn_text_color_selector" android:hapticFeedbackEnabled="true" - android:text="@string/aus" + android:text="@string/off" app:backgroundTint="@null" app:layout_constraintBottom_toBottomOf="@+id/textView7" app:layout_constraintStart_toEndOf="@+id/textView7" @@ -201,7 +201,7 @@ android:drawableLeft="@drawable/signal_wifi_statusbar_4_bar_24px" android:drawableTint="@color/mtrl_btn_text_color_selector" android:hapticFeedbackEnabled="true" - android:text="@string/an" + android:text="@string/on" app:backgroundTint="@null" app:layout_constraintBottom_toBottomOf="@+id/textView5" app:layout_constraintEnd_toStartOf="@+id/textView5" @@ -217,7 +217,7 @@ android:drawableLeft="@drawable/kodi" android:drawableTint="@color/mtrl_btn_text_color_selector" android:hapticFeedbackEnabled="true" - android:text="@string/an" + android:text="@string/on" app:backgroundTint="@null" app:layout_constraintBottom_toBottomOf="@+id/textView7" app:layout_constraintEnd_toStartOf="@+id/textView7" diff --git a/app/src/main/res/layout/fragment_konsole.xml b/app/src/main/res/layout/fragment_konsole.xml index b2fbdb8..1ae829f 100644 --- a/app/src/main/res/layout/fragment_konsole.xml +++ b/app/src/main/res/layout/fragment_konsole.xml @@ -89,7 +89,7 @@ android:layout_width="253dp" android:layout_height="wrap_content" android:gravity="center_horizontal" - android:text="@string/konsole" + android:text="@string/console" android:textAlignment="center" android:textColor="@color/mtrl_btn_text_color_selector" android:textSize="20sp" @@ -103,7 +103,7 @@ android:layout_height="wrap_content" android:layout_marginTop="25dp" android:gravity="center_horizontal" - android:text="@string/serverbefehle" + android:text="@string/servercommands" android:textAlignment="center" android:textColor="@color/mtrl_btn_text_color_selector" android:textSize="20sp" diff --git a/app/src/main/res/layout/fragment_schlafzimmer.xml b/app/src/main/res/layout/fragment_schlafzimmer.xml index 102c319..fc17aae 100644 --- a/app/src/main/res/layout/fragment_schlafzimmer.xml +++ b/app/src/main/res/layout/fragment_schlafzimmer.xml @@ -46,7 +46,7 @@ android:layout_marginLeft="10dp" android:background="@drawable/button_right" android:hapticFeedbackEnabled="true" - android:text="@string/aus" + android:text="@string/off" app:backgroundTint="@null" app:layout_constraintBottom_toBottomOf="@+id/textView2" app:layout_constraintStart_toEndOf="@+id/textView2" @@ -60,7 +60,7 @@ android:layout_marginRight="10dp" android:background="@drawable/button_left" android:hapticFeedbackEnabled="true" - android:text="@string/an" + android:text="@string/on" app:backgroundTint="@null" app:layout_constraintBottom_toBottomOf="@+id/textView2" app:layout_constraintEnd_toStartOf="@+id/textView2" @@ -74,7 +74,7 @@ android:layout_marginLeft="10dp" android:background="@drawable/button_right" android:hapticFeedbackEnabled="true" - android:text="@string/aus" + android:text="@string/off" app:backgroundTint="@null" app:layout_constraintBottom_toBottomOf="@+id/textView3" app:layout_constraintStart_toEndOf="@+id/textView3" @@ -88,7 +88,7 @@ android:layout_marginRight="10dp" android:background="@drawable/button_left" android:hapticFeedbackEnabled="true" - android:text="@string/an" + android:text="@string/on" app:backgroundTint="@null" app:layout_constraintBottom_toBottomOf="@+id/textView3" app:layout_constraintEnd_toStartOf="@+id/textView3" @@ -102,7 +102,7 @@ android:layout_marginRight="10dp" android:background="@drawable/button_left" android:hapticFeedbackEnabled="true" - android:text="@string/an" + android:text="@string/on" app:backgroundTint="@null" app:layout_constraintBottom_toBottomOf="@+id/textView5" app:layout_constraintEnd_toStartOf="@+id/textView5" @@ -164,7 +164,7 @@ android:layout_marginLeft="10dp" android:background="@drawable/button_right" android:hapticFeedbackEnabled="true" - android:text="@string/aus" + android:text="@string/off" app:backgroundTint="@null" app:layout_constraintBottom_toBottomOf="@+id/textView5" app:layout_constraintStart_toEndOf="@+id/textView5" diff --git a/app/src/main/res/layout/fragment_zeitsteuerung.xml b/app/src/main/res/layout/fragment_zeitsteuerung.xml index e41ca5e..912782b 100644 --- a/app/src/main/res/layout/fragment_zeitsteuerung.xml +++ b/app/src/main/res/layout/fragment_zeitsteuerung.xml @@ -58,7 +58,7 @@ android:layout_height="wrap_content" android:layout_marginTop="25dp" android:gravity="center_horizontal" - android:text="@string/befehl" + android:text="@string/command" android:textAlignment="center" android:textColor="@color/mtrl_btn_text_color_selector" android:textSize="20sp" @@ -73,7 +73,7 @@ android:layout_width="253dp" android:layout_height="wrap_content" android:gravity="center_horizontal" - android:text="@string/zeitgesteuerte_kommandos" + android:text="@string/timed_commands" android:textAlignment="center" android:textColor="@color/mtrl_btn_text_color_selector" android:textSize="20sp" diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml index 0f536d1..ff67691 100644 --- a/app/src/main/res/layout/nav_header_main.xml +++ b/app/src/main/res/layout/nav_header_main.xml @@ -17,10 +17,10 @@ android:id="@+id/imageView" android:layout_width="wrap_content" android:layout_height="80dp" - android:contentDescription="@string/nav_header_desc" android:paddingTop="@dimen/nav_header_vertical_spacing" android:src="@drawable/teraplex_logo" - app:tint="@color/mtrl_btn_text_color_selector"/> + app:tint="@color/mtrl_btn_text_color_selector" + android:contentDescription="TODO" /> - - TERAPLEX - \ No newline at end of file diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index dd73139..2b95d50 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -4,9 +4,9 @@ NAVIGATION ÖFFNEN NAVIGATION SCHLIESSEN ANDROID STUDIO - IP-ADRESSE - BENUTZERNAME - PASSWORT + IP-ADRESSE + BENUTZERNAME + PASSWORT HOME KONSOLE KÜCHE @@ -19,29 +19,28 @@ AUSLOGGEN SPRACHE SCHLIESSEN - WÄHLE DEINE FARBE WEITER AUSLOGGEN WILLKOMMEN BEI TERAPLEX EINLOGGEN WLAN KODI - AUS - AN - KONSOLE + AUS + AN + KONSOLE BEFEHL SENDEN - SERVERBEFEHLE + SERVERBEFEHLE NEUSTARTEN HERUNTERFAHREN - ZEITGESTEUERTE KOMMANDOS - BEFEHL + ZEITGESTEUERTE KOMMANDOS + BEFEHL ZEITGESTEUERTER BEFEHL FARBEN - HINTERGRUND - SPRACHE - EINSTELLUNGEN ZURÜCKSETZEN - ZURÜCKSETZEN - HINTERGRUND WÄHLEN + HINTERGRUND + SPRACHE + EINSTELLUNGEN ZURÜCKSETZEN + ZURÜCKSETZEN + HINTERGRUND WÄHLEN SSH-FERNBEDIENUNG BITTE VERBINDE DICH MIT DEINEM SERVER DU BIST ALS {USERNAME} AUF {IP} @@ -49,7 +48,7 @@ AUSLOGGEN MÖCHTEST DU WIRKLICH DIE APP UND ALLE IHRE EINSTELLUNGEN ZURÜCKSETZEN? APP ZURÜCKSETZEN - ABOUT + ÜBER LOGIN_DATEN GESPEICHERT FELDER DÜRFEN NICHT LEER SEIN! FARBSCHEMA diff --git a/app/src/main/res/values-tlh/strings.xml b/app/src/main/res/values-tlh/strings.xml deleted file mode 100644 index f69318e..0000000 --- a/app/src/main/res/values-tlh/strings.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - jIQuch - \'up - polonyuS - juH - ghoS - qevpob - Doch - pum - vaS - qeylIS - \'Iv - yu\' - Hol - SoQmoH - bIrchoH - lu\' - parmaq - parmaq - BATLH BIMEJNIS - QONOS - qatlh - vutwI\' - Bej - Daq - ghoS - ja\'chu\' - ja\'chu\' - Daw\' - QID - naD - naD - naD - ngeH - chech - Hol - qem - nobHa\' - lI\' - verengan - android.studio@android.com - parmaq - \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7766cf0..a2006a5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4,49 +4,44 @@ Close navigation drawer Android Studio android.studio@android.com - Navigation header - Navigation header - Navigation header - Navigation header - Navigation header LOGOUT SSH-REMOTE //home WELCOME TO TERAPLEX - IP-ADDRESS - USERNAME - PASSWORD + IP-ADDRESS + USERNAME + PASSWORD LOGIN LOGOUT WLAN KODI - OFF - ON + OFF + ON PLEASE CONNECT TO YOUR SERVER YOU ARE LOGGED IN ON {IP} AS {USERNAME} INPUTFIELDS CANT BE EMPTY! LOGIN-DATA SAVED! //konsole - CONSOLE + CONSOLE SEND COMMAND - SERVERCOMMANDS + SERVERCOMMANDS REBOOT SHUTDOWN //zeitgesteuerte kommandos - TIMED COMMANDS - COMMAND + TIMED COMMANDS + COMMAND SET TIMED COMMAND //settings COLORS - BACKGROUND - "CHOOSE\nBACKGROUND" - LANGUAGE - RESET SETTINGS - RESET + BACKGROUND + "CHOOSE\nBACKGROUND" + LANGUAGE + RESET SETTINGS + RESET COLORSCHEME "RED\nBLUE" "GREEN\nYELLOW" @@ -81,7 +76,6 @@ LANGUAGE CLOSE - CHOOSE YOUR COLOR OK \ No newline at end of file