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 8378187..339e517 100644
--- a/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java
+++ b/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java
@@ -63,6 +63,7 @@ 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.Tabs.TabsFragment;
import de.jg_cody.Teraplex.ui.rooms.ListAdapter;
@@ -385,7 +386,7 @@ public class MainActivity extends AppCompatActivity {
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();
+ nhf.getChildFragmentManager().beginTransaction().replace(R.id.nav_host_fragment, new CreditsFragment()).commit();
Objects.requireNonNull(getSupportActionBar()).setTitle(R.string.menu_about);
}
diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/Einstellungen/EinstellungenFragment.java b/app/src/main/java/de/jg_cody/Teraplex/ui/Einstellungen/EinstellungenFragment.java
index 78e71b4..7727758 100644
--- a/app/src/main/java/de/jg_cody/Teraplex/ui/Einstellungen/EinstellungenFragment.java
+++ b/app/src/main/java/de/jg_cody/Teraplex/ui/Einstellungen/EinstellungenFragment.java
@@ -171,10 +171,10 @@ public class EinstellungenFragment extends Fragment {
}
private void showChangeLanguageDialog() {
- final String[] listItems = {"GERMAN", "ENGLISCH", "KLINGONISCH"};
+ final String[] listItems = {"GERMAN", "ENGLISCH"};
AlertDialog.Builder mBuilder = new AlertDialog.Builder(getContext());
mBuilder.setTitle("CHOOSE LANGUAGE");
- mBuilder.setSingleChoiceItems(listItems, -5, new DialogInterface.OnClickListener() {
+ mBuilder.setSingleChoiceItems(listItems, -1, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
if (i == 0) {
@@ -185,10 +185,6 @@ public class EinstellungenFragment extends Fragment {
setLocale("en");
startActivity(requireActivity().getIntent());
requireActivity().finish();
- } else if (i == 2) {
- setLocale("tlh");
- startActivity(requireActivity().getIntent());
- requireActivity().finish();
}
dialogInterface.dismiss();
}
diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/Konsole/KonsoleFragment.java b/app/src/main/java/de/jg_cody/Teraplex/ui/Konsole/KonsoleFragment.java
index 3282a87..1ff5ca9 100644
--- a/app/src/main/java/de/jg_cody/Teraplex/ui/Konsole/KonsoleFragment.java
+++ b/app/src/main/java/de/jg_cody/Teraplex/ui/Konsole/KonsoleFragment.java
@@ -65,7 +65,20 @@ public class KonsoleFragment extends Fragment {
public void onClick(View v) {
try {
if (befehlInput.getText().toString().trim().length() == 0) {
- Toast.makeText(getContext(), "Feld darf nicht leer sein!", Toast.LENGTH_SHORT).show();
+ MediaPlayer mp = MediaPlayer.create(getContext(), R.raw.state_change_confirm_up);
+ mp.start();
+ AlertDialog mDialog = new AlertDialog.Builder(getContext())
+ .setTitle("UNGÜLTIGE EINGABE")
+ .setMessage("EINGABEFELDER DÜRFEN NICHT LEER SEIN")
+
+ // Specifying a listener allows you to take an action before dismissing the dialog.
+ // The dialog is automatically dismissed when a dialog button is clicked.
+ .setPositiveButton(android.R.string.yes, null )
+ .create();
+ Objects.requireNonNull(mDialog.getWindow()).setBackgroundDrawableResource(R.drawable.button_round);
+ mDialog.getWindow().getAttributes().windowAnimations = R.style.DialogAnimation; //style id
+ mDialog.show();
+ return;
} else {
command = befehlInput.getText().toString();
Toast.makeText(getContext(), "Kommando gesendet...", Toast.LENGTH_SHORT).show();
diff --git a/app/src/main/res/layout/fragment_einstellungen.xml b/app/src/main/res/layout/fragment_einstellungen.xml
index 90ca3d1..cc7aa39 100644
--- a/app/src/main/res/layout/fragment_einstellungen.xml
+++ b/app/src/main/res/layout/fragment_einstellungen.xml
@@ -29,30 +29,30 @@
android:clickable="true"
tools:context=".ui.Credits.CreditsFragment">
-
+
-
+
-
+
+ android:id="@+id/button_language"
+ android:layout_width="140dp"
+ android:layout_height="55dp"
+ android:layout_marginTop="10dp"
+ android:layout_marginEnd="35dp"
+ android:layout_marginRight="35dp"
+ android:background="@drawable/button_round"
+ android:text="@string/language"
+ app:backgroundTint="@null"
+ app:layout_constraintBottom_toTopOf="@+id/divider3"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/divider" />
-
+