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

build.gradle

+1 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ buildscript {
		propMinSdkVersion = 21
		propTargetSdkVersion = propCompileSdkVersion
		propVersionCode = 1
		propVersionName = '5.3.11'
		propVersionName = '5.3.13'
		kotlin_version = '1.3.0'
		}

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

+10 −4

Original line number	Diff line number	Diff line
		@@ -14,8 +14,11 @@ class UpgradeToProDialog(val activity: Activity) {
		private val FIRST_APPS_FREE_TILL = 1541980800000L // November 12
		private val NOV_12 = "Nov 12 2018"

		private val CONTACTS_FREE_TILL = 1542067200000L // November 13
		private val NOV_13 = "Nov 13 2018"
		private val CONTACTS_FREE_TILL = 1542153600000L // November 14
		private val NOV_14 = "Nov 14 2018"

		private val NOTES_FREE_TILL = 1542240000000L // November 15
		private val NOV_15 = "Nov 15 2018"

		init {
		var text = activity.getString(R.string.upgrade_to_pro_long)
		@@ -23,7 +26,10 @@ class UpgradeToProDialog(val activity: Activity) {
		val freeTill = String.format(activity.getString(R.string.it_is_free), NOV_12)
		text += "\n$freeTill"
		} else if (packageName.endsWith("contacts") && System.currentTimeMillis() < CONTACTS_FREE_TILL) {
		val freeTill = String.format(activity.getString(R.string.it_is_free), NOV_13)
		val freeTill = String.format(activity.getString(R.string.it_is_free), NOV_14)
		text += "\n$freeTill"
		} else if (packageName.endsWith("notes") && System.currentTimeMillis() < NOTES_FREE_TILL) {
		val freeTill = String.format(activity.getString(R.string.it_is_free), NOV_15)
		text += "\n$freeTill"
		}

		@@ -33,7 +39,7 @@ class UpgradeToProDialog(val activity: Activity) {

		AlertDialog.Builder(activity)
		.setPositiveButton(R.string.upgrade) { dialog, which -> upgradeApp() }
		.setNeutralButton(R.string.more_info, null)
		.setNeutralButton(R.string.more_info, null) // do not dismiss the dialog on pressing More Info
		.setNegativeButton(R.string.cancel, null)
		.create().apply {
		activity.setupDialogStuff(view, this)

commons/src/main/kotlin/com/simplemobiletools/commons/helpers/Constants.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -250,4 +250,4 @@ fun getConflictResolution(resolutions: LinkedHashMap<String, Int>, path: String)
		}
		}

		val proPackages = arrayListOf("draw", "gallery", "filemanager", "contacts")
		val proPackages = arrayListOf("draw", "gallery", "filemanager", "contacts", "notes")

commons/src/main/res/values-ar/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -492,7 +492,7 @@

		<!-- Pro version -->
		<string name="upgrade_to_pro_long">This version of the app is no longer maintained. Please upgrade to the Pro version.</string>
		<string name="it_is_free">It is free till: %s</string>
		<string name="it_is_free">It is free till: %s. If you download it till then, you will be able to use it for free forever.</string>
		<string name="more_info">More info</string>
		<string name="upgrade">Upgrade</string>

commons/src/main/res/values-az/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -492,7 +492,7 @@

		<!-- Pro version -->
		<string name="upgrade_to_pro_long">This version of the app is no longer maintained. Please upgrade to the Pro version.</string>
		<string name="it_is_free">It is free till: %s</string>
		<string name="it_is_free">It is free till: %s. If you download it till then, you will be able to use it for free forever.</string>
		<string name="more_info">More info</string>
		<string name="upgrade">Upgrade</string>