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 ffb53cf..92ac1d0 100644
--- a/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java
+++ b/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java
@@ -385,7 +385,7 @@ public class MainActivity extends AppCompatActivity {
transaction.replace(R.id.nav_host_fragment, pef).setPrimaryNavigationFragment(pef);
transaction.addToBackStack(null);
transaction.commit();
- Objects.requireNonNull(getSupportActionBar()).setTitle(R.string.menu_einstellungen);
+ Objects.requireNonNull(getSupportActionBar()).setTitle(R.string.menu_settings);
}
public void menurighttopcredits(MenuItem i) {
@@ -394,7 +394,7 @@ public class MainActivity extends AppCompatActivity {
transaction.replace(R.id.nav_host_fragment, pef).setPrimaryNavigationFragment(pef);
transaction.addToBackStack(null);
transaction.commit();
- Objects.requireNonNull(getSupportActionBar()).setTitle(R.string.menu_über);
+ Objects.requireNonNull(getSupportActionBar()).setTitle(R.string.menu_about);
}
public void menurighttopdocumentation(MenuItem i) {
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 d2765db..74362b0 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
@@ -23,8 +23,6 @@ import androidx.annotation.RequiresApi;
import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider;
-import com.rarepebble.colorpicker.ColorPickerView;
-
import java.util.Base64;
import java.util.Locale;
import java.util.Objects;
@@ -200,46 +198,17 @@ public class EinstellungenFragment extends Fragment {
}
private void showChangeBackgroundDialog() {
- final String[] listItems = {"FARBE", "GRADIENT", "GRAFIK", "RESET BACKGROUND"};
+ final String[] listItems = {"GRAFIK", "RESET BACKGROUND"};
AlertDialog.Builder mBuilder = new AlertDialog.Builder(getContext());
mBuilder.setTitle("CHOOSE BACKGROUND-TYPE");
mBuilder.setSingleChoiceItems(listItems, -5, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialogInterface, int i) {
if (i == 0) {
- try {
- final ColorPickerView picker = new ColorPickerView(getContext());
- picker.setColor(0xff12345);
- AlertDialog mDialog = new AlertDialog.Builder(getContext()).setView(picker).setTitle(R.string.colorpicker).setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
-
- }
- }).create();
- Objects.requireNonNull(mDialog.getWindow()).setBackgroundDrawableResource(R.drawable.button_round);
- mDialog.show();
- } catch (Exception e) {
- }
- } else if (i == 1) {
- try {
- final ColorPickerView picker = new ColorPickerView(getContext());
- picker.setColor(0xff12345);
- AlertDialog mDialog = new AlertDialog.Builder(getContext()).setView(picker).setTitle(R.string.colorpicker).setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
-
-
- }
- }).create();
- Objects.requireNonNull(mDialog.getWindow()).setBackgroundDrawableResource(R.drawable.button_round);
- mDialog.show();
- } catch (Exception ignored) {
- }
- } else if (i == 2) {
Intent a = new Intent(
Intent.ACTION_PICK, android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
requireActivity().startActivityForResult(a, MainActivity.RESULT_LOAD_IMAGE);
- } else if (i == 3) {
+ } else if (i == 1) {
requireContext().getSharedPreferences("appsettings", Context.MODE_PRIVATE).edit().remove("Background").apply();
startActivity(requireActivity().getIntent());
requireActivity().finish();
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 707ffd8..2086abb 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -22,8 +22,9 @@
app:layout_constraintVertical_bias="0.0" />
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
\ No newline at end of file
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
index ce81a97..2b4b605 100644
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@@ -7,7 +7,7 @@
android:icon="@drawable/contact_support_black_24dp"
android:onClick="menurighttopdocumentation"
android:orderInCategory="100"
- android:title="@string/menu_frage"
+ android:title="@string/menu_documentation"
app:iconTint="?attr/colorOnPrimary"
app:showAsAction="ifRoom" />
\ No newline at end of file
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index cdb7ccb..5df37df 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -21,7 +21,7 @@
\ 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 2041534..dd73139 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -14,12 +14,11 @@
SCHLAFZIMMER
FLUR
KÜCHE
- EINSTELLUNGEN
- FRAGE
- CREDITS
+ EINSTELLUNGEN
+ FRAGE
AUSLOGGEN
- SPRACHE
- SCHLIESSEN
+ SPRACHE
+ SCHLIESSEN
WÄHLE DEINE FARBE
WEITER
AUSLOGGEN
@@ -41,11 +40,6 @@
HINTERGRUND
SPRACHE
EINSTELLUNGEN ZURÜCKSETZEN
- FARBSCHEMA
- BLAU
- ROT
- GRÜN
- GELB
ZURÜCKSETZEN
HINTERGRUND WÄHLEN
SSH-FERNBEDIENUNG
@@ -55,5 +49,21 @@
AUSLOGGEN
MÖCHTEST DU WIRKLICH DIE APP UND ALLE IHRE EINSTELLUNGEN ZURÜCKSETZEN?
APP ZURÜCKSETZEN
- ABOUT
+ ABOUT
+ LOGIN_DATEN GESPEICHERT
+ FELDER DÜRFEN NICHT LEER SEIN!
+ FARBSCHEMA
+ ROT BLAU
+ GRÜN GELB
+ ORANGE TÜRKIS
+ GELB BLAU
+ PINK GRÜN
+ TERAPLEX v1.1.1
+ LIZENZ
+ KONTAKT
+ APPCODE
+ TEAM
+ IN KOOPERATION MIT
+ TAB HINZUFÜGEN
+ TABS ENTFERNEN
\ No newline at end of file
diff --git a/app/src/main/res/values-tlh/strings.xml b/app/src/main/res/values-tlh/strings.xml
index de4ff7c..f69318e 100644
--- a/app/src/main/res/values-tlh/strings.xml
+++ b/app/src/main/res/values-tlh/strings.xml
@@ -10,14 +10,13 @@
pum
vaS
qeylIS
- \'Iv
- yu\'
- Hol
- SoQmoH
+ \'Iv
+ yu\'
+ Hol
+ SoQmoH
bIrchoH
lu\'
parmaq
- QeH
parmaq
BATLH BIMEJNIS
QONOS
@@ -37,11 +36,6 @@
chech
Hol
qem
- naH
- SuD
- qe\'
- wIgh
- DeQ
nobHa\'
lI\'
verengan
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3eced1e..7766cf0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -74,29 +74,14 @@
ADD TAB
REMOVE TABS
- SETTINGS
- QUESTION
- ÜBER
+ SETTINGS
+ QUESTION
+ ABOUT
LOGOUT
- LANGUAGE
- CLOSE
+ LANGUAGE
+ CLOSE
CHOOSE YOUR COLOR
OK
-
- - RED
- - GREEN
- - BLUE
- - Dark
-
-
-
- - GERMAN
- - ENGLISH
- - KLINGONISCH
-
-
- Hello blank fragment
-
\ No newline at end of file