update gradle, kotlin, commons

This commit is contained in:
tibbi
2017-11-30 00:12:40 +01:00
parent 0a73f20df0
commit 67b98bcdf5
9 changed files with 25 additions and 49 deletions

View File

@ -39,26 +39,11 @@ android {
} }
dependencies { dependencies {
compile 'com.simplemobiletools:commons:2.38.8' implementation 'com.simplemobiletools:commons:3.0.3'
compile 'com.android.support:multidex:1.0.2' implementation 'com.facebook.stetho:stetho:1.5.0'
compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'
compile 'com.facebook.stetho:stetho:1.5.0'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
} }
buildscript { Properties props = new Properties()
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()
def propFile = new File('signing.properties') def propFile = new File('signing.properties')
if (propFile.canRead()) { if (propFile.canRead()) {
props.load(new FileInputStream(propFile)) props.load(new FileInputStream(propFile))

View File

@ -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 *;
#}

View File

@ -2,7 +2,8 @@
<manifest <manifest
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.simplemobiletools.applauncher"> package="com.simplemobiletools.applauncher"
android:installLocation="auto">
<uses-permission <uses-permission
android:name="android.permission.USE_FINGERPRINT" android:name="android.permission.USE_FINGERPRINT"

View File

@ -20,7 +20,6 @@ import com.simplemobiletools.commons.helpers.LICENSE_KOTLIN
import com.simplemobiletools.commons.helpers.LICENSE_MULTISELECT import com.simplemobiletools.commons.helpers.LICENSE_MULTISELECT
import com.simplemobiletools.commons.helpers.LICENSE_STETHO import com.simplemobiletools.commons.helpers.LICENSE_STETHO
import com.simplemobiletools.commons.models.Release import com.simplemobiletools.commons.models.Release
import com.simplemobiletools.commons.views.MyScalableRecyclerView
import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.activity_main.*
import java.util.* import java.util.*
@ -70,7 +69,6 @@ class MainActivity : SimpleActivity(), RecyclerAdapter.AppLaunchersListener {
override fun onCreateOptionsMenu(menu: Menu): Boolean { override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.menu, menu) menuInflater.inflate(R.menu.menu, menu)
updateMenuTextSize(resources, menu)
return true return true
} }
@ -94,7 +92,7 @@ class MainActivity : SimpleActivity(), RecyclerAdapter.AppLaunchersListener {
private fun getGridAdapter() = launchers_grid.adapter as? RecyclerAdapter private fun getGridAdapter() = launchers_grid.adapter as? RecyclerAdapter
private fun setupGridLayoutManager() { private fun setupGridLayoutManager() {
launchers_grid.isDragSelectionEnabled = true /*launchers_grid.isDragSelectionEnabled = true
launchers_grid.listener = object : MyScalableRecyclerView.MyScalableRecyclerViewListener { launchers_grid.listener = object : MyScalableRecyclerView.MyScalableRecyclerViewListener {
override fun zoomIn() {} override fun zoomIn() {}
@ -107,7 +105,7 @@ class MainActivity : SimpleActivity(), RecyclerAdapter.AppLaunchersListener {
override fun selectRange(initialSelection: Int, lastDraggedIndex: Int, minReached: Int, maxReached: Int) { override fun selectRange(initialSelection: Int, lastDraggedIndex: Int, minReached: Int, maxReached: Int) {
getGridAdapter()?.selectRange(initialSelection, lastDraggedIndex, minReached, maxReached) getGridAdapter()?.selectRange(initialSelection, lastDraggedIndex, minReached, maxReached)
} }
} }*/
} }
private fun setupLaunchers() { private fun setupLaunchers() {
@ -151,7 +149,7 @@ class MainActivity : SimpleActivity(), RecyclerAdapter.AppLaunchersListener {
} }
override fun itemLongClicked(position: Int) { override fun itemLongClicked(position: Int) {
launchers_grid.setDragSelectActive(position) //launchers_grid.setDragSelectActive(position)
} }
private fun checkWhatsNewDialog() { private fun checkWhatsNewDialog() {

View File

@ -1,12 +1,10 @@
package com.simplemobiletools.applauncher.activities package com.simplemobiletools.applauncher.activities
import android.content.Intent import android.content.Intent
import android.os.Bundle import com.simplemobiletools.commons.activities.BaseSplashActivity
import android.support.v7.app.AppCompatActivity
class SplashActivity : AppCompatActivity() { class SplashActivity : BaseSplashActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun initActivity() {
super.onCreate(savedInstanceState)
startActivity(Intent(this, MainActivity::class.java)) startActivity(Intent(this, MainActivity::class.java))
finish() finish()
} }

View File

@ -59,6 +59,9 @@ class RecyclerAdapter(val activity: SimpleActivity, val launchers: MutableList<A
} }
private val adapterListener = object : MyAdapterListener { private val adapterListener = object : MyAdapterListener {
override fun itemLongClicked(position: Int) {
}
override fun toggleItemSelectionAdapter(select: Boolean, position: Int) { override fun toggleItemSelectionAdapter(select: Boolean, position: Int) {
toggleItemSelection(select, position) toggleItemSelection(select, position)
} }

View File

@ -44,6 +44,9 @@ class RecyclerDialogAdapter(activity: Activity, val launchers: List<AppLauncher>
} }
private val adapterListener = object : MyAdapterListener { private val adapterListener = object : MyAdapterListener {
override fun itemLongClicked(position: Int) {
}
override fun toggleItemSelectionAdapter(select: Boolean, position: Int) { override fun toggleItemSelectionAdapter(select: Boolean, position: Int) {
toggleItemSelection(select, position) toggleItemSelection(select, position)
} }

View File

@ -6,7 +6,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<com.simplemobiletools.commons.views.MyScalableRecyclerView <com.simplemobiletools.commons.views.MyRecyclerView
android:id="@+id/launchers_grid" android:id="@+id/launchers_grid"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"

View File

@ -1,11 +1,16 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.kotlin_version = '1.2.0'
repositories { repositories {
jcenter() jcenter()
google()
} }
dependencies { 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 // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
@ -15,8 +20,8 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
jcenter() jcenter()
google()
maven { url "https://jitpack.io" } maven { url "https://jitpack.io" }
maven { url "https://maven.google.com" }
} }
} }