mirror of
https://github.com/nextcloud/android.git
synced 2024-12-18 15:01:57 +03:00
Add copyrights and replace logo for splash screen
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger
parent
34a7b2c022
commit
5e4e5a7e85
10 changed files with 106 additions and 74 deletions
|
|
@ -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 <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
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
|
||||
|
|
|
|||
|
|
@ -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 <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
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
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 6.6 KiB |
|
|
@ -1,31 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Nextcloud Android client application
|
||||
|
||||
Copyright (C) 2018 Edvard Holst
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
|
||||
License as published by the Free Software Foundation; either
|
||||
version 3 of the License, or 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 <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item
|
||||
android:drawable="@color/primary"/>
|
||||
|
||||
<item>
|
||||
<bitmap
|
||||
android:gravity="center"
|
||||
android:src="@drawable/logo" />
|
||||
</item>
|
||||
|
||||
</layer-list>
|
||||
30
app/src/main/res/drawable/logo.xml
Normal file
30
app/src/main/res/drawable/logo.xml
Normal file
|
|
@ -0,0 +1,30 @@
|
|||
<!--
|
||||
~
|
||||
~ Nextcloud Android client application
|
||||
~
|
||||
~ Copyright (C) 2023 Nextcloud GmbH
|
||||
~
|
||||
~ 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 <https://www.gnu.org/licenses/>.
|
||||
-->
|
||||
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="116dp"
|
||||
android:height="116dp"
|
||||
android:viewportWidth="116"
|
||||
android:viewportHeight="116">
|
||||
<path
|
||||
android:fillColor="#ffffff"
|
||||
android:fillType="nonZero"
|
||||
android:pathData="M58.16,32.16C46.39,32.16 36.41,40.14 33.32,50.95C30.64,45.21 24.81,41.2 18.11,41.2C8.89,41.2 1.31,48.78 1.31,58C1.31,67.22 8.89,74.81 18.11,74.81C24.81,74.81 30.64,70.79 33.32,65.05C36.41,75.86 46.39,83.84 58.16,83.84C69.84,83.84 79.76,75.98 82.93,65.29C85.67,70.9 91.42,74.81 98.03,74.81C107.25,74.81 114.83,67.22 114.83,58C114.83,48.78 107.25,41.2 98.03,41.2C91.42,41.2 85.67,45.1 82.93,50.7C79.76,40.02 69.84,32.16 58.16,32.16ZM58.16,42.02C67.04,42.02 74.14,49.12 74.14,58C74.14,66.88 67.04,73.98 58.16,73.98C49.27,73.98 42.18,66.88 42.18,58C42.18,49.12 49.27,42.02 58.16,42.02ZM18.11,51.06C22,51.06 25.05,54.11 25.05,58C25.05,61.89 22,64.94 18.11,64.94C14.22,64.94 11.17,61.89 11.17,58C11.17,54.11 14.22,51.06 18.11,51.06ZM98.03,51.06C101.92,51.06 104.97,54.11 104.97,58C104.97,61.89 101.92,64.94 98.03,64.94C94.13,64.94 91.09,61.89 91.09,58C91.09,54.11 94.13,51.06 98.03,51.06Z" />
|
||||
</vector>
|
||||
|
|
@ -1,4 +1,22 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Nextcloud Android client application
|
||||
|
||||
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
|
||||
License as published by the Free Software Foundation; either
|
||||
version 3 of the License, or 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 <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -12,7 +30,7 @@
|
|||
app:layout_constraintBottom_toTopOf="@+id/guideline"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:srcCompat="@drawable/nextcloud_logo" />
|
||||
app:srcCompat="@drawable/logo" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -29,8 +47,8 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:text="@string/splashScreenBold"
|
||||
android:textColor="@color/white"
|
||||
android:textStyle="bold"
|
||||
android:textSize="@dimen/txt_size_20sp" />
|
||||
android:textSize="@dimen/splash_text_size"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatTextView
|
||||
android:id="@+id/splashScreenNormal"
|
||||
|
|
@ -38,7 +56,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:text="@string/splashScreenNormal"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="@dimen/txt_size_20sp" />
|
||||
android:textSize="@dimen/splash_text_size" />
|
||||
</LinearLayout>
|
||||
|
||||
<androidx.constraintlayout.widget.Guideline
|
||||
|
|
|
|||
|
|
@ -1,34 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<dimen name="splash_image_size">116dp</dimen>
|
||||
<dimen name="grid_recyclerview_padding">4dp</dimen>
|
||||
<dimen name="list_item_icons_size">16dp</dimen>
|
||||
<dimen name="grid_item_icons_size">24dp</dimen>
|
||||
<dimen name="media_grid_item_rv_spacing">6dp</dimen>
|
||||
<dimen name="txt_size_14sp">14sp</dimen>
|
||||
<dimen name="txt_size_16sp">16sp</dimen>
|
||||
<dimen name="txt_size_18sp">18sp</dimen>
|
||||
<dimen name="txt_size_15sp">15sp</dimen>
|
||||
<dimen name="crop_corner_size">15dp</dimen>
|
||||
<dimen name="edit_scan_bottom_bar_height">56dp</dimen>
|
||||
<dimen name="standard_folders_grid_item_size">86dp</dimen>
|
||||
<dimen name="standard_files_grid_item_size">80dp</dimen>
|
||||
<dimen name="txt_size_11sp">11sp</dimen>
|
||||
<dimen name="share_row_icon_size">30dp</dimen>
|
||||
<dimen name="create_link_button_height">55dp</dimen>
|
||||
<dimen name="note_et_height">258dp</dimen>
|
||||
<dimen name="txt_size_17sp">17sp</dimen>
|
||||
<dimen name="share_exp_date_divider_margin">20dp</dimen>
|
||||
<dimen name="privacy_btn_width">160dp</dimen>
|
||||
<dimen name="privacy_icon_size">50dp</dimen>
|
||||
<dimen name="login_btn_width">150dp</dimen>
|
||||
<dimen name="login_btn_height">55dp</dimen>
|
||||
<dimen name="login_btn_bottom_margin">48dp</dimen>
|
||||
<dimen name="login_btn_bottom_margin_land">48dp</dimen>
|
||||
<dimen name="login_btn_bottom_margin_small_screen">24dp</dimen>
|
||||
<dimen name="shared_with_me_icon_size">26dp</dimen>
|
||||
<dimen name="txt_size_20sp">20sp</dimen>
|
||||
<dimen name="notification_row_item_height">145dp</dimen>
|
||||
<dimen name="button_stroke_width">1dp</dimen>
|
||||
<dimen name="txt_size_13sp">13sp</dimen>
|
||||
</resources>
|
||||
|
|
@ -146,6 +146,8 @@
|
|||
<dimen name="default_login_width">400dp</dimen>
|
||||
<dimen name="dialogBorderRadius">24dp</dimen>
|
||||
<dimen name="dialog_padding">24dp</dimen>
|
||||
<dimen name="splash_image_size">116dp</dimen>
|
||||
<dimen name="splash_text_size">20sp</dimen>
|
||||
<integer name="small_margin">5</integer>
|
||||
<integer name="zero">0</integer>
|
||||
<dimen name="txt_size_16sp">16sp</dimen>
|
||||
|
|
|
|||
|
|
@ -6,9 +6,8 @@
|
|||
|
||||
<!-- App name and other strings-->
|
||||
<string name="app_name">Nextcloud</string>
|
||||
<!-- required for NMC -->
|
||||
<string name="splashScreenBold">Magenta</string>
|
||||
<string name="splashScreenNormal">CLOUD</string>
|
||||
<string name="splashScreenBold"></string>
|
||||
<string name="splashScreenNormal">Nextcloud</string>
|
||||
<string name="account_type">nextcloud</string> <!-- better if was a domain name; but changing it now would require migrate accounts when the app is updated -->
|
||||
<string name="authority">org.nextcloud</string> <!-- better if was the app package with ".provider" appended ; it identifies the provider -->
|
||||
<string name="users_and_groups_search_authority">com.nextcloud.android.providers.UsersAndGroupsSearchProvider</string>
|
||||
|
|
|
|||
7
drawable_resources/nextcloud-splash-logo.svg
Normal file
7
drawable_resources/nextcloud-splash-logo.svg
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg width="100%" height="100%" viewBox="0 0 116 116" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
|
||||
<g transform="matrix(0.934491,0,0,0.934491,-16.6897,-5.00788)">
|
||||
<path id="logo" d="M80.093,39.773C67.5,39.773 56.827,48.31 53.519,59.876C50.644,53.741 44.414,49.443 37.238,49.443C27.37,49.443 19.257,57.556 19.257,67.424C19.257,77.293 27.37,85.409 37.238,85.409C44.414,85.409 50.644,81.108 53.519,74.972C56.827,86.539 67.5,95.079 80.093,95.079C92.592,95.079 103.21,86.668 106.603,75.231C109.531,81.228 115.684,85.409 122.758,85.409C132.627,85.409 140.742,77.293 140.742,67.424C140.742,57.556 132.627,49.443 122.758,49.443C115.684,49.443 109.531,53.622 106.603,59.617C103.21,48.181 92.592,39.773 80.093,39.773ZM80.093,50.329C89.598,50.329 97.192,57.919 97.192,67.424C97.192,76.93 89.598,84.524 80.093,84.524C70.587,84.524 62.997,76.93 62.997,67.424C62.997,57.919 70.587,50.329 80.093,50.329ZM37.238,59.999C41.403,59.999 44.668,63.26 44.668,67.424C44.668,71.589 41.403,74.854 37.238,74.854C33.074,74.854 29.813,71.589 29.813,67.424C29.813,63.26 33.074,59.999 37.238,59.999ZM122.758,59.999C126.923,59.999 130.187,63.26 130.187,67.424C130.187,71.589 126.923,74.854 122.758,74.854C118.593,74.854 115.332,71.589 115.332,67.424C115.332,63.26 118.593,59.999 122.758,59.999Z" style="fill:white;fill-rule:nonzero;"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.6 KiB |
Loading…
Reference in a new issue