Skip to content

Commit 59ba807

Browse files
authored
fix: fix the crash that happens when the screen is rotated. (#1054)
1 parent e2f9ec1 commit 59ba807

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

app/src/main/java/com/osfans/trime/ui/main/LogActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@ class LogActivity : AppCompatActivity() {
6767
rightMargin = navBars.right
6868
bottomMargin = navBars.bottom
6969
}
70-
binding.toolbar.toolbar.updateLayoutParams<ViewGroup.MarginLayoutParams> {
70+
binding.logToolbar.toolbar.updateLayoutParams<ViewGroup.MarginLayoutParams> {
7171
topMargin = statusBars.top
7272
}
7373
windowInsets
7474
}
7575

7676
setContentView(binding.root)
7777
with(binding) {
78-
setSupportActionBar(toolbar.toolbar)
78+
setSupportActionBar(logToolbar.toolbar)
7979
this@LogActivity.logView = logView
8080
if (intent.hasExtra(FROM_CRASH)) {
8181
supportActionBar!!.setTitle(R.string.crash_logs)

app/src/main/java/com/osfans/trime/ui/main/PrefMainActivity.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ class PrefMainActivity : AppCompatActivity() {
6565
ViewCompat.setOnApplyWindowInsetsListener(binding.root) { _, windowInsets ->
6666
val statusBars = windowInsets.getInsets(WindowInsetsCompat.Type.statusBars())
6767
val navBars = windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars())
68-
binding.toolbar.appBar.updateLayoutParams<ViewGroup.MarginLayoutParams> {
68+
binding.prefToolbar.appBar.updateLayoutParams<ViewGroup.MarginLayoutParams> {
6969
leftMargin = navBars.left
7070
rightMargin = navBars.right
7171
}
72-
binding.toolbar.toolbar.updateLayoutParams<ViewGroup.MarginLayoutParams> {
72+
binding.prefToolbar.toolbar.updateLayoutParams<ViewGroup.MarginLayoutParams> {
7373
topMargin = statusBars.top
7474
}
7575
binding.navHostFragment.updateLayoutParams<ViewGroup.MarginLayoutParams> {
@@ -80,19 +80,19 @@ class PrefMainActivity : AppCompatActivity() {
8080
}
8181

8282
setContentView(binding.root)
83-
setSupportActionBar(binding.toolbar.toolbar)
83+
setSupportActionBar(binding.prefToolbar.toolbar)
8484
val appBarConfiguration = AppBarConfiguration(
8585
topLevelDestinationIds = setOf(),
8686
fallbackOnNavigateUpListener = ::onNavigateUpListener,
8787
)
8888
navHostFragment =
8989
supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment
90-
binding.toolbar.toolbar.setupWithNavController(navHostFragment.navController, appBarConfiguration)
90+
binding.prefToolbar.toolbar.setupWithNavController(navHostFragment.navController, appBarConfiguration)
9191
viewModel.toolbarTitle.observe(this) {
92-
binding.toolbar.toolbar.title = it
92+
binding.prefToolbar.toolbar.title = it
9393
}
9494
viewModel.topOptionsMenu.observe(this) {
95-
binding.toolbar.toolbar.menu.forEach { m ->
95+
binding.prefToolbar.toolbar.menu.forEach { m ->
9696
m.isVisible = it
9797
}
9898
}

app/src/main/res/layout/activity_log.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
tools:context=".ui.main.LogActivity">
99

1010
<include
11-
android:id="@+id/toolbar"
11+
android:id="@+id/logToolbar"
1212
layout="@layout/toolbar"
1313
app:layout_constraintEnd_toEndOf="parent"
1414
app:layout_constraintStart_toStartOf="parent"
@@ -21,7 +21,7 @@
2121
app:layout_constraintBottom_toTopOf="@id/logButtons"
2222
app:layout_constraintEnd_toEndOf="parent"
2323
app:layout_constraintStart_toStartOf="parent"
24-
app:layout_constraintTop_toBottomOf="@id/toolbar" />
24+
app:layout_constraintTop_toBottomOf="@id/logToolbar" />
2525

2626
<LinearLayout
2727
android:id="@+id/logButtons"

app/src/main/res/layout/activity_pref.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
android:layout_width="match_parent"
66
android:layout_height="match_parent">
77

8-
<include android:id="@+id/toolbar" layout="@layout/toolbar" />
8+
<include android:id="@+id/prefToolbar" layout="@layout/toolbar" />
99

1010
<androidx.fragment.app.FragmentContainerView
1111
android:id="@+id/nav_host_fragment"

0 commit comments

Comments
 (0)