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 507236d..d2765db 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 @@ -17,7 +17,6 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; import android.widget.ImageView; -import android.widget.Toast; import androidx.annotation.NonNull; import androidx.annotation.RequiresApi; @@ -107,7 +106,6 @@ public class EinstellungenFragment extends Fragment { theme1.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - Toast.makeText(getContext(), "Theme1", Toast.LENGTH_SHORT).show(); SharedPreferences.Editor editor = requireContext().getSharedPreferences("appsettings", MODE_PRIVATE).edit(); editor.putString("Theme", "RED_BLUE"); editor.apply(); @@ -121,7 +119,6 @@ public class EinstellungenFragment extends Fragment { theme2.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - Toast.makeText(getContext(), "Theme2", Toast.LENGTH_SHORT).show(); SharedPreferences.Editor editor = requireContext().getSharedPreferences("appsettings", MODE_PRIVATE).edit(); editor.putString("Theme", "GREEN_YELLOW"); editor.apply(); @@ -135,7 +132,6 @@ public class EinstellungenFragment extends Fragment { theme3.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - Toast.makeText(getContext(), "Theme3", Toast.LENGTH_SHORT).show(); SharedPreferences.Editor editor = requireContext().getSharedPreferences("appsettings", MODE_PRIVATE).edit(); editor.putString("Theme", "ORANGE_TURQUOISE"); editor.apply(); @@ -149,7 +145,6 @@ public class EinstellungenFragment extends Fragment { theme4.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - Toast.makeText(getContext(), "Theme4", Toast.LENGTH_SHORT).show(); SharedPreferences.Editor editor = requireContext().getSharedPreferences("appsettings", MODE_PRIVATE).edit(); editor.putString("Theme", "YELLOW_BLUE"); editor.apply(); @@ -163,7 +158,6 @@ public class EinstellungenFragment extends Fragment { theme5.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - Toast.makeText(getContext(), "Theme5", Toast.LENGTH_SHORT).show(); SharedPreferences.Editor editor = requireContext().getSharedPreferences("appsettings", MODE_PRIVATE).edit(); editor.putString("Theme", "PINK_GREEN"); editor.apply(); @@ -214,7 +208,6 @@ public class EinstellungenFragment extends Fragment { 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() { @@ -229,7 +222,6 @@ public class EinstellungenFragment extends Fragment { } } else if (i == 1) { 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() { diff --git a/app/src/main/java/de/jg_cody/Teraplex/ui/intro/IntroFragment.java b/app/src/main/java/de/jg_cody/Teraplex/ui/intro/IntroFragment.java index 0f7c63d..1274b5d 100644 --- a/app/src/main/java/de/jg_cody/Teraplex/ui/intro/IntroFragment.java +++ b/app/src/main/java/de/jg_cody/Teraplex/ui/intro/IntroFragment.java @@ -60,7 +60,6 @@ public class IntroFragment extends Fragment { } else { videoBG.setScaleY(1f / scaleX); } - System.out.println("VIDEOOOOO"); mMediaPlayer = mediaPlayer; // We want our video to play over and over so we set looping to true. mMediaPlayer.setLooping(true); diff --git a/app/src/main/res/layout/fragment_credits.xml b/app/src/main/res/layout/fragment_credits.xml index 197c94a..f7ad73b 100644 --- a/app/src/main/res/layout/fragment_credits.xml +++ b/app/src/main/res/layout/fragment_credits.xml @@ -73,7 +73,8 @@ app:drawableTint="@color/mtrl_btn_text_color_selector" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/lizenz" /> + app:layout_constraintTop_toBottomOf="@+id/lizenz" + android:drawableLeft="@drawable/copyright_black_24dp" /> + + @@ -115,6 +117,7 @@ ?attr/colorPrimaryVariant + @style/ActionPopupMenuStyle @color/orange @@ -136,6 +139,7 @@ ?attr/colorPrimaryVariant + @style/ActionPopupMenuStyle @color/yellow @@ -157,6 +161,7 @@ ?attr/colorPrimaryVariant + @style/ActionPopupMenuStyle @color/pink diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index ce7c3d0..2d3c191 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -18,7 +18,11 @@ ?attr/colorPrimaryVariant - @drawable/button_round + @style/ActionPopupMenuStyle + + + \ No newline at end of file