mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "Extra themes are a pro feature" 

This reverts commit c0b797444c.
This commit is contained in:
M66B 2019-12-28 14:35:14 +01:00
parent c0b797444c
commit 53f6baed77
6 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PLAYSTORE.txt
View File

@ -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

1
README.md
View File

@ -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))

5
app/src/main/java/eu/faircode/email/ActivityBase.java
View File

@ -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":

3
app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
View File

@ -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");

18
app/src/main/res/layout/dialog_theme.xml
View File

@ -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"

1
metadata/en-US/full_description.txt
View File

@ -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