Url imprint added.

nextmcloud · Jun 12, 2023 · 1647dee · 1647dee
1 parent 1bea81b
commit 1647dee
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java
@@ -848,7 +848,7 @@ private void setupImprintPreference(int titleColor) {
             pImprint.setTitle(StringUtils.getColorSpan(getString(R.string.prefs_imprint),
                                                              titleColor));
             pImprint.setOnPreferenceClickListener(preference -> {
-                String imprintWeb = getString(R.string.url_imprint);
+                String imprintWeb = getString(R.string.url_imprint_nmc);
                 if (!imprintWeb.isEmpty()) {
                     openLinkInWebView(imprintWeb, R.string.prefs_imprint);
                 }

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -1,12 +1,9 @@
 <?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>

diff --git a/app/src/main/res/values/setup.xml b/app/src/main/res/values/setup.xml
@@ -77,10 +77,12 @@
     <string name="sourcecode_url" translatable="false">https://github.com/nextcloud/android</string>
     <bool name="license_enabled">true</bool>
     <string name="license_url" translatable="false">https://www.gnu.org/licenses/gpl-2.0.html</string>
-    <!-- todo add url imprint, conflict error is coming right now as tobias -->
     <string name="url_imprint"></string>
     <string name="url_app_download">"https://play.google.com/store/apps/details?id=com.nextcloud.client"</string>
     <string name="url_server_install">https://nextcloud.com/install</string>
+    <!-- using different key as existing url_imprint will be duplicated during the merge process
+         because url_app_download will be changed in branding -->
+    <string name="url_imprint_nmc">https://www.telekom.de/impressum</string>
 
     <!-- synced folder light; if enabled: move to setting & global upload settings -->
     <bool name="syncedFolder_light">false</bool>