diff --git a/app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt b/app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt index 0fb6796..4d7c879 100644 --- a/app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt +++ b/app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt @@ -29,8 +29,6 @@ class ProfilesActivity : BaseActivity() { it.profileService.setActiveProfile(id) } } - - reloadList() } override fun onStart() { @@ -43,6 +41,8 @@ class ProfilesActivity : BaseActivity() { intArrayOf() ) } + + reloadList() } override fun onStop() { diff --git a/app/src/main/java/com/github/kr328/clash/adapter/ProfileAdapter.kt b/app/src/main/java/com/github/kr328/clash/adapter/ProfileAdapter.kt index 58b5532..b79b196 100644 --- a/app/src/main/java/com/github/kr328/clash/adapter/ProfileAdapter.kt +++ b/app/src/main/java/com/github/kr328/clash/adapter/ProfileAdapter.kt @@ -41,15 +41,17 @@ class ProfileAdapter(private val context: Context, private val listener: (Int) - listener(current.id) } - with(current.token) { - when { - startsWith("http") || startsWith("content") -> { - holder.view.operation = context.getDrawable(R.drawable.ic_profile_refresh) - } - startsWith("file") -> { - holder.view.operation = context.getDrawable(R.drawable.ic_profile_edit) - } - } - } + holder.view.operation = context.getDrawable(R.drawable.ic_vert) + +// with(current.token) { +// when { +// startsWith("http") || startsWith("content") -> { +// +// } +// startsWith("file") -> { +// +// } +// } +// } } } \ No newline at end of file diff --git a/app/src/main/java/com/github/kr328/clash/view/FatItem.kt b/app/src/main/java/com/github/kr328/clash/view/FatItem.kt index 5df79fc..55127ee 100644 --- a/app/src/main/java/com/github/kr328/clash/view/FatItem.kt +++ b/app/src/main/java/com/github/kr328/clash/view/FatItem.kt @@ -20,7 +20,6 @@ class FatItem @JvmOverloads constructor( private val summaryView: TextView private val operationView: View private val iconView: View - private val dividerView: View private val clickable: View private val operationClickable: View @@ -85,7 +84,6 @@ class FatItem @JvmOverloads constructor( titleView = findViewById(R.id.view_fat_item_title) summaryView = findViewById(R.id.view_fat_item_summary) operationView = findViewById(R.id.view_fat_item_operation) - dividerView = findViewById(R.id.view_fat_item_divider) iconView = findViewById(R.id.view_fat_item_icon) clickable = findViewById(R.id.view_fat_item_clickable) operationClickable = findViewById(R.id.view_fat_item_operation_clickable) diff --git a/app/src/main/java/com/github/kr328/clash/view/RadioFatItem.kt b/app/src/main/java/com/github/kr328/clash/view/RadioFatItem.kt index f99c3fd..170c369 100644 --- a/app/src/main/java/com/github/kr328/clash/view/RadioFatItem.kt +++ b/app/src/main/java/com/github/kr328/clash/view/RadioFatItem.kt @@ -21,7 +21,6 @@ class RadioFatItem @JvmOverloads constructor( private val summaryView: TextView private val operationView: View private val radioView: MaterialRadioButton - private val dividerView: View private val clickable: View private val operationClickable: View @@ -75,7 +74,6 @@ class RadioFatItem @JvmOverloads constructor( titleView = findViewById(R.id.view_radio_fat_item_title) summaryView = findViewById(R.id.view_radio_fat_item_summary) operationView = findViewById(R.id.view_radio_fat_item_operation) - dividerView = findViewById(R.id.view_radio_fat_item_divider) radioView = findViewById(R.id.view_radio_fat_item_radio) clickable = findViewById(R.id.view_radio_fat_item_clickable) operationClickable = findViewById(R.id.view_radio_fat_item_operation_clickable) diff --git a/app/src/main/res/drawable/ic_vert.xml b/app/src/main/res/drawable/ic_vert.xml new file mode 100644 index 0000000..5176d8a --- /dev/null +++ b/app/src/main/res/drawable/ic_vert.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/view_fat_item.xml b/app/src/main/res/layout/view_fat_item.xml index 34bc35f..491fc92 100644 --- a/app/src/main/res/layout/view_fat_item.xml +++ b/app/src/main/res/layout/view_fat_item.xml @@ -27,23 +27,22 @@ - - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/view_radio_fat_item.xml b/app/src/main/res/layout/view_radio_fat_item.xml index ba2bcd4..bb3ee99 100644 --- a/app/src/main/res/layout/view_radio_fat_item.xml +++ b/app/src/main/res/layout/view_radio_fat_item.xml @@ -30,23 +30,22 @@ - - - - + \ No newline at end of file diff --git a/app/src/main/res/layout/view_title.xml b/app/src/main/res/layout/view_title.xml new file mode 100644 index 0000000..3509b84 --- /dev/null +++ b/app/src/main/res/layout/view_title.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file