From c9a4a7fbdd08833ff1eff034e7b6235cbf57a625 Mon Sep 17 00:00:00 2001 From: JG-Cody Date: Sun, 6 Jun 2021 19:48:21 +0200 Subject: [PATCH] minimal changes... --- .../de/jg_cody/Teraplex/MainActivity.java | 41 +++++------ .../ui/Schlafzimmer/SchlafzimmerFragment.java | 12 ++-- .../Teraplex/ui/home/HomeFragment.java | 25 ++++--- app/src/main/res/layout-v23/app_bar_main.xml | 50 ++++++------- app/src/main/res/layout/app_bar_main.xml | 28 ++++---- app/src/main/res/layout/fragment_credits.xml | 9 ++- app/src/main/res/layout/fragment_home.xml | 72 +++++++++---------- .../main/res/layout/fragment_schlafzimmer.xml | 28 ++++---- app/src/main/res/values/strings.xml | 2 + 9 files changed, 138 insertions(+), 129 deletions(-) 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 b70eda0..21e5d07 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java +++ b/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java @@ -19,11 +19,9 @@ import android.os.Bundle; import android.provider.MediaStore; import android.text.SpannableString; import android.text.style.ForegroundColorSpan; -import android.util.Log; import android.util.TypedValue; import android.view.Menu; import android.view.MenuItem; -import android.view.View; import android.widget.ImageView; import androidx.annotation.RequiresApi; @@ -36,7 +34,6 @@ import androidx.navigation.Navigation; import androidx.navigation.ui.AppBarConfiguration; import androidx.navigation.ui.NavigationUI; -import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.android.material.navigation.NavigationView; import java.io.ByteArrayOutputStream; @@ -47,8 +44,6 @@ import java.util.Locale; import de.jg_cody.Teraplex.ui.Credits.CreditsFragment; import de.jg_cody.Teraplex.ui.Einstellungen.EinstellungenFragment; -import de.jg_cody.Teraplex.ui.Konsole.KonsoleFragment; -import de.jg_cody.Teraplex.ui.home.HomeFragment; public class MainActivity extends AppCompatActivity implements AddButtonDialog.AddButtonDialogListener { @@ -77,25 +72,25 @@ public class MainActivity extends AppCompatActivity implements AddButtonDialog.A Toolbar toolbar = findViewById(R.id.toolbar); toolbar.setBackgroundResource(R.drawable.toolbartop); setSupportActionBar(toolbar); - FloatingActionButton addfab = findViewById(R.id.addbutton_fab); - addfab.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - showChooseElement(); - } - }); +// FloatingActionButton addfab = findViewById(R.id.addbutton_fab); +// addfab.setOnClickListener(new View.OnClickListener() { +// @Override +// public void onClick(View v) { +// showChooseElement(); +// } +// }); - FloatingActionButton mfab = findViewById(R.id.fab); - mfab.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - try { - Log.d("I", "ACTION BUTTON CLICKED"); - SSH_connection.executeRemoteCommand(HomeFragment.ip, HomeFragment.user, HomeFragment.password, KonsoleFragment.command); - } catch (Exception e) { - } - } - }); +// FloatingActionButton mfab = findViewById(R.id.fab); +// mfab.setOnClickListener(new View.OnClickListener() { +// @Override +// public void onClick(View view) { +// try { +// 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 diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/Schlafzimmer/SchlafzimmerFragment.java b/app/src/main/java/de/jg_cody/Teraplex/ui/Schlafzimmer/SchlafzimmerFragment.java index ea7dfbd..716453f 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/Schlafzimmer/SchlafzimmerFragment.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/Schlafzimmer/SchlafzimmerFragment.java @@ -59,7 +59,7 @@ public class SchlafzimmerFragment extends Fragment { } - schlafzimmeru1aus = (Button) root.findViewById(R.id.schlafzimmeru1aus); + schlafzimmeru1aus = (Button) root.findViewById(R.id.schlafzimmeru1an); schlafzimmeru1aus.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -72,7 +72,7 @@ public class SchlafzimmerFragment extends Fragment { } }); - schlafzimmeru1an = (Button) root.findViewById(R.id.schlafzimmeru1an); + schlafzimmeru1an = (Button) root.findViewById(R.id.schlafzimmeru1aus); schlafzimmeru1an.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -85,7 +85,7 @@ public class SchlafzimmerFragment extends Fragment { } }); - schlafzimmeru2aus = (Button) root.findViewById(R.id.schlafzimmeru2aus); + schlafzimmeru2aus = (Button) root.findViewById(R.id.schlafzimmeru2an); schlafzimmeru2aus.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -98,7 +98,7 @@ public class SchlafzimmerFragment extends Fragment { } }); - schlafzimmeru2an = (Button) root.findViewById(R.id.schlafzimmeru2an); + schlafzimmeru2an = (Button) root.findViewById(R.id.schlafzimmeru2aus); schlafzimmeru2an.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -111,7 +111,7 @@ public class SchlafzimmerFragment extends Fragment { } }); - schlafzimmeru3aus = (Button) root.findViewById(R.id.schlafzimmeru3aus); + schlafzimmeru3aus = (Button) root.findViewById(R.id.schlafzimmeru3an); schlafzimmeru3aus.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -124,7 +124,7 @@ public class SchlafzimmerFragment extends Fragment { } }); - schlafzimmeru3an = (Button) root.findViewById(R.id.schlafzimmeru3an); + schlafzimmeru3an = (Button) root.findViewById(R.id.schlafzimmeru3aus); schlafzimmeru3an.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { 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 6841639..07e5923 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 @@ -78,25 +78,31 @@ public class HomeFragment extends Fragment { if (user == null || ip == null) { loginButton.setVisibility(View.VISIBLE); } - else {loginButton.setVisibility(View.INVISIBLE);} + else {loginButton.setVisibility(View.INVISIBLE); + ipInput.setVisibility(View.GONE); + userInput.setVisibility(View.GONE); + passwordInput.setVisibility(View.GONE);} loginButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { if (userInput.getText().toString().trim().length() == 0 || ipInput.getText().toString().trim().length() == 0 || passwordInput.getText().toString().trim().length() == 0) { - Toast.makeText(getContext(), "Felder dürfen nicht leer sein!", Toast.LENGTH_SHORT).show(); + Toast.makeText(getContext(),getString(R.string.felder_dürfen_nicht_leer_sein), Toast.LENGTH_SHORT).show(); } else { user = userInput.getText().toString(); password = passwordInput.getText().toString(); ip = ipInput.getText().toString(); SharedPreferences p = getContext().getSharedPreferences("appsettings", Context.MODE_PRIVATE); p.edit().putString("user", user).putString("password", password).putString("ip", ip).apply(); - Toast.makeText(getContext(), "Login-Daten gespeichert...", Toast.LENGTH_SHORT).show(); + Toast.makeText(getContext(), getString(R.string.login_saved), Toast.LENGTH_SHORT).show(); if (user == null || ip == null) { login_data.setText(""); } else { - login_data.setText("Sie sind als " + user + " bei " + ip + " angemeldet!"); + login_data.setText(getString(R.string.sie_sind_als_angemeldet).replace("{IP}", ip).replace("{USERNAME}", user)); logoutButton.setVisibility(View.VISIBLE); loginButton.setVisibility(View.INVISIBLE); + ipInput.setVisibility(View.GONE); + userInput.setVisibility(View.GONE); + passwordInput.setVisibility(View.GONE); } } } @@ -104,6 +110,9 @@ public class HomeFragment extends Fragment { logoutButton = (Button) root.findViewById(R.id.logoutButton); if (user == null || ip == null) { logoutButton.setVisibility(View.INVISIBLE); + ipInput.setVisibility(View.VISIBLE); + userInput.setVisibility(View.VISIBLE); + passwordInput.setVisibility(View.VISIBLE); } else {logoutButton.setVisibility(View.VISIBLE);} logoutButton.setOnClickListener(new View.OnClickListener() { @@ -114,7 +123,7 @@ public class HomeFragment extends Fragment { getActivity().finish(); } }); - wlan_aus_Button = (Button) root.findViewById(R.id.wlan_aus); + wlan_aus_Button = (Button) root.findViewById(R.id.wlan_an); wlan_aus_Button.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -126,7 +135,7 @@ public class HomeFragment extends Fragment { } } }); - wlan_an_Button = (Button) root.findViewById(R.id.wlan_an); + wlan_an_Button = (Button) root.findViewById(R.id.wlan_aus); wlan_an_Button.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -138,7 +147,7 @@ public class HomeFragment extends Fragment { } } }); - kodiaus = (Button) root.findViewById(R.id.kodiaus); + kodiaus = (Button) root.findViewById(R.id.kodian); kodiaus.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -151,7 +160,7 @@ public class HomeFragment extends Fragment { } }); - kodian = (Button) root.findViewById(R.id.kodian); + kodian = (Button) root.findViewById(R.id.kodiaus); kodian.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/res/layout-v23/app_bar_main.xml b/app/src/main/res/layout-v23/app_bar_main.xml index f012959..f6cd89b 100644 --- a/app/src/main/res/layout-v23/app_bar_main.xml +++ b/app/src/main/res/layout-v23/app_bar_main.xml @@ -20,32 +20,32 @@ app:layout_anchor="@+id/include" app:layout_anchorGravity="center" /> - + - + - \ No newline at end of file + \ 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 44b1b4f..02003f5 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -18,19 +18,19 @@ android:id="@+id/include" layout="@layout/content_main" /> - + - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_credits.xml b/app/src/main/res/layout/fragment_credits.xml index 6ceb78a..a920a13 100644 --- a/app/src/main/res/layout/fragment_credits.xml +++ b/app/src/main/res/layout/fragment_credits.xml @@ -1,4 +1,5 @@ + + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="1.0" /> + app:layout_constraintStart_toStartOf="@+id/text_home" + app:layout_constraintTop_toBottomOf="@+id/login_data" /> + app:layout_constraintStart_toStartOf="@+id/text_home" + app:layout_constraintTop_toBottomOf="@+id/ipInput" />