mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2024-12-24 00:50:32 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of git://github.com/ksyko/NewPipe into jf

Browse Source
This commit is contained in:
Christian Schabesberger 2017-01-31 18:25:30 +01:00
commit 7c9771873b
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/schabi/newpipe/ChannelActivity.java
View File

@ -73,8 +73,9 @@ public class ChannelActivity extends AppCompatActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
if (Objects.equals(PreferenceManager.getDefaultSharedPreferences(this) if (PreferenceManager.getDefaultSharedPreferences(this)
.getString("theme", getResources().getString(R.string.light_theme_title)), getResources().getString(R.string.dark_theme_title))) { .getString("theme", getResources().getString(R.string.light_theme_title)).
equals(getResources().getString(R.string.dark_theme_title))) {
setTheme(R.style.DarkTheme_NoActionBar); setTheme(R.style.DarkTheme_NoActionBar);
} }
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);

10
app/src/main/java/org/schabi/newpipe/ThemableActivity.java
View File

@ -1,20 +1,18 @@
package org.schabi.newpipe; package org.schabi.newpipe;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import java.util.Objects;
import static org.schabi.newpipe.R.attr.theme;
public class ThemableActivity extends AppCompatActivity { public class ThemableActivity extends AppCompatActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
if (Objects.equals(PreferenceManager.getDefaultSharedPreferences(this) if (PreferenceManager.getDefaultSharedPreferences(this)
.getString("theme", getResources().getString(R.string.light_theme_title)), getResources().getString(R.string.dark_theme_title))) { .getString("theme", getResources().getString(R.string.light_theme_title)).
equals(getResources().getString(R.string.dark_theme_title))) {
setTheme(R.style.DarkTheme); setTheme(R.style.DarkTheme);
} }
} }

5
app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
View File

@ -46,8 +46,9 @@ public class SettingsActivity extends PreferenceActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceBundle) { protected void onCreate(Bundle savedInstanceBundle) {
if (Objects.equals(PreferenceManager.getDefaultSharedPreferences(this) if (PreferenceManager.getDefaultSharedPreferences(this)
.getString("theme", getResources().getString(R.string.light_theme_title)), getResources().getString(R.string.dark_theme_title))) { .getString("theme", getResources().getString(R.string.light_theme_title)).
equals(getResources().getString(R.string.dark_theme_title))) {
setTheme(R.style.DarkTheme); setTheme(R.style.DarkTheme);
} }
getDelegate().installViewFactory(); getDelegate().installViewFactory();

4
app/src/main/res/layout/activity_error.xml
View File

@ -42,7 +42,7 @@
android:id="@+id/errorMessageView" android:id="@+id/errorMessageView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?android:attr/colorAccent" android:textColor="?attr/colorAccent"
android:text="@string/info_labels"/> android:text="@string/info_labels"/>
<TextView <TextView
@ -63,7 +63,7 @@
android:id="@+id/errorInfoLabelsView" android:id="@+id/errorInfoLabelsView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?android:attr/colorAccent" android:textColor="?attr/colorAccent"
android:text="@string/info_labels"/> android:text="@string/info_labels"/>
<HorizontalScrollView <HorizontalScrollView