From c4673662b279d54fb133e54a74c54dd7a9be15b3 Mon Sep 17 00:00:00 2001 From: asdoi Date: Tue, 8 Sep 2020 16:44:53 +0200 Subject: update skip/forward value --- .../main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java index 5ca8b666a..f64f21936 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java @@ -126,8 +126,6 @@ public class AudioPlayerFragment extends Fragment implements setupLengthTextView(); setupControlButtons(); setupPlaybackSpeedButton(); - txtvRev.setText(NumberFormat.getInstance().format(UserPreferences.getRewindSecs())); - txtvFF.setText(NumberFormat.getInstance().format(UserPreferences.getFastForwardSecs())); sbPosition.setOnSeekBarChangeListener(this); pager = root.findViewById(R.id.pager); @@ -379,6 +377,8 @@ public class AudioPlayerFragment extends Fragment implements controller.init(); loadMediaInfo(); EventBus.getDefault().register(this); + txtvRev.setText(NumberFormat.getInstance().format(UserPreferences.getRewindSecs())); + txtvFF.setText(NumberFormat.getInstance().format(UserPreferences.getFastForwardSecs())); } @Override -- cgit v1.2.3 From da14ae58dcfe55a3cec60da182f8750dd17b580c Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Mon, 14 Sep 2020 11:14:52 -0700 Subject: - better resizing for multiple screen ratios --- .../de/danoeh/antennapod/fragment/CoverFragment.java | 18 +++++++++++++++--- app/src/main/res/layout/cover_fragment.xml | 17 ++++++++++------- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java index 79f378249..648fc614a 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java @@ -45,6 +45,7 @@ import org.greenrobot.eventbus.ThreadMode; public class CoverFragment extends Fragment { private static final String TAG = "CoverFragment"; + static final double SIXTEEN_BY_NINE = 1.7; private View root; private TextView txtvPodcastTitle; @@ -188,20 +189,31 @@ public class CoverFragment extends Fragment { private void configureForOrientation(Configuration newConfig) { LinearLayout mainContainer = getView().findViewById(R.id.cover_fragment); - ViewGroup.LayoutParams params = imgvCover.getLayoutParams(); + LinearLayout textContainer = getView().findViewById(R.id.cover_fragment_text_container); + + LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) imgvCover.getLayoutParams(); + LinearLayout.LayoutParams textParams = (LinearLayout.LayoutParams) textContainer.getLayoutParams(); + double ratio = (float) newConfig.screenHeightDp / (float) newConfig.screenWidthDp; if (newConfig.orientation == Configuration.ORIENTATION_PORTRAIT) { + double percentageWidth = 0.8; + if (ratio <= SIXTEEN_BY_NINE) { + percentageWidth = (ratio / SIXTEEN_BY_NINE) * percentageWidth * 0.8; + } mainContainer.setOrientation(LinearLayout.VERTICAL); if (newConfig.screenWidthDp > 0) { - params.width = (int) (convertDpToPixel(newConfig.screenWidthDp) * .80); + params.width = (int) (convertDpToPixel(newConfig.screenWidthDp) * percentageWidth); params.height = params.width; + textParams.weight = 0; imgvCover.setLayoutParams(params); } } else { + double percentageHeight = ratio * 0.8; mainContainer.setOrientation(LinearLayout.HORIZONTAL); if (newConfig.screenHeightDp > 0) { - params.height = (int) (convertDpToPixel(newConfig.screenHeightDp) * .40); + params.height = (int) (convertDpToPixel(newConfig.screenHeightDp) * percentageHeight); params.width = params.height; + textParams.weight = 1; imgvCover.setLayoutParams(params); } } diff --git a/app/src/main/res/layout/cover_fragment.xml b/app/src/main/res/layout/cover_fragment.xml index 443f19835..fb156d6e6 100644 --- a/app/src/main/res/layout/cover_fragment.xml +++ b/app/src/main/res/layout/cover_fragment.xml @@ -15,8 +15,9 @@ android:layout_width="200dp" android:layout_height="200dp" android:layout_gravity="center" - android:layout_marginLeft="64dp" - android:layout_marginRight="64dp" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:layout_marginTop="8dp" android:layout_weight="0" android:foreground="?attr/selectableItemBackgroundBorderless" android:importantForAccessibility="no" @@ -29,16 +30,17 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:layout_marginTop="16dp" + android:layout_marginTop="8dp" android:layout_marginBottom="8dp"> @@ -47,8 +49,9 @@ android:id="@+id/txtvEpisodeTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:ellipsize="end" - android:gravity="center" + android:ellipsize="none" + android:gravity="center_horizontal" + android:textSize="@dimen/text_size_small" android:maxLines="2" android:textColor="?android:attr/textColorPrimary" android:textIsSelectable="true" -- cgit v1.2.3 From f3e3f9c4d1f4216fd292b127d1e822776ea52a09 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Fri, 18 Sep 2020 23:07:10 +0200 Subject: Fixed pages forgetting scroll position when switching tabs --- app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java | 1 + app/src/main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java | 1 + 2 files changed, 2 insertions(+) diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java index cf0c6db90..37b842e0c 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java @@ -48,6 +48,7 @@ public class DownloadsFragment extends Fragment { viewPager = root.findViewById(R.id.viewpager); viewPager.setAdapter(new DownloadsPagerAdapter(this)); + viewPager.setOffscreenPageLimit(2); // Give the TabLayout the ViewPager tabLayout = root.findViewById(R.id.sliding_tabs); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java index e98890627..afd027b3a 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/EpisodesFragment.java @@ -51,6 +51,7 @@ public class EpisodesFragment extends Fragment { ((AppCompatActivity) getActivity()).setSupportActionBar(toolbar); viewPager = rootView.findViewById(R.id.viewpager); viewPager.setAdapter(new EpisodesPagerAdapter(this)); + viewPager.setOffscreenPageLimit(2); // Give the TabLayout the ViewPager tabLayout = rootView.findViewById(R.id.sliding_tabs); -- cgit v1.2.3 From b75c05cca1f9074ac51f4c12dbad5ac118c6d222 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Fri, 18 Sep 2020 23:11:38 +0200 Subject: Upgraded AppCompat to fix WebView crashes --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0a5695377..01af13b4e 100644 --- a/build.gradle +++ b/build.gradle @@ -48,7 +48,7 @@ project.ext { // AndroidX annotationVersion = "1.1.0" - appcompatVersion = "1.1.0" + appcompatVersion = "1.2.0" mediaVersion = "1.1.0" preferenceVersion = "1.1.1" workManagerVersion = "2.3.4" -- cgit v1.2.3 From fdae07347bc4413e118c9f17c254829aee6313dd Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Sat, 19 Sep 2020 21:10:16 +0200 Subject: Removed artwork folder --- artwork/feature-graphic.svg | 164 -------------------------- artwork/ic_launcher.svg | 75 ------------ artwork/screenshots/generateScreenshots.sh | 54 --------- artwork/screenshots/raw/de-DE/00.png | Bin 988741 -> 0 bytes artwork/screenshots/raw/de-DE/01.png | Bin 995809 -> 0 bytes artwork/screenshots/raw/de-DE/02.png | Bin 254192 -> 0 bytes artwork/screenshots/raw/de-DE/03a.png | Bin 393905 -> 0 bytes artwork/screenshots/raw/de-DE/03b.png | Bin 395890 -> 0 bytes artwork/screenshots/raw/de-DE/04.png | Bin 473491 -> 0 bytes artwork/screenshots/raw/de-DE/05.png | Bin 704178 -> 0 bytes artwork/screenshots/raw/de-DE/texts.txt | 6 - artwork/screenshots/raw/en-US/00.png | Bin 952560 -> 0 bytes artwork/screenshots/raw/en-US/01.png | Bin 97710 -> 0 bytes artwork/screenshots/raw/en-US/02.png | Bin 250923 -> 0 bytes artwork/screenshots/raw/en-US/03a.png | Bin 394632 -> 0 bytes artwork/screenshots/raw/en-US/03b.png | Bin 396605 -> 0 bytes artwork/screenshots/raw/en-US/04.png | Bin 380087 -> 0 bytes artwork/screenshots/raw/en-US/05.png | Bin 759276 -> 0 bytes artwork/screenshots/raw/en-US/texts.txt | 6 - artwork/screenshots/raw/fr-FR/00.png | Bin 951594 -> 0 bytes artwork/screenshots/raw/fr-FR/01.png | Bin 96555 -> 0 bytes artwork/screenshots/raw/fr-FR/02.png | Bin 254441 -> 0 bytes artwork/screenshots/raw/fr-FR/03a.png | Bin 396364 -> 0 bytes artwork/screenshots/raw/fr-FR/03b.png | Bin 398409 -> 0 bytes artwork/screenshots/raw/fr-FR/04.png | Bin 379047 -> 0 bytes artwork/screenshots/raw/fr-FR/05.png | Bin 726651 -> 0 bytes artwork/screenshots/raw/nl-NL/00.png | 1 - artwork/screenshots/raw/nl-NL/01.png | 1 - artwork/screenshots/raw/nl-NL/02.png | 1 - artwork/screenshots/raw/nl-NL/03a.png | 1 - artwork/screenshots/raw/nl-NL/03b.png | 1 - artwork/screenshots/raw/nl-NL/04.png | 1 - artwork/screenshots/raw/nl-NL/05.png | 1 - artwork/screenshots/raw/nl-NL/texts.txt | 6 - artwork/screenshots/templates/phone.png | Bin 452645 -> 0 bytes artwork/screenshots/templates/suggestions.png | Bin 561417 -> 0 bytes artwork/screenshots/templates/twophones-a.png | Bin 544210 -> 0 bytes artwork/screenshots/templates/twophones-b.png | Bin 478127 -> 0 bytes artwork/screenshots/templates/twophones.png | Bin 3737 -> 0 bytes 39 files changed, 318 deletions(-) delete mode 100644 artwork/feature-graphic.svg delete mode 100644 artwork/ic_launcher.svg delete mode 100644 artwork/screenshots/generateScreenshots.sh delete mode 100644 artwork/screenshots/raw/de-DE/00.png delete mode 100644 artwork/screenshots/raw/de-DE/01.png delete mode 100644 artwork/screenshots/raw/de-DE/02.png delete mode 100644 artwork/screenshots/raw/de-DE/03a.png delete mode 100644 artwork/screenshots/raw/de-DE/03b.png delete mode 100644 artwork/screenshots/raw/de-DE/04.png delete mode 100644 artwork/screenshots/raw/de-DE/05.png delete mode 100644 artwork/screenshots/raw/de-DE/texts.txt delete mode 100644 artwork/screenshots/raw/en-US/00.png delete mode 100644 artwork/screenshots/raw/en-US/01.png delete mode 100644 artwork/screenshots/raw/en-US/02.png delete mode 100644 artwork/screenshots/raw/en-US/03a.png delete mode 100644 artwork/screenshots/raw/en-US/03b.png delete mode 100644 artwork/screenshots/raw/en-US/04.png delete mode 100644 artwork/screenshots/raw/en-US/05.png delete mode 100644 artwork/screenshots/raw/en-US/texts.txt delete mode 100644 artwork/screenshots/raw/fr-FR/00.png delete mode 100644 artwork/screenshots/raw/fr-FR/01.png delete mode 100644 artwork/screenshots/raw/fr-FR/02.png delete mode 100644 artwork/screenshots/raw/fr-FR/03a.png delete mode 100644 artwork/screenshots/raw/fr-FR/03b.png delete mode 100644 artwork/screenshots/raw/fr-FR/04.png delete mode 100644 artwork/screenshots/raw/fr-FR/05.png delete mode 120000 artwork/screenshots/raw/nl-NL/00.png delete mode 120000 artwork/screenshots/raw/nl-NL/01.png delete mode 120000 artwork/screenshots/raw/nl-NL/02.png delete mode 120000 artwork/screenshots/raw/nl-NL/03a.png delete mode 120000 artwork/screenshots/raw/nl-NL/03b.png delete mode 120000 artwork/screenshots/raw/nl-NL/04.png delete mode 120000 artwork/screenshots/raw/nl-NL/05.png delete mode 100644 artwork/screenshots/raw/nl-NL/texts.txt delete mode 100644 artwork/screenshots/templates/phone.png delete mode 100644 artwork/screenshots/templates/suggestions.png delete mode 100644 artwork/screenshots/templates/twophones-a.png delete mode 100644 artwork/screenshots/templates/twophones-b.png delete mode 100644 artwork/screenshots/templates/twophones.png diff --git a/artwork/feature-graphic.svg b/artwork/feature-graphic.svg deleted file mode 100644 index c8ed16012..000000000 --- a/artwork/feature-graphic.svg +++ /dev/null @@ -1,164 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/artwork/ic_launcher.svg b/artwork/ic_launcher.svg deleted file mode 100644 index cd65ace03..000000000 --- a/artwork/ic_launcher.svg +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - diff --git a/artwork/screenshots/generateScreenshots.sh b/artwork/screenshots/generateScreenshots.sh deleted file mode 100644 index 7ffc4be65..000000000 --- a/artwork/screenshots/generateScreenshots.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh - -function generateText() { - echo "$1" - convert -size 1698x750 xc:none -gravity Center -pointsize 130 -fill white -font Lato-Regular \ - -annotate 0 "$1" /tmp/text.png -} - -function simplePhone() { - generateText "$1" - convert templates/phone.png \ - $2 -geometry +306+992 -composite \ - /tmp/text.png -geometry +0+0 -composite \ - $3 -} - -function addLayer() { - convert $2 $1 -composite $2 -} - -function generateScreenshots() { - language=$1 - mkdir output/$1 2>/dev/null - text0=`cat raw/$language/texts.txt | head -1 | tail -1` - text1=`cat raw/$language/texts.txt | head -2 | tail -1` - text2=`cat raw/$language/texts.txt | head -3 | tail -1` - text3=`cat raw/$language/texts.txt | head -4 | tail -1` - text4=`cat raw/$language/texts.txt | head -5 | tail -1` - text5=`cat raw/$language/texts.txt | head -6 | tail -1` - - simplePhone "$text0" raw/$language/00.png output/$language/00.png - simplePhone "$text1" raw/$language/01.png output/$language/01.png - simplePhone "$text2" raw/$language/02.png output/$language/03.png - generateText "$text3" - convert templates/twophones.png \ - templates/twophones-a.png -geometry +0+10 -composite \ - raw/$language/03a.png -geometry +119+992 -composite \ - templates/twophones-b.png -geometry +0+0 -composite \ - raw/$language/03b.png -geometry +479+1540 -composite \ - /tmp/text.png -geometry +0+0 -composite \ - output/$language/02.png - simplePhone "$text4" raw/$language/04.png output/$language/04.png - simplePhone "$text5" raw/$language/05.png output/$language/05.png - addLayer templates/suggestions.png output/$language/05.png - mogrify -resize 1120 "output/$language/*.png" -} - -mkdir output 2>/dev/null - -generateScreenshots "de-DE" -generateScreenshots "en-US" -generateScreenshots "nl-NL" - -rm /tmp/text.png diff --git a/artwork/screenshots/raw/de-DE/00.png b/artwork/screenshots/raw/de-DE/00.png deleted file mode 100644 index f5f7a463b..000000000 Binary files a/artwork/screenshots/raw/de-DE/00.png and /dev/null differ diff --git a/artwork/screenshots/raw/de-DE/01.png b/artwork/screenshots/raw/de-DE/01.png deleted file mode 100644 index eac002341..000000000 Binary files a/artwork/screenshots/raw/de-DE/01.png and /dev/null differ diff --git a/artwork/screenshots/raw/de-DE/02.png b/artwork/screenshots/raw/de-DE/02.png deleted file mode 100644 index f189d11f2..000000000 Binary files a/artwork/screenshots/raw/de-DE/02.png and /dev/null differ diff --git a/artwork/screenshots/raw/de-DE/03a.png b/artwork/screenshots/raw/de-DE/03a.png deleted file mode 100644 index 9681a8586..000000000 Binary files a/artwork/screenshots/raw/de-DE/03a.png and /dev/null differ diff --git a/artwork/screenshots/raw/de-DE/03b.png b/artwork/screenshots/raw/de-DE/03b.png deleted file mode 100644 index 28868ecc1..000000000 Binary files a/artwork/screenshots/raw/de-DE/03b.png and /dev/null differ diff --git a/artwork/screenshots/raw/de-DE/04.png b/artwork/screenshots/raw/de-DE/04.png deleted file mode 100644 index 03467f768..000000000 Binary files a/artwork/screenshots/raw/de-DE/04.png and /dev/null differ diff --git a/artwork/screenshots/raw/de-DE/05.png b/artwork/screenshots/raw/de-DE/05.png deleted file mode 100644 index 4d687d88b..000000000 Binary files a/artwork/screenshots/raw/de-DE/05.png and /dev/null differ diff --git a/artwork/screenshots/raw/de-DE/texts.txt b/artwork/screenshots/raw/de-DE/texts.txt deleted file mode 100644 index a0ea2c731..000000000 --- a/artwork/screenshots/raw/de-DE/texts.txt +++ /dev/null @@ -1,6 +0,0 @@ -Abonniere deine\nLieblings-Podcasts -Höre in beliebiger\nGeschwindigkeit -Spare Zeit mit\nautomatischen Downloads -Wähle dein\nLieblings-Theme -Passe AntennaPod\nan deine Wünsche an -Entdecke tausende\nneuer Podcasts diff --git a/artwork/screenshots/raw/en-US/00.png b/artwork/screenshots/raw/en-US/00.png deleted file mode 100644 index f201567a1..000000000 Binary files a/artwork/screenshots/raw/en-US/00.png and /dev/null differ diff --git a/artwork/screenshots/raw/en-US/01.png b/artwork/screenshots/raw/en-US/01.png deleted file mode 100644 index 1c0cd9e8d..000000000 Binary files a/artwork/screenshots/raw/en-US/01.png and /dev/null differ diff --git a/artwork/screenshots/raw/en-US/02.png b/artwork/screenshots/raw/en-US/02.png deleted file mode 100644 index c7812c099..000000000 Binary files a/artwork/screenshots/raw/en-US/02.png and /dev/null differ diff --git a/artwork/screenshots/raw/en-US/03a.png b/artwork/screenshots/raw/en-US/03a.png deleted file mode 100644 index 153344671..000000000 Binary files a/artwork/screenshots/raw/en-US/03a.png and /dev/null differ diff --git a/artwork/screenshots/raw/en-US/03b.png b/artwork/screenshots/raw/en-US/03b.png deleted file mode 100644 index 464c4f9fb..000000000 Binary files a/artwork/screenshots/raw/en-US/03b.png and /dev/null differ diff --git a/artwork/screenshots/raw/en-US/04.png b/artwork/screenshots/raw/en-US/04.png deleted file mode 100644 index 65fe711a6..000000000 Binary files a/artwork/screenshots/raw/en-US/04.png and /dev/null differ diff --git a/artwork/screenshots/raw/en-US/05.png b/artwork/screenshots/raw/en-US/05.png deleted file mode 100644 index 35a1d3b08..000000000 Binary files a/artwork/screenshots/raw/en-US/05.png and /dev/null differ diff --git a/artwork/screenshots/raw/en-US/texts.txt b/artwork/screenshots/raw/en-US/texts.txt deleted file mode 100644 index f1ef1c960..000000000 --- a/artwork/screenshots/raw/en-US/texts.txt +++ /dev/null @@ -1,6 +0,0 @@ -Subscribe to all of your\nfavorite podcasts -Play smart with\nyour speed of choice -Save time with\nautomatic downloads -Select the theme\nthat fits best to you -Adapt AntennaPod\nto your needs -Discover thousands\nof great podcasts diff --git a/artwork/screenshots/raw/fr-FR/00.png b/artwork/screenshots/raw/fr-FR/00.png deleted file mode 100644 index e32664902..000000000 Binary files a/artwork/screenshots/raw/fr-FR/00.png and /dev/null differ diff --git a/artwork/screenshots/raw/fr-FR/01.png b/artwork/screenshots/raw/fr-FR/01.png deleted file mode 100644 index f1119dd11..000000000 Binary files a/artwork/screenshots/raw/fr-FR/01.png and /dev/null differ diff --git a/artwork/screenshots/raw/fr-FR/02.png b/artwork/screenshots/raw/fr-FR/02.png deleted file mode 100644 index 17cae455a..000000000 Binary files a/artwork/screenshots/raw/fr-FR/02.png and /dev/null differ diff --git a/artwork/screenshots/raw/fr-FR/03a.png b/artwork/screenshots/raw/fr-FR/03a.png deleted file mode 100644 index 4944f4f3d..000000000 Binary files a/artwork/screenshots/raw/fr-FR/03a.png and /dev/null differ diff --git a/artwork/screenshots/raw/fr-FR/03b.png b/artwork/screenshots/raw/fr-FR/03b.png deleted file mode 100644 index c4cf5f058..000000000 Binary files a/artwork/screenshots/raw/fr-FR/03b.png and /dev/null differ diff --git a/artwork/screenshots/raw/fr-FR/04.png b/artwork/screenshots/raw/fr-FR/04.png deleted file mode 100644 index 2d7572b65..000000000 Binary files a/artwork/screenshots/raw/fr-FR/04.png and /dev/null differ diff --git a/artwork/screenshots/raw/fr-FR/05.png b/artwork/screenshots/raw/fr-FR/05.png deleted file mode 100644 index cdf2cac38..000000000 Binary files a/artwork/screenshots/raw/fr-FR/05.png and /dev/null differ diff --git a/artwork/screenshots/raw/nl-NL/00.png b/artwork/screenshots/raw/nl-NL/00.png deleted file mode 120000 index e0bfea551..000000000 --- a/artwork/screenshots/raw/nl-NL/00.png +++ /dev/null @@ -1 +0,0 @@ -../en-US/00.png \ No newline at end of file diff --git a/artwork/screenshots/raw/nl-NL/01.png b/artwork/screenshots/raw/nl-NL/01.png deleted file mode 120000 index 3fd528c1c..000000000 --- a/artwork/screenshots/raw/nl-NL/01.png +++ /dev/null @@ -1 +0,0 @@ -../en-US/01.png \ No newline at end of file diff --git a/artwork/screenshots/raw/nl-NL/02.png b/artwork/screenshots/raw/nl-NL/02.png deleted file mode 120000 index b885756ff..000000000 --- a/artwork/screenshots/raw/nl-NL/02.png +++ /dev/null @@ -1 +0,0 @@ -../en-US/02.png \ No newline at end of file diff --git a/artwork/screenshots/raw/nl-NL/03a.png b/artwork/screenshots/raw/nl-NL/03a.png deleted file mode 120000 index 1a8941b2e..000000000 --- a/artwork/screenshots/raw/nl-NL/03a.png +++ /dev/null @@ -1 +0,0 @@ -../en-US/03a.png \ No newline at end of file diff --git a/artwork/screenshots/raw/nl-NL/03b.png b/artwork/screenshots/raw/nl-NL/03b.png deleted file mode 120000 index 060f855ae..000000000 --- a/artwork/screenshots/raw/nl-NL/03b.png +++ /dev/null @@ -1 +0,0 @@ -../en-US/03b.png \ No newline at end of file diff --git a/artwork/screenshots/raw/nl-NL/04.png b/artwork/screenshots/raw/nl-NL/04.png deleted file mode 120000 index ce90b2129..000000000 --- a/artwork/screenshots/raw/nl-NL/04.png +++ /dev/null @@ -1 +0,0 @@ -../en-US/04.png \ No newline at end of file diff --git a/artwork/screenshots/raw/nl-NL/05.png b/artwork/screenshots/raw/nl-NL/05.png deleted file mode 120000 index 3ea218d4d..000000000 --- a/artwork/screenshots/raw/nl-NL/05.png +++ /dev/null @@ -1 +0,0 @@ -../en-US/05.png \ No newline at end of file diff --git a/artwork/screenshots/raw/nl-NL/texts.txt b/artwork/screenshots/raw/nl-NL/texts.txt deleted file mode 100644 index ebd140cf4..000000000 --- a/artwork/screenshots/raw/nl-NL/texts.txt +++ /dev/null @@ -1,6 +0,0 @@ -Abonneer je op al\nje favoriete podcasts -Speel slim met\nafspeelsnelheid naar keuze -Bespaar tijd met\nautomatische downloads -Selecteer het thema\ndat het best bij je past -Pas AntennaPod aan\naan jouw wensen -Ontdek honderden\ninteressante podcasts diff --git a/artwork/screenshots/templates/phone.png b/artwork/screenshots/templates/phone.png deleted file mode 100644 index 70df4736e..000000000 Binary files a/artwork/screenshots/templates/phone.png and /dev/null differ diff --git a/artwork/screenshots/templates/suggestions.png b/artwork/screenshots/templates/suggestions.png deleted file mode 100644 index 00d761ef6..000000000 Binary files a/artwork/screenshots/templates/suggestions.png and /dev/null differ diff --git a/artwork/screenshots/templates/twophones-a.png b/artwork/screenshots/templates/twophones-a.png deleted file mode 100644 index bb10550e8..000000000 Binary files a/artwork/screenshots/templates/twophones-a.png and /dev/null differ diff --git a/artwork/screenshots/templates/twophones-b.png b/artwork/screenshots/templates/twophones-b.png deleted file mode 100644 index ffe3dddf6..000000000 Binary files a/artwork/screenshots/templates/twophones-b.png and /dev/null differ diff --git a/artwork/screenshots/templates/twophones.png b/artwork/screenshots/templates/twophones.png deleted file mode 100644 index ea532f1d9..000000000 Binary files a/artwork/screenshots/templates/twophones.png and /dev/null differ -- cgit v1.2.3 From 806b1f48ecf93f93e548980a87c0e6495591f596 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Sat, 19 Sep 2020 21:20:15 +0200 Subject: Make ProviderInstaller synchronous again See #4077 for details: It is fast and the old method sometimes does not install the provider early enough Reverts #3946 and #4285 --- .../java/de/danoeh/antennapod/core/ClientConfig.java | 3 ++- .../core/service/ProviderInstallerInterceptor.java | 18 ------------------ .../core/service/download/AntennapodHttpClient.java | 2 -- .../java/de/danoeh/antennapod/core/ClientConfig.java | 16 ++-------------- 4 files changed, 4 insertions(+), 35 deletions(-) delete mode 100644 core/src/main/java/de/danoeh/antennapod/core/service/ProviderInstallerInterceptor.java diff --git a/core/src/free/java/de/danoeh/antennapod/core/ClientConfig.java b/core/src/free/java/de/danoeh/antennapod/core/ClientConfig.java index 3c1eda242..824a4fae3 100644 --- a/core/src/free/java/de/danoeh/antennapod/core/ClientConfig.java +++ b/core/src/free/java/de/danoeh/antennapod/core/ClientConfig.java @@ -45,6 +45,7 @@ public class ClientConfig { UserPreferences.init(context); UsageStatistics.init(context); PlaybackPreferences.init(context); + installSslProvider(context); NetworkUtils.init(context); AntennapodHttpClient.setCacheDirectory(new File(context.getCacheDir(), "okhttp")); SleepTimerPreferences.init(context); @@ -53,7 +54,7 @@ public class ClientConfig { initialized = true; } - public static void installSslProvider(Context context) { + private static void installSslProvider(Context context) { // ProviderInstaller is a closed-source Google library } } diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/ProviderInstallerInterceptor.java b/core/src/main/java/de/danoeh/antennapod/core/service/ProviderInstallerInterceptor.java deleted file mode 100644 index 4fa1fc3d7..000000000 --- a/core/src/main/java/de/danoeh/antennapod/core/service/ProviderInstallerInterceptor.java +++ /dev/null @@ -1,18 +0,0 @@ -package de.danoeh.antennapod.core.service; - -import androidx.annotation.NonNull; -import okhttp3.Interceptor; -import okhttp3.Response; - -import java.io.IOException; - -public class ProviderInstallerInterceptor implements Interceptor { - public static Runnable installer = () -> { }; - - @Override - @NonNull - public Response intercept(Chain chain) throws IOException { - installer.run(); - return chain.proceed(chain.request()); - } -} diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java index d0484f2a2..e0c23bdac 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/AntennapodHttpClient.java @@ -32,7 +32,6 @@ import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.X509TrustManager; import de.danoeh.antennapod.core.preferences.UserPreferences; -import de.danoeh.antennapod.core.service.ProviderInstallerInterceptor; import de.danoeh.antennapod.core.service.UserAgentInterceptor; import de.danoeh.antennapod.core.storage.DBWriter; import okhttp3.Cache; @@ -117,7 +116,6 @@ public class AntennapodHttpClient { } return response; }); - builder.interceptors().add(new ProviderInstallerInterceptor()); builder.interceptors().add(new BasicAuthorizationInterceptor()); builder.networkInterceptors().add(new UserAgentInterceptor()); diff --git a/core/src/play/java/de/danoeh/antennapod/core/ClientConfig.java b/core/src/play/java/de/danoeh/antennapod/core/ClientConfig.java index 09d9f4623..7d38aedc2 100644 --- a/core/src/play/java/de/danoeh/antennapod/core/ClientConfig.java +++ b/core/src/play/java/de/danoeh/antennapod/core/ClientConfig.java @@ -12,7 +12,6 @@ import de.danoeh.antennapod.core.preferences.PlaybackPreferences; import de.danoeh.antennapod.core.preferences.SleepTimerPreferences; import de.danoeh.antennapod.core.preferences.UsageStatistics; import de.danoeh.antennapod.core.preferences.UserPreferences; -import de.danoeh.antennapod.core.service.ProviderInstallerInterceptor; import de.danoeh.antennapod.core.service.download.AntennapodHttpClient; import de.danoeh.antennapod.core.storage.PodDBAdapter; import de.danoeh.antennapod.core.util.NetworkUtils; @@ -55,6 +54,7 @@ public class ClientConfig { UserPreferences.init(context); UsageStatistics.init(context); PlaybackPreferences.init(context); + installSslProvider(context); NetworkUtils.init(context); // Don't initialize Cast-related logic unless it is enabled, to avoid the unnecessary // Google Play Service usage. @@ -65,18 +65,6 @@ public class ClientConfig { } else { Log.v(TAG, "Cast is disabled. All Cast-related initialization will be skipped."); } - ProviderInstaller.installIfNeededAsync(context, new ProviderInstaller.ProviderInstallListener() { - @Override - public void onProviderInstalled() { - Log.e(TAG, "onProviderInstalled"); - } - - @Override - public void onProviderInstallFailed(int i, Intent intent) { - Log.e(TAG, "onProviderInstallFailed"); - } - }); - ProviderInstallerInterceptor.installer = () -> installSslProvider(context); AntennapodHttpClient.setCacheDirectory(new File(context.getCacheDir(), "okhttp")); SleepTimerPreferences.init(context); RxJavaErrorHandlerSetup.setupRxJavaErrorHandler(); @@ -84,7 +72,7 @@ public class ClientConfig { initialized = true; } - public static void installSslProvider(Context context) { + private static void installSslProvider(Context context) { try { ProviderInstaller.installIfNeeded(context); } catch (GooglePlayServicesRepairableException e) { -- cgit v1.2.3 From d38c7a442aa9e1b6d69146f2647dba24f56dacf4 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Sun, 30 Aug 2020 09:17:24 +0200 Subject: Added 'special thanks' screen --- app/src/main/assets/special_thanks.csv | 3 + .../preferences/AboutDevelopersFragment.java | 65 ----------- .../fragment/preferences/AboutFragment.java | 56 --------- .../preferences/AboutLicensesFragment.java | 126 --------------------- .../preferences/AboutTranslatorsFragment.java | 64 ----------- .../preferences/MainPreferencesFragment.java | 1 + .../fragment/preferences/about/AboutFragment.java | 51 +++++++++ .../about/ContributorsPagerFragment.java | 95 ++++++++++++++++ .../preferences/about/DevelopersFragment.java | 59 ++++++++++ .../preferences/about/LicensesFragment.java | 126 +++++++++++++++++++++ .../preferences/about/SpecialThanksFragment.java | 58 ++++++++++ .../preferences/about/TranslatorsFragment.java | 58 ++++++++++ app/src/main/res/xml/preferences_about.xml | 11 +- core/src/main/res/values/strings.xml | 5 +- 14 files changed, 457 insertions(+), 321 deletions(-) create mode 100644 app/src/main/assets/special_thanks.csv delete mode 100644 app/src/main/java/de/danoeh/antennapod/fragment/preferences/AboutDevelopersFragment.java delete mode 100644 app/src/main/java/de/danoeh/antennapod/fragment/preferences/AboutFragment.java delete mode 100644 app/src/main/java/de/danoeh/antennapod/fragment/preferences/AboutLicensesFragment.java delete mode 100644 app/src/main/java/de/danoeh/antennapod/fragment/preferences/AboutTranslatorsFragment.java create mode 100644 app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/AboutFragment.java create mode 100644 app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/ContributorsPagerFragment.java create mode 100644 app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/DevelopersFragment.java create mode 100644 app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/LicensesFragment.java create mode 100644 app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/SpecialThanksFragment.java create mode 100644 app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/TranslatorsFragment.java diff --git a/app/src/main/assets/special_thanks.csv b/app/src/main/assets/special_thanks.csv new file mode 100644 index 000000000..348e3208e --- /dev/null +++ b/app/src/main/assets/special_thanks.csv @@ -0,0 +1,3 @@ +221 Pixels;Logo design;https://avatars2.githubusercontent.com/u/58243143?s=60&v=4 +ByteHamster;Forum admin;https://avatars2.githubusercontent.com/u/5811634?s=60&v=4 +Keunes;Communications;https://avatars2.githubusercontent.com/u/11229646?s=60&v=4 diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/AboutDevelopersFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/AboutDevelopersFragment.java deleted file mode 100644 index 62a5eb306..000000000 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/AboutDevelopersFragment.java +++ /dev/null @@ -1,65 +0,0 @@ -package de.danoeh.antennapod.fragment.preferences; - -import android.os.Bundle; -import android.view.View; -import android.widget.Toast; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.ListFragment; -import de.danoeh.antennapod.R; -import de.danoeh.antennapod.activity.PreferenceActivity; -import de.danoeh.antennapod.adapter.SimpleIconListAdapter; -import io.reactivex.Single; -import io.reactivex.SingleOnSubscribe; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; - -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.util.ArrayList; - -public class AboutDevelopersFragment extends ListFragment { - private Disposable developersLoader; - - @Override - public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - getListView().setDivider(null); - getListView().setSelector(android.R.color.transparent); - - developersLoader = Single.create((SingleOnSubscribe>) emitter -> { - ArrayList developers = new ArrayList<>(); - BufferedReader reader = new BufferedReader(new InputStreamReader( - getContext().getAssets().open("developers.csv"))); - String line; - while ((line = reader.readLine()) != null) { - String[] info = line.split(";"); - developers.add(new SimpleIconListAdapter.ListItem(info[0], info[2], - "https://avatars2.githubusercontent.com/u/" + info[1] + "?s=60&v=4")); - } - emitter.onSuccess(developers); - }) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe( - developers -> setListAdapter(new SimpleIconListAdapter<>(getContext(), developers)), - error -> Toast.makeText(getContext(), "Error while loading developers", Toast.LENGTH_LONG).show() - ); - - } - - @Override - public void onStop() { - super.onStop(); - if (developersLoader != null) { - developersLoader.dispose(); - } - } - - @Override - public void onStart() { - super.onStart(); - ((PreferenceActivity) getActivity()).getSupportActionBar().setTitle(R.string.developers); - } -} diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/AboutFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/AboutFragment.java deleted file mode 100644 index 0fa7bd4bb..000000000 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/AboutFragment.java +++ /dev/null @@ -1,56 +0,0 @@ -package de.danoeh.antennapod.fragment.preferences; - -import android.content.ClipData; -import android.content.ClipboardManager; -import android.content.Context; -import android.os.Bundle; -import androidx.preference.PreferenceFragmentCompat; -import com.google.android.material.snackbar.Snackbar; -import de.danoeh.antennapod.BuildConfig; -import de.danoeh.antennapod.R; -import de.danoeh.antennapod.activity.PreferenceActivity; -import de.danoeh.antennapod.core.util.IntentUtils; - -public class AboutFragment extends PreferenceFragmentCompat { - - @Override - public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { - addPreferencesFromResource(R.xml.preferences_about); - - findPreference("about_version").setSummary(String.format( - "%s (%s)", BuildConfig.VERSION_NAME, BuildConfig.COMMIT_HASH)); - findPreference("about_version").setOnPreferenceClickListener((preference) -> { - ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE); - ClipData clip = ClipData.newPlainText(getString(R.string.bug_report_title), - findPreference("about_version").getSummary()); - clipboard.setPrimaryClip(clip); - Snackbar.make(getView(), R.string.copied_to_clipboard, Snackbar.LENGTH_SHORT).show(); - return true; - }); - findPreference("about_developers").setOnPreferenceClickListener((preference) -> { - getFragmentManager().beginTransaction().replace(R.id.content, new AboutDevelopersFragment()) - .addToBackStack(getString(R.string.developers)).commit(); - return true; - }); - findPreference("about_translators").setOnPreferenceClickListener((preference) -> { - getFragmentManager().beginTransaction().replace(R.id.content, new AboutTranslatorsFragment()) - .addToBackStack(getString(R.string.translators)).commit(); - return true; - }); - findPreference("about_privacy_policy").setOnPreferenceClickListener((preference) -> { - IntentUtils.openInBrowser(getContext(), "https://antennapod.org/privacy.html"); - return true; - }); - findPreference("about_licenses").setOnPreferenceClickListener((preference) -> { - getFragmentManager().beginTransaction().replace(R.id.content, new AboutLicensesFragment()) - .addToBackStack(getString(R.string.translators)).commit(); - return true; - }); - } - - @Override - public void onStart() { - super.onStart(); - ((PreferenceActivity) getActivity()).getSupportActionBar().setTitle(R.string.about_pref); - } -} diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/AboutLicensesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/AboutLicensesFragment.java deleted file mode 100644 index 536d11e01..000000000 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/AboutLicensesFragment.java +++ /dev/null @@ -1,126 +0,0 @@ -package de.danoeh.antennapod.fragment.preferences; - -import android.os.Bundle; -import android.view.View; -import android.widget.ListView; -import android.widget.Toast; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AlertDialog; -import androidx.fragment.app.ListFragment; -import de.danoeh.antennapod.R; -import de.danoeh.antennapod.activity.PreferenceActivity; -import de.danoeh.antennapod.adapter.SimpleIconListAdapter; -import de.danoeh.antennapod.core.util.IntentUtils; -import io.reactivex.Single; -import io.reactivex.SingleOnSubscribe; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.NodeList; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.ArrayList; - -public class AboutLicensesFragment extends ListFragment { - private Disposable licensesLoader; - private final ArrayList licenses = new ArrayList<>(); - - @Override - public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - getListView().setDivider(null); - - licensesLoader = Single.create((SingleOnSubscribe>) emitter -> { - licenses.clear(); - InputStream stream = getContext().getAssets().open("licenses.xml"); - DocumentBuilder docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); - NodeList libraryList = docBuilder.parse(stream).getElementsByTagName("library"); - for (int i = 0; i < libraryList.getLength(); i++) { - NamedNodeMap lib = libraryList.item(i).getAttributes(); - licenses.add(new LicenseItem( - lib.getNamedItem("name").getTextContent(), - String.format("By %s, %s license", - lib.getNamedItem("author").getTextContent(), - lib.getNamedItem("license").getTextContent()), - null, - lib.getNamedItem("website").getTextContent(), - lib.getNamedItem("licenseText").getTextContent())); - } - emitter.onSuccess(licenses); - }) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe( - developers -> setListAdapter(new SimpleIconListAdapter(getContext(), developers)), - error -> Toast.makeText(getContext(), "Error while loading licenses", Toast.LENGTH_LONG).show() - ); - - } - - private static class LicenseItem extends SimpleIconListAdapter.ListItem { - final String licenseUrl; - final String licenseTextFile; - - LicenseItem(String title, String subtitle, String imageUrl, String licenseUrl, String licenseTextFile) { - super(title, subtitle, imageUrl); - this.licenseUrl = licenseUrl; - this.licenseTextFile = licenseTextFile; - } - } - - @Override - public void onListItemClick(@NonNull ListView l, @NonNull View v, int position, long id) { - super.onListItemClick(l, v, position, id); - - LicenseItem item = licenses.get(position); - CharSequence[] items = {"View website", "View license"}; - new AlertDialog.Builder(getContext()) - .setTitle(item.title) - .setItems(items, (dialog, which) -> { - if (which == 0) { - IntentUtils.openInBrowser(getContext(), item.licenseUrl); - } else if (which == 1) { - showLicenseText(item.licenseTextFile); - } - }).show(); - } - - private void showLicenseText(String licenseTextFile) { - try { - BufferedReader reader = new BufferedReader(new InputStreamReader( - getContext().getAssets().open(licenseTextFile))); - StringBuilder licenseText = new StringBuilder(); - String line; - while ((line = reader.readLine()) != null) { - licenseText.append(line).append("\n"); - } - - new AlertDialog.Builder(getContext()) - .setMessage(licenseText) - .show(); - } catch (IOException e) { - e.printStackTrace(); - } - } - - @Override - public void onStop() { - super.onStop(); - if (licensesLoader != null) { - licensesLoader.dispose(); - } - } - - @Override - public void onStart() { - super.onStart(); - ((PreferenceActivity) getActivity()).getSupportActionBar().setTitle(R.string.licenses); - } -} diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/AboutTranslatorsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/AboutTranslatorsFragment.java deleted file mode 100644 index 914dbb9a2..000000000 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/AboutTranslatorsFragment.java +++ /dev/null @@ -1,64 +0,0 @@ -package de.danoeh.antennapod.fragment.preferences; - -import android.os.Bundle; -import android.view.View; -import android.widget.Toast; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.ListFragment; -import de.danoeh.antennapod.R; -import de.danoeh.antennapod.activity.PreferenceActivity; -import de.danoeh.antennapod.adapter.SimpleIconListAdapter; -import io.reactivex.Single; -import io.reactivex.SingleOnSubscribe; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; -import io.reactivex.schedulers.Schedulers; - -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.util.ArrayList; - -public class AboutTranslatorsFragment extends ListFragment { - private Disposable translatorsLoader; - - @Override - public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - getListView().setDivider(null); - getListView().setSelector(android.R.color.transparent); - - translatorsLoader = Single.create((SingleOnSubscribe>) emitter -> { - ArrayList translators = new ArrayList<>(); - BufferedReader reader = new BufferedReader(new InputStreamReader( - getContext().getAssets().open("translators.csv"))); - String line; - while ((line = reader.readLine()) != null) { - String[] info = line.split(";"); - translators.add(new SimpleIconListAdapter.ListItem(info[0], info[1], null)); - } - emitter.onSuccess(translators); - }) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe( - translators -> setListAdapter(new SimpleIconListAdapter<>(getContext(), translators)), - error -> Toast.makeText(getContext(), "Error while loading translators", Toast.LENGTH_LONG).show() - ); - - } - - @Override - public void onStop() { - super.onStop(); - if (translatorsLoader != null) { - translatorsLoader.dispose(); - } - } - - @Override - public void onStart() { - super.onStart(); - ((PreferenceActivity) getActivity()).getSupportActionBar().setTitle(R.string.translators); - } -} diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/MainPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/MainPreferencesFragment.java index 406585808..05ea521a9 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/MainPreferencesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/MainPreferencesFragment.java @@ -10,6 +10,7 @@ import de.danoeh.antennapod.R; import de.danoeh.antennapod.activity.BugReportActivity; import de.danoeh.antennapod.activity.PreferenceActivity; import de.danoeh.antennapod.core.util.IntentUtils; +import de.danoeh.antennapod.fragment.preferences.about.AboutFragment; public class MainPreferencesFragment extends PreferenceFragmentCompat { private static final String TAG = "MainPreferencesFragment"; diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/AboutFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/AboutFragment.java new file mode 100644 index 000000000..b440d053b --- /dev/null +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/AboutFragment.java @@ -0,0 +1,51 @@ +package de.danoeh.antennapod.fragment.preferences.about; + +import android.content.ClipData; +import android.content.ClipboardManager; +import android.content.Context; +import android.os.Bundle; +import androidx.preference.PreferenceFragmentCompat; +import com.google.android.material.snackbar.Snackbar; +import de.danoeh.antennapod.BuildConfig; +import de.danoeh.antennapod.R; +import de.danoeh.antennapod.activity.PreferenceActivity; +import de.danoeh.antennapod.core.util.IntentUtils; + +public class AboutFragment extends PreferenceFragmentCompat { + + @Override + public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { + addPreferencesFromResource(R.xml.preferences_about); + + findPreference("about_version").setSummary(String.format( + "%s (%s)", BuildConfig.VERSION_NAME, BuildConfig.COMMIT_HASH)); + findPreference("about_version").setOnPreferenceClickListener((preference) -> { + ClipboardManager clipboard = (ClipboardManager) getContext().getSystemService(Context.CLIPBOARD_SERVICE); + ClipData clip = ClipData.newPlainText(getString(R.string.bug_report_title), + findPreference("about_version").getSummary()); + clipboard.setPrimaryClip(clip); + Snackbar.make(getView(), R.string.copied_to_clipboard, Snackbar.LENGTH_SHORT).show(); + return true; + }); + findPreference("about_contributors").setOnPreferenceClickListener((preference) -> { + getParentFragmentManager().beginTransaction().replace(R.id.content, new ContributorsPagerFragment()) + .addToBackStack(getString(R.string.contributors)).commit(); + return true; + }); + findPreference("about_privacy_policy").setOnPreferenceClickListener((preference) -> { + IntentUtils.openInBrowser(getContext(), "https://antennapod.org/privacy.html"); + return true; + }); + findPreference("about_licenses").setOnPreferenceClickListener((preference) -> { + getParentFragmentManager().beginTransaction().replace(R.id.content, new LicensesFragment()) + .addToBackStack(getString(R.string.translators)).commit(); + return true; + }); + } + + @Override + public void onStart() { + super.onStart(); + ((PreferenceActivity) getActivity()).getSupportActionBar().setTitle(R.string.about_pref); + } +} diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/ContributorsPagerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/ContributorsPagerFragment.java new file mode 100644 index 000000000..20cef1313 --- /dev/null +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/ContributorsPagerFragment.java @@ -0,0 +1,95 @@ +package de.danoeh.antennapod.fragment.preferences.about; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.viewpager2.adapter.FragmentStateAdapter; +import androidx.viewpager2.widget.ViewPager2; +import com.google.android.material.tabs.TabLayout; +import com.google.android.material.tabs.TabLayoutMediator; +import de.danoeh.antennapod.R; +import de.danoeh.antennapod.activity.PreferenceActivity; + +/** + * Displays the 'about->Contributors' pager screen. + */ +public class ContributorsPagerFragment extends Fragment { + + public static final String TAG = "StatisticsFragment"; + + private static final int POS_DEVELOPERS = 0; + private static final int POS_TRANSLATORS = 1; + private static final int POS_SPECIAL_THANKS = 2; + private static final int TOTAL_COUNT = 3; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } + + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + super.onCreateView(inflater, container, savedInstanceState); + setHasOptionsMenu(true); + + View rootView = inflater.inflate(R.layout.pager_fragment, container, false); + ViewPager2 viewPager = rootView.findViewById(R.id.viewpager); + viewPager.setAdapter(new StatisticsPagerAdapter(this)); + // Give the TabLayout the ViewPager + TabLayout tabLayout = rootView.findViewById(R.id.sliding_tabs); + new TabLayoutMediator(tabLayout, viewPager, (tab, position) -> { + switch (position) { + case POS_DEVELOPERS: + tab.setText(R.string.developers); + break; + case POS_TRANSLATORS: + tab.setText(R.string.translators); + break; + case POS_SPECIAL_THANKS: + tab.setText(R.string.special_thanks); + break; + default: + break; + } + }).attach(); + + rootView.findViewById(R.id.toolbar).setVisibility(View.GONE); + + return rootView; + } + + @Override + public void onStart() { + super.onStart(); + ((PreferenceActivity) getActivity()).getSupportActionBar().setTitle(R.string.contributors); + } + + public static class StatisticsPagerAdapter extends FragmentStateAdapter { + + StatisticsPagerAdapter(@NonNull Fragment fragment) { + super(fragment); + } + + @NonNull + @Override + public Fragment createFragment(int position) { + switch (position) { + case POS_TRANSLATORS: + return new TranslatorsFragment(); + case POS_SPECIAL_THANKS: + return new SpecialThanksFragment(); + default: + case POS_DEVELOPERS: + return new DevelopersFragment(); + } + } + + @Override + public int getItemCount() { + return TOTAL_COUNT; + } + } +} diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/DevelopersFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/DevelopersFragment.java new file mode 100644 index 000000000..60d9f95dd --- /dev/null +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/DevelopersFragment.java @@ -0,0 +1,59 @@ +package de.danoeh.antennapod.fragment.preferences.about; + +import android.os.Bundle; +import android.view.View; +import android.widget.Toast; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.ListFragment; +import de.danoeh.antennapod.R; +import de.danoeh.antennapod.activity.PreferenceActivity; +import de.danoeh.antennapod.adapter.SimpleIconListAdapter; +import io.reactivex.Single; +import io.reactivex.SingleOnSubscribe; +import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.disposables.Disposable; +import io.reactivex.schedulers.Schedulers; + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.util.ArrayList; + +public class DevelopersFragment extends ListFragment { + private Disposable developersLoader; + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + getListView().setDivider(null); + getListView().setSelector(android.R.color.transparent); + + developersLoader = Single.create((SingleOnSubscribe>) emitter -> { + ArrayList developers = new ArrayList<>(); + BufferedReader reader = new BufferedReader(new InputStreamReader( + getContext().getAssets().open("developers.csv"))); + String line; + while ((line = reader.readLine()) != null) { + String[] info = line.split(";"); + developers.add(new SimpleIconListAdapter.ListItem(info[0], info[2], + "https://avatars2.githubusercontent.com/u/" + info[1] + "?s=60&v=4")); + } + emitter.onSuccess(developers); + }) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe( + developers -> setListAdapter(new SimpleIconListAdapter<>(getContext(), developers)), + error -> Toast.makeText(getContext(), error.getMessage(), Toast.LENGTH_LONG).show() + ); + + } + + @Override + public void onStop() { + super.onStop(); + if (developersLoader != null) { + developersLoader.dispose(); + } + } +} diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/LicensesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/LicensesFragment.java new file mode 100644 index 000000000..97565a613 --- /dev/null +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/LicensesFragment.java @@ -0,0 +1,126 @@ +package de.danoeh.antennapod.fragment.preferences.about; + +import android.os.Bundle; +import android.view.View; +import android.widget.ListView; +import android.widget.Toast; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.fragment.app.ListFragment; +import de.danoeh.antennapod.R; +import de.danoeh.antennapod.activity.PreferenceActivity; +import de.danoeh.antennapod.adapter.SimpleIconListAdapter; +import de.danoeh.antennapod.core.util.IntentUtils; +import io.reactivex.Single; +import io.reactivex.SingleOnSubscribe; +import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.disposables.Disposable; +import io.reactivex.schedulers.Schedulers; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.NodeList; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.ArrayList; + +public class LicensesFragment extends ListFragment { + private Disposable licensesLoader; + private final ArrayList licenses = new ArrayList<>(); + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + getListView().setDivider(null); + + licensesLoader = Single.create((SingleOnSubscribe>) emitter -> { + licenses.clear(); + InputStream stream = getContext().getAssets().open("licenses.xml"); + DocumentBuilder docBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); + NodeList libraryList = docBuilder.parse(stream).getElementsByTagName("library"); + for (int i = 0; i < libraryList.getLength(); i++) { + NamedNodeMap lib = libraryList.item(i).getAttributes(); + licenses.add(new LicenseItem( + lib.getNamedItem("name").getTextContent(), + String.format("By %s, %s license", + lib.getNamedItem("author").getTextContent(), + lib.getNamedItem("license").getTextContent()), + null, + lib.getNamedItem("website").getTextContent(), + lib.getNamedItem("licenseText").getTextContent())); + } + emitter.onSuccess(licenses); + }) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe( + developers -> setListAdapter(new SimpleIconListAdapter(getContext(), developers)), + error -> Toast.makeText(getContext(), error.getMessage(), Toast.LENGTH_LONG).show() + ); + + } + + private static class LicenseItem extends SimpleIconListAdapter.ListItem { + final String licenseUrl; + final String licenseTextFile; + + LicenseItem(String title, String subtitle, String imageUrl, String licenseUrl, String licenseTextFile) { + super(title, subtitle, imageUrl); + this.licenseUrl = licenseUrl; + this.licenseTextFile = licenseTextFile; + } + } + + @Override + public void onListItemClick(@NonNull ListView l, @NonNull View v, int position, long id) { + super.onListItemClick(l, v, position, id); + + LicenseItem item = licenses.get(position); + CharSequence[] items = {"View website", "View license"}; + new AlertDialog.Builder(getContext()) + .setTitle(item.title) + .setItems(items, (dialog, which) -> { + if (which == 0) { + IntentUtils.openInBrowser(getContext(), item.licenseUrl); + } else if (which == 1) { + showLicenseText(item.licenseTextFile); + } + }).show(); + } + + private void showLicenseText(String licenseTextFile) { + try { + BufferedReader reader = new BufferedReader(new InputStreamReader( + getContext().getAssets().open(licenseTextFile))); + StringBuilder licenseText = new StringBuilder(); + String line; + while ((line = reader.readLine()) != null) { + licenseText.append(line).append("\n"); + } + + new AlertDialog.Builder(getContext()) + .setMessage(licenseText) + .show(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void onStop() { + super.onStop(); + if (licensesLoader != null) { + licensesLoader.dispose(); + } + } + + @Override + public void onStart() { + super.onStart(); + ((PreferenceActivity) getActivity()).getSupportActionBar().setTitle(R.string.licenses); + } +} diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/SpecialThanksFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/SpecialThanksFragment.java new file mode 100644 index 000000000..6db1389ea --- /dev/null +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/SpecialThanksFragment.java @@ -0,0 +1,58 @@ +package de.danoeh.antennapod.fragment.preferences.about; + +import android.os.Bundle; +import android.view.View; +import android.widget.Toast; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.ListFragment; +import de.danoeh.antennapod.R; +import de.danoeh.antennapod.activity.PreferenceActivity; +import de.danoeh.antennapod.adapter.SimpleIconListAdapter; +import io.reactivex.Single; +import io.reactivex.SingleOnSubscribe; +import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.disposables.Disposable; +import io.reactivex.schedulers.Schedulers; + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.util.ArrayList; + +public class SpecialThanksFragment extends ListFragment { + private Disposable translatorsLoader; + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + getListView().setDivider(null); + getListView().setSelector(android.R.color.transparent); + + translatorsLoader = Single.create((SingleOnSubscribe>) emitter -> { + ArrayList translators = new ArrayList<>(); + BufferedReader reader = new BufferedReader(new InputStreamReader( + getContext().getAssets().open("special_thanks.csv"))); + String line; + while ((line = reader.readLine()) != null) { + String[] info = line.split(";"); + translators.add(new SimpleIconListAdapter.ListItem(info[0], info[1], info[2])); + } + emitter.onSuccess(translators); + }) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe( + translators -> setListAdapter(new SimpleIconListAdapter<>(getContext(), translators)), + error -> Toast.makeText(getContext(), error.getMessage(), Toast.LENGTH_LONG).show() + ); + + } + + @Override + public void onStop() { + super.onStop(); + if (translatorsLoader != null) { + translatorsLoader.dispose(); + } + } +} diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/TranslatorsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/TranslatorsFragment.java new file mode 100644 index 000000000..e8d8e113b --- /dev/null +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/TranslatorsFragment.java @@ -0,0 +1,58 @@ +package de.danoeh.antennapod.fragment.preferences.about; + +import android.os.Bundle; +import android.view.View; +import android.widget.Toast; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.ListFragment; +import de.danoeh.antennapod.R; +import de.danoeh.antennapod.activity.PreferenceActivity; +import de.danoeh.antennapod.adapter.SimpleIconListAdapter; +import io.reactivex.Single; +import io.reactivex.SingleOnSubscribe; +import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.disposables.Disposable; +import io.reactivex.schedulers.Schedulers; + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.util.ArrayList; + +public class TranslatorsFragment extends ListFragment { + private Disposable translatorsLoader; + + @Override + public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + getListView().setDivider(null); + getListView().setSelector(android.R.color.transparent); + + translatorsLoader = Single.create((SingleOnSubscribe>) emitter -> { + ArrayList translators = new ArrayList<>(); + BufferedReader reader = new BufferedReader(new InputStreamReader( + getContext().getAssets().open("translators.csv"))); + String line; + while ((line = reader.readLine()) != null) { + String[] info = line.split(";"); + translators.add(new SimpleIconListAdapter.ListItem(info[0], info[1], null)); + } + emitter.onSuccess(translators); + }) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe( + translators -> setListAdapter(new SimpleIconListAdapter<>(getContext(), translators)), + error -> Toast.makeText(getContext(), error.getMessage(), Toast.LENGTH_LONG).show() + ); + + } + + @Override + public void onStop() { + super.onStop(); + if (translatorsLoader != null) { + translatorsLoader.dispose(); + } + } +} diff --git a/app/src/main/res/xml/preferences_about.xml b/app/src/main/res/xml/preferences_about.xml index 9b8d744e1..475a1152f 100644 --- a/app/src/main/res/xml/preferences_about.xml +++ b/app/src/main/res/xml/preferences_about.xml @@ -10,15 +10,10 @@ android:icon="?attr/ic_unfav" android:summary="1.7.2 (asd8qs)"/> - + android:summary="@string/contributors_summary" + android:title="@string/contributors"/> About AntennaPod version + Contributors + Everyone can help to make AntennaPod better - with code, translations or by helping users in our forum Developers - Everyone can help to make AntennaPod better Translators - Translations are created by users of AntennaPod using Transifex + Special thanks Privacy policy Licenses AntennaPod uses other great software -- cgit v1.2.3 From 3671188b0f9d29f25729c4f189290fc289f60f10 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Sun, 20 Sep 2020 08:52:25 +0200 Subject: Fixed crash (fromCallable rethrows instead of calling onError) --- .../antennapod/fragment/ItemDescriptionFragment.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java index ed8697adb..fc3052e20 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java @@ -11,6 +11,7 @@ import android.view.ViewGroup; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import de.danoeh.antennapod.R; +import de.danoeh.antennapod.core.util.playback.Playable; import de.danoeh.antennapod.core.util.playback.PlaybackController; import de.danoeh.antennapod.core.util.playback.Timeline; import de.danoeh.antennapod.view.ShownotesWebView; @@ -82,8 +83,10 @@ public class ItemDescriptionFragment extends Fragment { if (webViewLoader != null) { webViewLoader.dispose(); } - webViewLoader = Maybe.fromCallable(this::loadData) - .subscribeOn(Schedulers.io()) + webViewLoader = Maybe.create(emitter -> { + Timeline timeline = new Timeline(getActivity(), controller.getMedia()); + emitter.onSuccess(timeline.processShownotes()); + }).subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(data -> { webvDescription.loadDataWithBaseURL("https://127.0.0.1", data, "text/html", @@ -92,15 +95,6 @@ public class ItemDescriptionFragment extends Fragment { }, error -> Log.e(TAG, Log.getStackTraceString(error))); } - @Nullable - private String loadData() { - if (controller == null || controller.getMedia() == null) { - return null; - } - Timeline timeline = new Timeline(getActivity(), controller.getMedia()); - return timeline.processShownotes(); - } - @Override public void onPause() { super.onPause(); -- cgit v1.2.3 From 43d36c7560eb018a2e450466d75c1dbbf136a961 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Sun, 20 Sep 2020 11:52:09 +0200 Subject: Fixed crash when item has no feed Apparently, there are ways to end up with items that have no feed. This hotfix prevents the app from crashing but it does not solve the reason for items without feeds. --- core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java b/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java index c30f46315..7330a6c80 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java +++ b/core/src/main/java/de/danoeh/antennapod/core/storage/DBReader.java @@ -154,6 +154,7 @@ public final class DBReader { Feed feed = feedIndex.get(item.getFeedId()); if (feed == null) { Log.w(TAG, "No match found for item with ID " + item.getId() + ". Feed ID was " + item.getFeedId()); + feed = new Feed("", "", "Error: Item without feed"); } item.setFeed(feed); } -- cgit v1.2.3 From cab277bb856a893bfa4e41c69efafd4e3ee912da Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Sun, 20 Sep 2020 22:45:23 +0200 Subject: New app icon --- .../play/listings/en-US/graphics/icon/icon.png | Bin 25302 -> 211969 bytes .../debug/res/mipmap-anydpi-v26/ic_launcher.xml | 5 ----- .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 5 ----- core/src/debug/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 8724 bytes .../res/mipmap-hdpi/ic_launcher_foreground.png | Bin 0 -> 20491 bytes .../debug/res/mipmap-hdpi/ic_launcher_round.png | Bin 0 -> 8724 bytes core/src/debug/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 4821 bytes .../res/mipmap-mdpi/ic_launcher_foreground.png | Bin 0 -> 9963 bytes .../debug/res/mipmap-mdpi/ic_launcher_round.png | Bin 0 -> 4821 bytes core/src/debug/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 13548 bytes .../res/mipmap-xhdpi/ic_launcher_foreground.png | Bin 0 -> 34069 bytes .../debug/res/mipmap-xhdpi/ic_launcher_round.png | Bin 0 -> 13548 bytes core/src/debug/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 25054 bytes .../res/mipmap-xxhdpi/ic_launcher_foreground.png | Bin 0 -> 75392 bytes .../debug/res/mipmap-xxhdpi/ic_launcher_round.png | Bin 0 -> 25054 bytes core/src/debug/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 38151 bytes .../res/mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 0 -> 117617 bytes .../debug/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 0 -> 38151 bytes .../src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 2 +- .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 2 +- core/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 4628 -> 8596 bytes .../res/mipmap-hdpi/ic_launcher_background.png | Bin 0 -> 7069 bytes .../res/mipmap-hdpi/ic_launcher_foreground.png | Bin 4876 -> 20308 bytes .../src/main/res/mipmap-hdpi/ic_launcher_round.png | Bin 4628 -> 8596 bytes core/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 2752 -> 4783 bytes .../res/mipmap-mdpi/ic_launcher_background.png | Bin 0 -> 3120 bytes .../res/mipmap-mdpi/ic_launcher_foreground.png | Bin 2884 -> 10041 bytes .../src/main/res/mipmap-mdpi/ic_launcher_round.png | Bin 2752 -> 4783 bytes core/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 6709 -> 13307 bytes .../res/mipmap-xhdpi/ic_launcher_background.png | Bin 0 -> 13262 bytes .../res/mipmap-xhdpi/ic_launcher_foreground.png | Bin 6980 -> 34640 bytes .../main/res/mipmap-xhdpi/ic_launcher_round.png | Bin 6709 -> 13307 bytes core/src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 10809 -> 24321 bytes .../res/mipmap-xxhdpi/ic_launcher_background.png | Bin 0 -> 35451 bytes .../res/mipmap-xxhdpi/ic_launcher_foreground.png | Bin 12641 -> 74736 bytes .../main/res/mipmap-xxhdpi/ic_launcher_round.png | Bin 10809 -> 24321 bytes core/src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 15604 -> 37255 bytes .../res/mipmap-xxxhdpi/ic_launcher_background.png | Bin 0 -> 64580 bytes .../res/mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 19600 -> 120501 bytes .../main/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 15604 -> 37255 bytes ic_launcher-web.png | Bin 53849 -> 0 bytes 41 files changed, 2 insertions(+), 12 deletions(-) delete mode 100644 core/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml delete mode 100644 core/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 core/src/debug/res/mipmap-hdpi/ic_launcher.png create mode 100644 core/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png create mode 100644 core/src/debug/res/mipmap-hdpi/ic_launcher_round.png create mode 100644 core/src/debug/res/mipmap-mdpi/ic_launcher.png create mode 100644 core/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png create mode 100644 core/src/debug/res/mipmap-mdpi/ic_launcher_round.png create mode 100644 core/src/debug/res/mipmap-xhdpi/ic_launcher.png create mode 100644 core/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png create mode 100644 core/src/debug/res/mipmap-xhdpi/ic_launcher_round.png create mode 100644 core/src/debug/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 core/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png create mode 100644 core/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png create mode 100644 core/src/debug/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 core/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png create mode 100644 core/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png create mode 100644 core/src/main/res/mipmap-hdpi/ic_launcher_background.png create mode 100644 core/src/main/res/mipmap-mdpi/ic_launcher_background.png create mode 100644 core/src/main/res/mipmap-xhdpi/ic_launcher_background.png create mode 100644 core/src/main/res/mipmap-xxhdpi/ic_launcher_background.png create mode 100644 core/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png delete mode 100644 ic_launcher-web.png diff --git a/app/src/main/play/listings/en-US/graphics/icon/icon.png b/app/src/main/play/listings/en-US/graphics/icon/icon.png index 824346d21..bab31c2dd 100644 Binary files a/app/src/main/play/listings/en-US/graphics/icon/icon.png and b/app/src/main/play/listings/en-US/graphics/icon/icon.png differ diff --git a/core/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml b/core/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index 74ad49784..000000000 --- a/core/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/core/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml b/core/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 74ad49784..000000000 --- a/core/src/debug/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/core/src/debug/res/mipmap-hdpi/ic_launcher.png b/core/src/debug/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..6f8022e25 Binary files /dev/null and b/core/src/debug/res/mipmap-hdpi/ic_launcher.png differ diff --git a/core/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png b/core/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..d2a3c3206 Binary files /dev/null and b/core/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/core/src/debug/res/mipmap-hdpi/ic_launcher_round.png b/core/src/debug/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 000000000..6f8022e25 Binary files /dev/null and b/core/src/debug/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/core/src/debug/res/mipmap-mdpi/ic_launcher.png b/core/src/debug/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..d542d555f Binary files /dev/null and b/core/src/debug/res/mipmap-mdpi/ic_launcher.png differ diff --git a/core/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png b/core/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..69c0a3433 Binary files /dev/null and b/core/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/core/src/debug/res/mipmap-mdpi/ic_launcher_round.png b/core/src/debug/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 000000000..d542d555f Binary files /dev/null and b/core/src/debug/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/core/src/debug/res/mipmap-xhdpi/ic_launcher.png b/core/src/debug/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..a02ec4ca8 Binary files /dev/null and b/core/src/debug/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/core/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png b/core/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..5653dad7c Binary files /dev/null and b/core/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/core/src/debug/res/mipmap-xhdpi/ic_launcher_round.png b/core/src/debug/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 000000000..a02ec4ca8 Binary files /dev/null and b/core/src/debug/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/core/src/debug/res/mipmap-xxhdpi/ic_launcher.png b/core/src/debug/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..066f9e5a5 Binary files /dev/null and b/core/src/debug/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/core/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png b/core/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..cd30be7a5 Binary files /dev/null and b/core/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/core/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png b/core/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..066f9e5a5 Binary files /dev/null and b/core/src/debug/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/core/src/debug/res/mipmap-xxxhdpi/ic_launcher.png b/core/src/debug/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..7dbab284c Binary files /dev/null and b/core/src/debug/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/core/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/core/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..fe1e7df8f Binary files /dev/null and b/core/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/core/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png b/core/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..7dbab284c Binary files /dev/null and b/core/src/debug/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/core/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/core/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 036d09bc5..4ae7d1237 100644 --- a/core/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/core/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/core/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/core/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 036d09bc5..4ae7d1237 100644 --- a/core/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/core/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,5 @@ - + \ 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 index 12e9b3395..9c922ce1c 100644 Binary files a/core/src/main/res/mipmap-hdpi/ic_launcher.png and b/core/src/main/res/mipmap-hdpi/ic_launcher.png 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 new file mode 100644 index 000000000..92b669f3e Binary files /dev/null and b/core/src/main/res/mipmap-hdpi/ic_launcher_background.png 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 index d687f94bb..b487de37d 100644 Binary files a/core/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/core/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/core/src/main/res/mipmap-hdpi/ic_launcher_round.png b/core/src/main/res/mipmap-hdpi/ic_launcher_round.png index 12e9b3395..9c922ce1c 100644 Binary files a/core/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/core/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/core/src/main/res/mipmap-mdpi/ic_launcher.png b/core/src/main/res/mipmap-mdpi/ic_launcher.png index 1da13d374..ef741cee7 100644 Binary files a/core/src/main/res/mipmap-mdpi/ic_launcher.png and b/core/src/main/res/mipmap-mdpi/ic_launcher.png 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 new file mode 100644 index 000000000..7f16ee8ba Binary files /dev/null and b/core/src/main/res/mipmap-mdpi/ic_launcher_background.png 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 index 2e7a4b74d..4003de0ea 100644 Binary files a/core/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/core/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/core/src/main/res/mipmap-mdpi/ic_launcher_round.png b/core/src/main/res/mipmap-mdpi/ic_launcher_round.png index 1da13d374..ef741cee7 100644 Binary files a/core/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/core/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/core/src/main/res/mipmap-xhdpi/ic_launcher.png b/core/src/main/res/mipmap-xhdpi/ic_launcher.png index 32b022ada..b05c50d44 100644 Binary files a/core/src/main/res/mipmap-xhdpi/ic_launcher.png and b/core/src/main/res/mipmap-xhdpi/ic_launcher.png 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 new file mode 100644 index 000000000..170e2f72e Binary files /dev/null and b/core/src/main/res/mipmap-xhdpi/ic_launcher_background.png 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 index 5f90a1d11..0cd7ee47a 100644 Binary files a/core/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/core/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/core/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/core/src/main/res/mipmap-xhdpi/ic_launcher_round.png index 32b022ada..b05c50d44 100644 Binary files a/core/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/core/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/core/src/main/res/mipmap-xxhdpi/ic_launcher.png b/core/src/main/res/mipmap-xxhdpi/ic_launcher.png index 321600e15..9d0116d26 100644 Binary files a/core/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/core/src/main/res/mipmap-xxhdpi/ic_launcher.png 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 new file mode 100644 index 000000000..adf055c06 Binary files /dev/null and b/core/src/main/res/mipmap-xxhdpi/ic_launcher_background.png 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 index d72ffedbb..fb39d3c71 100644 Binary files a/core/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/core/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/core/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/core/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index 321600e15..9d0116d26 100644 Binary files a/core/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/core/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/core/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/core/src/main/res/mipmap-xxxhdpi/ic_launcher.png index ff2870dca..3c61e7dfc 100644 Binary files a/core/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/core/src/main/res/mipmap-xxxhdpi/ic_launcher.png 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 new file mode 100644 index 000000000..f0be130f2 Binary files /dev/null and b/core/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png 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 index 0af16fadf..c3fd1eb5a 100644 Binary files a/core/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/core/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/core/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/core/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index ff2870dca..3c61e7dfc 100644 Binary files a/core/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/core/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/ic_launcher-web.png b/ic_launcher-web.png deleted file mode 100644 index 3868fc03b..000000000 Binary files a/ic_launcher-web.png and /dev/null differ -- cgit v1.2.3 From eb3993f776da330741ef9ef6522a5b20bd45f20b Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Sun, 20 Sep 2020 23:13:28 +0200 Subject: New notification icon --- app/src/main/AndroidManifest.xml | 2 +- app/src/main/res/layout/feeditemlist_header.xml | 2 +- app/src/main/res/layout/gpodnet_podcast_listitem.xml | 2 +- app/src/main/res/layout/itunes_podcast_listitem.xml | 2 +- app/src/main/res/layout/onlinefeedview_activity.xml | 2 +- app/src/main/res/layout/searchlist_item.xml | 2 +- app/src/main/res/layout/statistics_listitem.xml | 2 +- .../playback/PlaybackServiceNotificationBuilder.java | 4 ++-- core/src/main/res/drawable-hdpi/ic_notification.png | Bin 0 -> 1016 bytes core/src/main/res/drawable-mdpi/ic_notification.png | Bin 0 -> 618 bytes core/src/main/res/drawable-xhdpi/ic_notification.png | Bin 0 -> 1441 bytes core/src/main/res/drawable-xxhdpi/ic_notification.png | Bin 0 -> 2390 bytes core/src/main/res/drawable-xxxhdpi/ic_notification.png | Bin 0 -> 3121 bytes core/src/main/res/drawable/ic_antenna.xml | 6 ------ .../res/drawable/notification_default_large_icon.xml | 15 --------------- core/src/main/res/layout/player_widget.xml | 2 +- 16 files changed, 10 insertions(+), 31 deletions(-) create mode 100644 core/src/main/res/drawable-hdpi/ic_notification.png create mode 100644 core/src/main/res/drawable-mdpi/ic_notification.png create mode 100644 core/src/main/res/drawable-xhdpi/ic_notification.png create mode 100644 core/src/main/res/drawable-xxhdpi/ic_notification.png create mode 100644 core/src/main/res/drawable-xxxhdpi/ic_notification.png delete mode 100644 core/src/main/res/drawable/ic_antenna.xml delete mode 100644 core/src/main/res/drawable/notification_default_large_icon.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b87c8d224..1f730b8a9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -42,7 +42,7 @@ + android:resource="@drawable/ic_notification"/> diff --git a/app/src/main/res/layout/feeditemlist_header.xml b/app/src/main/res/layout/feeditemlist_header.xml index e74aeac0a..f8912b93e 100644 --- a/app/src/main/res/layout/feeditemlist_header.xml +++ b/app/src/main/res/layout/feeditemlist_header.xml @@ -22,7 +22,7 @@ android:layout_marginRight="16dp" android:layout_marginEnd="16dp" android:importantForAccessibility="no" - tools:src="@drawable/ic_antenna" + tools:src="@tools:sample/avatars" tools:background="@android:color/holo_green_dark"/> diff --git a/app/src/main/res/layout/itunes_podcast_listitem.xml b/app/src/main/res/layout/itunes_podcast_listitem.xml index dcf2face6..fe53e1944 100644 --- a/app/src/main/res/layout/itunes_podcast_listitem.xml +++ b/app/src/main/res/layout/itunes_podcast_listitem.xml @@ -23,7 +23,7 @@ android:cropToPadding="true" android:scaleType="fitXY" tools:background="@android:color/holo_green_dark" - tools:src="@drawable/ic_antenna" /> + tools:src="@tools:sample/avatars" /> + tools:src="@tools:sample/avatars"/> - - diff --git a/core/src/main/res/drawable/notification_default_large_icon.xml b/core/src/main/res/drawable/notification_default_large_icon.xml deleted file mode 100644 index 6da31b1bb..000000000 --- a/core/src/main/res/drawable/notification_default_large_icon.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - diff --git a/core/src/main/res/layout/player_widget.xml b/core/src/main/res/layout/player_widget.xml index b0e5e0fd8..6e463e9cd 100644 --- a/core/src/main/res/layout/player_widget.xml +++ b/core/src/main/res/layout/player_widget.xml @@ -40,7 +40,7 @@ android:id="@+id/imgvCover" android:layout_width="@android:dimen/app_icon_size" android:layout_height="match_parent" - android:src="@drawable/ic_antenna" + android:src="@mipmap/ic_launcher_round" android:layout_margin="12dp" /> Date: Sun, 20 Sep 2020 23:21:35 +0200 Subject: Updated screenshots --- .../de-DE/graphics/phone-screenshots/00.png | Bin 1497812 -> 1073593 bytes .../de-DE/graphics/phone-screenshots/01.png | Bin 1412509 -> 975991 bytes .../de-DE/graphics/phone-screenshots/02.png | Bin 775545 -> 931300 bytes .../de-DE/graphics/phone-screenshots/03.png | Bin 1396778 -> 634159 bytes .../de-DE/graphics/phone-screenshots/04.png | Bin 1007155 -> 832513 bytes .../de-DE/graphics/phone-screenshots/05.png | Bin 1119328 -> 1057683 bytes .../en-US/graphics/phone-screenshots/00.png | Bin 1469428 -> 1062876 bytes .../en-US/graphics/phone-screenshots/01.png | Bin 609387 -> 953326 bytes .../en-US/graphics/phone-screenshots/02.png | Bin 784201 -> 563909 bytes .../en-US/graphics/phone-screenshots/03.png | Bin 1408825 -> 625108 bytes .../en-US/graphics/phone-screenshots/04.png | Bin 902025 -> 791607 bytes .../en-US/graphics/phone-screenshots/05.png | Bin 1129419 -> 951698 bytes .../es-ES/graphics/phone-screenshots/00.png | Bin 0 -> 1059048 bytes .../es-ES/graphics/phone-screenshots/01.png | Bin 0 -> 950880 bytes .../es-ES/graphics/phone-screenshots/02.png | Bin 0 -> 566507 bytes .../es-ES/graphics/phone-screenshots/03.png | Bin 0 -> 631537 bytes .../es-ES/graphics/phone-screenshots/04.png | Bin 0 -> 790678 bytes .../es-ES/graphics/phone-screenshots/05.png | Bin 0 -> 944519 bytes .../fr-FR/graphics/phone-screenshots/00.png | Bin 0 -> 1059937 bytes .../fr-FR/graphics/phone-screenshots/01.png | Bin 0 -> 958188 bytes .../fr-FR/graphics/phone-screenshots/02.png | Bin 0 -> 558621 bytes .../fr-FR/graphics/phone-screenshots/03.png | Bin 0 -> 627704 bytes .../fr-FR/graphics/phone-screenshots/04.png | Bin 0 -> 800579 bytes .../fr-FR/graphics/phone-screenshots/05.png | Bin 0 -> 950236 bytes .../it-IT/graphics/phone-screenshots/00.png | Bin 0 -> 1054112 bytes .../it-IT/graphics/phone-screenshots/01.png | Bin 0 -> 950751 bytes .../it-IT/graphics/phone-screenshots/02.png | Bin 0 -> 573414 bytes .../it-IT/graphics/phone-screenshots/03.png | Bin 0 -> 635544 bytes .../it-IT/graphics/phone-screenshots/04.png | Bin 0 -> 792202 bytes .../it-IT/graphics/phone-screenshots/05.png | Bin 0 -> 945111 bytes .../nl-NL/graphics/phone-screenshots/00.png | Bin 0 -> 1059430 bytes .../nl-NL/graphics/phone-screenshots/01.png | Bin 0 -> 963352 bytes .../nl-NL/graphics/phone-screenshots/02.png | Bin 0 -> 567202 bytes .../nl-NL/graphics/phone-screenshots/03.png | Bin 0 -> 631105 bytes .../nl-NL/graphics/phone-screenshots/04.png | Bin 0 -> 789348 bytes .../nl-NL/graphics/phone-screenshots/05.png | Bin 0 -> 952291 bytes 36 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/src/main/play/listings/es-ES/graphics/phone-screenshots/00.png create mode 100644 app/src/main/play/listings/es-ES/graphics/phone-screenshots/01.png create mode 100644 app/src/main/play/listings/es-ES/graphics/phone-screenshots/02.png create mode 100644 app/src/main/play/listings/es-ES/graphics/phone-screenshots/03.png create mode 100644 app/src/main/play/listings/es-ES/graphics/phone-screenshots/04.png create mode 100644 app/src/main/play/listings/es-ES/graphics/phone-screenshots/05.png create mode 100644 app/src/main/play/listings/fr-FR/graphics/phone-screenshots/00.png create mode 100644 app/src/main/play/listings/fr-FR/graphics/phone-screenshots/01.png create mode 100644 app/src/main/play/listings/fr-FR/graphics/phone-screenshots/02.png create mode 100644 app/src/main/play/listings/fr-FR/graphics/phone-screenshots/03.png create mode 100644 app/src/main/play/listings/fr-FR/graphics/phone-screenshots/04.png create mode 100644 app/src/main/play/listings/fr-FR/graphics/phone-screenshots/05.png create mode 100644 app/src/main/play/listings/it-IT/graphics/phone-screenshots/00.png create mode 100644 app/src/main/play/listings/it-IT/graphics/phone-screenshots/01.png create mode 100644 app/src/main/play/listings/it-IT/graphics/phone-screenshots/02.png create mode 100644 app/src/main/play/listings/it-IT/graphics/phone-screenshots/03.png create mode 100644 app/src/main/play/listings/it-IT/graphics/phone-screenshots/04.png create mode 100644 app/src/main/play/listings/it-IT/graphics/phone-screenshots/05.png create mode 100644 app/src/main/play/listings/nl-NL/graphics/phone-screenshots/00.png create mode 100644 app/src/main/play/listings/nl-NL/graphics/phone-screenshots/01.png create mode 100644 app/src/main/play/listings/nl-NL/graphics/phone-screenshots/02.png create mode 100644 app/src/main/play/listings/nl-NL/graphics/phone-screenshots/03.png create mode 100644 app/src/main/play/listings/nl-NL/graphics/phone-screenshots/04.png create mode 100644 app/src/main/play/listings/nl-NL/graphics/phone-screenshots/05.png diff --git a/app/src/main/play/listings/de-DE/graphics/phone-screenshots/00.png b/app/src/main/play/listings/de-DE/graphics/phone-screenshots/00.png index 9fe34a151..b45199a32 100644 Binary files a/app/src/main/play/listings/de-DE/graphics/phone-screenshots/00.png and b/app/src/main/play/listings/de-DE/graphics/phone-screenshots/00.png differ diff --git a/app/src/main/play/listings/de-DE/graphics/phone-screenshots/01.png b/app/src/main/play/listings/de-DE/graphics/phone-screenshots/01.png index 57528fe56..e7bfdc2d7 100644 Binary files a/app/src/main/play/listings/de-DE/graphics/phone-screenshots/01.png and b/app/src/main/play/listings/de-DE/graphics/phone-screenshots/01.png differ diff --git a/app/src/main/play/listings/de-DE/graphics/phone-screenshots/02.png b/app/src/main/play/listings/de-DE/graphics/phone-screenshots/02.png index a7b6a35f2..1d7ec8bf7 100644 Binary files a/app/src/main/play/listings/de-DE/graphics/phone-screenshots/02.png and b/app/src/main/play/listings/de-DE/graphics/phone-screenshots/02.png differ diff --git a/app/src/main/play/listings/de-DE/graphics/phone-screenshots/03.png b/app/src/main/play/listings/de-DE/graphics/phone-screenshots/03.png index 014920d27..7a7ede191 100644 Binary files a/app/src/main/play/listings/de-DE/graphics/phone-screenshots/03.png and b/app/src/main/play/listings/de-DE/graphics/phone-screenshots/03.png differ diff --git a/app/src/main/play/listings/de-DE/graphics/phone-screenshots/04.png b/app/src/main/play/listings/de-DE/graphics/phone-screenshots/04.png index 88d5c89e2..2120934c9 100644 Binary files a/app/src/main/play/listings/de-DE/graphics/phone-screenshots/04.png and b/app/src/main/play/listings/de-DE/graphics/phone-screenshots/04.png differ diff --git a/app/src/main/play/listings/de-DE/graphics/phone-screenshots/05.png b/app/src/main/play/listings/de-DE/graphics/phone-screenshots/05.png index 2708df498..1eedf13f9 100644 Binary files a/app/src/main/play/listings/de-DE/graphics/phone-screenshots/05.png and b/app/src/main/play/listings/de-DE/graphics/phone-screenshots/05.png differ diff --git a/app/src/main/play/listings/en-US/graphics/phone-screenshots/00.png b/app/src/main/play/listings/en-US/graphics/phone-screenshots/00.png index 2ab1d595a..26779f5a1 100644 Binary files a/app/src/main/play/listings/en-US/graphics/phone-screenshots/00.png and b/app/src/main/play/listings/en-US/graphics/phone-screenshots/00.png differ diff --git a/app/src/main/play/listings/en-US/graphics/phone-screenshots/01.png b/app/src/main/play/listings/en-US/graphics/phone-screenshots/01.png index e435dfd80..9877ebba6 100644 Binary files a/app/src/main/play/listings/en-US/graphics/phone-screenshots/01.png and b/app/src/main/play/listings/en-US/graphics/phone-screenshots/01.png differ diff --git a/app/src/main/play/listings/en-US/graphics/phone-screenshots/02.png b/app/src/main/play/listings/en-US/graphics/phone-screenshots/02.png index eba177029..6f938629b 100644 Binary files a/app/src/main/play/listings/en-US/graphics/phone-screenshots/02.png and b/app/src/main/play/listings/en-US/graphics/phone-screenshots/02.png differ diff --git a/app/src/main/play/listings/en-US/graphics/phone-screenshots/03.png b/app/src/main/play/listings/en-US/graphics/phone-screenshots/03.png index 586b10752..550c49031 100644 Binary files a/app/src/main/play/listings/en-US/graphics/phone-screenshots/03.png and b/app/src/main/play/listings/en-US/graphics/phone-screenshots/03.png differ diff --git a/app/src/main/play/listings/en-US/graphics/phone-screenshots/04.png b/app/src/main/play/listings/en-US/graphics/phone-screenshots/04.png index dd13094c6..6d0585ff4 100644 Binary files a/app/src/main/play/listings/en-US/graphics/phone-screenshots/04.png and b/app/src/main/play/listings/en-US/graphics/phone-screenshots/04.png differ diff --git a/app/src/main/play/listings/en-US/graphics/phone-screenshots/05.png b/app/src/main/play/listings/en-US/graphics/phone-screenshots/05.png index 2684f2a8b..ebdf4c832 100644 Binary files a/app/src/main/play/listings/en-US/graphics/phone-screenshots/05.png and b/app/src/main/play/listings/en-US/graphics/phone-screenshots/05.png differ diff --git a/app/src/main/play/listings/es-ES/graphics/phone-screenshots/00.png b/app/src/main/play/listings/es-ES/graphics/phone-screenshots/00.png new file mode 100644 index 000000000..6c3ed9122 Binary files /dev/null and b/app/src/main/play/listings/es-ES/graphics/phone-screenshots/00.png differ diff --git a/app/src/main/play/listings/es-ES/graphics/phone-screenshots/01.png b/app/src/main/play/listings/es-ES/graphics/phone-screenshots/01.png new file mode 100644 index 000000000..7bd0730a4 Binary files /dev/null and b/app/src/main/play/listings/es-ES/graphics/phone-screenshots/01.png differ diff --git a/app/src/main/play/listings/es-ES/graphics/phone-screenshots/02.png b/app/src/main/play/listings/es-ES/graphics/phone-screenshots/02.png new file mode 100644 index 000000000..2c02ee1d5 Binary files /dev/null and b/app/src/main/play/listings/es-ES/graphics/phone-screenshots/02.png differ diff --git a/app/src/main/play/listings/es-ES/graphics/phone-screenshots/03.png b/app/src/main/play/listings/es-ES/graphics/phone-screenshots/03.png new file mode 100644 index 000000000..306de8f3b Binary files /dev/null and b/app/src/main/play/listings/es-ES/graphics/phone-screenshots/03.png differ diff --git a/app/src/main/play/listings/es-ES/graphics/phone-screenshots/04.png b/app/src/main/play/listings/es-ES/graphics/phone-screenshots/04.png new file mode 100644 index 000000000..c1a09170c Binary files /dev/null and b/app/src/main/play/listings/es-ES/graphics/phone-screenshots/04.png differ diff --git a/app/src/main/play/listings/es-ES/graphics/phone-screenshots/05.png b/app/src/main/play/listings/es-ES/graphics/phone-screenshots/05.png new file mode 100644 index 000000000..2698d5d27 Binary files /dev/null and b/app/src/main/play/listings/es-ES/graphics/phone-screenshots/05.png differ diff --git a/app/src/main/play/listings/fr-FR/graphics/phone-screenshots/00.png b/app/src/main/play/listings/fr-FR/graphics/phone-screenshots/00.png new file mode 100644 index 000000000..c51243a76 Binary files /dev/null and b/app/src/main/play/listings/fr-FR/graphics/phone-screenshots/00.png differ diff --git a/app/src/main/play/listings/fr-FR/graphics/phone-screenshots/01.png b/app/src/main/play/listings/fr-FR/graphics/phone-screenshots/01.png new file mode 100644 index 000000000..58e14b540 Binary files /dev/null and b/app/src/main/play/listings/fr-FR/graphics/phone-screenshots/01.png differ diff --git a/app/src/main/play/listings/fr-FR/graphics/phone-screenshots/02.png b/app/src/main/play/listings/fr-FR/graphics/phone-screenshots/02.png new file mode 100644 index 000000000..16d6d2f30 Binary files /dev/null and b/app/src/main/play/listings/fr-FR/graphics/phone-screenshots/02.png differ diff --git a/app/src/main/play/listings/fr-FR/graphics/phone-screenshots/03.png b/app/src/main/play/listings/fr-FR/graphics/phone-screenshots/03.png new file mode 100644 index 000000000..abbe2565e Binary files /dev/null and b/app/src/main/play/listings/fr-FR/graphics/phone-screenshots/03.png differ diff --git a/app/src/main/play/listings/fr-FR/graphics/phone-screenshots/04.png b/app/src/main/play/listings/fr-FR/graphics/phone-screenshots/04.png new file mode 100644 index 000000000..884d91a66 Binary files /dev/null and b/app/src/main/play/listings/fr-FR/graphics/phone-screenshots/04.png differ diff --git a/app/src/main/play/listings/fr-FR/graphics/phone-screenshots/05.png b/app/src/main/play/listings/fr-FR/graphics/phone-screenshots/05.png new file mode 100644 index 000000000..14f04a323 Binary files /dev/null and b/app/src/main/play/listings/fr-FR/graphics/phone-screenshots/05.png differ diff --git a/app/src/main/play/listings/it-IT/graphics/phone-screenshots/00.png b/app/src/main/play/listings/it-IT/graphics/phone-screenshots/00.png new file mode 100644 index 000000000..a860cc8c7 Binary files /dev/null and b/app/src/main/play/listings/it-IT/graphics/phone-screenshots/00.png differ diff --git a/app/src/main/play/listings/it-IT/graphics/phone-screenshots/01.png b/app/src/main/play/listings/it-IT/graphics/phone-screenshots/01.png new file mode 100644 index 000000000..b28200a86 Binary files /dev/null and b/app/src/main/play/listings/it-IT/graphics/phone-screenshots/01.png differ diff --git a/app/src/main/play/listings/it-IT/graphics/phone-screenshots/02.png b/app/src/main/play/listings/it-IT/graphics/phone-screenshots/02.png new file mode 100644 index 000000000..5fd46f51f Binary files /dev/null and b/app/src/main/play/listings/it-IT/graphics/phone-screenshots/02.png differ diff --git a/app/src/main/play/listings/it-IT/graphics/phone-screenshots/03.png b/app/src/main/play/listings/it-IT/graphics/phone-screenshots/03.png new file mode 100644 index 000000000..1fcaaba69 Binary files /dev/null and b/app/src/main/play/listings/it-IT/graphics/phone-screenshots/03.png differ diff --git a/app/src/main/play/listings/it-IT/graphics/phone-screenshots/04.png b/app/src/main/play/listings/it-IT/graphics/phone-screenshots/04.png new file mode 100644 index 000000000..f77490481 Binary files /dev/null and b/app/src/main/play/listings/it-IT/graphics/phone-screenshots/04.png differ diff --git a/app/src/main/play/listings/it-IT/graphics/phone-screenshots/05.png b/app/src/main/play/listings/it-IT/graphics/phone-screenshots/05.png new file mode 100644 index 000000000..14259aa8c Binary files /dev/null and b/app/src/main/play/listings/it-IT/graphics/phone-screenshots/05.png differ diff --git a/app/src/main/play/listings/nl-NL/graphics/phone-screenshots/00.png b/app/src/main/play/listings/nl-NL/graphics/phone-screenshots/00.png new file mode 100644 index 000000000..df59503e6 Binary files /dev/null and b/app/src/main/play/listings/nl-NL/graphics/phone-screenshots/00.png differ diff --git a/app/src/main/play/listings/nl-NL/graphics/phone-screenshots/01.png b/app/src/main/play/listings/nl-NL/graphics/phone-screenshots/01.png new file mode 100644 index 000000000..c9a93bb17 Binary files /dev/null and b/app/src/main/play/listings/nl-NL/graphics/phone-screenshots/01.png differ diff --git a/app/src/main/play/listings/nl-NL/graphics/phone-screenshots/02.png b/app/src/main/play/listings/nl-NL/graphics/phone-screenshots/02.png new file mode 100644 index 000000000..ac6f2d65d Binary files /dev/null and b/app/src/main/play/listings/nl-NL/graphics/phone-screenshots/02.png differ diff --git a/app/src/main/play/listings/nl-NL/graphics/phone-screenshots/03.png b/app/src/main/play/listings/nl-NL/graphics/phone-screenshots/03.png new file mode 100644 index 000000000..464efedc4 Binary files /dev/null and b/app/src/main/play/listings/nl-NL/graphics/phone-screenshots/03.png differ diff --git a/app/src/main/play/listings/nl-NL/graphics/phone-screenshots/04.png b/app/src/main/play/listings/nl-NL/graphics/phone-screenshots/04.png new file mode 100644 index 000000000..4db1bdfa5 Binary files /dev/null and b/app/src/main/play/listings/nl-NL/graphics/phone-screenshots/04.png differ diff --git a/app/src/main/play/listings/nl-NL/graphics/phone-screenshots/05.png b/app/src/main/play/listings/nl-NL/graphics/phone-screenshots/05.png new file mode 100644 index 000000000..95cee64e3 Binary files /dev/null and b/app/src/main/play/listings/nl-NL/graphics/phone-screenshots/05.png differ -- cgit v1.2.3 From 56256285c2792fba6185a1dff20d7ecb589412f8 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Sun, 20 Sep 2020 23:34:43 +0200 Subject: New teaser images --- .../graphics/feature-graphic/feature-graphic.png | Bin 60183 -> 154355 bytes .../en-US/graphics/promo-graphic/promo-graphic.png | Bin 10717 -> 9775 bytes .../en-US/graphics/tv-banner/tv-banner.png | Bin 81268 -> 290613 bytes core/src/main/res/drawable-nodpi/teaser.png | Bin 60183 -> 208621 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/src/main/play/listings/en-US/graphics/feature-graphic/feature-graphic.png b/app/src/main/play/listings/en-US/graphics/feature-graphic/feature-graphic.png index 3b5261b28..2e3f60b98 100644 Binary files a/app/src/main/play/listings/en-US/graphics/feature-graphic/feature-graphic.png and b/app/src/main/play/listings/en-US/graphics/feature-graphic/feature-graphic.png differ diff --git a/app/src/main/play/listings/en-US/graphics/promo-graphic/promo-graphic.png b/app/src/main/play/listings/en-US/graphics/promo-graphic/promo-graphic.png index a12aab438..77a6e1c70 100644 Binary files a/app/src/main/play/listings/en-US/graphics/promo-graphic/promo-graphic.png and b/app/src/main/play/listings/en-US/graphics/promo-graphic/promo-graphic.png differ diff --git a/app/src/main/play/listings/en-US/graphics/tv-banner/tv-banner.png b/app/src/main/play/listings/en-US/graphics/tv-banner/tv-banner.png index b278213d5..142aa4839 100644 Binary files a/app/src/main/play/listings/en-US/graphics/tv-banner/tv-banner.png and b/app/src/main/play/listings/en-US/graphics/tv-banner/tv-banner.png differ diff --git a/core/src/main/res/drawable-nodpi/teaser.png b/core/src/main/res/drawable-nodpi/teaser.png index 3b5261b28..d339ed512 100644 Binary files a/core/src/main/res/drawable-nodpi/teaser.png and b/core/src/main/res/drawable-nodpi/teaser.png differ -- cgit v1.2.3 From e82702655e5b2b5a4c5fe2a3d9276f052571ac68 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Mon, 21 Sep 2020 09:32:07 +0200 Subject: Updated widget icon --- .../de/danoeh/antennapod/core/service/PlayerWidgetJobService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java b/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java index f39ac0df8..7bf1a5df1 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java @@ -132,7 +132,7 @@ public class PlayerWidgetJobService extends SafeJobIntentService { views.setImageViewBitmap(R.id.imgvCover, icon); } catch (Throwable tr) { Log.e(TAG, "Error loading the media icon for the widget", tr); - views.setImageViewResource(R.id.imgvCover, R.mipmap.ic_launcher_foreground); + views.setImageViewResource(R.id.imgvCover, R.mipmap.ic_launcher_round); } views.setTextViewText(R.id.txtvTitle, media.getEpisodeTitle()); @@ -171,7 +171,7 @@ public class PlayerWidgetJobService extends SafeJobIntentService { views.setViewVisibility(R.id.txtvProgress, View.GONE); views.setViewVisibility(R.id.txtvTitle, View.GONE); views.setViewVisibility(R.id.txtNoPlaying, View.VISIBLE); - views.setImageViewResource(R.id.imgvCover, R.mipmap.ic_launcher_foreground); + views.setImageViewResource(R.id.imgvCover, R.mipmap.ic_launcher_round); views.setImageViewResource(R.id.butPlay, R.drawable.ic_av_play_white_48dp); } -- cgit v1.2.3 From 727f38cf633a73ff219e66d5924691b95dc9a9e9 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Mon, 21 Sep 2020 09:50:01 +0200 Subject: New splash screen --- .../res/drawable/ic_launcher_background_debug.xml | 179 --------------------- .../ic_launcher_foreground_no_finish.png | Bin 0 -> 74988 bytes core/src/main/res/drawable/bg_splash.xml | 12 +- core/src/main/res/values/colors.xml | 4 +- core/src/main/res/values/styles.xml | 4 +- 5 files changed, 14 insertions(+), 185 deletions(-) delete mode 100644 core/src/debug/res/drawable/ic_launcher_background_debug.xml create mode 100644 core/src/main/res/drawable-nodpi/ic_launcher_foreground_no_finish.png diff --git a/core/src/debug/res/drawable/ic_launcher_background_debug.xml b/core/src/debug/res/drawable/ic_launcher_background_debug.xml deleted file mode 100644 index 3bc445a92..000000000 --- a/core/src/debug/res/drawable/ic_launcher_background_debug.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/core/src/main/res/drawable-nodpi/ic_launcher_foreground_no_finish.png b/core/src/main/res/drawable-nodpi/ic_launcher_foreground_no_finish.png new file mode 100644 index 000000000..33a5b3fe4 Binary files /dev/null and b/core/src/main/res/drawable-nodpi/ic_launcher_foreground_no_finish.png differ diff --git a/core/src/main/res/drawable/bg_splash.xml b/core/src/main/res/drawable/bg_splash.xml index 32241ec22..929fe411a 100644 --- a/core/src/main/res/drawable/bg_splash.xml +++ b/core/src/main/res/drawable/bg_splash.xml @@ -1,13 +1,19 @@ - + + + + + + android:src="@drawable/ic_launcher_foreground_no_finish"/> \ No newline at end of file diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml index a86d61eba..8cb386fcf 100644 --- a/core/src/main/res/values/colors.xml +++ b/core/src/main/res/values/colors.xml @@ -23,9 +23,11 @@ #0078C2 #3D8BFF - #008AB8 #DDDDDD #191919 + #0ba2ff + #0878ff + diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml index ab78eac47..b7e482a91 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -224,8 +224,8 @@