Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

additional cleanup, removed submodule, renamed things

This commit is contained in:
Tom Hennen 2016-03-25 13:04:59 -04:00
parent 7ed82bcac3
commit f5111ce6e3
11 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java
View File

@ -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;

2
app/src/main/java/de/danoeh/antennapod/fragment/SubscriptionFragment.java
View File

@ -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);
}
}

10
app/src/main/res/drawable/unread_circle.xml
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<stroke
android:width="1dp"
android:color="@color/white"/>
</shape>

2
app/src/main/res/layout/fragment_subscriptions.xml
View File

@ -13,4 +13,4 @@
android:layout_height="match_parent"
android:layout_gravity="center_horizontal">
</GridView>
</LinearLayout>
</LinearLayout>

2
app/src/main/res/layout/subscription_item.xml
View File

@ -9,4 +9,4 @@
android:id="@+id/subscription_item"
android:layout_height="match_parent"/>
</RelativeLayout>
</RelativeLayout>

2
app/src/main/res/layout/subscription_view.xml
View File

@ -40,4 +40,4 @@
android:textSize="12sp"
tools:text="@string/app_name" />
</RelativeLayout>
</RelativeLayout>

10
app/src/main/res/values/strings.xml
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="time_just_now">just now</string>
<string name="time_a_min_ago">a min ago</string>
<string name="time_an_hour_ago">an hour ago</string>
<string name="time_min_ago">" min ago"</string>
<string name="time_yesterday">yesterday</string>
<string name="time_hours_ago">" hours ago"</string>
<string name="time_days_ago">" days ago"</string>
</resources>

3
core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
View File

@ -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;

2
core/src/main/res/values/arrays.xml
View File

@ -148,7 +148,7 @@
<item>@string/episodes_label</item>
<item>@string/downloads_label</item>
<item>@string/playback_history_label</item>
<item>@string/my_subscriptions</item>
<item>@string/subscriptions_label</item>
<item>@string/add_feed_label</item>
</string-array>

2
core/src/main/res/values/strings.xml
View File

@ -22,7 +22,7 @@
<string name="downloads_running_label">Running</string>
<string name="downloads_completed_label">Completed</string>
<string name="downloads_log_label">Log</string>
<string name="my_subscriptions">Subscriptions</string>
<string name="subscriptions_label">Subscriptions</string>
<string name="cancel_download_label">Cancel\nDownload</string>
<string name="playback_history_label">Playback History</string>
<string name="gpodnet_main_label">gpodder.net</string>

1
submodules/dslv

@ -1 +0,0 @@
Subproject commit 5f58dff340f705b4dc7f920f81c33d382919c3ad