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

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

Merge pull request #37 from SimpleMobileTools/master 

upd
parents 55d577df 8b449f83

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

        propVersionName = '4.5.1'

        kotlin_version = '1.2.51'

        support_libs = '27.1.1'

    }

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

+8 −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(), color)

        updateStatusbarColor(color)



        if (isLollipopPlus()) {
@@ -382,4 +381,11 @@ abstract class BaseSimpleActivity : AppCompatActivity() { 
            }

        }

    }



    fun checkAppOnSDCard() {

        if (!baseConfig.wasAppOnSDShown && isAppInstalledOnSDCard()) {

            baseConfig.wasAppOnSDShown = true

            ConfirmationDialog(this, "", R.string.app_on_sd_card, R.string.ok, 0) {}

        }

    }

}

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

+9 −6
Original line number Diff line number Diff line
@@ -118,18 +118,21 @@ class ColorPickerDialog(val activity: Activity, color: Int, val removeDimmedBack 


            override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {

                if (s.length == 6 && !isHueBeingDragged) {

                    try {

                        val newColor = Color.parseColor("#$s")

                        Color.colorToHSV(newColor, currentColorHsv)

                        updateHue()

                        moveColorPicker()

                    } catch (ignored: Exception) {

                    }

                }

            }

        })



        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/FilePickerDialog.kt

+7 −2
Original line number Diff line number Diff line
@@ -50,12 +50,17 @@ class FilePickerDialog(val activity: BaseSimpleActivity, 
            currPath = currPath.getParentPath()

        }



        // do not allow copying files in the recycle bin manually

        if (currPath.startsWith(activity.filesDir.absolutePath)) {

            currPath = activity.internalStoragePath

        }



        mDialogView.filepicker_breadcrumbs.listener = this

        tryUpdateItems()



        val builder = AlertDialog.Builder(activity)

                .setNegativeButton(R.string.cancel, null)

                .setOnKeyListener({ dialogInterface, i, keyEvent ->

                .setOnKeyListener { dialogInterface, i, keyEvent ->

                    if (keyEvent.action == KeyEvent.ACTION_UP && i == KeyEvent.KEYCODE_BACK) {

                        val breadcrumbs = mDialogView.filepicker_breadcrumbs

                        if (breadcrumbs.childCount > 1) {
@@ -67,7 +72,7 @@ class FilePickerDialog(val activity: BaseSimpleActivity, 
                        }

                    }

                    true

                })

                }



        if (!pickFile)

            builder.setPositiveButton(R.string.ok, null)

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)