diff --git a/app/src/main/java/de/jg_cody/Teraplex/AddButtonDialog.java b/app/src/main/java/de/jg_cody/Teraplex/AddButtonDialog.java
index 1e659f9..072059e 100644
--- a/app/src/main/java/de/jg_cody/Teraplex/AddButtonDialog.java
+++ b/app/src/main/java/de/jg_cody/Teraplex/AddButtonDialog.java
@@ -21,7 +21,6 @@ public class AddButtonDialog extends DialogFragment {
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-
LayoutInflater inflater = getActivity().getLayoutInflater();
View view = inflater.inflate(R.layout.addbuttondialog, null);
@@ -44,7 +43,6 @@ public class AddButtonDialog extends DialogFragment {
editTextUsername = view.findViewById(R.id.button_name);
editTextPassword = view.findViewById(R.id.button_command);
-
return builder.create();
}
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 cef8653..b70eda0 100644
--- a/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java
+++ b/app/src/main/java/de/jg_cody/Teraplex/MainActivity.java
@@ -161,13 +161,13 @@ public class MainActivity extends AppCompatActivity implements AddButtonDialog.A
}
public void openDialog1() {
- AddButtonsDialog AddButtonsDialog = new AddButtonsDialog();
- AddButtonsDialog.show(getSupportFragmentManager(), "example dialog");
+ AddButtonDialog AddButtonDialog = new AddButtonDialog();
+ AddButtonDialog.show(getSupportFragmentManager(), "example dialog");
}
public void openDialog2() {
- AddButtonDialog AddButtonDialog = new AddButtonDialog();
- AddButtonDialog.show(getSupportFragmentManager(), "example dialog");
+ AddButtonsDialog AddButtonsDialog = new AddButtonsDialog();
+ AddButtonsDialog.show(getSupportFragmentManager(), "example dialog");
}
@Override
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 08ec8c2..2764d49 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
@@ -117,9 +117,8 @@ public class EinstellungenFragment extends Fragment {
choose_background.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- Intent i = new Intent(
- Intent.ACTION_PICK, android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
- getActivity().startActivityForResult(i, MainActivity.RESULT_LOAD_IMAGE);
+ showChangeBackgroundDialog();
+
}
});
@@ -156,6 +155,46 @@ public class EinstellungenFragment extends Fragment {
mDialog.show();
}
+ private void showChangeBackgroundDialog() {
+ final String[] listItems = {"FARBE", "GRAFIK", "RESET BACKGROUND"};
+ AlertDialog.Builder mBuilder = new AlertDialog.Builder(getContext());
+ mBuilder.setTitle("CHOOSE LANGUAGE");
+ mBuilder.setSingleChoiceItems(listItems, -5, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialogInterface, int i) {
+ if (i == 0) {
+ try {
+ Toast.makeText(getContext(), "Colorpicker", Toast.LENGTH_SHORT).show();
+ 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();
+ mDialog.getWindow().setBackgroundDrawableResource(R.drawable.button_round);
+ mDialog.show();
+ } catch (Exception e) {
+ }
+ } else if (i == 1) {
+ Intent a = new Intent(
+ Intent.ACTION_PICK, android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
+ getActivity().startActivityForResult(a, MainActivity.RESULT_LOAD_IMAGE);
+ } else if (i == 2) {
+ getContext().getSharedPreferences("appsettings", Context.MODE_PRIVATE).edit().remove("Background").commit();
+ startActivity(getActivity().getIntent());
+ getActivity().finish();
+
+ }
+ dialogInterface.dismiss();
+ }
+ });
+ AlertDialog mDialog = mBuilder.create();
+ mDialog.getWindow().setBackgroundDrawableResource(R.drawable.button_round);
+ mDialog.show();
+ }
+
private void setLocale(String lang) {
Locale locale = new Locale(lang);
Locale.setDefault(locale);
diff --git a/app/src/main/res/drawable/background_full.xml b/app/src/main/res/drawable/background_full.xml
new file mode 100644
index 0000000..3a29688
--- /dev/null
+++ b/app/src/main/res/drawable/background_full.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/backgroundalpha.xml b/app/src/main/res/drawable/backgroundalpha.xml
deleted file mode 100644
index 7953e52..0000000
--- a/app/src/main/res/drawable/backgroundalpha.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/backgroundoverlay.xml b/app/src/main/res/drawable/backgroundoverlay.xml
new file mode 100644
index 0000000..f288896
--- /dev/null
+++ b/app/src/main/res/drawable/backgroundoverlay.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/button_left.xml b/app/src/main/res/drawable/button_left.xml
index f29e0e4..9f18eab 100644
--- a/app/src/main/res/drawable/button_left.xml
+++ b/app/src/main/res/drawable/button_left.xml
@@ -7,8 +7,8 @@
android:color="#FFFFFF" />
+ android:endColor="?attr/colorPrimary"
+ android:startColor="?attr/colorSecondary" />
+ android:endColor="?attr/colorOnBackground"
+ android:startColor="?attr/colorOnBackground" />
+ android:endColor="?attr/colorPrimary"
+ android:startColor="?attr/colorPrimary" />
+ android:endColor="?attr/colorOnBackground"
+ android:startColor="?attr/colorOnBackground" />
+ android:endColor="?attr/colorPrimary"
+ android:startColor="?attr/colorSecondary" />
+ android:endColor="?attr/colorOnBackground"
+ android:startColor="?attr/colorOnBackground" />
+ android:endColor="?attr/colorPrimary"
+ android:startColor="?attr/colorSecondary" />
+ android:endColor="?attr/colorOnBackground"
+ android:startColor="?attr/colorOnBackground" />
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/toolbartop.xml b/app/src/main/res/drawable/toolbartop.xml
index b4efc3c..839d98d 100644
--- a/app/src/main/res/drawable/toolbartop.xml
+++ b/app/src/main/res/drawable/toolbartop.xml
@@ -27,8 +27,8 @@
android:color="#FFFFFF" />
+ android:endColor="?attr/colorOnBackground"
+ android:startColor="?attr/colorOnBackground" />
+ layout="@layout/content_main"
+ app:layout_anchor="@+id/include"
+ app:layout_anchorGravity="center" />
diff --git a/app/src/main/res/layout/fragment_credits.xml b/app/src/main/res/layout/fragment_credits.xml
index dad75a6..fba4fba 100644
--- a/app/src/main/res/layout/fragment_credits.xml
+++ b/app/src/main/res/layout/fragment_credits.xml
@@ -22,14 +22,20 @@
app:layout_constraintVertical_bias="0.0"/>
@@ -68,7 +75,7 @@
android:gravity="center_horizontal"
android:text="PROGRAMMCODE"
android:textAlignment="center"
- android:textColor="#FFFFFF"
+ android:textColor="@color/mtrl_btn_text_color_selector"
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -81,8 +88,8 @@
android:gravity="center_horizontal"
android:text="www.github.com"
android:textAlignment="center"
- android:textColor="#FFFFFF"
- android:textSize="18sp"
+ android:textColor="@color/mtrl_btn_text_color_selector"
+ android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/programmcode" />
@@ -91,14 +98,13 @@
android:id="@+id/team"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginStart="75dp"
- android:layout_marginLeft="75dp"
android:layout_marginTop="25dp"
android:gravity="center_horizontal"
android:text="TEAM"
android:textAlignment="center"
- android:textColor="#FFFFFF"
+ android:textColor="@color/mtrl_btn_text_color_selector"
android:textSize="18sp"
+ app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/divider5" />
@@ -109,8 +115,8 @@
android:gravity="center_horizontal"
android:text="WEBSITE: jg-cody.de/teraplex"
android:textAlignment="center"
- android:textColor="#FFFFFF"
- android:textSize="18sp"
+ android:textColor="@color/mtrl_btn_text_color_selector"
+ android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.497"
app:layout_constraintStart_toStartOf="parent"
@@ -123,8 +129,8 @@
android:gravity="center_horizontal"
android:text="MAIL TO: info@jg-cody.de"
android:textAlignment="center"
- android:textColor="#FFFFFF"
- android:textSize="18sp"
+ android:textColor="@color/mtrl_btn_text_color_selector"
+ android:textSize="14sp"
app:layout_constraintStart_toStartOf="@+id/mail"
app:layout_constraintTop_toBottomOf="@+id/contact2" />
@@ -136,7 +142,7 @@
android:gravity="center_horizontal"
android:text="KONTAKT"
android:textAlignment="center"
- android:textColor="#FFFFFF"
+ android:textColor="@color/mtrl_btn_text_color_selector"
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -144,16 +150,16 @@
@@ -161,16 +167,14 @@
android:id="@+id/cooperation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="25dp"
- android:layout_marginEnd="20dp"
- android:layout_marginRight="20dp"
android:gravity="center_horizontal"
android:text="IN KOOPERATION WITH"
android:textAlignment="center"
- android:textColor="#FFFFFF"
- android:textSize="18sp"
+ android:textColor="@color/mtrl_btn_text_color_selector"
+ android:textSize="14sp"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/divider5" />
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/MatzeZ" />
@@ -219,8 +223,8 @@
android:gravity="center_horizontal"
android:text="www.graphite-official.de"
android:textAlignment="center"
- android:textColor="#FFFFFF"
- android:textSize="18sp"
+ android:textColor="@color/mtrl_btn_text_color_selector"
+ android:textSize="14sp"
app:layout_constraintEnd_toEndOf="@+id/cooperation"
app:layout_constraintStart_toStartOf="@+id/cooperation"
app:layout_constraintTop_toBottomOf="@+id/cooperation" />
@@ -245,42 +249,42 @@
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_einstellungen.xml b/app/src/main/res/layout/fragment_einstellungen.xml
index d48f828..54d43a4 100644
--- a/app/src/main/res/layout/fragment_einstellungen.xml
+++ b/app/src/main/res/layout/fragment_einstellungen.xml
@@ -22,7 +22,7 @@
app:layout_constraintVertical_bias="0.0" />
+ app:layout_constraintTop_toTopOf="@+id/button_colorpicker"
+ app:layout_constraintVertical_bias="0.0" />
@@ -59,12 +61,13 @@
android:layout_height="wrap_content"
android:layout_marginStart="50dp"
android:layout_marginLeft="50dp"
- android:layout_marginTop="75dp"
+ android:layout_marginTop="125dp"
+ android:layout_marginBottom="25dp"
android:gravity="center_horizontal"
android:text="@string/farben"
android:textAlignment="center"
- android:textColor="#FFFFFF"
- android:textSize="20dp"
+ android:textColor="@color/mtrl_btn_text_color_selector"
+ android:textSize="18sp"
app:layout_constraintBottom_toTopOf="@+id/divider2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -78,8 +81,8 @@
android:gravity="center_horizontal"
android:text="@string/sprache"
android:textAlignment="center"
- android:textColor="#FFFFFF"
- android:textSize="20dp"
+ android:textColor="@color/mtrl_btn_text_color_selector"
+ android:textSize="18sp"
app:layout_constraintBottom_toTopOf="@+id/divider3"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/divider" />
@@ -93,8 +96,8 @@
android:gravity="center_horizontal"
android:text="@string/einstellungen_zurücksetzen"
android:textAlignment="center"
- android:textColor="#FFFFFF"
- android:textSize="20dp"
+ android:textColor="@color/mtrl_btn_text_color_selector"
+ android:textSize="18sp"
app:layout_constraintBottom_toTopOf="@+id/divider4"
app:layout_constraintStart_toStartOf="@+id/Background"
app:layout_constraintTop_toBottomOf="@+id/divider3" />
@@ -109,8 +112,8 @@
android:gravity="center_horizontal"
android:text="@string/farbschema"
android:textAlignment="center"
- android:textColor="#FFFFFF"
- android:textSize="20dp"
+ android:textColor="@color/mtrl_btn_text_color_selector"
+ android:textSize="18sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/divider4" />
@@ -225,42 +228,43 @@
+ android:background="@drawable/background_full"
+ app:layout_constraintEnd_toEndOf="@+id/divider2"
+ app:layout_constraintStart_toStartOf="@+id/divider2"
+ app:layout_constraintTop_toBottomOf="@+id/button_pickimage" />
+ android:background="@drawable/background_full"
+ app:layout_constraintEnd_toEndOf="@+id/divider"
+ app:layout_constraintStart_toStartOf="@+id/divider"
+ app:layout_constraintTop_toBottomOf="@+id/button_language" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 8930a38..f5cf272 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -24,55 +24,74 @@
+
+
+
+
-
-
+ app:layout_constraintTop_toTopOf="@+id/textView6" />
+ app:layout_constraintTop_toBottomOf="@+id/divider8" />
+
+
+ app:layout_constraintTop_toBottomOf="@+id/SendCommandButton" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_zeitsteuerung.xml b/app/src/main/res/layout/fragment_zeitsteuerung.xml
index 10028ff..897f30c 100644
--- a/app/src/main/res/layout/fragment_zeitsteuerung.xml
+++ b/app/src/main/res/layout/fragment_zeitsteuerung.xml
@@ -16,20 +16,37 @@
android:src="@drawable/background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.5"
+ app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.0" />
+ app:layout_constraintVertical_bias="1.0" />
+
+
+ app:layout_constraintTop_toBottomOf="@+id/divider10" />
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 4ca1eac..83bc687 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -2,12 +2,14 @@
\ No newline at end of file