Revert "Extra themes are a pro feature"

This reverts commit c0b797444c.

PLAYSTORE.txt

@@ -65,7 +65,6 @@ All pro features are convenience or advanced features.
 
 * Account/identity/folder colors
 * Colored stars
-* Extra themes
 * Notification settings (sounds) per account/folder/sender (requires Android 8 Oreo)
 * Configurable notification actions
 * Snooze messages

README.md

@@ -84,7 +84,6 @@ All pro features are convenience or advanced features.
 
 * Account/identity/folder colors
 * Colored stars ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq107))
-* Extra themes
 * Notification settings (sounds) per account/folder/sender (requires Android 8 Oreo)
 * Configurable notification actions
 * Snooze messages ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq67))

app/src/main/java/eu/faircode/email/ActivityBase.java

@@ -86,11 +86,6 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
             int uiMode = getResources().getConfiguration().uiMode;
             Log.i("UI mode=" + uiMode);
 
-            if (!this.getClass().equals(ActivitySetup.class) &&
-                    !ActivityBilling.isPro(this) &&
-                    (theme.contains("yellow") || theme.contains("red")))
-                theme = "blue_orange_light";
-
             switch (theme) {
                 case "light":
                 case "blue_orange_light":

app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java

@@ -694,9 +694,6 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
             swDark = dview.findViewById(R.id.swDark);
             swSystem = dview.findViewById(R.id.swSystem);
 
-            Helper.linkPro(dview.findViewById(R.id.tvThemeYellowPurplePro));
-            Helper.linkPro(dview.findViewById(R.id.tvThemeRedGreenPro));
-
             final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
             String theme = prefs.getString("theme", "light");
 

app/src/main/res/layout/dialog_theme.xml

@@ -44,15 +44,6 @@
                 android:text="@string/title_setup_theme_yellow_purple"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
-            <TextView
-                android:id="@+id/tvThemeYellowPurplePro"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="end"
-                android:text="@string/title_pro_feature"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                android:textColor="?android:attr/textColorLink" />
-
             <RadioButton
                 android:id="@+id/rbThemeRedGreen"
                 android:layout_width="wrap_content"
@@ -61,15 +52,6 @@
                 android:text="@string/title_setup_theme_red_green"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
-            <TextView
-                android:id="@+id/tvThemeRedGreenPro"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="end"
-                android:text="@string/title_pro_feature"
-                android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                android:textColor="?android:attr/textColorLink" />
-
             <RadioButton
                 android:id="@+id/rbThemeGrey"
                 android:layout_width="wrap_content"

metadata/en-US/full_description.txt

@@ -65,7 +65,6 @@ All pro features are convenience or advanced features.
 
 * Account/identity/folder colors
 * Colored stars
-* Extra themes
 * Notification settings (sounds) per account/folder/sender (requires Android 8 Oreo)
 * Configurable notification actions
 * Snooze messages