summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hennen <tom.hennen@gmail.com>2015-09-05 19:42:55 -0400
committerTom Hennen <tom.hennen@gmail.com>2015-09-07 21:25:18 -0400
commit64336d5d267a7a2d91bbc1d1ecbd272063fd262d (patch)
tree7110e341229e305eea1708eae99e8bcd690529ed
parent0bbe1fcad7efc65fb6d6270d5f28a1e799c05cd3 (diff)
downloadAntennaPod-64336d5d267a7a2d91bbc1d1ecbd272063fd262d.zip
fixed dark theme
-rw-r--r--app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java11
-rw-r--r--app/src/main/res/layout/episodes_fragment.xml3
2 files changed, 10 insertions, 4 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
index ec73e3c47..7f3e2399f 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
@@ -167,10 +167,17 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity
transaction.replace(R.id.main_view, mainFragment);
} else {
String lastFragment = getLastNavFragment();
- if(ArrayUtils.contains(NAV_DRAWER_TAGS, lastFragment)) {
+ if (ArrayUtils.contains(NAV_DRAWER_TAGS, lastFragment)) {
loadFragment(lastFragment, null);
} else {
- loadFeedFragmentById(Integer.valueOf(lastFragment), null);
+ try {
+ loadFeedFragmentById(Integer.valueOf(lastFragment), null);
+ } catch (NumberFormatException e) {
+ // it's not a number, this happens if we removed
+ // a label from the NAV_DRAWER_TAGS
+ // give them a nice default...
+ loadFragment(QueueFragment.TAG, null);
+ }
}
}
externalPlayerFragment = new ExternalPlayerFragment();
diff --git a/app/src/main/res/layout/episodes_fragment.xml b/app/src/main/res/layout/episodes_fragment.xml
index 736a874b8..e0028a262 100644
--- a/app/src/main/res/layout/episodes_fragment.xml
+++ b/app/src/main/res/layout/episodes_fragment.xml
@@ -15,7 +15,6 @@
android:id="@+id/viewpager"
android:layout_width="match_parent"
android:layout_height="0px"
- android:layout_weight="1"
- android:background="@android:color/white" />
+ android:layout_weight="1" />
</LinearLayout> \ No newline at end of file