From ab3b46ab7a4e8b8e62f24def6120b8cf3f53f380 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 4 Jul 2017 21:44:30 +0200
Subject: [PATCH] update commons to 2.22.4

---
 app/build.gradle                                             | 2 +-
 .../simplemobiletools/notes/activities/SettingsActivity.kt   | 4 ++--
 .../kotlin/com/simplemobiletools/notes/helpers/Config.kt     | 2 +-
 .../kotlin/com/simplemobiletools/notes/helpers/Constants.kt  | 2 +-
 app/src/main/res/layout/activity_settings.xml                | 2 +-
 app/src/main/res/values-de/strings.xml                       | 5 -----
 app/src/main/res/values-es/strings.xml                       | 5 -----
 app/src/main/res/values-fr/strings.xml                       | 5 -----
 app/src/main/res/values-hu/strings.xml                       | 5 -----
 app/src/main/res/values-it/strings.xml                       | 5 -----
 app/src/main/res/values-ja/strings.xml                       | 5 -----
 app/src/main/res/values-lt/strings.xml                       | 5 -----
 app/src/main/res/values-pt-rBR/strings.xml                   | 5 -----
 app/src/main/res/values-pt/strings.xml                       | 5 -----
 app/src/main/res/values-ru/strings.xml                       | 5 -----
 app/src/main/res/values-sv/strings.xml                       | 5 -----
 app/src/main/res/values/strings.xml                          | 5 -----
 17 files changed, 6 insertions(+), 66 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index e95d4e24..3d80c73d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,7 +32,7 @@ android {
 }
 
 dependencies {
-    compile 'com.simplemobiletools:commons:2.21.11'
+    compile 'com.simplemobiletools:commons:2.22.4'
     compile 'com.facebook.stetho:stetho:1.4.1'
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt
index 501bcc1d..1a5e5d45 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt
@@ -62,7 +62,7 @@ class SettingsActivity : SimpleActivity() {
         settings_font_size_holder.setOnClickListener {
             val items = arrayListOf(
                     RadioItem(FONT_SIZE_SMALL, res.getString(R.string.small)),
-                    RadioItem(FONT_SIZE_NORMAL, res.getString(R.string.normal)),
+                    RadioItem(FONT_SIZE_MEDIUM, res.getString(R.string.medium)),
                     RadioItem(FONT_SIZE_LARGE, res.getString(R.string.large)),
                     RadioItem(FONT_SIZE_EXTRA_LARGE, res.getString(R.string.extra_large)))
 
@@ -76,7 +76,7 @@ class SettingsActivity : SimpleActivity() {
 
     private fun getFontSizeText() = getString(when (config.fontSize) {
         FONT_SIZE_SMALL -> R.string.small
-        FONT_SIZE_NORMAL -> R.string.normal
+        FONT_SIZE_MEDIUM -> R.string.medium
         FONT_SIZE_LARGE -> R.string.large
         else -> R.string.extra_large
     })
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt
index b82a4d86..9869137e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt
@@ -17,7 +17,7 @@ class Config(context: Context) : BaseConfig(context) {
         set(clickableLinks) = prefs.edit().putBoolean(CLICKABLE_LINKS, clickableLinks).apply()
 
     var fontSize: Int
-        get() = prefs.getInt(FONT_SIZE, FONT_SIZE_NORMAL)
+        get() = prefs.getInt(FONT_SIZE, FONT_SIZE_MEDIUM)
         set(size) = prefs.edit().putInt(FONT_SIZE, size).apply()
 
     var gravity: Int
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt
index edae1d46..4cec9a61 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt
@@ -19,7 +19,7 @@ val GRAVITY_RIGHT = 2
 
 // font sizes
 val FONT_SIZE_SMALL = 0
-val FONT_SIZE_NORMAL = 1
+val FONT_SIZE_MEDIUM = 1
 val FONT_SIZE_LARGE = 2
 val FONT_SIZE_EXTRA_LARGE = 3
 
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 8349e531..3fc758ad 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -113,7 +113,7 @@
                 android:layout_toStartOf="@+id/settings_font_size"
                 android:paddingLeft="@dimen/medium_margin"
                 android:paddingRight="@dimen/medium_margin"
-                android:text="@string/note_font_size"/>
+                android:text="@string/font_size"/>
 
             <com.simplemobiletools.commons.views.MyTextView
                 android:id="@+id/settings_font_size"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 7e0937db..c5ef3230 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -31,11 +31,6 @@
     <string name="widget_note">Widget-Notiz</string>
     <string name="links_and_emails_clickable">Links und E-Mail Adressen anklickbar</string>
     <string name="place_cursor_end">Place cursor to the end of note</string>
-    <string name="note_font_size">Schriftgröße</string>
-    <string name="small">Klein</string>
-    <string name="normal">Normal</string>
-    <string name="large">Groß</string>
-    <string name="extra_large">Sehr groß</string>
     <string name="gravity">Ausrichtung</string>
     <string name="left">Linksbündig</string>
     <string name="center">Zentriert</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 8936efbb..a519ee6d 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -28,14 +28,9 @@
     <string name="display_success_message">Display save success messages</string>
 
     <!-- Settings -->
-    <string name="note_font_size">Tamaño de fuente</string>
     <string name="links_and_emails_clickable">Make links and emails clickable</string>
     <string name="place_cursor_end">Place cursor to the end of note</string>
     <string name="widget_note">Nota del widget</string>
-    <string name="small">Pequeña</string>
-    <string name="normal">Normal</string>
-    <string name="large">Grande</string>
-    <string name="extra_large">Enorme</string>
     <string name="gravity">Alineación del texto</string>
     <string name="left">Izquierda</string>
     <string name="center">Centrado</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 338ceb24..8c24e704 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -31,11 +31,6 @@
     <string name="widget_note">Note utilisée dans le widget</string>
     <string name="links_and_emails_clickable">Rendre les liens et les emails cliquables</string>
     <string name="place_cursor_end">Place cursor to the end of note</string>
-    <string name="note_font_size">Taille de la police de la note</string>
-    <string name="small">Petite</string>
-    <string name="normal">Normale</string>
-    <string name="large">Large</string>
-    <string name="extra_large">Extra Large</string>
     <string name="gravity">Gravité</string>
     <string name="left">Gauche</string>
     <string name="center">Centre</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 1b829ff0..c9cffad4 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -31,11 +31,6 @@
     <string name="widget_note">Widgetben használt jegyzet</string>
     <string name="links_and_emails_clickable">Hivatkozások és e-mail címek felismerése</string>
     <string name="place_cursor_end">Place cursor to the end of note</string>
-    <string name="note_font_size">Jegyzet betűméret</string>
-    <string name="small">Kicsi</string>
-    <string name="normal">Közepes</string>
-    <string name="large">Nagy</string>
-    <string name="extra_large">Óriási</string>
     <string name="gravity">Igazítottság</string>
     <string name="left">Bal</string>
     <string name="center">Közép</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index b3f32d80..7946419a 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -28,14 +28,9 @@
     <string name="display_success_message">Display save success messages</string>
 
     <!-- Settings -->
-    <string name="note_font_size">Note font size</string>
     <string name="links_and_emails_clickable">Make links and emails clickable</string>
     <string name="place_cursor_end">Place cursor to the end of note</string>
     <string name="widget_note">Note used in widget</string>
-    <string name="small">Small</string>
-    <string name="normal">Normal</string>
-    <string name="large">Large</string>
-    <string name="extra_large">Extra Large</string>
     <string name="gravity">Gravity</string>
     <string name="left">Left</string>
     <string name="center">Center</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index f4e98bd2..9c490c63 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -28,14 +28,9 @@
     <string name="display_success_message">Display save success messages</string>
 
     <!-- Settings -->
-    <string name="note_font_size">メモのフォントサイズ</string>
     <string name="links_and_emails_clickable">Make links and emails clickable</string>
     <string name="place_cursor_end">Place cursor to the end of note</string>
     <string name="widget_note">ウィジェットで使用するメモ</string>
-    <string name="small">小</string>
-    <string name="normal">通常</string>
-    <string name="large">大</string>
-    <string name="extra_large">特大</string>
     <string name="gravity">重力</string>
     <string name="left">左</string>
     <string name="center">中央</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 51dcd855..a82704a2 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -31,11 +31,6 @@
     <string name="widget_note">Note used in widget</string>
     <string name="links_and_emails_clickable">Make links and emails clickable</string>
     <string name="place_cursor_end">Place cursor to the end of note</string>
-    <string name="note_font_size">Note font size</string>
-    <string name="small">Small</string>
-    <string name="normal">Normal</string>
-    <string name="large">Large</string>
-    <string name="extra_large">Extra Large</string>
     <string name="gravity">Gravity</string>
     <string name="left">Left</string>
     <string name="center">Center</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index c3a6132b..90a1a65a 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -28,14 +28,9 @@
     <string name="display_success_message">Mostrar mensagens de gravação com sucesso</string>
 
     <!-- Settings -->
-    <string name="note_font_size">Tamanho do texto da nota</string>
     <string name="links_and_emails_clickable">Ativar clique em ligações e endereços de e-mail</string>
     <string name="place_cursor_end">Place cursor to the end of note</string>
     <string name="widget_note">Nota utilizada no widget</string>
-    <string name="small">Pequeno</string>
-    <string name="normal">Normal</string>
-    <string name="large">Grande</string>
-    <string name="extra_large">Muito grande</string>
     <string name="gravity">Gravidade</string>
     <string name="left">Esquerda</string>
     <string name="center">Centro</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 12c05590..1d771f3c 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -28,14 +28,9 @@
     <string name="display_success_message">Mostrar mensagens de gravação com sucesso</string>
 
     <!-- Settings -->
-    <string name="note_font_size">Tamanho do texto da nota</string>
     <string name="links_and_emails_clickable">Ativar clique em ligações e endereços de e-mail</string>
     <string name="place_cursor_end">Place cursor to the end of note</string>
     <string name="widget_note">Nota utilizada no widget</string>
-    <string name="small">Pequeno</string>
-    <string name="normal">Normal</string>
-    <string name="large">Grande</string>
-    <string name="extra_large">Muito grande</string>
     <string name="gravity">Gravidade</string>
     <string name="left">Esquerda</string>
     <string name="center">Centro</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index de8a9479..fc2d0854 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -31,11 +31,6 @@
     <string name="widget_note">Заметка, отображаемая в виджете</string>
     <string name="links_and_emails_clickable">Сделать ссылки и адреса электронной почты активными</string>
     <string name="place_cursor_end">Помещать курсор в конец заметки</string>
-    <string name="note_font_size">Размер текста заметки</string>
-    <string name="small">Мелкий</string>
-    <string name="normal">Нормальный</string>
-    <string name="large">Крупный</string>
-    <string name="extra_large">Очень крупный</string>
     <string name="gravity">Выравнивание</string>
     <string name="left">По левому краю</string>
     <string name="center">По центру</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index bfe5fe95..763d7f8b 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -28,14 +28,9 @@
     <string name="display_success_message">Display save success messages</string>
 
     <!-- Settings -->
-    <string name="note_font_size">Note font size</string>
     <string name="links_and_emails_clickable">Make links and emails clickable</string>
     <string name="place_cursor_end">Place cursor to the end of note</string>
     <string name="widget_note">Note used in widget</string>
-    <string name="small">Small</string>
-    <string name="normal">Normal</string>
-    <string name="large">Large</string>
-    <string name="extra_large">Extra Large</string>
     <string name="gravity">Gravity</string>
     <string name="left">Left</string>
     <string name="center">Center</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 51dcd855..a82704a2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,11 +31,6 @@
     <string name="widget_note">Note used in widget</string>
     <string name="links_and_emails_clickable">Make links and emails clickable</string>
     <string name="place_cursor_end">Place cursor to the end of note</string>
-    <string name="note_font_size">Note font size</string>
-    <string name="small">Small</string>
-    <string name="normal">Normal</string>
-    <string name="large">Large</string>
-    <string name="extra_large">Extra Large</string>
     <string name="gravity">Gravity</string>
     <string name="left">Left</string>
     <string name="center">Center</string>