feat: cancel button on source

boykod · Aug 2, 2022 · 9af2643 · 9af2643
1 parent 35d9a83
commit 9af2643
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 3 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/filestack/src/main/java/ua/motionman/filestack/ui/filestacksources/SourcesFragment.kt b/filestack/src/main/java/ua/motionman/filestack/ui/filestacksources/SourcesFragment.kt
@@ -29,14 +29,17 @@ class SourcesFragment : Fragment(R.layout.sources_fragment) {
  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
  super.onViewCreated(view, savedInstanceState)
 
- setToolbarTitle()
+ setupToolbar()
  initAdapter()
 
  sourceAdapter.submitList(localSourceData)
  }
 
- private fun setToolbarTitle() {
- binding.sourcesToolbar.toolbarTitleTextView.text = getText(R.string.source_title)
+ private fun setupToolbar() {
+ with(binding.sourcesToolbar) {
+ toolbarTitleTextView.text = getText(R.string.source_title)
+ toolbarCancelTextView.setOnClickListener { activity?.finish() }
+ }
  }
 
  private fun initAdapter() {

diff --git a/filestack/src/main/res/layout/toolbar.xml b/filestack/src/main/res/layout/toolbar.xml
@@ -18,12 +18,24 @@
  android:layout_height="wrap_content"
  android:textColor="@color/white"
  android:textSize="18sp"
+ android:textStyle="bold"
  app:layout_constraintBottom_toBottomOf="parent"
  app:layout_constraintEnd_toEndOf="parent"
  app:layout_constraintStart_toStartOf="parent"
  app:layout_constraintTop_toTopOf="parent"
  tools:text="Toolbar" />
 
+ <androidx.appcompat.widget.AppCompatTextView
+ android:id="@+id/toolbarCancelTextView"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/cancel_button"
+ android:textColor="@color/white"
+ android:textSize="16sp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+
  </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.appcompat.widget.Toolbar>