From 5e4e5a7e85725f32f7d5792432ef3cc71cc2a02e Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 4 May 2023 20:02:58 +0200 Subject: [PATCH] Add copyrights and replace logo for splash screen Signed-off-by: Andy Scherzinger --- .../com/nmc/android/ui/LauncherActivityIT.kt | 24 +++++++++++-- .../com/nmc/android/ui/LauncherActivity.kt | 21 +++++++++++ app/src/main/res/drawable-hdpi/logo.png | Bin 6764 -> 0 bytes app/src/main/res/drawable/launch_screen.xml | 31 ---------------- app/src/main/res/drawable/logo.xml | 30 ++++++++++++++++ app/src/main/res/layout/activity_splash.xml | 26 +++++++++++--- app/src/main/res/values/dimens.xml | 34 ------------------ app/src/main/res/values/dims.xml | 2 ++ app/src/main/res/values/setup.xml | 5 ++- drawable_resources/nextcloud-splash-logo.svg | 7 ++++ 10 files changed, 106 insertions(+), 74 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/logo.png delete mode 100644 app/src/main/res/drawable/launch_screen.xml create mode 100644 app/src/main/res/drawable/logo.xml delete mode 100644 app/src/main/res/values/dimens.xml create mode 100644 drawable_resources/nextcloud-splash-logo.svg 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 a44b10fd0f258330ab5caae1c4e151d8fd83fc10..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6764 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 - - - - - - - - - - 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 @@ + + + + + + +