diff --git a/app/src/androidTest/java/com/nmc/android/ui/LauncherActivityIT.kt b/app/src/androidTest/java/com/nmc/android/ui/LauncherActivityIT.kt
index 6dad10f2798b..78708498efce 100644
--- a/app/src/androidTest/java/com/nmc/android/ui/LauncherActivityIT.kt
+++ b/app/src/androidTest/java/com/nmc/android/ui/LauncherActivityIT.kt
@@ -8,10 +8,9 @@ package com.nmc.android.ui
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.assertion.ViewAssertions.matches
-import androidx.test.espresso.matcher.ViewMatchers
import androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed
-import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
import androidx.test.ext.junit.rules.ActivityScenarioRule
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.owncloud.android.AbstractIT
@@ -27,26 +26,13 @@ class LauncherActivityIT : AbstractIT() {
val activityRule = ActivityScenarioRule(LauncherActivity::class.java)
@Test
- fun testSplashScreenWithEmptyTitlesShouldHideTitles() {
- waitForIdleSync()
-
+ fun verifyUIElements() {
onView(withId(R.id.ivSplash)).check(matches(isCompletelyDisplayed()))
+ onView(withId(R.id.splashScreenBold)).check(matches(isCompletelyDisplayed()))
+ onView(withId(R.id.splashScreenNormal)).check(matches(isCompletelyDisplayed()))
- onView(withId(R.id.splashScreenBold)).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.GONE)))
- onView(withId(R.id.splashScreenNormal)).check(matches(withEffectiveVisibility(ViewMatchers.Visibility.GONE)))
- }
-
- @Test
- fun testSplashScreenWithTitlesShouldShowTitles() {
- waitForIdleSync()
- onView(withId(R.id.ivSplash)).check(matches(isCompletelyDisplayed()))
-
- activityRule.scenario.onActivity {
- it.setSplashTitles("Example", "Cloud")
- }
-
- val onePercentArea = ViewMatchers.isDisplayingAtLeast(1)
- onView(withId(R.id.splashScreenBold)).check(matches(onePercentArea))
- onView(withId(R.id.splashScreenNormal)).check(matches(onePercentArea))
+ onView(withId(R.id.splashScreenBold)).check(matches(withText("Magenta")))
+ onView(withId(R.id.splashScreenNormal)).check(matches(withText("CLOUD")))
+ shortSleep()
}
}
diff --git a/app/src/main/res/drawable/ic_magentacloud_splash_logo.xml b/app/src/main/res/drawable/ic_magentacloud_splash_logo.xml
new file mode 100644
index 000000000000..0abbc5ab08cd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_magentacloud_splash_logo.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index c068a3904a41..8c7f5e91e98c 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -18,11 +18,12 @@
app:layout_constraintBottom_toTopOf="@+id/guideline"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:srcCompat="@drawable/nextcloud_splash_logo" />
+ app:srcCompat="@drawable/ic_magentacloud_splash_logo" />
+
+ 4dp
+ 16dp
+ 24dp
+ 6dp
+ 18sp
+ 15sp
+ 15dp
+ 56dp
+ 86dp
+ 80dp
+ 11sp
+ 30dp
+ 55dp
+ 258dp
+ 17sp
+ 20dp
+ 160dp
+ 50dp
+ 150dp
+ 55dp
+ 48dp
+ 48dp
+ 24dp
+ 26dp
+ 20sp
+ 145dp
+ 1dp
+ 13sp
+
\ No newline at end of file
diff --git a/app/src/main/res/values/dims.xml b/app/src/main/res/values/dims.xml
index 1f6a3f88885b..d5e54129c118 100644
--- a/app/src/main/res/values/dims.xml
+++ b/app/src/main/res/values/dims.xml
@@ -146,7 +146,7 @@
400dp
24dp
24dp
- 180dp
+ 116dp
20sp
5
0
diff --git a/app/src/main/res/values/setup.xml b/app/src/main/res/values/setup.xml
index 046976793481..12ac3c608968 100644
--- a/app/src/main/res/values/setup.xml
+++ b/app/src/main/res/values/setup.xml
@@ -130,8 +130,8 @@
-
-
+ Magenta
+ CLOUD
https://nominatim.openstreetmap.org/