summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorH. Lehmann <ByteHamster@users.noreply.github.com>2020-01-09 20:56:11 +0100
committerGitHub <noreply@github.com>2020-01-09 20:56:11 +0100
commit5975f579d459f574a63d29ed9cad84e791a7b0b8 (patch)
tree7a1f0317d4100fe6e70ba31daff2deca94576360 /app
parent6d0b16461d5567dae4b3dd6553d53acffb766359 (diff)
parent44bb7d53a2d05e67eedaadf11f97559fbb713f38 (diff)
downloadAntennaPod-5975f579d459f574a63d29ed9cad84e791a7b0b8.zip
Merge pull request #3719 from ByteHamster/removed-unused-code
Removed unused code
Diffstat (limited to 'app')
-rw-r--r--app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java1
-rw-r--r--app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java9
-rw-r--r--app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java13
-rw-r--r--app/src/main/res/layout/audio_controls.xml4
-rw-r--r--app/src/play/res/layout/media_router_controller.xml2
5 files changed, 3 insertions, 26 deletions
diff --git a/app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java b/app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java
index 647ab911f..459cd2478 100644
--- a/app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java
+++ b/app/src/androidTest/java/de/test/antennapod/storage/DBReaderTest.java
@@ -368,7 +368,6 @@ public class DBReaderTest {
@Test
public void testGetFeedItemlistCheckChaptersFalse() throws Exception {
- Context context = InstrumentationRegistry.getTargetContext();
List<Feed> feeds = DBTestUtils.saveFeedlist(10, 10, false, false, 0);
for (Feed feed : feeds) {
for (FeedItem item : feed.getItems()) {
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java
index 936337cbf..4365fa0ae 100644
--- a/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java
+++ b/app/src/androidTest/java/de/test/antennapod/ui/UITestUtils.java
@@ -98,15 +98,6 @@ public class UITestUtils {
return String.format("%s/files/%d", server.getBaseUrl(), id);
}
- private File newBitmapFile(String name) throws IOException {
- File imgFile = new File(destDir, name);
- Bitmap bitmap = Bitmap.createBitmap(128, 128, Bitmap.Config.ARGB_8888);
- FileOutputStream out = new FileOutputStream(imgFile);
- bitmap.compress(Bitmap.CompressFormat.PNG, 1, out);
- out.close();
- return imgFile;
- }
-
private File newMediaFile(String name) throws IOException {
File mediaFile = new File(hostedMediaDir, name);
if (mediaFile.exists()) {
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java
index 191999cf7..0acfe60bf 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java
@@ -33,19 +33,6 @@ public class UserInterfacePreferencesFragment extends PreferenceFragmentCompat {
}
private void setupInterfaceScreen() {
-
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
- // disable expanded notification option on unsupported android versions
- findPreference(PREF_EXPANDED_NOTIFICATION).setEnabled(false);
- findPreference(PREF_EXPANDED_NOTIFICATION).setOnPreferenceClickListener(
- preference -> {
- Toast toast = Toast.makeText(getActivity(),
- R.string.pref_expand_notify_unsupport_toast, Toast.LENGTH_SHORT);
- toast.show();
- return true;
- }
- );
- }
findPreference(UserPreferences.PREF_THEME)
.setOnPreferenceChangeListener(
(preference, newValue) -> {
diff --git a/app/src/main/res/layout/audio_controls.xml b/app/src/main/res/layout/audio_controls.xml
index 5049db215..25e914c55 100644
--- a/app/src/main/res/layout/audio_controls.xml
+++ b/app/src/main/res/layout/audio_controls.xml
@@ -43,7 +43,7 @@
android:textStyle="bold"
android:textColor="@color/status_progress"
android:textSize="24sp"
- android:background="@drawable/borderless_button_dark"/>
+ android:background="?android:attr/selectableItemBackground"/>
<Button
android:id="@+id/butIncSpeed"
@@ -57,7 +57,7 @@
android:textStyle="bold"
android:textColor="@color/status_progress"
android:textSize="24sp"
- android:background="@drawable/borderless_button_dark"/>
+ android:background="?android:attr/selectableItemBackground"/>
<SeekBar
android:id="@+id/playback_speed"
diff --git a/app/src/play/res/layout/media_router_controller.xml b/app/src/play/res/layout/media_router_controller.xml
index 9489173a3..bdb1b1cc2 100644
--- a/app/src/play/res/layout/media_router_controller.xml
+++ b/app/src/play/res/layout/media_router_controller.xml
@@ -17,7 +17,7 @@
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:contentDescription="@string/mr_controller_play"
- android:background="?attr/selectableItemBackgroundBorderless"/>
+ android:background="?android:attr/selectableItemBackground"/>
<LinearLayout android:id="@+id/mrc_control_title_container"
android:orientation="vertical"