make the Read FAQ before sending email optional (56a38ca5) · Commits · e / os / Simple-Commons

build.gradle

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ buildscript {
		propMinSdkVersion = 16
		propTargetSdkVersion = propCompileSdkVersion
		propVersionCode = 1
		propVersionName = '4.5.11'
		propVersionName = '4.5.12'
		kotlin_version = '1.2.51'
		support_libs = '27.1.1'
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -63,9 +63,7 @@ class AboutActivity : BaseSimpleActivity() {
		val href = "$label<br><a href=\"mailto:$email?subject=$appName&body=$body\">$email</a>"
		about_email.text = Html.fromHtml(href)

		if (baseConfig.wasBeforeAskingShown) {
		about_email.movementMethod = LinkMovementMethod.getInstance()
		} else {
		if (intent.getBooleanExtra(SHOW_FAQ_BEFORE_MAIL, false) && !baseConfig.wasBeforeAskingShown) {
		about_email.setOnClickListener {
		baseConfig.wasBeforeAskingShown = true
		about_email.movementMethod = LinkMovementMethod.getInstance()
		@@ -74,6 +72,8 @@ class AboutActivity : BaseSimpleActivity() {
		about_faq_label.performClick()
		}
		}
		} else {
		about_email.movementMethod = LinkMovementMethod.getInstance()
		}
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -210,7 +210,7 @@ abstract class BaseSimpleActivity : AppCompatActivity() {

		private fun isExternalStorageDocument(uri: Uri) = "com.android.externalstorage.documents" == uri.authority

		fun startAboutActivity(appNameId: Int, licenseMask: Int, versionName: String, faqItems: ArrayList<FAQItem> = arrayListOf()) {
		fun startAboutActivity(appNameId: Int, licenseMask: Int, versionName: String, faqItems: ArrayList<FAQItem>, showFAQBeforeMail: Boolean) {
		Intent(applicationContext, AboutActivity::class.java).apply {
		putExtra(APP_ICON_IDS, getAppIconIDs())
		putExtra(APP_LAUNCHER_NAME, getAppLauncherName())
		@@ -218,6 +218,7 @@ abstract class BaseSimpleActivity : AppCompatActivity() {
		putExtra(APP_LICENSES, licenseMask)
		putExtra(APP_VERSION_NAME, versionName)
		putExtra(APP_FAQ, faqItems)
		putExtra(SHOW_FAQ_BEFORE_MAIL, showFAQBeforeMail)
		startActivity(this)
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ const val IS_CUSTOMIZING_COLORS = "is_customizing_colors"
		const val ALARM_SOUND_TYPE_ALARM = 1
		const val ALARM_SOUND_TYPE_NOTIFICATION = 2
		const val YOUR_ALARM_SOUNDS_MIN_ID = 1000
		const val SHOW_FAQ_BEFORE_MAIL = "show_faq_before_mail"

		const val HOUR_MINUTES = 60
		const val DAY_MINUTES = 24 * HOUR_MINUTES