Mastodon
/
pachli-android
mirror of https://github.com/pachli/pachli-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove array.xml and re-enable (partially working) light theme.

This commit is contained in:
Vavassor 2017-03-21 20:40:00 -04:00
parent 8b8911bfd0
commit b3e9b86b61
4 changed files with 14 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/keylesspalace/tusky/BaseActivity.java
View File

@ -64,12 +64,9 @@ public class BaseActivity extends AppCompatActivity {
createMastodonAPI(); createMastodonAPI();
createTuskyAPI(); createTuskyAPI();
/* Note from Andrew March 13, 2017: Keep this and restore it when the light theme is no
longer bugged.
if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("lightTheme", false)) { if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("lightTheme", false)) {
setTheme(R.style.AppTheme_Light); setTheme(R.style.AppTheme_Light);
} }
*/
} }
@Override @Override

4
app/src/main/java/com/keylesspalace/tusky/MainActivity.java
View File

@ -153,9 +153,7 @@ public class MainActivity extends BaseActivity {
} }
@Override @Override
public void onTabReselected(TabLayout.Tab tab) { public void onTabReselected(TabLayout.Tab tab) {}
}
}); });
Intent intent = getIntent(); Intent intent = getIntent();

28
app/src/main/res/values/array.xml
View File

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<string-array name="pull_notification_check_interval_names" tools:ignore="MissingTranslation">
<item>5 minutes</item>
<item>10 minutes</item>
<item>15 minutes</item>
<item>20 minutes</item>
<item>25 minutes</item>
<item>30 minutes</item>
<item>45 minutes</item>
<item>1 hour</item>
<item>2 hours</item>
</string-array>
<string-array name="pull_notification_check_intervals" inputType="integer" translatable="false">
<item>5</item>
<item>10</item>
<item>15</item>
<item>20</item>
<item>25</item>
<item>30</item>
<item>45</item>
<item>60</item>
<item>120</item>
</string-array>
</resources>

13
app/src/main/res/xml/preferences.xml
View File

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:key="@string/preferences_file_key"> android:key="@string/preferences_file_key">
<PreferenceCategory android:title="@string/pref_title_notification_settings"> <PreferenceCategory android:title="@string/pref_title_notification_settings">
<CheckBoxPreference <CheckBoxPreference
android:key="notificationsEnabled" android:key="notificationsEnabled"
android:title="@string/pref_title_notifications_enabled" android:title="@string/pref_title_notifications_enabled"
@ -24,5 +26,16 @@
android:key="notificationStyleLight" android:key="notificationStyleLight"
android:title="@string/pref_title_notification_style_light" android:title="@string/pref_title_notification_style_light"
android:defaultValue="true" /> android:defaultValue="true" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/pref_title_appearance_settings">
<CheckBoxPreference
android:key="lightTheme"
android:title="@string/pref_title_light_theme"
android:defaultValue="false" />
</PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>