Skip to content

Commit 479dc44

Browse files
committed
replace rule web ui to android rule preference
1 parent 3bd2d65 commit 479dc44

File tree

13 files changed

+194
-666
lines changed

13 files changed

+194
-666
lines changed

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,6 @@ dependencies {
201201
testImplementation("junit:junit:4.13.2")
202202
testImplementation("androidx.test.espresso:espresso-core:3.6.1")
203203
testImplementation("androidx.test.ext:junit-ktx:1.2.1")
204-
androidTestUtil("androidx.test:orchestrator:1.5.0")
205-
testImplementation("org.robolectric:robolectric:4.14")
204+
androidTestUtil("androidx.test:orchestrator:1.5.1")
205+
testImplementation("org.robolectric:robolectric:4.14.1")
206206
}

app/src/main/kotlin/io/github/asutorufa/yuhaiin/HostsDialogFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class HostsDialogFragment : DialogFragment() {
2727
private val mainActivity by lazy { requireActivity() as MainActivity }
2828

2929
override fun onPause() {
30-
Log.d("appListFragment", "onPause: ${adapter.hostsMap}")
30+
Log.d("HostsDialogFragment", "onPause: ${adapter.hostsMap}")
3131
adapter.hostsMap.let {
3232
MainApplication.store.putStringMap("hosts", it)
3333
}

app/src/main/kotlin/io/github/asutorufa/yuhaiin/MainApplication.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,12 @@ fun Store.putStringMap(key: String?, values: Map<String, String>) {
4747
putString(key, Json.encodeToString(values))
4848
}
4949

50+
fun Store.getStringArrayList(key: String): ArrayList<String> {
51+
val data = getString(key)
52+
if (data.isEmpty()) return ArrayList()
53+
return Json.decodeFromString<ArrayList<String>>(data)
54+
}
55+
56+
fun Store.putStringArrayList(key: String, values: ArrayList<String>) {
57+
putString(key, Json.encodeToString(values))
58+
}

app/src/main/kotlin/io/github/asutorufa/yuhaiin/ProfileFragment.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ class ProfileFragment : PreferenceFragmentCompat() {
6363

6464

6565
private fun initPreferences() {
66-
findPreference<Preference>(resources.getString(R.string.rule))!!.also {
67-
it.setOnPreferenceClickListener {
68-
findNavController().navigate(ProfileFragmentDirections.actionProfileFragmentToRuleFragment())
69-
true
70-
}
71-
}
66+
// findPreference<Preference>(resources.getString(R.string.rule))!!.also {
67+
// it.setOnPreferenceClickListener {
68+
// findNavController().navigate(ProfileFragmentDirections.actionProfileFragmentToRuleFragment())
69+
// true
70+
// }
71+
// }
7272

7373

7474
findPreference<Preference>(resources.getString(R.string.logcat))?.apply {

app/src/main/kotlin/io/github/asutorufa/yuhaiin/RuleFragment.kt

Lines changed: 0 additions & 340 deletions
This file was deleted.

0 commit comments

Comments
 (0)