Merge pull request #8 from SimpleMobileTools/master (e5a7ccad) · Commits · e / os / Simple-Commons

build.gradle

+2 −3

Original line number	Diff line number	Diff line
		@@ -2,13 +2,12 @@

		buildscript {
		ext {
		propBuildToolsVersion = '27.0.1'
		propCompileSdkVersion = 27
		propMinSdkVersion = 16
		propTargetSdkVersion = propCompileSdkVersion
		propVersionCode = 1
		propVersionName = '3.2.6'
		kotlin_version = '1.2.0'
		propVersionName = '3.4.13'
		kotlin_version = '1.2.10'
		support_libs = '27.0.2'
		}

commons/build.gradle

+0 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,6 @@ apply plugin: 'kotlin-kapt'

		android {
		compileSdkVersion propCompileSdkVersion
		buildToolsVersion propBuildToolsVersion

		defaultConfig {
		minSdkVersion propMinSdkVersion

commons/proguard-rules.pro

+2 −0

Original line number	Diff line number	Diff line
		@@ -5,3 +5,5 @@
		-dontwarn com.bumptech.glide.load.resource.bitmap.Downsampler
		-dontwarn com.bumptech.glide.load.resource.bitmap.HardwareConfigState
		-dontwarn com.bumptech.glide.manager.RequestManagerRetriever

		-keep public class * extends java.lang.Exception

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

+12 −13

Original line number	Diff line number	Diff line
		@@ -2,6 +2,7 @@ package com.simplemobiletools.commons.activities

		import android.content.ActivityNotFoundException
		import android.content.Intent
		import android.graphics.Color
		import android.os.Build
		import android.os.Bundle
		import android.text.Html
		@@ -9,7 +10,7 @@ import android.text.method.LinkMovementMethod
		import android.view.View
		import com.simplemobiletools.commons.R
		import com.simplemobiletools.commons.extensions.baseConfig
		import com.simplemobiletools.commons.extensions.getLinkTextColor
		import com.simplemobiletools.commons.extensions.isBlackAndWhiteTheme
		import com.simplemobiletools.commons.extensions.launchViewIntent
		import com.simplemobiletools.commons.extensions.updateTextColors
		import com.simplemobiletools.commons.helpers.APP_LICENSES
		@@ -19,14 +20,14 @@ import kotlinx.android.synthetic.main.activity_about.*
		import java.util.*

		class AboutActivity : BaseSimpleActivity() {
		var appName = ""
		var linkTextColor = 0
		private var appName = ""
		private var linkColor = 0

		override fun onCreate(savedInstanceState: Bundle?) {
		super.onCreate(savedInstanceState)
		setContentView(R.layout.activity_about)
		appName = intent.getStringExtra(APP_NAME) ?: ""
		linkTextColor = getLinkTextColor()
		linkColor = if (isBlackAndWhiteTheme()) Color.WHITE else baseConfig.primaryColor
		}

		override fun onResume() {
		@@ -46,14 +47,13 @@ class AboutActivity : BaseSimpleActivity() {
		}

		private fun setupWebsite() {
		val websiteText = String.format(getString(R.string.two_string_placeholder), getString(R.string.website_label), getString(R.string.website))
		val websiteText = String.format(getString(R.string.two_string_placeholder), getString(R.string.website_label), getString(R.string.my_website))
		about_website.text = websiteText
		about_website.setLinkTextColor(linkTextColor)
		}

		private fun setupEmail() {
		val label = getString(R.string.email_label)
		val email = getString(R.string.email)
		val email = getString(R.string.my_email)

		val appVersion = String.format(getString(R.string.app_version, intent.getStringExtra(APP_VERSION_NAME)))
		val deviceOS = String.format(getString(R.string.device_os), Build.VERSION.RELEASE)
		@@ -63,14 +63,13 @@ class AboutActivity : BaseSimpleActivity() {
		val href = "$label<br><a href=\"mailto:$email?subject=$appName&body=$body\">$email</a>"
		about_email.text = Html.fromHtml(href)
		about_email.movementMethod = LinkMovementMethod.getInstance()
		about_email.setLinkTextColor(linkTextColor)
		}

		private fun setupMoreApps() {
		about_more_apps.setOnClickListener {
		launchViewIntent("https://play.google.com/store/apps/dev?id=9070296388022589266")
		}
		about_more_apps.setTextColor(linkTextColor)
		about_more_apps.setTextColor(linkColor)
		}

		private fun setupInvite() {
		@@ -84,7 +83,7 @@ class AboutActivity : BaseSimpleActivity() {
		startActivity(Intent.createChooser(this, getString(R.string.invite_via)))
		}
		}
		about_invite.setTextColor(linkTextColor)
		about_invite.setTextColor(linkColor)
		}

		private fun setupRateUs() {
		@@ -99,7 +98,7 @@ class AboutActivity : BaseSimpleActivity() {
		}
		}
		}
		about_rate_us.setTextColor(linkTextColor)
		about_rate_us.setTextColor(linkColor)
		}

		private fun setupLicense() {
		@@ -109,14 +108,14 @@ class AboutActivity : BaseSimpleActivity() {
		startActivity(this)
		}
		}
		about_license.setTextColor(linkTextColor)
		about_license.setTextColor(linkColor)
		}

		private fun setupDonate() {
		about_donate.setOnClickListener {
		launchViewIntent("https://simplemobiletools.github.io/donate/")
		}
		about_donate.setTextColor(linkTextColor)
		about_donate.setTextColor(linkColor)
		}

		private fun setupFacebook() {

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

+17 −13

Original line number	Diff line number	Diff line
		@@ -174,7 +174,7 @@ open class BaseSimpleActivity : AppCompatActivity() {
		}

		if (files.size == 1) {
		if (File(destinationFolder.absolutePath, files[0].name).exists()) {
		if (File(destination, files[0].name).exists()) {
		toast(R.string.name_taken)
		return
		}
		@@ -186,7 +186,7 @@ open class BaseSimpleActivity : AppCompatActivity() {
		toast(R.string.copying)
		startCopyMove(files, destinationFolder, isCopyOperation, copyPhotoVideoOnly)
		} else {
		if (isPathOnSD(source) \|\| isPathOnSD(destinationFolder.absolutePath)) {
		if (isPathOnSD(source) \|\| isPathOnSD(destination) \|\| files.first().isDirectory \|\| isOreoPlus()) {
		handleSAFDialog(File(source)) {
		toast(R.string.moving)
		startCopyMove(files, destinationFolder, false, copyPhotoVideoOnly)
		@@ -195,6 +195,7 @@ open class BaseSimpleActivity : AppCompatActivity() {
		toast(R.string.moving)
		val updatedFiles = ArrayList<File>(files.size * 2)
		updatedFiles.addAll(files)
		try {
		for (oldFile in files) {
		val newFile = File(destinationFolder, oldFile.name)
		if (!newFile.exists() && oldFile.renameTo(newFile)) {
		@@ -211,6 +212,9 @@ open class BaseSimpleActivity : AppCompatActivity() {
		copyMoveListener.copySucceeded(false, files.size * 2 == updatedFiles.size)
		}
		}
		} catch (e: Exception) {
		showErrorToast(e)
		}
		}
		}
		}