MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move function as extension

Browse Source
This commit is contained in:
topjohnwu 2019-09-28 12:17:34 -04:00
parent c4356171b3
commit d3f49334e2
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/topjohnwu/magisk/base/BaseActivity.kt
View File

@ -11,7 +11,6 @@ import androidx.appcompat.app.AppCompatDelegate
import androidx.collection.SparseArrayCompat
import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat
import androidx.core.net.toUri
import androidx.databinding.DataBindingUtil
import androidx.databinding.ViewDataBinding
import com.topjohnwu.magisk.BR
@ -21,7 +20,6 @@ import com.topjohnwu.magisk.extensions.set
import com.topjohnwu.magisk.model.events.EventHandler
import com.topjohnwu.magisk.model.permissions.PermissionRequestBuilder
import com.topjohnwu.magisk.utils.LocaleManager
import com.topjohnwu.magisk.utils.Utils
import com.topjohnwu.magisk.utils.currentLocale
import kotlin.random.Random
@ -69,8 +67,6 @@ abstract class BaseActivity<ViewModel : BaseViewModel, Binding : ViewDataBinding
}
}
fun openUrl(url: String) = Utils.openLink(this, url.toUri())
fun withPermissions(vararg permissions: String, builder: PermissionRequestBuilder.() -> Unit) {
val request = PermissionRequestBuilder().apply(builder).build()
val ungranted = permissions.filter {
@ -91,6 +87,10 @@ abstract class BaseActivity<ViewModel : BaseViewModel, Binding : ViewDataBinding
}
}
fun withExternalRW(builder: PermissionRequestBuilder.() -> Unit) {
withPermissions(Manifest.permission.WRITE_EXTERNAL_STORAGE, builder = builder)
}
override fun onRequestPermissionsResult(
requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
var success = true
@ -107,10 +107,6 @@ abstract class BaseActivity<ViewModel : BaseViewModel, Binding : ViewDataBinding
}
fun withExternalRW(builder: PermissionRequestBuilder.() -> Unit) {
withPermissions(Manifest.permission.WRITE_EXTERNAL_STORAGE, builder = builder)
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
resultCallbacks[requestCode]?.apply {

4
app/src/main/java/com/topjohnwu/magisk/extensions/XAndroid.kt
View File

@ -17,7 +17,9 @@ import android.view.View
import androidx.annotation.ColorRes
import androidx.annotation.DrawableRes
import androidx.core.content.ContextCompat
import androidx.core.net.toUri
import com.topjohnwu.magisk.utils.FileProvider
import com.topjohnwu.magisk.utils.Utils
import com.topjohnwu.magisk.utils.currentLocale
import java.io.File
import java.io.FileNotFoundException
@ -153,3 +155,5 @@ fun Context.startEndToLeftRight(start: Int, end: Int): Pair<Int, Int> {
}
return start to end
}
fun Context.openUrl(url: String) = Utils.openLink(this, url.toUri())

1
app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
View File

@ -10,6 +10,7 @@ import com.topjohnwu.magisk.base.BaseFragment
import com.topjohnwu.magisk.data.repository.MagiskRepository
import com.topjohnwu.magisk.databinding.FragmentMagiskBinding
import com.topjohnwu.magisk.extensions.inject
import com.topjohnwu.magisk.extensions.openUrl
import com.topjohnwu.magisk.extensions.subscribeK
import com.topjohnwu.magisk.extensions.writeTo
import com.topjohnwu.magisk.model.events.*