From 5e366f50ea6ce0e8520c0a0da1a0d5fc085933d5 Mon Sep 17 00:00:00 2001
From: nuclearfog <hatespirit666@gmail.com>
Date: Tue, 5 May 2020 15:58:43 +0200
Subject: [PATCH] changed string resources, removed unused resources

---
 .../java/org/nuclearfog/twidda/activity/AppSettings.java | 1 -
 app/src/main/res/drawable/upload.xml                     | 9 ---------
 app/src/main/res/layout/page_settings.xml                | 2 +-
 app/src/main/res/layout/popup_app_info.xml               | 3 ++-
 app/src/main/res/values-de-rDE/strings.xml               | 7 +++----
 app/src/main/res/values/dimens.xml                       | 4 +---
 app/src/main/res/values/strings.xml                      | 7 +++----
 7 files changed, 10 insertions(+), 23 deletions(-)
 delete mode 100644 app/src/main/res/drawable/upload.xml

diff --git a/app/src/main/java/org/nuclearfog/twidda/activity/AppSettings.java b/app/src/main/java/org/nuclearfog/twidda/activity/AppSettings.java
index 6658a81a..fac1cab0 100644
--- a/app/src/main/java/org/nuclearfog/twidda/activity/AppSettings.java
+++ b/app/src/main/java/org/nuclearfog/twidda/activity/AppSettings.java
@@ -196,7 +196,6 @@ public class AppSettings extends AppCompatActivity implements OnClickListener, O
         if (item.getItemId() == R.id.settings_info) {
             Dialog dialog = new Dialog(this, R.style.AppInfoDialog);
             dialog.setContentView(R.layout.popup_app_info);
-            dialog.setTitle(R.string.settings_about);
             String versionName = " V" + BuildConfig.VERSION_NAME;
             TextView appInfo = dialog.findViewById(R.id.settings_app_info);
             appInfo.setLinkTextColor(settings.getHighlightColor());
diff --git a/app/src/main/res/drawable/upload.xml b/app/src/main/res/drawable/upload.xml
deleted file mode 100644
index 302b24bf..00000000
--- a/app/src/main/res/drawable/upload.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M8,12h4V6h3l-5,-5L5,6h3V12zM19.338,13.532c-0.21,-0.224 -1.611,-1.723 -2.011,-2.114C17.062,11.159 16.683,11 16.285,11h-1.757l3.064,2.994h-3.544c-0.102,0 -0.194,0.052 -0.24,0.133L12.992,16H7.008l-0.816,-1.873c-0.046,-0.081 -0.139,-0.133 -0.24,-0.133H2.408L5.471,11H3.715c-0.397,0 -0.776,0.159 -1.042,0.418c-0.4,0.392 -1.801,1.891 -2.011,2.114c-0.489,0.521 -0.758,0.936 -0.63,1.449l0.561,3.074c0.128,0.514 0.691,0.936 1.252,0.936h16.312c0.561,0 1.124,-0.422 1.252,-0.936l0.561,-3.074C20.096,14.468 19.828,14.053 19.338,13.532z" />
-</vector>
diff --git a/app/src/main/res/layout/page_settings.xml b/app/src/main/res/layout/page_settings.xml
index ff900a49..d3f8e0f1 100644
--- a/app/src/main/res/layout/page_settings.xml
+++ b/app/src/main/res/layout/page_settings.xml
@@ -161,7 +161,7 @@
                     android:layout_weight="3"
                     android:background="@drawable/button"
                     android:singleLine="true"
-                    android:text="@string/settings_load_count"
+                    android:text="@string/settings_list_size"
                     android:textSize="@dimen/textsize_settings_small" />
 
                 <CheckBox
diff --git a/app/src/main/res/layout/popup_app_info.xml b/app/src/main/res/layout/popup_app_info.xml
index 3a0dd09e..4cbd976a 100644
--- a/app/src/main/res/layout/popup_app_info.xml
+++ b/app/src/main/res/layout/popup_app_info.xml
@@ -9,7 +9,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="@dimen/settings_appinfo_text_padding"
-        android:text="@string/app_name" />
+        android:text="@string/app_name"
+        android:textSize="@dimen/settings_info_appname_font" />
 
     <TextView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 8aa396a1..a643faeb 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="settings_font">Schrift</string>
     <string name="highlight">Hervorhebung</string>
-    <string name="settings_load_count">Listengröße</string>
+    <string name="settings_list_size">Listengröße</string>
     <string name="user_follow">folgen</string>
     <string name="confirm_retry">wiederholen</string>
     <string name="color_settings">Farbeinstellungen</string>
@@ -149,7 +149,6 @@
     <string name="profile_banner">Profilbanner</string>
     <string name="editprofile_add_banner">Profilbanner hinzufügen</string>
     <string name="error_invalid_link">Ungültiger Link!</string>
-    <string name="settings_about">Über</string>
-    <string name="settings_3rd_party_license">"App und drittabbieter Bibliotheken lizenz "</string>
-    <string name="settings_info_github">"Github Seite: "</string>
+    <string name="settings_3rd_party_license">App und Drittabbieter Lizenz:</string>
+    <string name="settings_info_github">Github Seite:</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 1194c4c3..6b170a59 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -12,14 +12,12 @@
     <dimen name="margin_tweet_icon">16dp</dimen>
     <dimen name="margin_layout">5dp</dimen>
     <dimen name="margin_layout_tweet">2dp</dimen>
-    <dimen name="margin_upload_btn">20dp</dimen>
     <dimen name="margin_side">10dp</dimen>
 
     <dimen name="padding_editprofile">20dp</dimen>
     <dimen name="padding_drawable">5dp</dimen>
     <dimen name="padding_side">10dp</dimen>
 
-    <dimen name="text_padding">5dp</dimen>
     <dimen name="text_bio_height">150dp</dimen>
     <dimen name="text_settings">5dp</dimen>
     <dimen name="text_input_width">300dp</dimen>
@@ -56,7 +54,6 @@
     <dimen name="preview_margin">10dp</dimen>
     <dimen name="dm_item_button_height">20dp</dimen>
     <dimen name="tweet_media_button_margin">5dp</dimen>
-    <dimen name="editprofile_upload_button_padding">12dp</dimen>
     <dimen name="tweet_location_progress_size">30dp</dimen>
     <dimen name="list_button_height">20dp</dimen>
     <dimen name="listitem_margin">4dp</dimen>
@@ -73,4 +70,5 @@
     <dimen name="profile_banner_padding">5dp</dimen>
     <dimen name="profile_tv_padding">2dp</dimen>
     <dimen name="settings_appinfo_text_padding">5dp</dimen>
+    <dimen name="settings_info_appname_font">18sp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b8372e1e..3cf023b7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,7 +14,7 @@
     <string name="settings_font">Font</string>
     <string name="popup">Popup</string>
     <string name="highlight">Highlight</string>
-    <string name="settings_load_count">List size</string>
+    <string name="settings_list_size">List size</string>
     <string name="user_block">Block</string>
     <string name="user_follow">follow</string>
     <string name="confirm_retry">retry</string>
@@ -150,8 +150,7 @@
     <string name="profile_banner">Profile banner image</string>
     <string name="editprofile_add_banner">add banner</string>
     <string name="error_invalid_link">invalid link!</string>
-    <string name="settings_about">About</string>
-    <string name="settings_3rd_party_license">App and 3rd party libraries license</string>
+    <string name="settings_3rd_party_license">App and 3rd party license:</string>
     <string name="settings_info_license_link" translatable="false">http://www.apache.org/licenses/LICENSE-2.0</string>
-    <string name="settings_info_github">Github page:</string>
+    <string name="settings_info_github">App on GitHub:</string>
 </resources>
\ No newline at end of file