bugfixes and minor changes

This commit is contained in:
JG-Cody 2021-08-24 20:01:38 +02:00
parent 8fc81dc00a
commit 20b49adeca
5 changed files with 26 additions and 15 deletions

View File

@ -159,7 +159,7 @@ public class HomeFragment extends Fragment {
requireActivity().runOnUiThread(new Runnable() { requireActivity().runOnUiThread(new Runnable() {
@Override @Override
public void run() { 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); SharedPreferences p = requireContext().getSharedPreferences("appsettings", Context.MODE_PRIVATE);
p.edit().putString("user", user).putString("password", password).putString("ip", ip).apply(); p.edit().putString("user", user).putString("password", password).putString("ip", ip).apply();
if (user == null || ip == null) { if (user == null || ip == null) {
@ -267,7 +267,7 @@ public class HomeFragment extends Fragment {
try { try {
MediaPlayer mp = MediaPlayer.create(getContext(), R.raw.state_change_confirm_down); MediaPlayer mp = MediaPlayer.create(getContext(), R.raw.state_change_confirm_down);
mp.start(); 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"); SSH_connection.executeRemoteCommand(ip, user, password, "reboot");
} catch (Exception ignored) { } catch (Exception ignored) {
} }
@ -321,7 +321,7 @@ public class HomeFragment extends Fragment {
try { try {
MediaPlayer mp = MediaPlayer.create(getContext(), R.raw.state_change_confirm_down); MediaPlayer mp = MediaPlayer.create(getContext(), R.raw.state_change_confirm_down);
mp.start(); 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"); SSH_connection.executeRemoteCommand(ip, user, password, "shutdown now");
} catch (Exception ignored) { } catch (Exception ignored) {
} }

View File

@ -66,7 +66,6 @@ public class TerminalFragment extends Fragment {
mDialog.show(); mDialog.show();
} else { } else {
Toast.makeText(getContext(), ("test"), Toast.LENGTH_SHORT).show();
scrollView = (ScrollView) root.findViewById((R.id.scrollView)); scrollView = (ScrollView) root.findViewById((R.id.scrollView));
terminal_edit_text = (EditText) root.findViewById(R.id.terminal_edit_text); terminal_edit_text = (EditText) root.findViewById(R.id.terminal_edit_text);
send_button = (Button) root.findViewById(R.id.send_button); send_button = (Button) root.findViewById(R.id.send_button);
@ -95,7 +94,7 @@ public class TerminalFragment extends Fragment {
requireActivity().runOnUiThread(new Runnable() { requireActivity().runOnUiThread(new Runnable() {
@Override @Override
public void run() { 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() { requireActivity().runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
Toast.makeText(getContext(), "VERBUNDEN", Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(), R.string.connected, Toast.LENGTH_SHORT).show();
} }
}); });
while (terminal != null) { while (terminal != null) {

View File

@ -95,7 +95,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="www.github.com" android:text="COMING SOON"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/mtrl_btn_text_color_selector" android:textColor="@color/mtrl_btn_text_color_selector"
android:textSize="14sp" android:textSize="14sp"
@ -122,7 +122,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="WEBSITE: jg-cody.de/teraplex" android:text="WEBSITE: JG-CODY.DE/TERAPLEX"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/mtrl_btn_text_color_selector" android:textColor="@color/mtrl_btn_text_color_selector"
android:textSize="14sp" android:textSize="14sp"
@ -136,7 +136,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="MAIL TO: info@jg-cody.de" android:text="MAIL TO: INFO@JG-CODY.de"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/mtrl_btn_text_color_selector" android:textColor="@color/mtrl_btn_text_color_selector"
android:textSize="14sp" android:textSize="14sp"
@ -191,7 +191,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="Julian G. | Matze Z." android:text="JULIAN G. | MATZE Z."
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/mtrl_btn_text_color_selector" android:textColor="@color/mtrl_btn_text_color_selector"
android:textSize="18sp" android:textSize="18sp"
@ -204,7 +204,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="Julian K." android:text="JULIAN K."
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/mtrl_btn_text_color_selector" android:textColor="@color/mtrl_btn_text_color_selector"
android:textSize="14sp" android:textSize="14sp"
@ -218,7 +218,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="www.jg-cody.de" android:text="WWW.JG-CODY.DE"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/mtrl_btn_text_color_selector" android:textColor="@color/mtrl_btn_text_color_selector"
android:textSize="14sp" android:textSize="14sp"
@ -231,7 +231,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:text="www.graphite-official.de" android:text="WWW.GRAPHITE-OFFICIAL.DE"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/mtrl_btn_text_color_selector" android:textColor="@color/mtrl_btn_text_color_selector"
android:textSize="14sp" android:textSize="14sp"

View File

@ -92,4 +92,12 @@
<string name="button2">SCHALTFLÄCHE 2</string> <string name="button2">SCHALTFLÄCHE 2</string>
<string name="send">SENDEN</string> <string name="send">SENDEN</string>
<string name="filename">DATEINAME</string> <string name="filename">DATEINAME</string>
<string name="rebooting">NEUSTART</string>
<string name="shutting_down">HERUNTERFAHREN</string>
<string name="off">AUS</string>
<string name="on">AN</string>
<string name="logoanimation">ZEIGE LOGOANIMATION</string>
<string name="hapticfeedback">VIBRATION</string>
<string name="connected">VERBUNDEN</string>
<string name="connecting">VERBINDE</string>
</resources> </resources>

View File

@ -15,7 +15,7 @@
<string name="login_password">PASSWORD</string> <string name="login_password">PASSWORD</string>
<string name="login">LOGIN</string> <string name="login">LOGIN</string>
<string name="logout">LOGOUT</string> <string name="logout">LOGOUT</string>
<string name="please_login">PLEASE CONNECT TO YOUR SERVER</string> <string name="please_login">PLEASE CONNECT TO YOUR SSH-SERVER</string>
<string name="sie_sind_als_angemeldet">YOU ARE LOGGED IN ON {IP} AS {USERNAME}</string> <string name="sie_sind_als_angemeldet">YOU ARE LOGGED IN ON {IP} AS {USERNAME}</string>
<string name="felder_dürfen_nicht_leer_sein">INPUTFIELDS CANT BE EMPTY!</string> <string name="felder_dürfen_nicht_leer_sein">INPUTFIELDS CANT BE EMPTY!</string>
<string name="login_saved">LOGIN-DATA SAVED!</string> <string name="login_saved">LOGIN-DATA SAVED!</string>
@ -25,10 +25,14 @@
<string name="button_send_command">SEND COMMAND</string> <string name="button_send_command">SEND COMMAND</string>
<string name="servercommands">SERVERCOMMANDS</string> <string name="servercommands">SERVERCOMMANDS</string>
<string name="reboot">REBOOT</string> <string name="reboot">REBOOT</string>
<string name="rebooting">REBOOTING</string>
<string name="shutdown">SHUTDOWN</string> <string name="shutdown">SHUTDOWN</string>
<string name="shutting_down">SHUTTING DOWN</string>
<string name="unable_to_connect">UNABLE TO CONNECT</string> <string name="unable_to_connect">UNABLE TO CONNECT</string>
<string name="try_again">PLEASE TRY AGAIN</string> <string name="try_again">PLEASE TRY AGAIN</string>
<string name="send">SEND</string> <string name="send">SEND</string>
<string name="connected">CONNECTED</string>
<string name="connecting">CONNECTING</string>
//main //main
<string name="command">COMMAND</string> <string name="command">COMMAND</string>
@ -49,7 +53,7 @@
<string name="button_import">IMPORT</string> <string name="button_import">IMPORT</string>
<string name="button_export">EXPORT</string> <string name="button_export">EXPORT</string>
<string name="export_settings">EXPORT-SETTINGS</string> <string name="export_settings">EXPORT-SETTINGS</string>
<string name="color_scheme">COLORSCHEME</string> <string name="color_scheme">COLORSCHEMES</string>
<string name="red_blue">"RED\nBLUE"</string> <string name="red_blue">"RED\nBLUE"</string>
<string name="green_yellow">"GREEN\nYELLOW"</string> <string name="green_yellow">"GREEN\nYELLOW"</string>
<string name="orange_turquoise">"ORANGE\nTURQUOISE"</string> <string name="orange_turquoise">"ORANGE\nTURQUOISE"</string>