mirror of
https://github.com/M66B/FairEmail.git
synced 2025-03-01 01:06:11 +00:00
Revert "Added beige switch to theme selection dialog"
This reverts commit 921773eaa0
.
This commit is contained in:
parent
dbdefa434e
commit
22ab0b03eb
4 changed files with 3 additions and 42 deletions
|
@ -54,7 +54,6 @@ public class FragmentDialogTheme extends FragmentDialogBase {
|
|||
private TextView tvYou;
|
||||
private RadioGroup rgThemeOptions;
|
||||
private TextView tvSystem;
|
||||
private SwitchCompat swBeige;
|
||||
private SwitchCompat swBlack;
|
||||
private SwitchCompat swHtmlLight;
|
||||
private SwitchCompat swComposerLight;
|
||||
|
@ -99,8 +98,6 @@ public class FragmentDialogTheme extends FragmentDialogBase {
|
|||
final Context context = getContext();
|
||||
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
|
||||
String theme = prefs.getString("theme", "blue_orange_system");
|
||||
boolean cards = prefs.getBoolean("cards", true);
|
||||
boolean beige = prefs.getBoolean("beige", true);
|
||||
boolean default_light = prefs.getBoolean("default_light", false);
|
||||
boolean composer_light = prefs.getBoolean("composer_light", false);
|
||||
boolean debug = prefs.getBoolean("debug", false);
|
||||
|
@ -113,7 +110,6 @@ public class FragmentDialogTheme extends FragmentDialogBase {
|
|||
swReverse = dview.findViewById(R.id.swReverse);
|
||||
rgThemeOptions = dview.findViewById(R.id.rgThemeOptions);
|
||||
tvSystem = dview.findViewById(R.id.tvSystem);
|
||||
swBeige = dview.findViewById(R.id.swBeige);
|
||||
swBlack = dview.findViewById(R.id.swBlack);
|
||||
swHtmlLight = dview.findViewById(R.id.swHtmlLight);
|
||||
swComposerLight = dview.findViewById(R.id.swComposerLight);
|
||||
|
@ -178,8 +174,6 @@ public class FragmentDialogTheme extends FragmentDialogBase {
|
|||
else
|
||||
rgThemeOptions.check(R.id.rbThemeLight);
|
||||
|
||||
swBeige.setChecked(beige);
|
||||
swBeige.setVisibility(cards ? View.VISIBLE : View.GONE);
|
||||
swBlack.setChecked(black);
|
||||
swHtmlLight.setChecked(default_light);
|
||||
swComposerLight.setChecked(composer_light);
|
||||
|
@ -311,7 +305,6 @@ public class FragmentDialogTheme extends FragmentDialogBase {
|
|||
boolean reverse = (swReverse.isEnabled() && swReverse.isChecked());
|
||||
boolean dark = (rgThemeOptions.isEnabled() && optionId == R.id.rbThemeDark);
|
||||
boolean system = (rgThemeOptions.isEnabled() && optionId == R.id.rbThemeSystem);
|
||||
boolean beige = swBeige.isChecked();
|
||||
boolean black = (swBlack.isEnabled() && swBlack.isChecked());
|
||||
|
||||
SharedPreferences.Editor editor = prefs.edit();
|
||||
|
@ -387,8 +380,6 @@ public class FragmentDialogTheme extends FragmentDialogBase {
|
|||
(black ? "_black" : dark ? "_dark" : "_light")).apply();
|
||||
}
|
||||
|
||||
editor.putBoolean("beige", beige);
|
||||
|
||||
editor.putBoolean("default_light", swHtmlLight.isChecked());
|
||||
editor.putBoolean("composer_light", swComposerLight.isChecked());
|
||||
|
||||
|
|
|
@ -366,16 +366,6 @@
|
|||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/rgThemeOptions" />
|
||||
|
||||
<androidx.appcompat.widget.SwitchCompat
|
||||
android:id="@+id/swBeige"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="12dp"
|
||||
android:text="@string/title_advanced_cards_beige"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/tvSystem" />
|
||||
|
||||
<androidx.appcompat.widget.SwitchCompat
|
||||
android:id="@+id/swBlack"
|
||||
android:layout_width="0dp"
|
||||
|
@ -384,7 +374,7 @@
|
|||
android:text="@string/title_setup_theme_black_background"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/swBeige" />
|
||||
app:layout_constraintTop_toBottomOf="@id/tvSystem" />
|
||||
|
||||
<androidx.appcompat.widget.SwitchCompat
|
||||
android:id="@+id/swHtmlLight"
|
||||
|
|
|
@ -434,16 +434,6 @@
|
|||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/rgThemeOptions" />
|
||||
|
||||
<androidx.appcompat.widget.SwitchCompat
|
||||
android:id="@+id/swBeige"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="12dp"
|
||||
android:text="@string/title_advanced_cards_beige"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/tvSystem" />
|
||||
|
||||
<androidx.appcompat.widget.SwitchCompat
|
||||
android:id="@+id/swBlack"
|
||||
android:layout_width="0dp"
|
||||
|
@ -452,7 +442,7 @@
|
|||
android:text="@string/title_setup_theme_black_background"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/swBeige" />
|
||||
app:layout_constraintTop_toBottomOf="@id/tvSystem" />
|
||||
|
||||
<androidx.appcompat.widget.SwitchCompat
|
||||
android:id="@+id/swHtmlLight"
|
||||
|
|
|
@ -183,16 +183,6 @@
|
|||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/rgThemeOptions" />
|
||||
|
||||
<androidx.appcompat.widget.SwitchCompat
|
||||
android:id="@+id/swBeige"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="12dp"
|
||||
android:text="@string/title_advanced_cards_beige"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/tvSystem" />
|
||||
|
||||
<androidx.appcompat.widget.SwitchCompat
|
||||
android:id="@+id/swBlack"
|
||||
android:layout_width="0dp"
|
||||
|
@ -201,7 +191,7 @@
|
|||
android:text="@string/title_setup_theme_black_background"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/swBeige" />
|
||||
app:layout_constraintTop_toBottomOf="@id/tvSystem" />
|
||||
|
||||
<androidx.appcompat.widget.SwitchCompat
|
||||
android:id="@+id/swHtmlLight"
|
||||
|
|
Loading…
Reference in a new issue