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 5dadf05708..6d9fc81e96 100644 --- a/app/src/androidTest/java/com/nmc/android/ui/LauncherActivityIT.kt +++ b/app/src/androidTest/java/com/nmc/android/ui/LauncherActivityIT.kt @@ -1,3 +1,24 @@ +/* + * + * Nextcloud Android client application + * + * @author TSI-mc + * Copyright (C) 2023 TSI-mc + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + package com.nmc.android.ui import androidx.test.espresso.Espresso.onView @@ -9,7 +30,6 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule import androidx.test.ext.junit.runners.AndroidJUnit4 import com.owncloud.android.AbstractIT import com.owncloud.android.R -import org.junit.Assert.* import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith @@ -30,4 +50,4 @@ class LauncherActivityIT : AbstractIT() { onView(withId(R.id.splashScreenBold)).check(matches(withText("Magenta"))) onView(withId(R.id.splashScreenNormal)).check(matches(withText("CLOUD"))) } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/nmc/android/ui/LauncherActivity.kt b/app/src/main/java/com/nmc/android/ui/LauncherActivity.kt index abf87450be..dc28789757 100644 --- a/app/src/main/java/com/nmc/android/ui/LauncherActivity.kt +++ b/app/src/main/java/com/nmc/android/ui/LauncherActivity.kt @@ -1,3 +1,23 @@ +/* + * Nextcloud Android client application + * + * @author TSI-mc + * Copyright (C) 2023 TSI-mc + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + */ + package com.nmc.android.ui import android.content.Intent @@ -7,6 +27,7 @@ import android.text.TextUtils import android.view.View import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import com.nextcloud.client.preferences.AppPreferences +import com.owncloud.android.R import com.owncloud.android.authentication.AuthenticatorActivity import com.owncloud.android.databinding.ActivitySplashBinding import com.owncloud.android.ui.activity.BaseActivity diff --git a/app/src/main/res/drawable-hdpi/logo.png b/app/src/main/res/drawable-hdpi/logo.png deleted file mode 100644 index a44b10fd0f..0000000000 Binary files a/app/src/main/res/drawable-hdpi/logo.png and /dev/null differ diff --git a/app/src/main/res/drawable/launch_screen.xml b/app/src/main/res/drawable/launch_screen.xml deleted file mode 100644 index bcb69968f5..0000000000 --- a/app/src/main/res/drawable/launch_screen.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/drawable/logo.xml b/app/src/main/res/drawable/logo.xml new file mode 100644 index 0000000000..fd5e31988e --- /dev/null +++ b/app/src/main/res/drawable/logo.xml @@ -0,0 +1,30 @@ + + + + + diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index 0eb2681f4c..0691a2d9db 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -1,4 +1,22 @@ + + app:srcCompat="@drawable/logo" /> + android:textSize="@dimen/splash_text_size" + android:textStyle="bold" /> + android:textSize="@dimen/splash_text_size" /> - - 116dp - 4dp - 16dp - 24dp - 6dp - 14sp - 16sp - 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 120e68d4fc..0fc10f9e1b 100644 --- a/app/src/main/res/values/dims.xml +++ b/app/src/main/res/values/dims.xml @@ -146,6 +146,8 @@ 400dp 24dp 24dp + 116dp + 20sp 5 0 16sp diff --git a/app/src/main/res/values/setup.xml b/app/src/main/res/values/setup.xml index c0b1039b85..f2e3889928 100644 --- a/app/src/main/res/values/setup.xml +++ b/app/src/main/res/values/setup.xml @@ -6,9 +6,8 @@ Nextcloud - - Magenta - CLOUD + + Nextcloud nextcloud org.nextcloud com.nextcloud.android.providers.UsersAndGroupsSearchProvider diff --git a/drawable_resources/nextcloud-splash-logo.svg b/drawable_resources/nextcloud-splash-logo.svg new file mode 100644 index 0000000000..51cfbaafd9 --- /dev/null +++ b/drawable_resources/nextcloud-splash-logo.svg @@ -0,0 +1,7 @@ + + + + + + +