mirror of https://github.com/M66B/FairEmail.git
Extra themes are a pro feature
This commit is contained in:
parent
d529b75d90
commit
c0b797444c
|
@ -65,6 +65,7 @@ All pro features are convenience or advanced features.
|
||||||
|
|
||||||
* Account/identity/folder colors
|
* Account/identity/folder colors
|
||||||
* Colored stars
|
* Colored stars
|
||||||
|
* Extra themes
|
||||||
* Notification settings (sounds) per account/folder/sender (requires Android 8 Oreo)
|
* Notification settings (sounds) per account/folder/sender (requires Android 8 Oreo)
|
||||||
* Configurable notification actions
|
* Configurable notification actions
|
||||||
* Snooze messages
|
* Snooze messages
|
||||||
|
|
|
@ -84,6 +84,7 @@ All pro features are convenience or advanced features.
|
||||||
|
|
||||||
* Account/identity/folder colors
|
* Account/identity/folder colors
|
||||||
* Colored stars ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq107))
|
* 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)
|
* Notification settings (sounds) per account/folder/sender (requires Android 8 Oreo)
|
||||||
* Configurable notification actions
|
* Configurable notification actions
|
||||||
* Snooze messages ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq67))
|
* Snooze messages ([instructions](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq67))
|
||||||
|
|
|
@ -86,6 +86,11 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
|
||||||
int uiMode = getResources().getConfiguration().uiMode;
|
int uiMode = getResources().getConfiguration().uiMode;
|
||||||
Log.i("UI mode=" + 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) {
|
switch (theme) {
|
||||||
case "light":
|
case "light":
|
||||||
case "blue_orange_light":
|
case "blue_orange_light":
|
||||||
|
|
|
@ -694,6 +694,9 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
|
||||||
swDark = dview.findViewById(R.id.swDark);
|
swDark = dview.findViewById(R.id.swDark);
|
||||||
swSystem = dview.findViewById(R.id.swSystem);
|
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());
|
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
|
||||||
String theme = prefs.getString("theme", "light");
|
String theme = prefs.getString("theme", "light");
|
||||||
|
|
||||||
|
|
|
@ -44,6 +44,15 @@
|
||||||
android:text="@string/title_setup_theme_yellow_purple"
|
android:text="@string/title_setup_theme_yellow_purple"
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
|
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
|
<RadioButton
|
||||||
android:id="@+id/rbThemeRedGreen"
|
android:id="@+id/rbThemeRedGreen"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
@ -52,6 +61,15 @@
|
||||||
android:text="@string/title_setup_theme_red_green"
|
android:text="@string/title_setup_theme_red_green"
|
||||||
android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
|
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
|
<RadioButton
|
||||||
android:id="@+id/rbThemeGrey"
|
android:id="@+id/rbThemeGrey"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
|
|
@ -65,6 +65,7 @@ All pro features are convenience or advanced features.
|
||||||
|
|
||||||
* Account/identity/folder colors
|
* Account/identity/folder colors
|
||||||
* Colored stars
|
* Colored stars
|
||||||
|
* Extra themes
|
||||||
* Notification settings (sounds) per account/folder/sender (requires Android 8 Oreo)
|
* Notification settings (sounds) per account/folder/sender (requires Android 8 Oreo)
|
||||||
* Configurable notification actions
|
* Configurable notification actions
|
||||||
* Snooze messages
|
* Snooze messages
|
||||||
|
|
Loading…
Reference in New Issue