Skip to content

Commit 3d079f2

Browse files
committed
Migrate to Kotlin API
1 parent 7ab1977 commit 3d079f2

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

core/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ def roomVersion = '2.2.3'
5454
def workVersion = '2.2.0'
5555
dependencies {
5656
api project(':plugin')
57+
api 'androidx.activity:activity-ktx:1.1.0-rc03'
5758
api "androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion"
5859
api "androidx.lifecycle:lifecycle-extensions:$lifecycleVersion"
5960
api "androidx.lifecycle:lifecycle-livedata-core-ktx:$lifecycleVersion"
60-
api "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion"
6161
api 'androidx.preference:preference:1.1.0'
6262
api "androidx.room:room-runtime:$roomVersion"
6363
api "androidx.work:work-runtime-ktx:$workVersion"

mobile/src/main/java/com/github/shadowsocks/subscription/SubscriptionFragment.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ import androidx.recyclerview.widget.RecyclerView
4141
import com.github.shadowsocks.MainActivity
4242
import com.github.shadowsocks.R
4343
import com.github.shadowsocks.ToolbarFragment
44-
import com.github.shadowsocks.bg.BaseService
4544
import com.github.shadowsocks.plugin.AlertDialogFragment
4645
import com.github.shadowsocks.utils.readableMessage
4746
import com.github.shadowsocks.widget.ListHolderListener

mobile/src/main/java/com/github/shadowsocks/widget/StatsBar.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,9 @@ import android.text.format.Formatter
2525
import android.util.AttributeSet
2626
import android.view.View
2727
import android.widget.TextView
28+
import androidx.activity.viewModels
2829
import androidx.appcompat.widget.TooltipCompat
2930
import androidx.coordinatorlayout.widget.CoordinatorLayout
30-
import androidx.lifecycle.ViewModelProvider
31-
import androidx.lifecycle.get
3231
import androidx.lifecycle.lifecycleScope
3332
import androidx.lifecycle.observe
3433
import com.github.shadowsocks.MainActivity
@@ -47,7 +46,7 @@ class StatsBar @JvmOverloads constructor(context: Context, attrs: AttributeSet?
4746
private lateinit var rxText: TextView
4847
private lateinit var txRateText: TextView
4948
private lateinit var rxRateText: TextView
50-
private val tester = ViewModelProvider(context as MainActivity).get<HttpsTest>()
49+
private val tester by (context as MainActivity).viewModels<HttpsTest>()
5150
private lateinit var behavior: Behavior
5251
override fun getBehavior(): Behavior {
5352
if (!this::behavior.isInitialized) behavior = object : Behavior() {

0 commit comments

Comments
 (0)