kopia lustrzana https://github.com/rt-bishop/Look4Sat
Now correctly popping back stack on PolarView pass end
rodzic
06633625ba
commit
b169af4883
|
@ -35,8 +35,8 @@ import com.rtbishop.look4sat.R
|
||||||
import com.rtbishop.look4sat.data.Result
|
import com.rtbishop.look4sat.data.Result
|
||||||
import com.rtbishop.look4sat.data.SatPass
|
import com.rtbishop.look4sat.data.SatPass
|
||||||
import com.rtbishop.look4sat.databinding.FragmentPolarBinding
|
import com.rtbishop.look4sat.databinding.FragmentPolarBinding
|
||||||
import com.rtbishop.look4sat.ui.SharedViewModel
|
|
||||||
import com.rtbishop.look4sat.repository.PrefsRepo
|
import com.rtbishop.look4sat.repository.PrefsRepo
|
||||||
|
import com.rtbishop.look4sat.ui.SharedViewModel
|
||||||
import com.rtbishop.look4sat.utility.RecyclerDivider
|
import com.rtbishop.look4sat.utility.RecyclerDivider
|
||||||
import com.rtbishop.look4sat.utility.formatForTimer
|
import com.rtbishop.look4sat.utility.formatForTimer
|
||||||
import dagger.hilt.android.AndroidEntryPoint
|
import dagger.hilt.android.AndroidEntryPoint
|
||||||
|
@ -161,7 +161,7 @@ class PolarFragment : Fragment(R.layout.fragment_polar), SensorEventListener {
|
||||||
binding.polarTimer.text = millisBeforeEnd.formatForTimer()
|
binding.polarTimer.text = millisBeforeEnd.formatForTimer()
|
||||||
if (dateNow.after(satPass.pass.endTime)) {
|
if (dateNow.after(satPass.pass.endTime)) {
|
||||||
binding.polarTimer.text = 0L.formatForTimer()
|
binding.polarTimer.text = 0L.formatForTimer()
|
||||||
findNavController().navigate(R.id.action_polar_to_passes)
|
findNavController().popBackStack()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -42,15 +42,6 @@
|
||||||
android:id="@+id/nav_polar"
|
android:id="@+id/nav_polar"
|
||||||
android:name="com.rtbishop.look4sat.ui.polarScreen.PolarFragment"
|
android:name="com.rtbishop.look4sat.ui.polarScreen.PolarFragment"
|
||||||
tools:layout="@layout/fragment_polar">
|
tools:layout="@layout/fragment_polar">
|
||||||
<action
|
|
||||||
android:id="@+id/action_polar_to_passes"
|
|
||||||
app:destination="@id/nav_passes"
|
|
||||||
app:enterAnim="@anim/nav_default_enter_anim"
|
|
||||||
app:exitAnim="@anim/nav_default_exit_anim"
|
|
||||||
app:popEnterAnim="@anim/nav_default_pop_enter_anim"
|
|
||||||
app:popExitAnim="@anim/nav_default_pop_exit_anim"
|
|
||||||
app:popUpTo="@id/nav_passes"
|
|
||||||
app:popUpToInclusive="true" />
|
|
||||||
</fragment>
|
</fragment>
|
||||||
|
|
||||||
<fragment
|
<fragment
|
||||||
|
|
Ładowanie…
Reference in New Issue