113 lines
5.7 KiB
Diff
113 lines
5.7 KiB
Diff
|
From 7655dfc3bb131f5609970d0593d8505750aeebcc Mon Sep 17 00:00:00 2001
|
||
|
|
From: harvey186 <harvey186@hotmail.com>
|
||
|
|
Date: Wed, 11 Dec 2024 15:32:26 +0100
|
||
|
|
Subject: [PATCH] About Waterfox-LeOSium
|
||
|
|
|
||
|
|
---
|
||
|
|
.../waterfox/android/ui/robots/SettingsRobot.kt | 14 +++++++-------
|
||
|
|
.../android/ui/robots/SettingsSubMenuAboutRobot.kt | 6 +++---
|
||
|
|
app/src/main/res/values-en-rCA/strings.xml | 2 +-
|
||
|
|
app/src/main/res/values-en-rGB/strings.xml | 2 +-
|
||
|
|
app/src/main/res/values/strings.xml | 2 +-
|
||
|
|
5 files changed, 13 insertions(+), 13 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/app/src/androidTest/java/net/waterfox/android/ui/robots/SettingsRobot.kt b/app/src/androidTest/java/net/waterfox/android/ui/robots/SettingsRobot.kt
|
||
|
|
index b91f91a68..47afad415 100644
|
||
|
|
--- a/app/src/androidTest/java/net/waterfox/android/ui/robots/SettingsRobot.kt
|
||
|
|
+++ b/app/src/androidTest/java/net/waterfox/android/ui/robots/SettingsRobot.kt
|
||
|
|
@@ -556,17 +556,17 @@ private fun assertAboutHeading(): ViewInteraction {
|
||
|
|
.check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
|
||
|
|
}
|
||
|
|
|
||
|
|
-private fun rateOnGooglePlayHeading(): UiObject {
|
||
|
|
- val rateOnGooglePlay = mDevice.findObject(UiSelector().text("Rate on Google Play"))
|
||
|
|
- settingsList().scrollToEnd(LISTS_MAXSWIPES)
|
||
|
|
- rateOnGooglePlay.waitForExists(waitingTime)
|
||
|
|
+//private fun rateOnGooglePlayHeading(): UiObject {
|
||
|
|
+// val rateOnGooglePlay = mDevice.findObject(UiSelector().text("Rate on Google Play"))
|
||
|
|
+// settingsList().scrollToEnd(LISTS_MAXSWIPES)
|
||
|
|
+// rateOnGooglePlay.waitForExists(waitingTime)
|
||
|
|
|
||
|
|
- return rateOnGooglePlay
|
||
|
|
-}
|
||
|
|
+ return rateOnGooglePlay//
|
||
|
|
+//}
|
||
|
|
|
||
|
|
private fun aboutWaterfoxHeading(): UiObject {
|
||
|
|
settingsList().scrollToEnd(LISTS_MAXSWIPES)
|
||
|
|
- return mDevice.findObject(UiSelector().text("About $appName"))
|
||
|
|
+ return mDevice.findObject(UiSelector().text("About LeOsium"))
|
||
|
|
}
|
||
|
|
|
||
|
|
fun swipeToBottom() = onView(withId(R.id.recycler_view)).perform(ViewActions.swipeUp())
|
||
|
|
diff --git a/app/src/androidTest/java/net/waterfox/android/ui/robots/SettingsSubMenuAboutRobot.kt b/app/src/androidTest/java/net/waterfox/android/ui/robots/SettingsSubMenuAboutRobot.kt
|
||
|
|
index 18d5da9c4..b756fce0f 100644
|
||
|
|
--- a/app/src/androidTest/java/net/waterfox/android/ui/robots/SettingsSubMenuAboutRobot.kt
|
||
|
|
+++ b/app/src/androidTest/java/net/waterfox/android/ui/robots/SettingsSubMenuAboutRobot.kt
|
||
|
|
@@ -74,12 +74,12 @@ private fun assertAboutToolbar() =
|
||
|
|
onView(
|
||
|
|
allOf(
|
||
|
|
withId(R.id.navigationToolbar),
|
||
|
|
- hasDescendant(withText("About $appName"))
|
||
|
|
+ hasDescendant(withText("About LeOSium"))
|
||
|
|
)
|
||
|
|
).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
|
||
|
|
|
||
|
|
private fun assertProductCompany(rule: ComposeTestRule) {
|
||
|
|
- rule.onNodeWithText("$appName is made by BrowserWorks.")
|
||
|
|
+ rule.onNodeWithText("LeOSium is made by Harvey186")
|
||
|
|
.assertIsDisplayed()
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -207,7 +207,7 @@ private fun assertLibrariesUsed(rule: ComposeTestRule) {
|
||
|
|
.assertIsDisplayed()
|
||
|
|
.performClick()
|
||
|
|
|
||
|
|
- onView(withId(R.id.navigationToolbar)).check(matches(hasDescendant(withText(containsString("$appName | OSS Libraries")))))
|
||
|
|
+ onView(withId(R.id.navigationToolbar)).check(matches(hasDescendant(withText(containsString("LeOSium | OSS Libraries")))))
|
||
|
|
|
||
|
|
rule.onNodeWithTag("about.library.list")
|
||
|
|
.performScrollToNode(hasText("org.mozilla.geckoview:geckoview", substring = true))
|
||
|
|
diff --git a/app/src/main/res/values-en-rCA/strings.xml b/app/src/main/res/values-en-rCA/strings.xml
|
||
|
|
index 2e3cad6d9..25bec1174 100644
|
||
|
|
--- a/app/src/main/res/values-en-rCA/strings.xml
|
||
|
|
+++ b/app/src/main/res/values-en-rCA/strings.xml
|
||
|
|
@@ -294,7 +294,7 @@
|
||
|
|
<string name="preferences_rate">Rate on Google Play</string>
|
||
|
|
<!-- Preference linking to about page for Fenix
|
||
|
|
The first parameter is the name of the app defined in app_name (for example: Fenix) -->
|
||
|
|
- <string name="preferences_about">About %1$s</string>
|
||
|
|
+ <string name="preferences_about">About LeOSium</string>
|
||
|
|
<!-- Preference for settings related to changing the default browser -->
|
||
|
|
<string name="preferences_set_as_default_browser">Set as default browser</string>
|
||
|
|
<!-- Preference category for advanced settings -->
|
||
|
|
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
|
||
|
|
index a9c7a6f15..62f44606d 100644
|
||
|
|
--- a/app/src/main/res/values-en-rGB/strings.xml
|
||
|
|
+++ b/app/src/main/res/values-en-rGB/strings.xml
|
||
|
|
@@ -295,7 +295,7 @@
|
||
|
|
<string name="preferences_rate">Rate on Google Play</string>
|
||
|
|
<!-- Preference linking to about page for Fenix
|
||
|
|
The first parameter is the name of the app defined in app_name (for example: Fenix) -->
|
||
|
|
- <string name="preferences_about">About %1$s</string>
|
||
|
|
+ <string name="preferences_about">About LeOSium</string>
|
||
|
|
<!-- Preference for settings related to changing the default browser -->
|
||
|
|
<string name="preferences_set_as_default_browser">Set as default browser</string>
|
||
|
|
<!-- Preference category for advanced settings -->
|
||
|
|
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
|
||
|
|
index 10750a871..00cbd2623 100644
|
||
|
|
--- a/app/src/main/res/values/strings.xml
|
||
|
|
+++ b/app/src/main/res/values/strings.xml
|
||
|
|
@@ -302,7 +302,7 @@
|
||
|
|
<string name="preferences_rate"> </string>
|
||
|
|
<!-- Preference linking to about page for LeOSium
|
||
|
|
The first parameter is the name of the app defined in app_name (for example: LeOSium) -->
|
||
|
|
- <string name="preferences_about">About %1$s</string>
|
||
|
|
+ <string name="preferences_about">About LeOSium</string>
|
||
|
|
<!-- Preference for settings related to changing the default browser -->
|
||
|
|
<string name="preferences_set_as_default_browser">Set as default browser</string>
|
||
|
|
<!-- Preference category for advanced settings -->
|
||
|
|
--
|
||
|
|
2.34.1
|
||
|
|
|