diff options
Diffstat (limited to 'app/src')
62 files changed, 216 insertions, 70 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index afb53f0bd..e805b1622 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,7 @@ <meta-data android:name="android.webkit.WebView.MetricsOptOut" android:value="true"/> <meta-data android:name="com.google.android.gms.car.notification.SmallIcon" - android:resource="@drawable/ic_antenna"/> + android:resource="@drawable/ic_notification"/> <meta-data android:name="com.google.android.gms.car.application" android:resource="@xml/automotive_app_desc"/> 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/AudioPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java index 7eb749681..9999b0b37 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java @@ -124,8 +124,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); @@ -376,6 +374,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 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/java/de/danoeh/antennapod/fragment/DownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java index c173bf8ee..bc2d85452 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadsFragment.java @@ -51,6 +51,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); 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.<String>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(); 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 3f1cec729..2d640458e 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/AboutFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/AboutFragment.java index eb57972a1..b440d053b 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/AboutFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/AboutFragment.java @@ -1,4 +1,4 @@ -package de.danoeh.antennapod.fragment.preferences; +package de.danoeh.antennapod.fragment.preferences.about; import android.content.ClipData; import android.content.ClipboardManager; @@ -27,14 +27,9 @@ public class AboutFragment extends PreferenceFragmentCompat { Snackbar.make(getView(), R.string.copied_to_clipboard, Snackbar.LENGTH_SHORT).show(); return true; }); - findPreference("about_developers").setOnPreferenceClickListener((preference) -> { - getParentFragmentManager().beginTransaction().replace(R.id.content, new AboutDevelopersFragment()) - .addToBackStack(getString(R.string.developers)).commit(); - return true; - }); - findPreference("about_translators").setOnPreferenceClickListener((preference) -> { - getParentFragmentManager().beginTransaction().replace(R.id.content, new AboutTranslatorsFragment()) - .addToBackStack(getString(R.string.translators)).commit(); + 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) -> { @@ -42,7 +37,7 @@ public class AboutFragment extends PreferenceFragmentCompat { return true; }); findPreference("about_licenses").setOnPreferenceClickListener((preference) -> { - getParentFragmentManager().beginTransaction().replace(R.id.content, new AboutLicensesFragment()) + getParentFragmentManager().beginTransaction().replace(R.id.content, new LicensesFragment()) .addToBackStack(getString(R.string.translators)).commit(); return true; }); 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/AboutDevelopersFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/DevelopersFragment.java index 62a5eb306..60d9f95dd 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/AboutDevelopersFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/DevelopersFragment.java @@ -1,4 +1,4 @@ -package de.danoeh.antennapod.fragment.preferences; +package de.danoeh.antennapod.fragment.preferences.about; import android.os.Bundle; import android.view.View; @@ -19,7 +19,7 @@ import java.io.BufferedReader; import java.io.InputStreamReader; import java.util.ArrayList; -public class AboutDevelopersFragment extends ListFragment { +public class DevelopersFragment extends ListFragment { private Disposable developersLoader; @Override @@ -44,7 +44,7 @@ public class AboutDevelopersFragment extends ListFragment { .observeOn(AndroidSchedulers.mainThread()) .subscribe( developers -> setListAdapter(new SimpleIconListAdapter<>(getContext(), developers)), - error -> Toast.makeText(getContext(), "Error while loading developers", Toast.LENGTH_LONG).show() + error -> Toast.makeText(getContext(), error.getMessage(), Toast.LENGTH_LONG).show() ); } @@ -56,10 +56,4 @@ public class AboutDevelopersFragment extends ListFragment { 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/AboutLicensesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/LicensesFragment.java index 536d11e01..97565a613 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/AboutLicensesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/LicensesFragment.java @@ -1,4 +1,4 @@ -package de.danoeh.antennapod.fragment.preferences; +package de.danoeh.antennapod.fragment.preferences.about; import android.os.Bundle; import android.view.View; @@ -28,7 +28,7 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.ArrayList; -public class AboutLicensesFragment extends ListFragment { +public class LicensesFragment extends ListFragment { private Disposable licensesLoader; private final ArrayList<LicenseItem> licenses = new ArrayList<>(); @@ -59,7 +59,7 @@ public class AboutLicensesFragment extends ListFragment { .observeOn(AndroidSchedulers.mainThread()) .subscribe( developers -> setListAdapter(new SimpleIconListAdapter<LicenseItem>(getContext(), developers)), - error -> Toast.makeText(getContext(), "Error while loading licenses", Toast.LENGTH_LONG).show() + error -> Toast.makeText(getContext(), error.getMessage(), Toast.LENGTH_LONG).show() ); } 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<ArrayList<SimpleIconListAdapter.ListItem>>) emitter -> { + ArrayList<SimpleIconListAdapter.ListItem> 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/AboutTranslatorsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/TranslatorsFragment.java index 914dbb9a2..e8d8e113b 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/AboutTranslatorsFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/about/TranslatorsFragment.java @@ -1,4 +1,4 @@ -package de.danoeh.antennapod.fragment.preferences; +package de.danoeh.antennapod.fragment.preferences.about; import android.os.Bundle; import android.view.View; @@ -19,7 +19,7 @@ import java.io.BufferedReader; import java.io.InputStreamReader; import java.util.ArrayList; -public class AboutTranslatorsFragment extends ListFragment { +public class TranslatorsFragment extends ListFragment { private Disposable translatorsLoader; @Override @@ -43,7 +43,7 @@ public class AboutTranslatorsFragment extends ListFragment { .observeOn(AndroidSchedulers.mainThread()) .subscribe( translators -> setListAdapter(new SimpleIconListAdapter<>(getContext(), translators)), - error -> Toast.makeText(getContext(), "Error while loading translators", Toast.LENGTH_LONG).show() + error -> Toast.makeText(getContext(), error.getMessage(), Toast.LENGTH_LONG).show() ); } @@ -55,10 +55,4 @@ public class AboutTranslatorsFragment extends ListFragment { translatorsLoader.dispose(); } } - - @Override - public void onStart() { - super.onStart(); - ((PreferenceActivity) getActivity()).getSupportActionBar().setTitle(R.string.translators); - } } 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 Binary files differindex 9fe34a151..b45199a32 100644 --- 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 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 Binary files differindex 57528fe56..e7bfdc2d7 100644 --- 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 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 Binary files differindex a7b6a35f2..1d7ec8bf7 100644 --- 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 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 Binary files differindex 014920d27..7a7ede191 100644 --- 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 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 Binary files differindex 88d5c89e2..2120934c9 100644 --- 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 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 Binary files differindex 2708df498..1eedf13f9 100644 --- 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 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 Binary files differindex 3b5261b28..2e3f60b98 100644 --- 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 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 Binary files differindex 824346d21..bab31c2dd 100644 --- a/app/src/main/play/listings/en-US/graphics/icon/icon.png +++ b/app/src/main/play/listings/en-US/graphics/icon/icon.png 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 Binary files differindex 2ab1d595a..26779f5a1 100644 --- 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 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 Binary files differindex e435dfd80..9877ebba6 100644 --- 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 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 Binary files differindex eba177029..6f938629b 100644 --- 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 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 Binary files differindex 586b10752..550c49031 100644 --- 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 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 Binary files differindex dd13094c6..6d0585ff4 100644 --- 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 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 Binary files differindex 2684f2a8b..ebdf4c832 100644 --- 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 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 Binary files differindex a12aab438..77a6e1c70 100644 --- 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 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 Binary files differindex b278213d5..142aa4839 100644 --- 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 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 Binary files differnew file mode 100644 index 000000000..6c3ed9122 --- /dev/null +++ b/app/src/main/play/listings/es-ES/graphics/phone-screenshots/00.png 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 Binary files differnew file mode 100644 index 000000000..7bd0730a4 --- /dev/null +++ b/app/src/main/play/listings/es-ES/graphics/phone-screenshots/01.png 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 Binary files differnew file mode 100644 index 000000000..2c02ee1d5 --- /dev/null +++ b/app/src/main/play/listings/es-ES/graphics/phone-screenshots/02.png 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 Binary files differnew file mode 100644 index 000000000..306de8f3b --- /dev/null +++ b/app/src/main/play/listings/es-ES/graphics/phone-screenshots/03.png 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 Binary files differnew file mode 100644 index 000000000..c1a09170c --- /dev/null +++ b/app/src/main/play/listings/es-ES/graphics/phone-screenshots/04.png 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 Binary files differnew file mode 100644 index 000000000..2698d5d27 --- /dev/null +++ b/app/src/main/play/listings/es-ES/graphics/phone-screenshots/05.png 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 Binary files differnew file mode 100644 index 000000000..c51243a76 --- /dev/null +++ b/app/src/main/play/listings/fr-FR/graphics/phone-screenshots/00.png 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 Binary files differnew file mode 100644 index 000000000..58e14b540 --- /dev/null +++ b/app/src/main/play/listings/fr-FR/graphics/phone-screenshots/01.png 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 Binary files differnew file mode 100644 index 000000000..16d6d2f30 --- /dev/null +++ b/app/src/main/play/listings/fr-FR/graphics/phone-screenshots/02.png 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 Binary files differnew file mode 100644 index 000000000..abbe2565e --- /dev/null +++ b/app/src/main/play/listings/fr-FR/graphics/phone-screenshots/03.png 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 Binary files differnew file mode 100644 index 000000000..884d91a66 --- /dev/null +++ b/app/src/main/play/listings/fr-FR/graphics/phone-screenshots/04.png 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 Binary files differnew file mode 100644 index 000000000..14f04a323 --- /dev/null +++ b/app/src/main/play/listings/fr-FR/graphics/phone-screenshots/05.png 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 Binary files differnew file mode 100644 index 000000000..a860cc8c7 --- /dev/null +++ b/app/src/main/play/listings/it-IT/graphics/phone-screenshots/00.png 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 Binary files differnew file mode 100644 index 000000000..b28200a86 --- /dev/null +++ b/app/src/main/play/listings/it-IT/graphics/phone-screenshots/01.png 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 Binary files differnew file mode 100644 index 000000000..5fd46f51f --- /dev/null +++ b/app/src/main/play/listings/it-IT/graphics/phone-screenshots/02.png 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 Binary files differnew file mode 100644 index 000000000..1fcaaba69 --- /dev/null +++ b/app/src/main/play/listings/it-IT/graphics/phone-screenshots/03.png 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 Binary files differnew file mode 100644 index 000000000..f77490481 --- /dev/null +++ b/app/src/main/play/listings/it-IT/graphics/phone-screenshots/04.png 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 Binary files differnew file mode 100644 index 000000000..14259aa8c --- /dev/null +++ b/app/src/main/play/listings/it-IT/graphics/phone-screenshots/05.png 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 Binary files differnew file mode 100644 index 000000000..df59503e6 --- /dev/null +++ b/app/src/main/play/listings/nl-NL/graphics/phone-screenshots/00.png 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 Binary files differnew file mode 100644 index 000000000..c9a93bb17 --- /dev/null +++ b/app/src/main/play/listings/nl-NL/graphics/phone-screenshots/01.png 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 Binary files differnew file mode 100644 index 000000000..ac6f2d65d --- /dev/null +++ b/app/src/main/play/listings/nl-NL/graphics/phone-screenshots/02.png 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 Binary files differnew file mode 100644 index 000000000..464efedc4 --- /dev/null +++ b/app/src/main/play/listings/nl-NL/graphics/phone-screenshots/03.png 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 Binary files differnew file mode 100644 index 000000000..4db1bdfa5 --- /dev/null +++ b/app/src/main/play/listings/nl-NL/graphics/phone-screenshots/04.png 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 Binary files differnew file mode 100644 index 000000000..95cee64e3 --- /dev/null +++ b/app/src/main/play/listings/nl-NL/graphics/phone-screenshots/05.png diff --git a/app/src/main/play/release-notes/en-US/default.txt b/app/src/main/play/release-notes/en-US/default.txt index 8c69a50aa..b44fd22bd 100644 --- a/app/src/main/play/release-notes/en-US/default.txt +++ b/app/src/main/play/release-notes/en-US/default.txt @@ -1,6 +1,6 @@ -This is a beta release for version 2.0.0. We would love to read your thoughts in our forum (link on the settings screen). +We are proud to release version 2.0.0 with a new logo and refreshed user interface. +Thank you to 6420 users who participated in the vote for the new logo! -- Brand new user interface (by @ByteHamster) - Support for chapter images (only new episodes, by @ByteHamster) - Skip intro and ending per feed (by @tonytamsf) - Option to show notifications after episodes have been auto-downloaded (by @shortspider) diff --git a/app/src/main/res/layout/cover_fragment.xml b/app/src/main/res/layout/cover_fragment.xml index a66a5f5d7..5460d0609 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="0dp" 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"> <TextView android:id="@+id/txtvPodcastTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:ellipsize="end" - android:gravity="center" + android:ellipsize="none" + android:gravity="center_horizontal" android:maxLines="2" + android:textSize="@dimen/text_size_small" android:textColor="?android:attr/textColorSecondary" android:textIsSelectable="true" tools:text="Podcast" /> @@ -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" diff --git a/app/src/main/res/layout/feeditemlist_header.xml b/app/src/main/res/layout/feeditemlist_header.xml index a8845ec27..005702c59 100644 --- a/app/src/main/res/layout/feeditemlist_header.xml +++ b/app/src/main/res/layout/feeditemlist_header.xml @@ -24,7 +24,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"/> <LinearLayout diff --git a/app/src/main/res/layout/gpodnet_podcast_listitem.xml b/app/src/main/res/layout/gpodnet_podcast_listitem.xml index 9821f6e17..99991e919 100644 --- a/app/src/main/res/layout/gpodnet_podcast_listitem.xml +++ b/app/src/main/res/layout/gpodnet_podcast_listitem.xml @@ -23,7 +23,7 @@ android:importantForAccessibility="no" android:cropToPadding="true" android:scaleType="fitXY" - 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" /> <LinearLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/onlinefeedview_activity.xml b/app/src/main/res/layout/onlinefeedview_activity.xml index 812933fb1..996db7d36 100644 --- a/app/src/main/res/layout/onlinefeedview_activity.xml +++ b/app/src/main/res/layout/onlinefeedview_activity.xml @@ -57,7 +57,7 @@ android:layout_marginStart="16dp" android:layout_marginTop="16dp" android:importantForAccessibility="no" - tools:src="@drawable/ic_antenna"/> + tools:src="@tools:sample/avatars"/> <TextView android:id="@+id/txtvTitle" diff --git a/app/src/main/res/layout/statistics_listitem.xml b/app/src/main/res/layout/statistics_listitem.xml index c41ace58b..5989595e1 100644 --- a/app/src/main/res/layout/statistics_listitem.xml +++ b/app/src/main/res/layout/statistics_listitem.xml @@ -21,7 +21,7 @@ android:adjustViewBounds="true" android:cropToPadding="true" android:scaleType="fitCenter" - tools:src="@drawable/ic_antenna" + tools:src="@tools:sample/avatars" tools:background="@android:color/holo_green_dark"/> <TextView 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)"/> <Preference - android:key="about_developers" + android:key="about_contributors" android:icon="?attr/ic_settings" - android:summary="@string/developers_summary" - android:title="@string/developers"/> - <Preference - android:key="about_translators" - android:icon="?attr/ic_chat" - android:summary="@string/translators_summary" - android:title="@string/translators"/> + android:summary="@string/contributors_summary" + android:title="@string/contributors"/> <Preference android:key="about_privacy_policy" android:icon="?attr/ic_questionmark" |