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

Commit 529bc7eb authored by tibbi's avatar tibbi
Browse files

add helper activity extensions for updating title and subtitle

parent 25f27d80

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

        propVersionName = '4.4.15'

        kotlin_version = '1.2.51'

        support_libs = '27.1.1'

    }

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

+1 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ import android.provider.DocumentsContract 
import android.support.v4.app.ActivityCompat

import android.support.v4.util.Pair

import android.support.v7.app.AppCompatActivity

import android.text.Html

import android.view.MenuItem

import android.view.WindowManager

import com.simplemobiletools.commons.R
@@ -107,7 +106,7 @@ abstract class BaseSimpleActivity : AppCompatActivity() { 


    fun updateActionbarColor(color: Int = baseConfig.primaryColor) {

        supportActionBar?.setBackgroundDrawable(ColorDrawable(color))

        supportActionBar?.title = Html.fromHtml("<font color='${color.getContrastColor().toHex()}'>${supportActionBar?.title}</font>")

        updateActionBarTitle(supportActionBar?.title.toString())

        updateStatusbarColor(color)



        if (isLollipopPlus()) {

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

+2 −2
Original line number Diff line number Diff line
@@ -128,8 +128,8 @@ class ColorPickerDialog(val activity: Activity, color: Int, val removeDimmedBack 


        val textColor = activity.baseConfig.textColor

        dialog = AlertDialog.Builder(activity)

                .setPositiveButton(R.string.ok, { dialog, which -> confirmNewColor() })

                .setNegativeButton(R.string.cancel, { dialog, which -> dialogDismissed() })

                .setPositiveButton(R.string.ok) { dialog, which -> confirmNewColor() }

                .setNegativeButton(R.string.cancel) { dialog, which -> dialogDismissed() }

                .setOnCancelListener { dialogDismissed() }

                .create().apply {

                    activity.setupDialogStuff(view, this) {

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

+2 −2
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ class LineColorPickerDialog(val activity: BaseSimpleActivity, val color: Int, va 
        }



        dialog = AlertDialog.Builder(activity)

                .setPositiveButton(R.string.ok, { dialog, which -> dialogConfirmed() })

                .setNegativeButton(R.string.cancel, { dialog, which -> dialogDismissed() })

                .setPositiveButton(R.string.ok) { dialog, which -> dialogConfirmed() }

                .setNegativeButton(R.string.cancel) { dialog, which -> dialogDismissed() }

                .setOnCancelListener { dialogDismissed() }

                .create().apply {

                    activity.setupDialogStuff(view, this)

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

+10 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ import android.provider.DocumentsContract 
import android.provider.MediaStore

import android.support.v4.provider.DocumentFile

import android.support.v7.app.AlertDialog

import android.support.v7.app.AppCompatActivity

import android.text.Html

import android.view.View

import android.view.ViewGroup

import android.view.Window
@@ -71,6 +73,14 @@ fun Activity.showErrorToast(exception: Exception, length: Int = Toast.LENGTH_LON 
    showErrorToast(exception.toString(), length)

}



fun AppCompatActivity.updateActionBarTitle(text: String, color: Int = baseConfig.primaryColor) {

    supportActionBar?.title = Html.fromHtml("<font color='${color.getContrastColor().toHex()}'>$text</font>")

}



fun AppCompatActivity.updateActionBarSubtitle(text: String) {

    supportActionBar?.subtitle = Html.fromHtml("<font color='${baseConfig.primaryColor.getContrastColor().toHex()}'>$text</font>")

}



@SuppressLint("NewApi")

fun Activity.appLaunched(appId: String) {

    baseConfig.internalStoragePath = getInternalStoragePath()