Skip to content

Commit ae538c4

Browse files
Update UI
1 parent cebc75e commit ae538c4

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

app/src/main/java/io/nekohasekai/sagernet/ui/profile/ChainSettingsActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import io.nekohasekai.sagernet.ktx.*
2929
import io.nekohasekai.sagernet.ui.ProfileSelectActivity
3030
import moe.matsuri.nb4a.Protocols.getProtocolColor
3131

32-
class ChainSettingsActivity : ProfileSettingsActivity<ChainBean>(R.layout.layout_chain_settings) {
32+
class ChainSettingsActivity : ProfileSettingsActivity<ChainBean>(R.layout.uwu_collapse_layout_chain) {
3333

3434
override fun createEntity() = ChainBean()
3535

@@ -292,4 +292,4 @@ class ChainSettingsActivity : ProfileSettingsActivity<ChainBean>(R.layout.layout
292292

293293
}
294294

295-
}
295+
}

app/src/main/java/io/nekohasekai/sagernet/ui/profile/ProfileSettingsActivity.kt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import androidx.preference.PreferenceDataStore
2828
import androidx.preference.PreferenceFragmentCompat
2929
import com.github.shadowsocks.plugin.Empty
3030
import com.github.shadowsocks.plugin.fragment.AlertDialogFragment
31+
import com.google.android.material.appbar.CollapsingToolbarLayout
3132
import com.google.android.material.dialog.MaterialAlertDialogBuilder
3233
import io.nekohasekai.sagernet.*
3334
import io.nekohasekai.sagernet.database.DataStore
@@ -45,7 +46,7 @@ import kotlin.properties.Delegates
4546

4647
@Suppress("UNCHECKED_CAST")
4748
abstract class ProfileSettingsActivity<T : AbstractBean>(
48-
@LayoutRes resId: Int = R.layout.layout_config_settings,
49+
@LayoutRes resId: Int = R.layout.uwu_collapse_layout,
4950
) : ThemedActivity(resId), OnPreferenceDataStoreChangeListener {
5051

5152
class UnsavedChangesDialogFragment : AlertDialogFragment<Empty, Empty>() {
@@ -92,9 +93,13 @@ abstract class ProfileSettingsActivity<T : AbstractBean>(
9293

9394
override fun onCreate(savedInstanceState: Bundle?) {
9495
super.onCreate(savedInstanceState)
96+
9597
setSupportActionBar(findViewById(R.id.toolbar))
98+
val collapsingToolbar =
99+
findViewById<CollapsingToolbarLayout>(R.id.collapsing_toolbar)
100+
collapsingToolbar.title = getString(R.string.profile_config)
101+
96102
supportActionBar?.apply {
97-
setTitle(R.string.profile_config)
98103
setDisplayHomeAsUpEnabled(true)
99104
setHomeAsUpIndicator(R.drawable.ic_navigation_close)
100105
}
@@ -393,4 +398,4 @@ abstract class ProfileSettingsActivity<T : AbstractBean>(
393398

394399
}
395400

396-
}
401+
}

0 commit comments

Comments
 (0)