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

build.gradle

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ buildscript {
		propMinSdkVersion = 16
		propTargetSdkVersion = propCompileSdkVersion
		propVersionCode = 1
		propVersionName = '3.14.12'
		propVersionName = '3.15.11'
		kotlin_version = '1.2.30'
		support_libs = '27.1.0'
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ class AboutActivity : BaseSimpleActivity() {
		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)
		val newline = "%0D%0A"
		val separator = "-------------------"
		val separator = "------------------------------"
		val body = "$appVersion$newline$deviceOS$newline$separator$newline$newline$newline"
		val href = "$label<br><a href=\"mailto:$email?subject=$appName&body=$body\">$email</a>"
		about_email.text = Html.fromHtml(href)

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

+23 −23

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ class LicenseActivity : BaseSimpleActivity() {

		val inflater = LayoutInflater.from(this)
		val licenses = initLicenses()
		val licenseMask = intent.getIntExtra(APP_LICENSES, 0)
		val licenseMask = intent.getIntExtra(APP_LICENSES, 0) or LICENSE_KOTLIN
		licenses.filter { licenseMask and it.id != 0 }.forEach {
		val license = it
		inflater.inflate(R.layout.license_faq_item, null).apply {
		@@ -40,8 +40,7 @@ class LicenseActivity : BaseSimpleActivity() {
		}
		}

		private fun initLicenses() =
		arrayOf(
		private fun initLicenses() = arrayOf(
		License(LICENSE_KOTLIN, R.string.kotlin_title, R.string.kotlin_text, R.string.kotlin_url),
		License(LICENSE_SUBSAMPLING, R.string.subsampling_title, R.string.subsampling_text, R.string.subsampling_url),
		License(LICENSE_GLIDE, R.string.glide_title, R.string.glide_text, R.string.glide_url),
		@@ -60,6 +59,7 @@ class LicenseActivity : BaseSimpleActivity() {
		License(LICENSE_ROBOLECTRIC, R.string.robolectric_title, R.string.robolectric_text, R.string.robolectric_url),
		License(LICENSE_ESPRESSO, R.string.espresso_title, R.string.espresso_text, R.string.espresso_url),
		License(LICENSE_GSON, R.string.gson_title, R.string.gson_text, R.string.gson_url),
		License(LICENSE_LEAK_CANARY, R.string.leak_canary_title, R.string.leakcanary_text, R.string.leakcanary_url)
		License(LICENSE_LEAK_CANARY, R.string.leak_canary_title, R.string.leakcanary_text, R.string.leakcanary_url),
		License(LICENSE_NUMBER_PICKER, R.string.number_picker_title, R.string.number_picker_text, R.string.number_picker_url)
		)
		}

commons/src/main/kotlin/com/simplemobiletools/commons/asynctasks/CopyMoveTask.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@ import com.simplemobiletools.commons.extensions.*
		import com.simplemobiletools.commons.helpers.CONFLICT_OVERWRITE
		import com.simplemobiletools.commons.helpers.CONFLICT_SKIP
		import com.simplemobiletools.commons.helpers.OTG_PATH
		import com.simplemobiletools.commons.helpers.isOreoPlus
		import com.simplemobiletools.commons.interfaces.CopyMoveListener
		import com.simplemobiletools.commons.models.FileDirItem
		import java.io.File
		@@ -121,7 +122,7 @@ class CopyMoveTask(val activity: BaseSimpleActivity, val copyOnly: Boolean = fal
		private fun initProgressNotification() {
		val channelId = "copying_moving_channel"
		val title = activity.getString(if (copyOnly) R.string.copying else R.string.moving)
		if (activity.isOreoPlus()) {
		if (isOreoPlus()) {
		val importance = NotificationManager.IMPORTANCE_LOW
		NotificationChannel(channelId, title, importance).apply {
		enableLights(false)

commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/CustomIntervalPickerDialog.kt

0 → 100644

+61 −0

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

		import android.app.Activity
		import android.support.v7.app.AlertDialog
		import android.view.ViewGroup
		import com.simplemobiletools.commons.R
		import com.simplemobiletools.commons.extensions.hideKeyboard
		import com.simplemobiletools.commons.extensions.setupDialogStuff
		import com.simplemobiletools.commons.extensions.showKeyboard
		import com.simplemobiletools.commons.extensions.value
		import com.simplemobiletools.commons.helpers.DAY_MINUTES
		import kotlinx.android.synthetic.main.dialog_custom_interval_picker.view.*

		class CustomIntervalPickerDialog(val activity: Activity, val selectedMinutes: Int = 0, val callback: (minutes: Int) -> Unit) {
		var dialog: AlertDialog
		var view = (activity.layoutInflater.inflate(R.layout.dialog_custom_interval_picker, null) as ViewGroup)

		init {
		view.apply {
		when {
		selectedMinutes == 0 -> dialog_radio_view.check(R.id.dialog_radio_minutes)
		selectedMinutes % DAY_MINUTES == 0 -> {
		dialog_radio_view.check(R.id.dialog_radio_days)
		dialog_custom_interval_value.setText((selectedMinutes / DAY_MINUTES).toString())
		}
		selectedMinutes % 60 == 0 -> {
		dialog_radio_view.check(R.id.dialog_radio_hours)
		dialog_custom_interval_value.setText((selectedMinutes / 60).toString())
		}
		else -> {
		dialog_radio_view.check(R.id.dialog_radio_minutes)
		dialog_custom_interval_value.setText(selectedMinutes.toString())
		}
		}
		}

		dialog = AlertDialog.Builder(activity)
		.setPositiveButton(R.string.ok, { dialogInterface, i -> confirmReminder() })
		.setNegativeButton(R.string.cancel, null)
		.create().apply {
		activity.setupDialogStuff(view, this) {
		showKeyboard(view.dialog_custom_interval_value)
		}
		}
		}

		private fun confirmReminder() {
		val value = view.dialog_custom_interval_value.value
		val multiplier = getMultiplier(view.dialog_radio_view.checkedRadioButtonId)
		val minutes = Integer.valueOf(if (value.isEmpty()) "0" else value)
		callback(minutes * multiplier)
		activity.hideKeyboard()
		dialog.dismiss()
		}

		private fun getMultiplier(id: Int) = when (id) {
		R.id.dialog_radio_hours -> 60
		R.id.dialog_radio_days -> DAY_MINUTES
		else -> 1
		}
		}