Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
c59a41a6
Commit
c59a41a6
authored
Jan 23, 2022
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor code refactoring
parent
e0410b6f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
18 deletions
+13
-18
Networking.kt
app/src/main/java/com/topjohnwu/magisk/di/Networking.kt
+0
-18
ServiceLocator.kt
app/src/main/java/com/topjohnwu/magisk/di/ServiceLocator.kt
+13
-0
No files found.
app/src/main/java/com/topjohnwu/magisk/di/Networking.kt
View file @
c59a41a6
package
com.topjohnwu.magisk.di
package
com.topjohnwu.magisk.di
import
android.content.Context
import
android.content.Context
import
android.text.method.LinkMovementMethod
import
com.squareup.moshi.Moshi
import
com.squareup.moshi.Moshi
import
com.topjohnwu.magisk.BuildConfig
import
com.topjohnwu.magisk.BuildConfig
import
com.topjohnwu.magisk.ProviderInstaller
import
com.topjohnwu.magisk.ProviderInstaller
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.Config
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.Info
import
com.topjohnwu.magisk.core.utils.currentLocale
import
com.topjohnwu.magisk.core.utils.currentLocale
import
io.noties.markwon.Markwon
import
io.noties.markwon.utils.NoCopySpannableFactory
import
okhttp3.Cache
import
okhttp3.Cache
import
okhttp3.ConnectionSpec
import
okhttp3.ConnectionSpec
import
okhttp3.Dns
import
okhttp3.Dns
...
@@ -100,18 +97,3 @@ inline fun <reified T> createApiService(retrofitBuilder: Retrofit.Builder, baseU
...
@@ -100,18 +97,3 @@ inline fun <reified T> createApiService(retrofitBuilder: Retrofit.Builder, baseU
.
build
()
.
build
()
.
create
(
T
::
class
.
java
)
.
create
(
T
::
class
.
java
)
}
}
fun
createMarkwon
(
context
:
Context
):
Markwon
{
return
Markwon
.
builder
(
context
)
.
textSetter
{
textView
,
spanned
,
bufferType
,
onComplete
->
textView
.
apply
{
post
{
movementMethod
=
LinkMovementMethod
.
getInstance
()
setSpannableFactory
(
NoCopySpannableFactory
.
getInstance
())
setText
(
spanned
,
bufferType
)
onComplete
.
run
()
}
}
}
.
build
()
}
app/src/main/java/com/topjohnwu/magisk/di/ServiceLocator.kt
View file @
c59a41a6
...
@@ -2,6 +2,7 @@ package com.topjohnwu.magisk.di
...
@@ -2,6 +2,7 @@ package com.topjohnwu.magisk.di
import
android.annotation.SuppressLint
import
android.annotation.SuppressLint
import
android.content.Context
import
android.content.Context
import
android.text.method.LinkMovementMethod
import
androidx.lifecycle.ViewModel
import
androidx.lifecycle.ViewModel
import
androidx.lifecycle.ViewModelProvider
import
androidx.lifecycle.ViewModelProvider
import
androidx.lifecycle.ViewModelStoreOwner
import
androidx.lifecycle.ViewModelStoreOwner
...
@@ -19,6 +20,8 @@ import com.topjohnwu.magisk.ui.install.InstallViewModel
...
@@ -19,6 +20,8 @@ import com.topjohnwu.magisk.ui.install.InstallViewModel
import
com.topjohnwu.magisk.ui.log.LogViewModel
import
com.topjohnwu.magisk.ui.log.LogViewModel
import
com.topjohnwu.magisk.ui.superuser.SuperuserViewModel
import
com.topjohnwu.magisk.ui.superuser.SuperuserViewModel
import
com.topjohnwu.magisk.ui.surequest.SuRequestViewModel
import
com.topjohnwu.magisk.ui.surequest.SuRequestViewModel
import
io.noties.markwon.Markwon
import
io.noties.markwon.utils.NoCopySpannableFactory
val
AppContext
:
Context
inline
get
()
=
ServiceLocator
.
context
val
AppContext
:
Context
inline
get
()
=
ServiceLocator
.
context
...
@@ -73,3 +76,13 @@ private fun createSuLogDatabase(context: Context) =
...
@@ -73,3 +76,13 @@ private fun createSuLogDatabase(context: Context) =
Room
.
databaseBuilder
(
context
,
SuLogDatabase
::
class
.
java
,
"sulogs.db"
)
Room
.
databaseBuilder
(
context
,
SuLogDatabase
::
class
.
java
,
"sulogs.db"
)
.
fallbackToDestructiveMigration
()
.
fallbackToDestructiveMigration
()
.
build
()
.
build
()
private
fun
createMarkwon
(
context
:
Context
)
=
Markwon
.
builder
(
context
).
textSetter
{
textView
,
spanned
,
bufferType
,
onComplete
->
textView
.
apply
{
movementMethod
=
LinkMovementMethod
.
getInstance
()
setSpannableFactory
(
NoCopySpannableFactory
.
getInstance
())
setText
(
spanned
,
bufferType
)
onComplete
.
run
()
}
}.
build
()
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment