Merge pull request #43 from SimpleMobileTools/master (98121c59) · Commits · e / os / Simple-Commons

build.gradle

+5 −6

Original line number	Diff line number	Diff line
		@@ -4,21 +4,20 @@ buildscript {
		ext {
		propCompileSdkVersion = 28
		propBuildToolsVersion = "28.0.3"
		propMinSdkVersion = 16
		propMinSdkVersion = 21
		propTargetSdkVersion = propCompileSdkVersion
		propVersionCode = 1
		propVersionName = '4.8.0'
		propVersionName = '5.1.6'
		kotlin_version = '1.2.71'
		support_libs = '27.1.1'
		}

		repositories {
		jcenter()
		google()
		jcenter()
		}

		dependencies {
		classpath 'com.android.tools.build:gradle:3.2.0'
		classpath 'com.android.tools.build:gradle:3.2.1'
		classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
		classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.0'
		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
		@@ -30,8 +29,8 @@ buildscript {

		allprojects {
		repositories {
		jcenter()
		google()
		jcenter()
		maven { url 'https://jitpack.io' }
		}
		}

commons/build.gradle

+4 −5

Original line number	Diff line number	Diff line
		@@ -28,15 +28,14 @@ android {
		}

		dependencies {
		compile "com.android.support:design:$support_libs"
		compile "com.android.support:appcompat-v7:$support_libs"
		api 'androidx.appcompat:appcompat:1.0.0'
		api 'com.github.ajalt.reprint:core:3.2.1@aar'
		implementation 'com.google.android.material:material:1.0.0'
		implementation 'com.github.bumptech.glide:glide:4.8.0'
		implementation 'com.booking:rtlviewpager:1.0.1'
		implementation 'com.andrognito.patternlockview:patternlockview:1.0.0'
		implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
		implementation 'com.bignerdranch.android:recyclerview-multiselect:0.2'
		implementation 'com.google.code.gson:gson:2.8.2'
		compile 'com.github.ajalt.reprint:core:3.2.1@aar'
		implementation 'com.duolingo.open:rtl-viewpager:1.0.3'

		kapt 'com.github.bumptech.glide:compiler:4.8.0'
		}

commons/src/main/kotlin/com/simplemobiletools/commons/activities/AboutActivity.kt

+4 −4

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ class AboutActivity : BaseSimpleActivity() {
		setupInvite()
		setupLicense()
		setupFacebook()
		setupGPlus()
		setupReddit()
		setupCopyright()
		}

		@@ -163,9 +163,9 @@ class AboutActivity : BaseSimpleActivity() {
		}
		}

		private fun setupGPlus() {
		about_gplus.setOnClickListener {
		launchViewIntent("https://plus.google.com/communities/104880861558693868382")
		private fun setupReddit() {
		about_reddit.setOnClickListener {
		launchViewIntent("https://www.reddit.com/r/SimpleMobileTools")
		}
		}

commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSimpleActivity.kt

+7 −17

Original line number	Diff line number	Diff line
		package com.simplemobiletools.commons.activities

		import android.annotation.SuppressLint
		import android.annotation.TargetApi
		import android.app.Activity
		import android.app.ActivityManager
		import android.content.Context
		@@ -9,14 +8,13 @@ import android.content.Intent
		import android.graphics.BitmapFactory
		import android.graphics.drawable.ColorDrawable
		import android.net.Uri
		import android.os.Build
		import android.os.Bundle
		import android.provider.DocumentsContract
		import android.support.v4.app.ActivityCompat
		import android.support.v4.util.Pair
		import android.support.v7.app.AppCompatActivity
		import android.view.MenuItem
		import android.view.WindowManager
		import androidx.appcompat.app.AppCompatActivity
		import androidx.core.app.ActivityCompat
		import androidx.core.util.Pair
		import com.simplemobiletools.commons.R
		import com.simplemobiletools.commons.asynctasks.CopyMoveTask
		import com.simplemobiletools.commons.dialogs.ConfirmationDialog
		@@ -108,20 +106,15 @@ abstract class BaseSimpleActivity : AppCompatActivity() {
		supportActionBar?.setBackgroundDrawable(ColorDrawable(color))
		updateActionBarTitle(supportActionBar?.title.toString(), color)
		updateStatusbarColor(color)

		if (isLollipopPlus()) {
		setTaskDescription(ActivityManager.TaskDescription(null, null, color))
		}
		}

		fun updateStatusbarColor(color: Int) {
		if (isLollipopPlus()) {
		window.statusBarColor = color.darkenColor()
		}
		}

		fun updateRecentsAppIcon() {
		if (baseConfig.isUsingModifiedAppIcon && isLollipopPlus()) {
		if (baseConfig.isUsingModifiedAppIcon) {
		val appIconIDs = getAppIconIDs()
		val currentAppIconColorIndex = getCurrentAppIconColorIndex()
		if (appIconIDs.size - 1 < currentAppIconColorIndex) {
		@@ -148,10 +141,8 @@ abstract class BaseSimpleActivity : AppCompatActivity() {
		}

		fun setTranslucentNavigation() {
		if (isKitkatPlus()) {
		window.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION, WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION)
		}
		}

		override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
		super.onActivityResult(requestCode, resultCode, resultData)
		@@ -189,7 +180,6 @@ abstract class BaseSimpleActivity : AppCompatActivity() {
		}
		}

		@TargetApi(Build.VERSION_CODES.KITKAT)
		private fun saveTreeUri(resultData: Intent) {
		val treeUri = resultData.data
		baseConfig.treeUri = treeUri.toString()

commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSplashActivity.kt

+1 −1

Original line number	Diff line number	Diff line
		package com.simplemobiletools.commons.activities

		import android.os.Bundle
		import android.support.v7.app.AppCompatActivity
		import androidx.appcompat.app.AppCompatActivity
		import com.simplemobiletools.commons.extensions.baseConfig
		import com.simplemobiletools.commons.extensions.getSharedTheme
		import com.simplemobiletools.commons.extensions.isThankYouInstalled