Skip to content
This repository has been archived by the owner on Feb 2, 2024. It is now read-only.

PAT-1444: Fixed Step titles when editing steps #144

Merged
merged 3 commits into from
Dec 9, 2019
Merged

PAT-1444: Fixed Step titles when editing steps #144

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0efc475
Fixed Step titles when we edit steps that are part of ReviewStep
AbdallahMedable Dec 9, 2019
984c8ed
Removed unused comment
AbdallahMedable Dec 9, 2019
c5898fe
Fixed showing back button when clearing step titles in case of edit r…
AbdallahMedable Dec 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions backbone/src/main/java/org/researchstack/backbone/ui/task/TaskActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import androidx.navigation.NavController
import androidx.navigation.NavDestination
import androidx.navigation.NavOptions
import androidx.navigation.Navigation
import androidx.navigation.ui.NavigationUI
import com.afollestad.materialdialogs.MaterialDialog
import com.afollestad.materialdialogs.Theme
import org.koin.androidx.viewmodel.ext.android.viewModel
import org.koin.core.parameter.parametersOf
import org.researchstack.backbone.R
import org.researchstack.backbone.step.Step
import org.researchstack.backbone.task.Task
import org.researchstack.backbone.ui.PinCodeActivity
import org.researchstack.backbone.ui.permissions.PermissionListener
Expand All @@ -52,11 +52,12 @@ class TaskActivity : PinCodeActivity(), PermissionMediator {

setSupportActionBar(findViewById(R.id.toolbar))

supportActionBar?.setDisplayHomeAsUpEnabled(false)
supportActionBar?.setDisplayHomeAsUpEnabled(true)

observe(viewModel.currentStepEvent) { showStep(it) }
observe(viewModel.taskCompleted) { close(it) }
observe(viewModel.moveReviewStep) {
showStepTitle(it.step)
navController.navigate(it.step.destinationId, null,
NavOptions.Builder().setPopUpTo(
viewModel.firstStep.destinationId,
Expand All @@ -78,8 +79,8 @@ class TaskActivity : PinCodeActivity(), PermissionMediator {

observe(viewModel.editStep) {
navController.navigate(it.destinationId)
supportActionBar?.title = ""
}
NavigationUI.setupActionBarWithNavController(this, navController)

navController.addOnDestinationChangedListener(object : NavController.OnDestinationChangedListener {
override fun onDestinationChanged(controller: NavController, destination: NavDestination, arguments: Bundle?) {
Expand Down Expand Up @@ -223,10 +224,16 @@ class TaskActivity : PinCodeActivity(), PermissionMediator {
if (navigationEvent.popUpToStep == null) {
navController.navigate(navigationEvent.step.destinationId)
}
supportActionBar?.title = viewModel.task.getTitleForStep(this, navigationEvent.step)
showStepTitle(navigationEvent.step)
setActivityTheme(viewModel.colorPrimary, viewModel.colorPrimaryDark)
}

private fun showStepTitle(step: Step) {
supportActionBar?.title =
if (viewModel.editing) ""
else viewModel.task.getTitleForStep(this, step)
}

private fun hideKeyboard() {
val imm = getSystemService(Activity.INPUT_METHOD_SERVICE) as InputMethodManager
if (imm.isActive && imm.isAcceptingText) {
Expand Down