Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit ca4e88e1 authored by solokot's avatar solokot Committed by GitHub
Browse files

Merge pull request #36 from SimpleMobileTools/master 

upd
parents d2a14fb1 827c4419

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.3.31'

        propVersionName = '4.4.1'

        kotlin_version = '1.2.51'

        support_libs = '27.1.1'

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ import android.support.v7.app.AlertDialog 
import android.text.Html

import android.text.method.LinkMovementMethod

import com.simplemobiletools.commons.R

import com.simplemobiletools.commons.extensions.launchViewIntent

import com.simplemobiletools.commons.extensions.launchPurchaseThankYouIntent

import com.simplemobiletools.commons.extensions.setupDialogStuff

import kotlinx.android.synthetic.main.dialog_purchase_thank_you.view.*
@@ -17,7 +17,7 @@ class PurchaseThankYouDialog(val activity: Activity) { 
        }



        AlertDialog.Builder(activity)

                .setPositiveButton(R.string.purchase, { dialog, which -> activity.launchViewIntent(R.string.thank_you_url) })

                .setPositiveButton(R.string.purchase) { dialog, which -> activity.launchPurchaseThankYouIntent() }

                .setNegativeButton(R.string.cancel, null)

                .create().apply {

                    activity.setupDialogStuff(view, this)

commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt

+2 −0
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ fun Activity.isShowingSAFDialog(path: String, treeUri: String, requestCode: Int) 
    }

}



fun Activity.launchPurchaseThankYouIntent() = launchViewIntent(resources.getString(R.string.thank_you_url))



fun Activity.launchViewIntent(id: Int) = launchViewIntent(resources.getString(id))



fun Activity.launchViewIntent(url: String) {

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

+1 −0
Original line number Diff line number Diff line
@@ -353,6 +353,7 @@ 


    <!-- Settings -->

    <string name="settings">Settings</string>

    <string name="purchase_simple_thank_you">Purchase Simple Thank You</string>

    <string name="customize_colors">Customize colors</string>

    <string name="customize_widget_colors">Customize widget colors</string>

    <string name="use_english_language">Use English language</string>

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

+1 −0
Original line number Diff line number Diff line
@@ -353,6 +353,7 @@ 


    <!-- Settings -->

    <string name="settings">Parametrlər</string>

    <string name="purchase_simple_thank_you">Purchase Simple Thank You</string>

    <string name="customize_colors">Rəngləri dəyiş</string>

    <string name="customize_widget_colors">Widget rənglərini dəyiş</string>

    <string name="use_english_language">İngilis dilində işlət</string>