diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogTheme.java b/app/src/main/java/eu/faircode/email/FragmentDialogTheme.java
index 0c2f07b2da..d129060e8e 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogTheme.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogTheme.java
@@ -3,7 +3,7 @@ package eu.faircode.email;
import android.app.Dialog;
import android.content.DialogInterface;
import android.content.SharedPreferences;
-import android.net.Uri;
+import android.graphics.Paint;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
@@ -25,6 +25,7 @@ public class FragmentDialogTheme extends FragmentDialogBase {
private RadioGroup rgThemeOptions;
private SwitchCompat swBlack;
private TextView tvSystem;
+ private TextView tvMore;
private void eval() {
int checkedId = rgTheme.getCheckedRadioButtonId();
@@ -50,24 +51,16 @@ public class FragmentDialogTheme extends FragmentDialogBase {
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
View dview = LayoutInflater.from(getContext()).inflate(R.layout.dialog_theme, null);
- itten = dview.findViewById(R.id.itten);
rgTheme = dview.findViewById(R.id.rgTheme);
swReverse = dview.findViewById(R.id.swReverse);
rgThemeOptions = dview.findViewById(R.id.rgThemeOptions);
swBlack = dview.findViewById(R.id.swBlack);
tvSystem = dview.findViewById(R.id.tvSystem);
+ tvMore = dview.findViewById(R.id.tvMore);
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
String theme = prefs.getString("theme", "blue_orange_system");
- itten.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- Uri uri = Uri.parse("https://en.wikipedia.org/wiki/Johannes_Itten");
- Helper.view(getContext(), uri, false);
- }
- });
-
rgTheme.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(RadioGroup group, int checkedId) {
@@ -169,6 +162,14 @@ public class FragmentDialogTheme extends FragmentDialogBase {
break;
}
+ tvMore.setPaintFlags(tvMore.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
+ tvMore.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Helper.viewFAQ(v.getContext(), 164);
+ }
+ });
+
return new AlertDialog.Builder(getContext())
.setView(dview)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
diff --git a/app/src/main/res/drawable-nodpi/farbkreis_itten_1961.png b/app/src/main/res/drawable-nodpi/farbkreis_itten_1961.png
deleted file mode 100644
index 35dad39b26..0000000000
Binary files a/app/src/main/res/drawable-nodpi/farbkreis_itten_1961.png and /dev/null differ
diff --git a/app/src/main/res/layout/dialog_theme.xml b/app/src/main/res/layout/dialog_theme.xml
index ad1e2ca5be..3c432f37b9 100644
--- a/app/src/main/res/layout/dialog_theme.xml
+++ b/app/src/main/res/layout/dialog_theme.xml
@@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:fadeScrollbars="false"
android:padding="24dp"
android:scrollbarStyle="outsideOverlay">
@@ -19,18 +20,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
-
-
-
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 103277f583..c2a673079b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -258,6 +258,7 @@
Black background
This will automatically switch to a light/dark theme on day/night mode, if supported by Android
+ I want more colors
Advanced