Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ALS-1971, ALS-1973 Navigation Mode bug fixes #125

Merged
merged 1 commit into from
Jan 28, 2025
Merged

ALS-1971, ALS-1973 Navigation Mode bug fixes #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 15 additions & 16 deletions app/src/main/java/com/aws/amazonlocation/ui/main/explore/ExploreFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ import com.aws.amazonlocation.utils.CLICK_TIME_DIFFERENCE
import com.aws.amazonlocation.utils.DELAY_300
import com.aws.amazonlocation.utils.DELAY_500
import com.aws.amazonlocation.utils.Debouncer
import com.aws.amazonlocation.utils.Distance.DISTANCE_IN_METER_10
import com.aws.amazonlocation.utils.Distance.DISTANCE_IN_METER_30
import com.aws.amazonlocation.utils.Durations
import com.aws.amazonlocation.utils.Durations.DELAY_FOR_BOTTOM_SHEET_LOAD
import com.aws.amazonlocation.utils.EventType
Expand All @@ -103,7 +103,6 @@ import com.aws.amazonlocation.utils.KEY_CLOUD_FORMATION_STATUS
import com.aws.amazonlocation.utils.KEY_COLOR_SCHEMES
import com.aws.amazonlocation.utils.KEY_MAP_STYLE_NAME
import com.aws.amazonlocation.utils.KEY_POLITICAL_VIEW
import com.aws.amazonlocation.utils.KEY_SELECTED_MAP_LANGUAGE
import com.aws.amazonlocation.utils.KEY_UNIT_SYSTEM
import com.aws.amazonlocation.utils.KEY_URL
import com.aws.amazonlocation.utils.KILOMETERS
Expand Down Expand Up @@ -1000,7 +999,7 @@ class ExploreFragment :
destinationLocation.latitude = latitude
destinationLocation.longitude = longitude
val distance = destinationLocation.distanceTo(latLng)
if (distance < DISTANCE_IN_METER_10) {
if (distance < DISTANCE_IN_METER_30) {
mBottomSheetHelper.hideNavigationSheet()
mBottomSheetHelper.expandNavigationCompleteSheet()
mBinding.bottomSheetNavigationComplete.tvNavigationCompleteAddress.text =
Expand Down Expand Up @@ -1203,12 +1202,13 @@ class ExploreFragment :
tvNavigationDot.show()
}
if (it.navigationList.isNotEmpty()) {
val index = if (it.navigationList.size > 1) 1 else 0
it.navigationList[0].distance?.let { distance ->
setNavigationTimeDialog(
distance,
it.navigationList[0].getAddress(),
it.navigationList[0].type ?: "",
it.navigationList[0]
it.navigationList[index].getAddress(),
it.navigationList[index].type.orEmpty(),
it.navigationList[index]
)
}
}
Expand Down Expand Up @@ -1659,16 +1659,15 @@ class ExploreFragment :
}
}
}
mNavigationListModel.first().let {
it.duration?.let { duration ->
it.destinationAddress?.let { description ->
setNavigationTimeDialog(
duration,
description,
mNavigationListModel[0].type,
mNavigationListModel[0]
)
}
if (mNavigationListModel.isNotEmpty()) {
val index = if (mNavigationListModel.size > 1) 1 else 0
mNavigationListModel[0].distance?.let { duration ->
setNavigationTimeDialog(
duration,
mNavigationListModel[index].destinationAddress.orEmpty(),
mNavigationListModel[index].type,
mNavigationListModel[index]
)
}
}
mViewModel.mNavigationResponse?.destinationAddress =
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/com/aws/amazonlocation/utils/Constants.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ object Credentials {
object Distance {
const val DISTANCE_IN_METER_30 = 30
const val DISTANCE_IN_METER_20 = 20
const val DISTANCE_IN_METER_10 = 10
}

object MapCameraZoom {
Expand Down
Loading