Skip to content

Commit 1c72e16

Browse files
committed
Hot fix - broken toolbar on confirm set controller
1 parent d3d2ee6 commit 1c72e16

File tree

4 files changed

+16
-2
lines changed

4 files changed

+16
-2
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ buildscript {
22
ext {
33
// App version
44
versionName = '1.7 RC1'
5-
versionCode = 12
5+
versionCode = 13
66

77
// SDK and tools
88
compileSdkVersion = 29

feature-staking-impl/src/main/java/jp/co/soramitsu/feature_staking_impl/presentation/staking/controller/confirm/ConfirmSetControllerFragment.kt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import android.os.Bundle
44
import android.view.LayoutInflater
55
import android.view.View
66
import android.view.ViewGroup
7+
import dev.chrisbanes.insetter.applyInsetter
78
import jp.co.soramitsu.common.base.BaseFragment
89
import jp.co.soramitsu.common.di.FeatureUtils
910
import jp.co.soramitsu.common.mixin.impl.observeValidations
@@ -15,6 +16,7 @@ import kotlinx.android.synthetic.main.fragment_confirm_set_controller.confirmSet
1516
import kotlinx.android.synthetic.main.fragment_confirm_set_controller.confirmSetControllerDestinationAccount
1617
import kotlinx.android.synthetic.main.fragment_confirm_set_controller.confirmSetControllerFee
1718
import kotlinx.android.synthetic.main.fragment_confirm_set_controller.confirmSetControllerStashAccount
19+
import kotlinx.android.synthetic.main.fragment_confirm_set_controller.confirmSetControllerToolbar
1820

1921
private const val PAYLOAD_KEY = "PAYLOAD_KEY"
2022

@@ -34,6 +36,14 @@ class ConfirmSetControllerFragment : BaseFragment<ConfirmSetControllerViewModel>
3436
}
3537

3638
override fun initViews() {
39+
confirmSetControllerToolbar.applyInsetter {
40+
type(statusBars = true) {
41+
padding()
42+
}
43+
}
44+
45+
confirmSetControllerToolbar.setHomeButtonListener { viewModel.back() }
46+
3747
confirmSetControllerConfirm.setOnClickListener { viewModel.confirmClicked() }
3848

3949
confirmSetControllerStashAccount.setWholeClickListener { viewModel.openStashExternalActions() }

feature-staking-impl/src/main/java/jp/co/soramitsu/feature_staking_impl/presentation/staking/controller/confirm/ConfirmSetControllerViewModel.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,8 @@ class ConfirmSetControllerViewModel(
106106
AddressIconGenerator.SIZE_SMALL,
107107
interactor.getAccount(address).name
108108
)
109+
110+
fun back() {
111+
router.back()
112+
}
109113
}

feature-staking-impl/src/main/res/layout/fragment_confirm_set_controller.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
tools:background="@color/black">
1010

1111
<jp.co.soramitsu.common.view.Toolbar
12-
android:id="@+id/confirmRebondToolbar"
12+
android:id="@+id/confirmSetControllerToolbar"
1313
android:layout_width="match_parent"
1414
android:layout_height="wrap_content"
1515
app:titleText="@string/common_confirmation" />

0 commit comments

Comments
 (0)