diff options
Diffstat (limited to 'app/src')
6 files changed, 40 insertions, 5 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/OnlineSearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/OnlineSearchFragment.java index 8ecb692a5..e8bd5a1e1 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/OnlineSearchFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/OnlineSearchFragment.java @@ -107,8 +107,8 @@ public class OnlineSearchFragment extends Fragment { txtvError = root.findViewById(R.id.txtvError); butRetry = root.findViewById(R.id.butRetry); txtvEmpty = root.findViewById(android.R.id.empty); - - txtvEmpty.setText(getString(R.string.search_powered_by, searchProvider.getName())); + TextView txtvPoweredBy = root.findViewById(R.id.search_powered_by); + txtvPoweredBy.setText(getString(R.string.search_powered_by, searchProvider.getName())); return root; } 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 0409ce11b..3f1cec729 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 @@ -22,6 +22,7 @@ public class MainPreferencesFragment extends PreferenceFragmentCompat { private static final String PREF_FAQ = "prefFaq"; private static final String PREF_VIEW_FORUM = "prefViewForum"; private static final String PREF_SEND_BUG_REPORT = "prefSendBugReport"; + private static final String PREF_CATEGORY_PROJECT = "project"; private static final String STATISTICS = "statistics"; private static final String PREF_ABOUT = "prefAbout"; @@ -30,6 +31,13 @@ public class MainPreferencesFragment extends PreferenceFragmentCompat { addPreferencesFromResource(R.xml.preferences); setupMainScreen(); setupSearch(); + + // If you are writing a spin-off, please update the details on screens like "About" and "Report bug" + // and afterwards remove the following lines. + String packageName = getContext().getPackageName(); + if (!"de.danoeh.antennapod".equals(packageName) && !"de.danoeh.antennapod.debug".equals(packageName)) { + findPreference(PREF_CATEGORY_PROJECT).setVisible(false); + } } @Override diff --git a/app/src/main/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml index d44552bab..ff0a54bc1 100644 --- a/app/src/main/res/layout/addfeed.xml +++ b/app/src/main/res/layout/addfeed.xml @@ -91,8 +91,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:drawablePadding="8dp" - app:drawableStartCompat="?attr/content_new" - app:drawableLeftCompat="?attr/content_new" + app:drawableStartCompat="?attr/feed" + app:drawableLeftCompat="?attr/feed" android:paddingTop="8dp" android:paddingBottom="8dp" android:background="?android:attr/selectableItemBackground" diff --git a/app/src/main/res/layout/fragment_itunes_search.xml b/app/src/main/res/layout/fragment_itunes_search.xml index 228bfb803..d82051867 100644 --- a/app/src/main/res/layout/fragment_itunes_search.xml +++ b/app/src/main/res/layout/fragment_itunes_search.xml @@ -36,6 +36,7 @@ android:layout_height="match_parent" android:layout_centerInParent="true" android:gravity="center" + android:visibility="gone" android:text="@string/search_status_no_results" /> <ProgressBar @@ -71,4 +72,17 @@ tools:visibility="visible" tools:background="@android:color/holo_red_light" /> + <TextView + android:id="@+id/search_powered_by" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="?android:attr/textColorTertiary" + android:text="@string/discover_powered_by_itunes" + android:textSize="12sp" + android:padding="4dp" + android:background="?android:attr/windowBackground" + android:layout_alignParentBottom="true" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:textAlignment="textEnd"/> </RelativeLayout> diff --git a/app/src/main/res/layout/quick_feed_discovery.xml b/app/src/main/res/layout/quick_feed_discovery.xml index a274fcdc7..b125206c1 100644 --- a/app/src/main/res/layout/quick_feed_discovery.xml +++ b/app/src/main/res/layout/quick_feed_discovery.xml @@ -62,4 +62,15 @@ android:layout_height="wrap_content"/> </RelativeLayout> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="?android:attr/textColorTertiary" + android:text="@string/discover_powered_by_itunes" + android:textSize="12sp" + android:layout_gravity="right|end" + android:paddingHorizontal="4dp" + android:textAlignment="textEnd"/> + </LinearLayout> diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index b69f27473..0a19a36b1 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -44,7 +44,9 @@ android:title="@string/statistics_label" android:icon="?attr/statistics" /> - <PreferenceCategory android:title="@string/project_pref"> + <PreferenceCategory + android:key="project" + android:title="@string/project_pref"> <Preference android:key="prefFaq" android:title="@string/pref_faq" |