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

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

Merge pull request #6 from SimpleMobileTools/master 

update
parents 984a58aa 77c99a8e

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ buildscript { 
        propMinSdkVersion = 16

        propTargetSdkVersion = propCompileSdkVersion

        propVersionCode = 1

        propVersionName = '3.0.21'

        propVersionName = '3.1.4'

        kotlin_version = '1.2.0'

        support_libs = '27.0.2'

    }

commons/src/main/kotlin/com/simplemobiletools/commons/adapters/FilepickerItemsAdapter.kt

+22 −5
Original line number Diff line number Diff line 
package com.simplemobiletools.commons.adapters



import android.content.pm.PackageManager

import android.view.Menu

import android.view.View

import android.view.ViewGroup
@@ -61,18 +62,34 @@ class FilepickerItemsAdapter(activity: BaseSimpleActivity, val fileDirItems: Lis 
        view.apply {

            list_item_name.text = fileDirItem.name

            list_item_name.setTextColor(textColor)

            list_item_details.setTextColor(textColor)



            if (fileDirItem.isDirectory) {

                list_item_icon.setImageDrawable(folderDrawable)

                list_item_details.text = getChildrenCnt(fileDirItem)

            } else {

                val path = fileDirItem.path

                val options = RequestOptions().centerCrop().error(fileDrawable)

                Glide.with(context).load(path).transition(withCrossFade()).apply(options).into(list_item_icon)

                list_item_details.text = fileDirItem.size.formatSize()

                val path = fileDirItem.path

                val options = RequestOptions()

                        .centerCrop()

                        .error(fileDrawable)



                val itemToLoad = if (fileDirItem.name.endsWith(".apk", true)) {

                    val packageInfo = context.packageManager.getPackageArchiveInfo(path, PackageManager.GET_ACTIVITIES)

                    if (packageInfo != null) {

                        val appInfo = packageInfo.applicationInfo

                        appInfo.sourceDir = path

                        appInfo.publicSourceDir = path

                        appInfo.loadIcon(context.packageManager)

                    } else {

                        path

                    }

                } else {

                    path

                }



            list_item_details.setTextColor(textColor)

                Glide.with(context).load(itemToLoad).transition(withCrossFade()).apply(options).into(list_item_icon)

            }

        }

    }

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

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ package com.simplemobiletools.commons.dialogs 


import android.app.Activity

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
@@ -11,6 +12,7 @@ import kotlinx.android.synthetic.main.dialog_donate.view.* 
class DonateDialog(val activity: Activity) {

    init {

        val view = activity.layoutInflater.inflate(R.layout.dialog_donate, null).apply {

            donate.text = Html.fromHtml(activity.getString(R.string.donate_please))

            donate.movementMethod = LinkMovementMethod.getInstance()

        }

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

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ class PropertiesDialog() { 
                    if (cursor.moveToFirst()) {

                        val dateModified = cursor.getIntValue(MediaStore.Images.Media.DATE_MODIFIED)

                        activity.runOnUiThread {

                            view.findViewById<TextView>(R.id.properties_last_modified).property_value.text = (dateModified * 1000L).formatLastModified()

                            view.findViewById<TextView>(R.id.properties_last_modified).property_value.text = (dateModified * 1000L).formatDate()

                        }

                    }

                }
@@ -90,7 +90,7 @@ class PropertiesDialog() { 
        }



        if (file.isDirectory) {

            addProperty(R.string.last_modified, file.lastModified().formatLastModified())

            addProperty(R.string.last_modified, file.lastModified().formatDate())

        } else {

            addProperty(R.string.last_modified, "...", R.id.properties_last_modified)

            addExifProperties(path)

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

+3 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ package com.simplemobiletools.commons.dialogs 


import android.app.Activity

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
@@ -11,7 +12,8 @@ import kotlinx.android.synthetic.main.dialog_purchase_thank_you.view.* 
class PurchaseThankYouDialog(val activity: Activity) {

    init {

        val view = activity.layoutInflater.inflate(R.layout.dialog_purchase_thank_you, null).apply {

            install_thank_you.movementMethod = LinkMovementMethod.getInstance()

            purchase_thank_you.text = Html.fromHtml(activity.getString(R.string.purchase_thank_you))

            purchase_thank_you.movementMethod = LinkMovementMethod.getInstance()

        }



        AlertDialog.Builder(activity)