diff --git a/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java b/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java index 080c64ef8..9cc828da3 100644 --- a/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java @@ -21,7 +21,7 @@ import androidx.test.uiautomator.UiObjectNotFoundException; import androidx.test.uiautomator.UiSelector; import android.util.Log; import android.view.View; -import org.fdroid.fdroid.views.BannerUpdatingRepos; +import org.fdroid.fdroid.views.StatusBanner; import org.fdroid.fdroid.views.main.MainActivity; import org.hamcrest.Matchers; import org.junit.After; @@ -267,7 +267,7 @@ public class MainActivityEspressoTest { if (!BuildConfig.FLAVOR.startsWith("full")) { return; } - onView(Matchers.instanceOf(BannerUpdatingRepos.class)).check(matches(not(isDisplayed()))); + onView(Matchers.instanceOf(StatusBanner.class)).check(matches(not(isDisplayed()))); onView(allOf(withText(R.string.menu_settings), isDisplayed())).perform(click()); onView(allOf(withText(R.string.main_menu__latest_apps), isDisplayed())).perform(click()); onView(allOf(withId(R.id.swipe_to_refresh), isDisplayed())) diff --git a/app/src/full/res/layout/main_tab_categories.xml b/app/src/full/res/layout/main_tab_categories.xml index af80ac01c..301570f7f 100644 --- a/app/src/full/res/layout/main_tab_categories.xml +++ b/app/src/full/res/layout/main_tab_categories.xml @@ -17,7 +17,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - "No internet" banner on main, categories, and updates screen */ -public class BannerUpdatingRepos extends androidx.appcompat.widget.AppCompatTextView { +public class StatusBanner extends androidx.appcompat.widget.AppCompatTextView { private int updateServiceStatus = UpdateService.STATUS_COMPLETE_WITH_CHANGES; private int networkState = ConnectivityMonitorService.FLAG_NET_NO_LIMIT; - public BannerUpdatingRepos(Context context) { + public StatusBanner(Context context) { this(context, null); } - public BannerUpdatingRepos(Context context, AttributeSet attrs) { + public StatusBanner(Context context, AttributeSet attrs) { this(context, attrs, android.R.attr.textViewStyle); } - public BannerUpdatingRepos(Context context, AttributeSet attrs, int defStyleAttr) { + public StatusBanner(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); int padding = (int) getResources().getDimension(R.dimen.banner__padding); setPadding(padding, padding, padding, padding); diff --git a/app/src/main/res/layout/main_tab_latest.xml b/app/src/main/res/layout/main_tab_latest.xml index 31b4a1c4a..99d3e3452 100644 --- a/app/src/main/res/layout/main_tab_latest.xml +++ b/app/src/main/res/layout/main_tab_latest.xml @@ -16,7 +16,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - diff --git a/app/src/main/res/layout/main_tab_updates.xml b/app/src/main/res/layout/main_tab_updates.xml index 2aea585f7..1db3a3375 100644 --- a/app/src/main/res/layout/main_tab_updates.xml +++ b/app/src/main/res/layout/main_tab_updates.xml @@ -18,7 +18,7 @@ android:layout_height="match_parent" android:background="?attr/mainTabSwapBackground"> -