From f5111ce6e3a2c90848d5b9e992c01403a82d1db3 Mon Sep 17 00:00:00 2001 From: Tom Hennen Date: Fri, 25 Mar 2016 13:04:59 -0400 Subject: [PATCH] additional cleanup, removed submodule, renamed things --- .../de/danoeh/antennapod/activity/MainActivity.java | 4 ---- .../antennapod/fragment/SubscriptionFragment.java | 2 +- app/src/main/res/drawable/unread_circle.xml | 10 ---------- app/src/main/res/layout/fragment_subscriptions.xml | 2 +- app/src/main/res/layout/subscription_item.xml | 2 +- app/src/main/res/layout/subscription_view.xml | 2 +- app/src/main/res/values/strings.xml | 10 ---------- .../antennapod/core/preferences/UserPreferences.java | 3 ++- core/src/main/res/values/arrays.xml | 2 +- core/src/main/res/values/strings.xml | 2 +- submodules/dslv | 1 - 11 files changed, 8 insertions(+), 32 deletions(-) delete mode 100644 app/src/main/res/drawable/unread_circle.xml delete mode 100644 app/src/main/res/values/strings.xml delete mode 160000 submodules/dslv 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 3b5168f51..1beef2071 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java @@ -43,17 +43,13 @@ import de.danoeh.antennapod.core.event.ProgressEvent; import de.danoeh.antennapod.core.event.QueueEvent; import de.danoeh.antennapod.core.feed.EventDistributor; import de.danoeh.antennapod.core.feed.Feed; -import de.danoeh.antennapod.core.feed.FeedMedia; import de.danoeh.antennapod.core.preferences.PlaybackPreferences; import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.service.playback.PlaybackService; -import de.danoeh.antennapod.core.service.playback.PlayerStatus; import de.danoeh.antennapod.core.storage.DBReader; import de.danoeh.antennapod.core.storage.DBWriter; import de.danoeh.antennapod.core.util.FeedItemUtil; import de.danoeh.antennapod.core.util.StorageUtils; -import de.danoeh.antennapod.core.util.playback.Playable; -import de.danoeh.antennapod.core.util.playback.PlaybackController; import de.danoeh.antennapod.dialog.RatingDialog; import de.danoeh.antennapod.fragment.AddFeedFragment; import de.danoeh.antennapod.fragment.DownloadsFragment; diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java index 286212891..b932e1a1b 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java @@ -88,7 +88,7 @@ public class SubscriptionFragment extends Fragment { }); if (getActivity() instanceof MainActivity) { - ((MainActivity) getActivity()).getSupportActionBar().setTitle(R.string.my_subscriptions); + ((MainActivity) getActivity()).getSupportActionBar().setTitle(R.string.subscriptions_label); } } diff --git a/app/src/main/res/drawable/unread_circle.xml b/app/src/main/res/drawable/unread_circle.xml deleted file mode 100644 index c31e753b1..000000000 --- a/app/src/main/res/drawable/unread_circle.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_subscriptions.xml b/app/src/main/res/layout/fragment_subscriptions.xml index 8a61e5fa5..a716cecb6 100644 --- a/app/src/main/res/layout/fragment_subscriptions.xml +++ b/app/src/main/res/layout/fragment_subscriptions.xml @@ -13,4 +13,4 @@ android:layout_height="match_parent" android:layout_gravity="center_horizontal"> - \ No newline at end of file + diff --git a/app/src/main/res/layout/subscription_item.xml b/app/src/main/res/layout/subscription_item.xml index fc89ab74d..cee37f7aa 100644 --- a/app/src/main/res/layout/subscription_item.xml +++ b/app/src/main/res/layout/subscription_item.xml @@ -9,4 +9,4 @@ android:id="@+id/subscription_item" android:layout_height="match_parent"/> - \ No newline at end of file + diff --git a/app/src/main/res/layout/subscription_view.xml b/app/src/main/res/layout/subscription_view.xml index 84dc00ba5..629d9a492 100644 --- a/app/src/main/res/layout/subscription_view.xml +++ b/app/src/main/res/layout/subscription_view.xml @@ -40,4 +40,4 @@ android:textSize="12sp" tools:text="@string/app_name" /> - \ No newline at end of file + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml deleted file mode 100644 index 9c055f887..000000000 --- a/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - just now - a min ago - an hour ago - " min ago" - yesterday - " hours ago" - " days ago" - \ No newline at end of file diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java index a38f50cfc..2088ab637 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java +++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java @@ -54,6 +54,8 @@ public class UserPreferences { public static final String PREF_PERSISTENT_NOTIFICATION = "prefPersistNotify"; public static final String PREF_LOCKSCREEN_BACKGROUND = "prefLockscreenBackground"; public static final String PREF_SHOW_DOWNLOAD_REPORT = "prefShowDownloadReport"; + public static final String PREF_SHOW_SUBSCRIPTIONS_IN_DRAWER = "prefShowSubscriptionsInDrawer"; + // Queue public static final String PREF_QUEUE_ADD_TO_FRONT = "prefQueueAddToFront"; @@ -112,7 +114,6 @@ public class UserPreferences { public static final int EPISODE_CLEANUP_QUEUE = -1; public static final int EPISODE_CLEANUP_NULL = -2; public static final int EPISODE_CLEANUP_DEFAULT = 0; - private static final String PREF_SHOW_SUBSCRIPTIONS_IN_DRAWER = "prefShowSubscriptionsInDrawer"; // Constants private static int EPISODE_CACHE_SIZE_UNLIMITED = -1; diff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml index 39a60edbf..57c566df1 100644 --- a/core/src/main/res/values/arrays.xml +++ b/core/src/main/res/values/arrays.xml @@ -148,7 +148,7 @@ @string/episodes_label @string/downloads_label @string/playback_history_label - @string/my_subscriptions + @string/subscriptions_label @string/add_feed_label diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 8d0ef56d9..7c40c7d1a 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -22,7 +22,7 @@ Running Completed Log - Subscriptions + Subscriptions Cancel\nDownload Playback History gpodder.net diff --git a/submodules/dslv b/submodules/dslv deleted file mode 160000 index 5f58dff34..000000000 --- a/submodules/dslv +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5f58dff340f705b4dc7f920f81c33d382919c3ad