From 20b49adecae56ea5cdc271efa25cacf7ad7d16b5 Mon Sep 17 00:00:00 2001 From: JG-Cody Date: Tue, 24 Aug 2021 20:01:38 +0200 Subject: [PATCH] bugfixes and minor changes --- .../de/jg_cody/Teraplex/ui/home/HomeFragment.java | 6 +++--- .../Teraplex/ui/terminal/TerminalFragment.java | 5 ++--- app/src/main/res/layout/fragment_credits.xml | 14 +++++++------- app/src/main/res/values-de-rDE/strings.xml | 8 ++++++++ app/src/main/res/values/strings.xml | 8 ++++++-- 5 files changed, 26 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/home/HomeFragment.java b/app/src/main/java/de/jg_cody/Teraplex/ui/home/HomeFragment.java index d96faa7..0f3fbc8 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/home/HomeFragment.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/home/HomeFragment.java @@ -159,7 +159,7 @@ public class HomeFragment extends Fragment { requireActivity().runOnUiThread(new Runnable() { @Override public void run() { - Toast.makeText(getContext(), "CONNECTED", Toast.LENGTH_SHORT).show(); + Toast.makeText(getContext(), R.string.connecting, Toast.LENGTH_SHORT).show(); SharedPreferences p = requireContext().getSharedPreferences("appsettings", Context.MODE_PRIVATE); p.edit().putString("user", user).putString("password", password).putString("ip", ip).apply(); if (user == null || ip == null) { @@ -267,7 +267,7 @@ public class HomeFragment extends Fragment { try { MediaPlayer mp = MediaPlayer.create(getContext(), R.raw.state_change_confirm_down); mp.start(); - Toast.makeText(getContext(), "Reboot wird ausgeführt...", Toast.LENGTH_SHORT).show(); + Toast.makeText(getContext(), R.string.rebooting, Toast.LENGTH_SHORT).show(); SSH_connection.executeRemoteCommand(ip, user, password, "reboot"); } catch (Exception ignored) { } @@ -321,7 +321,7 @@ public class HomeFragment extends Fragment { try { MediaPlayer mp = MediaPlayer.create(getContext(), R.raw.state_change_confirm_down); mp.start(); - Toast.makeText(getContext(), "Server wird heruntergefahren...", Toast.LENGTH_SHORT).show(); + Toast.makeText(getContext(), R.string.shutting_down, Toast.LENGTH_SHORT).show(); SSH_connection.executeRemoteCommand(ip, user, password, "shutdown now"); } catch (Exception ignored) { } diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/terminal/TerminalFragment.java b/app/src/main/java/de/jg_cody/Teraplex/ui/terminal/TerminalFragment.java index d62718d..1027a45 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/terminal/TerminalFragment.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/terminal/TerminalFragment.java @@ -66,7 +66,6 @@ public class TerminalFragment extends Fragment { mDialog.show(); } else { - Toast.makeText(getContext(), ("test"), Toast.LENGTH_SHORT).show(); scrollView = (ScrollView) root.findViewById((R.id.scrollView)); terminal_edit_text = (EditText) root.findViewById(R.id.terminal_edit_text); send_button = (Button) root.findViewById(R.id.send_button); @@ -95,7 +94,7 @@ public class TerminalFragment extends Fragment { requireActivity().runOnUiThread(new Runnable() { @Override public void run() { - Toast.makeText(getContext(), "CAN NOT CONNECT", Toast.LENGTH_SHORT).show(); + Toast.makeText(getContext(), R.string.unable_to_connect, Toast.LENGTH_SHORT).show(); } }); @@ -105,7 +104,7 @@ public class TerminalFragment extends Fragment { requireActivity().runOnUiThread(new Runnable() { @Override public void run() { - Toast.makeText(getContext(), "VERBUNDEN", Toast.LENGTH_SHORT).show(); + Toast.makeText(getContext(), R.string.connected, Toast.LENGTH_SHORT).show(); } }); while (terminal != null) { diff --git a/app/src/main/res/layout/fragment_credits.xml b/app/src/main/res/layout/fragment_credits.xml index 63449b1..5e6e85f 100644 --- a/app/src/main/res/layout/fragment_credits.xml +++ b/app/src/main/res/layout/fragment_credits.xml @@ -95,7 +95,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center_horizontal" - android:text="www.github.com" + android:text="COMING SOON" android:textAlignment="center" android:textColor="@color/mtrl_btn_text_color_selector" android:textSize="14sp" @@ -122,7 +122,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center_horizontal" - android:text="WEBSITE: jg-cody.de/teraplex" + android:text="WEBSITE: JG-CODY.DE/TERAPLEX" android:textAlignment="center" android:textColor="@color/mtrl_btn_text_color_selector" android:textSize="14sp" @@ -136,7 +136,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center_horizontal" - android:text="MAIL TO: info@jg-cody.de" + android:text="MAIL TO: INFO@JG-CODY.de" android:textAlignment="center" android:textColor="@color/mtrl_btn_text_color_selector" android:textSize="14sp" @@ -191,7 +191,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center_horizontal" - android:text="Julian G. | Matze Z." + android:text="JULIAN G. | MATZE Z." android:textAlignment="center" android:textColor="@color/mtrl_btn_text_color_selector" android:textSize="18sp" @@ -204,7 +204,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center_horizontal" - android:text="Julian K." + android:text="JULIAN K." android:textAlignment="center" android:textColor="@color/mtrl_btn_text_color_selector" android:textSize="14sp" @@ -218,7 +218,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center_horizontal" - android:text="www.jg-cody.de" + android:text="WWW.JG-CODY.DE" android:textAlignment="center" android:textColor="@color/mtrl_btn_text_color_selector" android:textSize="14sp" @@ -231,7 +231,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center_horizontal" - android:text="www.graphite-official.de" + android:text="WWW.GRAPHITE-OFFICIAL.DE" android:textAlignment="center" android:textColor="@color/mtrl_btn_text_color_selector" android:textSize="14sp" diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index 1c57639..250a333 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -92,4 +92,12 @@ SCHALTFLÄCHE 2 SENDEN DATEINAME + NEUSTART + HERUNTERFAHREN + AUS + AN + ZEIGE LOGOANIMATION + VIBRATION + VERBUNDEN + VERBINDE \ 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 7da9c33..2a0c1b2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -15,7 +15,7 @@ PASSWORD LOGIN LOGOUT - PLEASE CONNECT TO YOUR SERVER + PLEASE CONNECT TO YOUR SSH-SERVER YOU ARE LOGGED IN ON {IP} AS {USERNAME} INPUTFIELDS CANT BE EMPTY! LOGIN-DATA SAVED! @@ -25,10 +25,14 @@ SEND COMMAND SERVERCOMMANDS REBOOT + REBOOTING SHUTDOWN + SHUTTING DOWN UNABLE TO CONNECT PLEASE TRY AGAIN SEND + CONNECTED + CONNECTING //main COMMAND @@ -49,7 +53,7 @@ IMPORT EXPORT EXPORT-SETTINGS - COLORSCHEME + COLORSCHEMES "RED\nBLUE" "GREEN\nYELLOW" "ORANGE\nTURQUOISE"