diff options
Diffstat (limited to 'app/src')
5 files changed, 84 insertions, 17 deletions
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/FeedSettingsTest.java b/app/src/androidTest/java/de/test/antennapod/ui/FeedSettingsTest.java new file mode 100644 index 000000000..b49be9a04 --- /dev/null +++ b/app/src/androidTest/java/de/test/antennapod/ui/FeedSettingsTest.java @@ -0,0 +1,79 @@ +package de.test.antennapod.ui; + +import android.content.Intent; +import androidx.test.espresso.intent.rule.IntentsTestRule; +import androidx.test.platform.app.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; +import de.danoeh.antennapod.R; +import de.danoeh.antennapod.activity.MainActivity; +import de.danoeh.antennapod.core.feed.Feed; +import de.test.antennapod.EspressoTestUtils; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.runner.RunWith; + +import static androidx.test.espresso.Espresso.onView; +import static androidx.test.espresso.action.ViewActions.click; +import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA; +import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed; +import static androidx.test.espresso.matcher.ViewMatchers.isRoot; +import static androidx.test.espresso.matcher.ViewMatchers.withId; +import static androidx.test.espresso.matcher.ViewMatchers.withText; +import static de.test.antennapod.EspressoTestUtils.clickPreference; +import static de.test.antennapod.EspressoTestUtils.waitForView; +import static org.hamcrest.Matchers.allOf; + +@RunWith(AndroidJUnit4.class) +public class FeedSettingsTest { + private UITestUtils uiTestUtils; + private Feed feed; + + @Rule + public IntentsTestRule<MainActivity> activityRule = new IntentsTestRule<>(MainActivity.class, false, false); + + @Before + public void setUp() throws Exception { + uiTestUtils = new UITestUtils(InstrumentationRegistry.getInstrumentation().getTargetContext()); + uiTestUtils.setup(); + + EspressoTestUtils.clearPreferences(); + EspressoTestUtils.clearDatabase(); + + uiTestUtils.addLocalFeedData(false); + feed = uiTestUtils.hostedFeeds.get(0); + Intent intent = new Intent(InstrumentationRegistry.getInstrumentation().getTargetContext(), MainActivity.class); + intent.putExtra(MainActivity.EXTRA_FEED_ID, feed.getId()); + activityRule.launchActivity(intent); + } + + @After + public void tearDown() throws Exception { + uiTestUtils.tearDown(); + } + + @Test + public void testClickFeedSettings() { + onView(isRoot()).perform(waitForView(allOf(isDescendantOfA(withId(R.id.appBar)), + withText(feed.getTitle()), isDisplayed()), 1000)); + onView(withId(R.id.butShowSettings)).perform(click()); + + clickPreference(R.string.keep_updated); + + clickPreference(R.string.authentication_label); + onView(withText(R.string.cancel_label)).perform(click()); + + clickPreference(R.string.playback_speed); + onView(withText(R.string.cancel_label)).perform(click()); + + clickPreference(R.string.pref_feed_skip); + onView(withText(R.string.cancel_label)).perform(click()); + + clickPreference(R.string.auto_delete_label); + onView(withText(R.string.cancel_label)).perform(click()); + + clickPreference(R.string.feed_volume_reduction); + onView(withText(R.string.cancel_label)).perform(click()); + } +} 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 d9dd7c47d..406585808 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 @@ -20,7 +20,7 @@ public class MainPreferencesFragment extends PreferenceFragmentCompat { private static final String PREF_SCREEN_GPODDER = "prefScreenGpodder"; private static final String PREF_SCREEN_STORAGE = "prefScreenStorage"; private static final String PREF_FAQ = "prefFaq"; - private static final String PREF_VIEW_MAILING_LIST = "prefViewMailingList"; + private static final String PREF_VIEW_FORUM = "prefViewForum"; private static final String PREF_SEND_BUG_REPORT = "prefSendBugReport"; private static final String STATISTICS = "statistics"; private static final String PREF_ABOUT = "prefAbout"; @@ -78,8 +78,8 @@ public class MainPreferencesFragment extends PreferenceFragmentCompat { IntentUtils.openInBrowser(getContext(), "https://antennapod.org/faq.html"); return true; }); - findPreference(PREF_VIEW_MAILING_LIST).setOnPreferenceClickListener(preference -> { - IntentUtils.openInBrowser(getContext(), "https://groups.google.com/forum/#!forum/antennapod"); + findPreference(PREF_VIEW_FORUM).setOnPreferenceClickListener(preference -> { + IntentUtils.openInBrowser(getContext(), "https://forum.antennapod.org/"); return true; }); findPreference(PREF_SEND_BUG_REPORT).setOnPreferenceClickListener(preference -> { diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml deleted file mode 100644 index 42f5e1245..000000000 --- a/app/src/main/res/layout/about.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/webViewContainer" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" > - - <WebView - android:id="@+id/webViewAbout" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - -</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/xml/feed_settings.xml b/app/src/main/res/xml/feed_settings.xml index f85c9ef3c..9f8392f44 100644 --- a/app/src/main/res/xml/feed_settings.xml +++ b/app/src/main/res/xml/feed_settings.xml @@ -23,6 +23,7 @@ <Preference android:key="feedAutoSkip" + android:icon="?attr/ic_settings_skip" android:summary="@string/pref_feed_skip_sum" android:title="@string/pref_feed_skip" /> diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 2141c811c..b69f27473 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -50,7 +50,7 @@ android:title="@string/pref_faq" android:icon="?attr/ic_questionmark" /> <Preference - android:key="prefViewMailingList" + android:key="prefViewForum" android:title="@string/visit_user_forum" android:icon="?attr/ic_chat" /> <Preference |