From 477b1ffcd4366ac79a8a6a6103bda1bc57d22487 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 7 Nov 2018 11:14:40 +0100
Subject: [PATCH] update commons to 5.3.13

---
 app/build.gradle                              |  2 +-
 .../notes/activities/MainActivity.kt          |  6 ++++
 .../notes/activities/SettingsActivity.kt      | 25 ++++------------
 app/src/main/res/layout/activity_settings.xml | 30 ++-----------------
 build.gradle                                  |  2 +-
 5 files changed, 17 insertions(+), 48 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index f8768107..4ee3b628 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,7 +41,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.2.10'
+    implementation 'com.simplemobiletools:commons:5.3.13'
     implementation 'com.facebook.stetho:stetho:1.5.0'
 }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
index 0ebcfdbc..c8875aae 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
@@ -13,6 +13,7 @@ import android.view.MenuItem
 import com.simplemobiletools.commons.dialogs.ConfirmationAdvancedDialog
 import com.simplemobiletools.commons.dialogs.FilePickerDialog
 import com.simplemobiletools.commons.dialogs.RadioGroupDialog
+import com.simplemobiletools.commons.dialogs.UpgradeToProDialog
 import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.*
 import com.simplemobiletools.commons.models.FAQItem
@@ -85,6 +86,11 @@ class MainActivity : SimpleActivity() {
 
         wasInit = true
         checkAppOnSDCard()
+
+        if (!config.wasInitialUpgradeToProShown) {
+            UpgradeToProDialog(this)
+            config.wasInitialUpgradeToProShown = true
+        }
     }
 
     override fun onResume() {
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 58ef2e91..cf551999 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt
@@ -12,26 +12,21 @@ import com.simplemobiletools.notes.extensions.config
 import com.simplemobiletools.notes.extensions.dbHelper
 import com.simplemobiletools.notes.extensions.updateWidgets
 import com.simplemobiletools.notes.helpers.*
-import com.simplemobiletools.notes.models.Note
 import kotlinx.android.synthetic.main.activity_settings.*
 import java.util.*
 
 class SettingsActivity : SimpleActivity() {
-    var notes = ArrayList<Note>()
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_settings)
-        notes = dbHelper.getNotes()
     }
 
     override fun onResume() {
         super.onResume()
 
-        setupPurchaseThankYou()
+        setupUpgradeToPro()
         setupCustomizeColors()
         setupUseEnglish()
-        setupAvoidWhatsNew()
         setupAutosaveNotes()
         setupDisplaySuccess()
         setupClickableLinks()
@@ -56,10 +51,10 @@ class SettingsActivity : SimpleActivity() {
         }
     }
 
-    private fun setupPurchaseThankYou() {
-        settings_purchase_thank_you_holder.beVisibleIf(config.appRunCount > 10 && !isThankYouInstalled())
-        settings_purchase_thank_you_holder.setOnClickListener {
-            launchPurchaseThankYouIntent()
+    private fun setupUpgradeToPro() {
+        settings_upgrade_to_pro_holder.beGoneIf(isAProApp())
+        settings_upgrade_to_pro_holder.setOnClickListener {
+            launchUpgradeToProIntent()
         }
     }
 
@@ -79,14 +74,6 @@ class SettingsActivity : SimpleActivity() {
         }
     }
 
-    private fun setupAvoidWhatsNew() {
-        settings_avoid_whats_new.isChecked = config.avoidWhatsNew
-        settings_avoid_whats_new_holder.setOnClickListener {
-            settings_avoid_whats_new.toggle()
-            config.avoidWhatsNew = settings_avoid_whats_new.isChecked
-        }
-    }
-
     private fun setupAutosaveNotes() {
         settings_autosave_notes.isChecked = config.autosaveNotes
         settings_autosave_notes_holder.setOnClickListener {
@@ -128,7 +115,7 @@ class SettingsActivity : SimpleActivity() {
     }
 
     private fun setupShowNotePicker() {
-        settings_show_note_picker_holder.beVisibleIf(notes.size > 1)
+        settings_show_note_picker_holder.beVisibleIf(dbHelper.getNotes().size > 1)
         settings_show_note_picker.isChecked = config.showNotePicker
         settings_show_note_picker_holder.setOnClickListener {
             settings_show_note_picker.toggle()
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index bb7ac119..e03f98af 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -13,7 +13,7 @@
         android:orientation="vertical">
 
         <RelativeLayout
-            android:id="@+id/settings_purchase_thank_you_holder"
+            android:id="@+id/settings_upgrade_to_pro_holder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
@@ -24,13 +24,13 @@
             android:paddingBottom="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MyTextView
-                android:id="@+id/settings_purchase_thank_you"
+                android:id="@+id/settings_upgrade_to_pro"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:paddingStart="@dimen/medium_margin"
                 android:paddingLeft="@dimen/medium_margin"
-                android:text="@string/purchase_simple_thank_you"/>
+                android:text="@string/upgrade_to_pro"/>
 
         </RelativeLayout>
 
@@ -306,30 +306,6 @@
             android:textAllCaps="true"
             android:textSize="@dimen/smaller_text_size"/>
 
-        <RelativeLayout
-            android:id="@+id/settings_avoid_whats_new_holder"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/medium_margin"
-            android:background="?attr/selectableItemBackground"
-            android:paddingLeft="@dimen/normal_margin"
-            android:paddingTop="@dimen/activity_margin"
-            android:paddingRight="@dimen/normal_margin"
-            android:paddingBottom="@dimen/activity_margin">
-
-            <com.simplemobiletools.commons.views.MySwitchCompat
-                android:id="@+id/settings_avoid_whats_new"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@null"
-                android:clickable="false"
-                android:paddingStart="@dimen/medium_margin"
-                android:paddingLeft="@dimen/medium_margin"
-                android:text="@string/avoid_whats_new"
-                app:switchPadding="@dimen/medium_margin"/>
-
-        </RelativeLayout>
-
         <RelativeLayout
             android:id="@+id/settings_cursor_placement_holder"
             android:layout_width="match_parent"
diff --git a/build.gradle b/build.gradle
index 0b0dbc07..17a20ee3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.71'
+    ext.kotlin_version = '1.3.0'
 
     repositories {
         google()