From 0cbd97b5cbffa5ba1b2458a2b33248e98a376d7e Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Sun, 17 Mar 2024 18:43:55 +0100 Subject: Move theme to :ui:common module (#6997) This enables creating Activities outside the app and core modules --- core/build.gradle | 1 - .../antennapod/core/preferences/ThemeSwitcher.java | 73 ----- .../PlaybackServiceNotificationBuilder.java | 2 +- .../de/danoeh/antennapod/core/util/Converter.java | 125 -------- .../danoeh/antennapod/core/util/DateFormatter.java | 39 --- .../de/danoeh/antennapod/core/util/ShareUtils.java | 1 + .../antennapod/core/util/gui/ShownotesCleaner.java | 2 +- .../antennapod/core/widget/WidgetUpdater.java | 2 +- core/src/main/res/color/button_bg_selector.xml | 6 - .../res/drawable-nodpi/launcher_animate_bg.png | Bin 37291 -> 0 bytes .../res/drawable-nodpi/launcher_animate_wave1.png | Bin 20533 -> 0 bytes .../res/drawable-nodpi/launcher_animate_wave2.png | Bin 31797 -> 0 bytes core/src/main/res/drawable-nodpi/teaser.webp | Bin 21054 -> 0 bytes core/src/main/res/drawable/bg_pill_translucent.xml | 5 - core/src/main/res/drawable/ic_drag_darktheme.xml | 9 - core/src/main/res/drawable/ic_drag_lighttheme.xml | 9 - core/src/main/res/drawable/launcher_animate.xml | 45 --- .../res/drawable/progress_bar_horizontal_dark.xml | 15 - .../res/drawable/progress_bar_horizontal_light.xml | 15 - .../src/main/res/drawable/scrollbar_thumb_dark.xml | 5 - .../main/res/drawable/scrollbar_thumb_default.xml | 14 - .../main/res/drawable/scrollbar_thumb_light.xml | 5 - .../res/drawable/scrollbar_thumb_pressed_dark.xml | 14 - .../res/drawable/scrollbar_thumb_pressed_light.xml | 14 - core/src/main/res/drawable/scrollbar_track.xml | 4 - .../main/res/layout/preference_material_switch.xml | 10 - .../src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 6 - core/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 7041 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_background.png | Bin 757 -> 0 bytes .../res/mipmap-hdpi/ic_launcher_foreground.png | Bin 11197 -> 0 bytes core/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 4101 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_background.png | Bin 441 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_foreground.png | Bin 5661 -> 0 bytes core/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 10052 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_background.png | Bin 854 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_foreground.png | Bin 12992 -> 0 bytes core/src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 16435 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_background.png | Bin 1200 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_foreground.png | Bin 21509 -> 0 bytes core/src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 23299 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_background.png | Bin 1464 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 30435 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_monochrome.png | Bin 10627 -> 0 bytes core/src/main/res/values-v23/styles.xml | 9 - core/src/main/res/values-v27/styles.xml | 10 - core/src/main/res/values/attrs.xml | 15 - core/src/main/res/values/colors.xml | 31 -- core/src/main/res/values/dimens.xml | 30 -- core/src/main/res/values/styles.xml | 314 --------------------- .../antennapod/core/feed/FeedFilterTest.java | 2 +- .../danoeh/antennapod/core/util/ConverterTest.java | 1 + 51 files changed, 6 insertions(+), 827 deletions(-) delete mode 100644 core/src/main/java/de/danoeh/antennapod/core/preferences/ThemeSwitcher.java delete mode 100644 core/src/main/java/de/danoeh/antennapod/core/util/Converter.java delete mode 100644 core/src/main/java/de/danoeh/antennapod/core/util/DateFormatter.java delete mode 100644 core/src/main/res/color/button_bg_selector.xml delete mode 100644 core/src/main/res/drawable-nodpi/launcher_animate_bg.png delete mode 100644 core/src/main/res/drawable-nodpi/launcher_animate_wave1.png delete mode 100644 core/src/main/res/drawable-nodpi/launcher_animate_wave2.png delete mode 100644 core/src/main/res/drawable-nodpi/teaser.webp delete mode 100644 core/src/main/res/drawable/bg_pill_translucent.xml delete mode 100644 core/src/main/res/drawable/ic_drag_darktheme.xml delete mode 100644 core/src/main/res/drawable/ic_drag_lighttheme.xml delete mode 100644 core/src/main/res/drawable/launcher_animate.xml delete mode 100644 core/src/main/res/drawable/progress_bar_horizontal_dark.xml delete mode 100644 core/src/main/res/drawable/progress_bar_horizontal_light.xml delete mode 100644 core/src/main/res/drawable/scrollbar_thumb_dark.xml delete mode 100644 core/src/main/res/drawable/scrollbar_thumb_default.xml delete mode 100644 core/src/main/res/drawable/scrollbar_thumb_light.xml delete mode 100644 core/src/main/res/drawable/scrollbar_thumb_pressed_dark.xml delete mode 100644 core/src/main/res/drawable/scrollbar_thumb_pressed_light.xml delete mode 100644 core/src/main/res/drawable/scrollbar_track.xml delete mode 100644 core/src/main/res/layout/preference_material_switch.xml delete mode 100644 core/src/main/res/mipmap-anydpi-v26/ic_launcher.xml delete mode 100644 core/src/main/res/mipmap-hdpi/ic_launcher.png delete mode 100644 core/src/main/res/mipmap-hdpi/ic_launcher_background.png delete mode 100644 core/src/main/res/mipmap-hdpi/ic_launcher_foreground.png delete mode 100644 core/src/main/res/mipmap-mdpi/ic_launcher.png delete mode 100644 core/src/main/res/mipmap-mdpi/ic_launcher_background.png delete mode 100644 core/src/main/res/mipmap-mdpi/ic_launcher_foreground.png delete mode 100644 core/src/main/res/mipmap-xhdpi/ic_launcher.png delete mode 100644 core/src/main/res/mipmap-xhdpi/ic_launcher_background.png delete mode 100644 core/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png delete mode 100644 core/src/main/res/mipmap-xxhdpi/ic_launcher.png delete mode 100644 core/src/main/res/mipmap-xxhdpi/ic_launcher_background.png delete mode 100644 core/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png delete mode 100644 core/src/main/res/mipmap-xxxhdpi/ic_launcher.png delete mode 100644 core/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png delete mode 100644 core/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png delete mode 100644 core/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png delete mode 100644 core/src/main/res/values-v23/styles.xml delete mode 100644 core/src/main/res/values-v27/styles.xml delete mode 100644 core/src/main/res/values/attrs.xml delete mode 100644 core/src/main/res/values/colors.xml delete mode 100644 core/src/main/res/values/dimens.xml delete mode 100644 core/src/main/res/values/styles.xml (limited to 'core') diff --git a/core/build.gradle b/core/build.gradle index 3a0a5e196..6683db189 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -46,7 +46,6 @@ dependencies { annotationProcessor "androidx.annotation:annotation:$annotationVersion" implementation "androidx.appcompat:appcompat:$appcompatVersion" implementation "androidx.core:core:$coreVersion" - implementation "androidx.core:core-splashscreen:1.0.0" implementation 'androidx.documentfile:documentfile:1.0.1' implementation "androidx.fragment:fragment:$fragmentVersion" implementation "androidx.media:media:$mediaVersion" diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/ThemeSwitcher.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/ThemeSwitcher.java deleted file mode 100644 index afe814fcb..000000000 --- a/core/src/main/java/de/danoeh/antennapod/core/preferences/ThemeSwitcher.java +++ /dev/null @@ -1,73 +0,0 @@ -package de.danoeh.antennapod.core.preferences; - -import android.content.Context; -import android.content.res.Configuration; -import androidx.annotation.StyleRes; -import de.danoeh.antennapod.core.R; -import de.danoeh.antennapod.storage.preferences.UserPreferences; - -public abstract class ThemeSwitcher { - @StyleRes - public static int getTheme(Context context) { - boolean dynamic = UserPreferences.getIsThemeColorTinted(); - switch (readThemeValue(context)) { - case DARK: - return dynamic ? R.style.Theme_AntennaPod_Dynamic_Dark : R.style.Theme_AntennaPod_Dark; - case BLACK: - return dynamic ? R.style.Theme_AntennaPod_Dynamic_TrueBlack : R.style.Theme_AntennaPod_TrueBlack; - case LIGHT: // fall-through - default: - return dynamic ? R.style.Theme_AntennaPod_Dynamic_Light : R.style.Theme_AntennaPod_Light; - } - } - - @StyleRes - public static int getNoTitleTheme(Context context) { - boolean dynamic = UserPreferences.getIsThemeColorTinted(); - switch (readThemeValue(context)) { - case DARK: - return dynamic ? R.style.Theme_AntennaPod_Dynamic_Dark_NoTitle : R.style.Theme_AntennaPod_Dark_NoTitle; - case BLACK: - return dynamic ? R.style.Theme_AntennaPod_Dynamic_TrueBlack_NoTitle - : R.style.Theme_AntennaPod_TrueBlack_NoTitle; - case LIGHT: // fall-through - default: - return dynamic ? R.style.Theme_AntennaPod_Dynamic_Light_NoTitle - : R.style.Theme_AntennaPod_Light_NoTitle; - } - } - - @StyleRes - public static int getTranslucentTheme(Context context) { - boolean dynamic = UserPreferences.getIsThemeColorTinted(); - switch (readThemeValue(context)) { - case DARK: - return dynamic ? R.style.Theme_AntennaPod_Dynamic_Dark_Translucent - : R.style.Theme_AntennaPod_Dark_Translucent; - case BLACK: - return dynamic ? R.style.Theme_AntennaPod_Dynamic_TrueBlack_Translucent - : R.style.Theme_AntennaPod_TrueBlack_Translucent; - case LIGHT: // fall-through - default: - return dynamic ? R.style.Theme_AntennaPod_Dynamic_Light_Translucent - : R.style.Theme_AntennaPod_Light_Translucent; - } - } - - private static UserPreferences.ThemePreference readThemeValue(Context context) { - UserPreferences.ThemePreference theme = UserPreferences.getTheme(); - if (theme == UserPreferences.ThemePreference.SYSTEM) { - int nightMode = context.getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK; - if (nightMode == Configuration.UI_MODE_NIGHT_YES) { - theme = UserPreferences.ThemePreference.DARK; - } else { - theme = UserPreferences.ThemePreference.LIGHT; - - } - } - if (theme == UserPreferences.ThemePreference.DARK && UserPreferences.getIsBlackTheme()) { - theme = UserPreferences.ThemePreference.BLACK; - } - return theme; - } -} diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceNotificationBuilder.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceNotificationBuilder.java index de57f17df..981757025 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceNotificationBuilder.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackServiceNotificationBuilder.java @@ -21,7 +21,7 @@ import com.bumptech.glide.request.RequestOptions; import de.danoeh.antennapod.core.R; import de.danoeh.antennapod.storage.preferences.UserPreferences; import de.danoeh.antennapod.core.receiver.MediaButtonReceiver; -import de.danoeh.antennapod.core.util.Converter; +import de.danoeh.antennapod.ui.common.Converter; import de.danoeh.antennapod.core.feed.util.ImageResourceUtils; import de.danoeh.antennapod.core.util.TimeSpeedConverter; import de.danoeh.antennapod.model.playback.Playable; diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/Converter.java b/core/src/main/java/de/danoeh/antennapod/core/util/Converter.java deleted file mode 100644 index 30464969b..000000000 --- a/core/src/main/java/de/danoeh/antennapod/core/util/Converter.java +++ /dev/null @@ -1,125 +0,0 @@ -package de.danoeh.antennapod.core.util; - -import android.content.Context; - -import android.content.res.Resources; -import java.util.Locale; - -import de.danoeh.antennapod.core.R; - -/** Provides methods for converting various units. */ -public final class Converter { - /** Class shall not be instantiated. */ - private Converter() { - } - - private static final int HOURS_MIL = 3600000; - private static final int MINUTES_MIL = 60000; - private static final int SECONDS_MIL = 1000; - - /** - * Converts milliseconds to a string containing hours, minutes and seconds. - */ - public static String getDurationStringLong(int duration) { - if (duration <= 0) { - return "00:00:00"; - } else { - int[] hms = millisecondsToHms(duration); - return String.format(Locale.getDefault(), "%02d:%02d:%02d", hms[0], hms[1], hms[2]); - } - } - - private static int[] millisecondsToHms(long duration) { - int h = (int) (duration / HOURS_MIL); - long rest = duration - h * HOURS_MIL; - int m = (int) (rest / MINUTES_MIL); - rest -= m * MINUTES_MIL; - int s = (int) (rest / SECONDS_MIL); - return new int[] {h, m, s}; - } - - /** - * Converts milliseconds to a string containing hours and minutes or minutes and seconds. - */ - public static String getDurationStringShort(int duration, boolean durationIsInHours) { - int firstPartBase = durationIsInHours ? HOURS_MIL : MINUTES_MIL; - int firstPart = duration / firstPartBase; - int leftoverFromFirstPart = duration - firstPart * firstPartBase; - int secondPart = leftoverFromFirstPart / (durationIsInHours ? MINUTES_MIL : SECONDS_MIL); - - return String.format(Locale.getDefault(), "%02d:%02d", firstPart, secondPart); - } - - /** - * Converts long duration string (HH:MM:SS) to milliseconds. - */ - public static int durationStringLongToMs(String input) { - String[] parts = input.split(":"); - if (parts.length != 3) { - return 0; - } - return Integer.parseInt(parts[0]) * 3600 * 1000 - + Integer.parseInt(parts[1]) * 60 * 1000 - + Integer.parseInt(parts[2]) * 1000; - } - - /** - * Converts short duration string (XX:YY) to milliseconds. If durationIsInHours is true then the - * format is HH:MM, otherwise it's MM:SS. - */ - public static int durationStringShortToMs(String input, boolean durationIsInHours) { - String[] parts = input.split(":"); - if (parts.length != 2) { - return 0; - } - - int modifier = durationIsInHours ? 60 : 1; - - return Integer.parseInt(parts[0]) * 60 * 1000 * modifier - + Integer.parseInt(parts[1]) * 1000 * modifier; - } - - /** - * Converts milliseconds to a localized string containing hours and minutes. - */ - public static String getDurationStringLocalized(Context context, long duration) { - return getDurationStringLocalized(context.getResources(), duration, false); - } - - public static String getDurationStringLocalized(Resources resources, long duration, boolean includeDays) { - String result = ""; - int h = (int) (duration / HOURS_MIL); - int d = h / 24; - if (!includeDays) { - d = 0; - } else if (d > 0) { - String days = resources.getQuantityString(R.plurals.time_days_quantified, d, d); - result += days.replace(" ", "\u00A0") + " "; - h -= d * 24; - } - int rest = (int) (duration - (d * 24 + h) * HOURS_MIL); - int m = rest / MINUTES_MIL; - if (h > 0) { - String hours = resources.getQuantityString(R.plurals.time_hours_quantified, h, h); - result += hours.replace(" ", "\u00A0"); - if (d == 0) { - result += " "; - } - } - if (d == 0) { - String minutes = resources.getQuantityString(R.plurals.time_minutes_quantified, m, m); - result += minutes.replace(" ", "\u00A0"); - } - return result; - } - - /** - * Converts seconds to a localized representation. - * @param time The time in seconds - * @return "HH:MM hours" - */ - public static String shortLocalizedDuration(Context context, long time) { - float hours = (float) time / 3600f; - return String.format(Locale.getDefault(), "%.1f ", hours) + context.getString(R.string.time_hours); - } -} diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/DateFormatter.java b/core/src/main/java/de/danoeh/antennapod/core/util/DateFormatter.java deleted file mode 100644 index c67e13db3..000000000 --- a/core/src/main/java/de/danoeh/antennapod/core/util/DateFormatter.java +++ /dev/null @@ -1,39 +0,0 @@ -package de.danoeh.antennapod.core.util; - -import android.content.Context; - -import java.text.DateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.GregorianCalendar; - -/** - * Formats dates. - */ -public class DateFormatter { - private DateFormatter() { - - } - - public static String formatAbbrev(final Context context, final Date date) { - if (date == null) { - return ""; - } - GregorianCalendar now = new GregorianCalendar(); - GregorianCalendar cal = new GregorianCalendar(); - cal.setTime(date); - boolean withinLastYear = now.get(Calendar.YEAR) == cal.get(Calendar.YEAR); - int format = android.text.format.DateUtils.FORMAT_ABBREV_ALL; - if (withinLastYear) { - format |= android.text.format.DateUtils.FORMAT_NO_YEAR; - } - return android.text.format.DateUtils.formatDateTime(context, date.getTime(), format); - } - - public static String formatForAccessibility(final Date date) { - if (date == null) { - return ""; - } - return DateFormat.getDateInstance(DateFormat.LONG).format(date); - } -} diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/ShareUtils.java b/core/src/main/java/de/danoeh/antennapod/core/util/ShareUtils.java index 630507487..5c8e5d86d 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/ShareUtils.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/ShareUtils.java @@ -9,6 +9,7 @@ import androidx.annotation.NonNull; import androidx.core.app.ShareCompat; import androidx.core.content.FileProvider; +import de.danoeh.antennapod.ui.common.Converter; import java.io.File; import java.net.URLEncoder; diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/gui/ShownotesCleaner.java b/core/src/main/java/de/danoeh/antennapod/core/util/gui/ShownotesCleaner.java index dbb2815e2..7bf9257a1 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/gui/ShownotesCleaner.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/gui/ShownotesCleaner.java @@ -23,7 +23,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import de.danoeh.antennapod.core.R; -import de.danoeh.antennapod.core.util.Converter; +import de.danoeh.antennapod.ui.common.Converter; /** * Cleans up and prepares shownotes: diff --git a/core/src/main/java/de/danoeh/antennapod/core/widget/WidgetUpdater.java b/core/src/main/java/de/danoeh/antennapod/core/widget/WidgetUpdater.java index 3d4cdbcf2..bc1cf8a5e 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/widget/WidgetUpdater.java +++ b/core/src/main/java/de/danoeh/antennapod/core/widget/WidgetUpdater.java @@ -17,6 +17,7 @@ import com.bumptech.glide.load.resource.bitmap.FitCenter; import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestOptions; +import de.danoeh.antennapod.ui.common.Converter; import java.util.concurrent.TimeUnit; import de.danoeh.antennapod.core.R; @@ -24,7 +25,6 @@ import de.danoeh.antennapod.storage.preferences.UserPreferences; import de.danoeh.antennapod.model.playback.MediaType; import de.danoeh.antennapod.core.receiver.MediaButtonReceiver; import de.danoeh.antennapod.core.receiver.PlayerWidget; -import de.danoeh.antennapod.core.util.Converter; import de.danoeh.antennapod.core.feed.util.ImageResourceUtils; import de.danoeh.antennapod.core.util.TimeSpeedConverter; import de.danoeh.antennapod.model.playback.Playable; diff --git a/core/src/main/res/color/button_bg_selector.xml b/core/src/main/res/color/button_bg_selector.xml deleted file mode 100644 index f416daa72..000000000 --- a/core/src/main/res/color/button_bg_selector.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/core/src/main/res/drawable-nodpi/launcher_animate_bg.png b/core/src/main/res/drawable-nodpi/launcher_animate_bg.png deleted file mode 100644 index 00eb3a2d6..000000000 Binary files a/core/src/main/res/drawable-nodpi/launcher_animate_bg.png and /dev/null differ diff --git a/core/src/main/res/drawable-nodpi/launcher_animate_wave1.png b/core/src/main/res/drawable-nodpi/launcher_animate_wave1.png deleted file mode 100644 index 432e497c3..000000000 Binary files a/core/src/main/res/drawable-nodpi/launcher_animate_wave1.png and /dev/null differ diff --git a/core/src/main/res/drawable-nodpi/launcher_animate_wave2.png b/core/src/main/res/drawable-nodpi/launcher_animate_wave2.png deleted file mode 100644 index 16d4e5023..000000000 Binary files a/core/src/main/res/drawable-nodpi/launcher_animate_wave2.png and /dev/null differ diff --git a/core/src/main/res/drawable-nodpi/teaser.webp b/core/src/main/res/drawable-nodpi/teaser.webp deleted file mode 100644 index 1f1e4a4a3..000000000 Binary files a/core/src/main/res/drawable-nodpi/teaser.webp and /dev/null differ diff --git a/core/src/main/res/drawable/bg_pill_translucent.xml b/core/src/main/res/drawable/bg_pill_translucent.xml deleted file mode 100644 index b25a9ac82..000000000 --- a/core/src/main/res/drawable/bg_pill_translucent.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/core/src/main/res/drawable/ic_drag_darktheme.xml b/core/src/main/res/drawable/ic_drag_darktheme.xml deleted file mode 100644 index 20c7db484..000000000 --- a/core/src/main/res/drawable/ic_drag_darktheme.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/core/src/main/res/drawable/ic_drag_lighttheme.xml b/core/src/main/res/drawable/ic_drag_lighttheme.xml deleted file mode 100644 index 46ff2f495..000000000 --- a/core/src/main/res/drawable/ic_drag_lighttheme.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/core/src/main/res/drawable/launcher_animate.xml b/core/src/main/res/drawable/launcher_animate.xml deleted file mode 100644 index 189a01d26..000000000 --- a/core/src/main/res/drawable/launcher_animate.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/src/main/res/drawable/progress_bar_horizontal_dark.xml b/core/src/main/res/drawable/progress_bar_horizontal_dark.xml deleted file mode 100644 index b575c2f80..000000000 --- a/core/src/main/res/drawable/progress_bar_horizontal_dark.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/core/src/main/res/drawable/progress_bar_horizontal_light.xml b/core/src/main/res/drawable/progress_bar_horizontal_light.xml deleted file mode 100644 index b2e18c988..000000000 --- a/core/src/main/res/drawable/progress_bar_horizontal_light.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/core/src/main/res/drawable/scrollbar_thumb_dark.xml b/core/src/main/res/drawable/scrollbar_thumb_dark.xml deleted file mode 100644 index 929c03914..000000000 --- a/core/src/main/res/drawable/scrollbar_thumb_dark.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/core/src/main/res/drawable/scrollbar_thumb_default.xml b/core/src/main/res/drawable/scrollbar_thumb_default.xml deleted file mode 100644 index 5e8a98b44..000000000 --- a/core/src/main/res/drawable/scrollbar_thumb_default.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/core/src/main/res/drawable/scrollbar_thumb_light.xml b/core/src/main/res/drawable/scrollbar_thumb_light.xml deleted file mode 100644 index a13cfd705..000000000 --- a/core/src/main/res/drawable/scrollbar_thumb_light.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/core/src/main/res/drawable/scrollbar_thumb_pressed_dark.xml b/core/src/main/res/drawable/scrollbar_thumb_pressed_dark.xml deleted file mode 100644 index a1618c5b6..000000000 --- a/core/src/main/res/drawable/scrollbar_thumb_pressed_dark.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/core/src/main/res/drawable/scrollbar_thumb_pressed_light.xml b/core/src/main/res/drawable/scrollbar_thumb_pressed_light.xml deleted file mode 100644 index be684541a..000000000 --- a/core/src/main/res/drawable/scrollbar_thumb_pressed_light.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/core/src/main/res/drawable/scrollbar_track.xml b/core/src/main/res/drawable/scrollbar_track.xml deleted file mode 100644 index ce838abe9..000000000 --- a/core/src/main/res/drawable/scrollbar_track.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/core/src/main/res/layout/preference_material_switch.xml b/core/src/main/res/layout/preference_material_switch.xml deleted file mode 100644 index b39e6b00f..000000000 --- a/core/src/main/res/layout/preference_material_switch.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/core/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/core/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 9764d2aa9..000000000 --- a/core/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/core/src/main/res/mipmap-hdpi/ic_launcher.png b/core/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index efda51a0e..000000000 Binary files a/core/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/core/src/main/res/mipmap-hdpi/ic_launcher_background.png b/core/src/main/res/mipmap-hdpi/ic_launcher_background.png deleted file mode 100644 index 3b5e329e5..000000000 Binary files a/core/src/main/res/mipmap-hdpi/ic_launcher_background.png and /dev/null differ diff --git a/core/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/core/src/main/res/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index b52ad5dd6..000000000 Binary files a/core/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/core/src/main/res/mipmap-mdpi/ic_launcher.png b/core/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index 9c2a5867a..000000000 Binary files a/core/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/core/src/main/res/mipmap-mdpi/ic_launcher_background.png b/core/src/main/res/mipmap-mdpi/ic_launcher_background.png deleted file mode 100644 index 38164a0b0..000000000 Binary files a/core/src/main/res/mipmap-mdpi/ic_launcher_background.png and /dev/null differ diff --git a/core/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/core/src/main/res/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index 236f6fca2..000000000 Binary files a/core/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/core/src/main/res/mipmap-xhdpi/ic_launcher.png b/core/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index a58294b36..000000000 Binary files a/core/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/core/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/core/src/main/res/mipmap-xhdpi/ic_launcher_background.png deleted file mode 100644 index 7bf8bf8a7..000000000 Binary files a/core/src/main/res/mipmap-xhdpi/ic_launcher_background.png and /dev/null differ diff --git a/core/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/core/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index 03cf16e53..000000000 Binary files a/core/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/core/src/main/res/mipmap-xxhdpi/ic_launcher.png b/core/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 0245e6394..000000000 Binary files a/core/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/core/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/core/src/main/res/mipmap-xxhdpi/ic_launcher_background.png deleted file mode 100644 index e1982893d..000000000 Binary files a/core/src/main/res/mipmap-xxhdpi/ic_launcher_background.png and /dev/null differ diff --git a/core/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/core/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index e6a824939..000000000 Binary files a/core/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/core/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/core/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index 998bfdea8..000000000 Binary files a/core/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/core/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/core/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png deleted file mode 100644 index 8db9c15a8..000000000 Binary files a/core/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png and /dev/null differ diff --git a/core/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/core/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index ccc00751c..000000000 Binary files a/core/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/core/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png b/core/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png deleted file mode 100644 index ae9ba36ea..000000000 Binary files a/core/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png and /dev/null differ diff --git a/core/src/main/res/values-v23/styles.xml b/core/src/main/res/values-v23/styles.xml deleted file mode 100644 index 95740f648..000000000 --- a/core/src/main/res/values-v23/styles.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - diff --git a/core/src/main/res/values-v27/styles.xml b/core/src/main/res/values-v27/styles.xml deleted file mode 100644 index df4d786be..000000000 --- a/core/src/main/res/values-v27/styles.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml deleted file mode 100644 index 57fde8e10..000000000 --- a/core/src/main/res/values/attrs.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml deleted file mode 100644 index ad835faf4..000000000 --- a/core/src/main/res/values/colors.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - #FFFFFF - #f5f5f5 - #757575 - #bfbfbf - #afafaf - #000000 - #80000000 - #50000000 - #55333333 - - - #FFFFFF - #EFEEEE - #21272b - #2D3337 - #22777777 - #90000000 - #905B5B5B - #1F000000 - - #0078C2 - #3D8BFF - - #364ff3 - #2E6FF6 - #1EB0FC - #16d0ff - diff --git a/core/src/main/res/values/dimens.xml b/core/src/main/res/values/dimens.xml deleted file mode 100644 index 68d0e59ab..000000000 --- a/core/src/main/res/values/dimens.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 0dp - 4dp - 64dp - 12sp - 14sp - 16sp - 22sp - 56dp - 56dp - 92dp - 132dp - 40dp - 48dp - 16dp - - 16dp - 8dp - 8dp - - 8dp - 16dp - - 48dp - 64dp - 12dp - - 480dp - diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml deleted file mode 100644 index da227d163..000000000 --- a/core/src/main/res/values/styles.xml +++ /dev/null @@ -1,314 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/core/src/test/java/de/danoeh/antennapod/core/feed/FeedFilterTest.java b/core/src/test/java/de/danoeh/antennapod/core/feed/FeedFilterTest.java index c7c47f4fd..cc8e1636c 100644 --- a/core/src/test/java/de/danoeh/antennapod/core/feed/FeedFilterTest.java +++ b/core/src/test/java/de/danoeh/antennapod/core/feed/FeedFilterTest.java @@ -1,6 +1,6 @@ package de.danoeh.antennapod.core.feed; -import de.danoeh.antennapod.core.util.Converter; +import de.danoeh.antennapod.ui.common.Converter; import de.danoeh.antennapod.model.feed.FeedFilter; import de.danoeh.antennapod.model.feed.FeedItem; import de.danoeh.antennapod.model.feed.FeedMedia; diff --git a/core/src/test/java/de/danoeh/antennapod/core/util/ConverterTest.java b/core/src/test/java/de/danoeh/antennapod/core/util/ConverterTest.java index 54e5462d0..2e4ead5e6 100644 --- a/core/src/test/java/de/danoeh/antennapod/core/util/ConverterTest.java +++ b/core/src/test/java/de/danoeh/antennapod/core/util/ConverterTest.java @@ -1,5 +1,6 @@ package de.danoeh.antennapod.core.util; +import de.danoeh.antennapod.ui.common.Converter; import org.junit.Test; import static org.junit.Assert.assertEquals; -- cgit v1.2.3