From 67b98bcdf50448ec97eb3ab39f7c95d287c373ae Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Thu, 30 Nov 2017 00:12:40 +0100
Subject: [PATCH] update gradle, kotlin, commons

---
 app/build.gradle                              | 21 +++----------------
 app/proguard-rules.pro                        | 17 ---------------
 app/src/main/AndroidManifest.xml              |  3 ++-
 .../applauncher/activities/MainActivity.kt    |  8 +++----
 .../applauncher/activities/SplashActivity.kt  |  8 +++----
 .../applauncher/adapters/RecyclerAdapter.kt   |  3 +++
 .../adapters/RecyclerDialogAdapter.kt         |  3 +++
 app/src/main/res/layout/activity_main.xml     |  2 +-
 build.gradle                                  |  9 ++++++--
 9 files changed, 25 insertions(+), 49 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 35dc236..1883c0d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -39,26 +39,11 @@ android {
 }
 
 dependencies {
-    compile 'com.simplemobiletools:commons:2.38.8'
-    compile 'com.android.support:multidex:1.0.2'
-    compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'
-    compile 'com.facebook.stetho:stetho:1.5.0'
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    implementation 'com.simplemobiletools:commons:3.0.3'
+    implementation 'com.facebook.stetho:stetho:1.5.0'
 }
 
-buildscript {
-    ext.kotlin_version = '1.1.51'
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
-    }
-}
-
-def Properties props = new Properties()
+Properties props = new Properties()
 def propFile = new File('signing.properties')
 if (propFile.canRead()) {
     props.load(new FileInputStream(propFile))
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 25ea334..e69de29 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -1,17 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in $ANDROID_HOME/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c0e813d..d1988cc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,8 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.simplemobiletools.applauncher">
+    package="com.simplemobiletools.applauncher"
+    android:installLocation="auto">
 
     <uses-permission
         android:name="android.permission.USE_FINGERPRINT"
diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt
index bb84773..7342760 100644
--- a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt
@@ -20,7 +20,6 @@ import com.simplemobiletools.commons.helpers.LICENSE_KOTLIN
 import com.simplemobiletools.commons.helpers.LICENSE_MULTISELECT
 import com.simplemobiletools.commons.helpers.LICENSE_STETHO
 import com.simplemobiletools.commons.models.Release
-import com.simplemobiletools.commons.views.MyScalableRecyclerView
 import kotlinx.android.synthetic.main.activity_main.*
 import java.util.*
 
@@ -70,7 +69,6 @@ class MainActivity : SimpleActivity(), RecyclerAdapter.AppLaunchersListener {
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu, menu)
-        updateMenuTextSize(resources, menu)
         return true
     }
 
@@ -94,7 +92,7 @@ class MainActivity : SimpleActivity(), RecyclerAdapter.AppLaunchersListener {
     private fun getGridAdapter() = launchers_grid.adapter as? RecyclerAdapter
 
     private fun setupGridLayoutManager() {
-        launchers_grid.isDragSelectionEnabled = true
+        /*launchers_grid.isDragSelectionEnabled = true
         launchers_grid.listener = object : MyScalableRecyclerView.MyScalableRecyclerViewListener {
             override fun zoomIn() {}
 
@@ -107,7 +105,7 @@ class MainActivity : SimpleActivity(), RecyclerAdapter.AppLaunchersListener {
             override fun selectRange(initialSelection: Int, lastDraggedIndex: Int, minReached: Int, maxReached: Int) {
                 getGridAdapter()?.selectRange(initialSelection, lastDraggedIndex, minReached, maxReached)
             }
-        }
+        }*/
     }
 
     private fun setupLaunchers() {
@@ -151,7 +149,7 @@ class MainActivity : SimpleActivity(), RecyclerAdapter.AppLaunchersListener {
     }
 
     override fun itemLongClicked(position: Int) {
-        launchers_grid.setDragSelectActive(position)
+        //launchers_grid.setDragSelectActive(position)
     }
 
     private fun checkWhatsNewDialog() {
diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SplashActivity.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SplashActivity.kt
index fadd1e8..8a693e2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SplashActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SplashActivity.kt
@@ -1,12 +1,10 @@
 package com.simplemobiletools.applauncher.activities
 
 import android.content.Intent
-import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import com.simplemobiletools.commons.activities.BaseSplashActivity
 
-class SplashActivity : AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
+class SplashActivity : BaseSplashActivity() {
+    override fun initActivity() {
         startActivity(Intent(this, MainActivity::class.java))
         finish()
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/RecyclerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/RecyclerAdapter.kt
index 9d080e4..1480821 100644
--- a/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/RecyclerAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/RecyclerAdapter.kt
@@ -59,6 +59,9 @@ class RecyclerAdapter(val activity: SimpleActivity, val launchers: MutableList<A
     }
 
     private val adapterListener = object : MyAdapterListener {
+        override fun itemLongClicked(position: Int) {
+        }
+
         override fun toggleItemSelectionAdapter(select: Boolean, position: Int) {
             toggleItemSelection(select, position)
         }
diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/RecyclerDialogAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/RecyclerDialogAdapter.kt
index 02c63de..b3da40b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/RecyclerDialogAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/RecyclerDialogAdapter.kt
@@ -44,6 +44,9 @@ class RecyclerDialogAdapter(activity: Activity, val launchers: List<AppLauncher>
     }
 
     private val adapterListener = object : MyAdapterListener {
+        override fun itemLongClicked(position: Int) {
+        }
+
         override fun toggleItemSelectionAdapter(select: Boolean, position: Int) {
             toggleItemSelection(select, position)
         }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 42a6096..8cda3c8 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.simplemobiletools.commons.views.MyScalableRecyclerView
+    <com.simplemobiletools.commons.views.MyRecyclerView
         android:id="@+id/launchers_grid"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/build.gradle b/build.gradle
index 8c22f11..89e92a1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
+    ext.kotlin_version = '1.2.0'
+
     repositories {
         jcenter()
+        google()
     }
+
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,8 +20,8 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
         maven { url "https://jitpack.io" }
-        maven { url "https://maven.google.com" }
     }
 }