Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c50d13f8 authored by Guillaume Jacquart's avatar Guillaume Jacquart
Browse files

1964: MR fixes, switch from lateinit to lazy.

parent f3fb49b2

app/src/main/java/foundation/e/advancedprivacy/features/dashboard/DashboardFragment.kt

+1 −2
Original line number Diff line number Diff line
@@ -40,14 +40,13 @@ import org.koin.androidx.viewmodel.ext.android.viewModel 


class DashboardFragment : NavToolbarFragment(R.layout.fragment_dashboard) {

    private val viewModel: DashboardViewModel by viewModel()

    private lateinit var numberFormatter: BigNumberFormatter

    private val numberFormatter: BigNumberFormatter by lazy { BigNumberFormatter(requireContext()) }



    private lateinit var binding: FragmentDashboardBinding



    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

        super.onViewCreated(view, savedInstanceState)

        binding = FragmentDashboardBinding.bind(view)

        numberFormatter = BigNumberFormatter(requireContext())



        with(binding.dataBlockedTrackers) {

            primaryMessage.apply {

app/src/main/java/foundation/e/advancedprivacy/features/trackers/apptrackers/AppTrackersFragment.kt

+1 −2
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ class AppTrackersFragment : NavToolbarFragment(R.layout.apptrackers_fragment) { 
    private val args: AppTrackersFragmentArgs by navArgs()

    private val viewModel: AppTrackersViewModel by viewModel { parametersOf(args.appUid) }



    private lateinit var numberFormatter: BigNumberFormatter

    private val numberFormatter: BigNumberFormatter by lazy { BigNumberFormatter(requireContext()) }



    private lateinit var binding: ApptrackersFragmentBinding
@@ -62,7 +62,6 @@ class AppTrackersFragment : NavToolbarFragment(R.layout.apptrackers_fragment) { 
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

        super.onViewCreated(view, savedInstanceState)

        binding = ApptrackersFragmentBinding.bind(view)

        numberFormatter = BigNumberFormatter(requireContext())



        binding.blockAllToggle.setOnClickListener {

            viewModel.onToggleBlockAll(binding.blockAllToggle.isChecked)

app/src/main/java/foundation/e/advancedprivacy/features/trackers/trackerdetails/TrackerDetailsFragment.kt

+1 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ class TrackerDetailsFragment : NavToolbarFragment(R.layout.trackerdetails_fragme 


    private val args: TrackerDetailsFragmentArgs by navArgs()

    private val viewModel: TrackerDetailsViewModel by viewModel { parametersOf(args.trackerId) }

    private lateinit var numberFormatter: BigNumberFormatter

    private val numberFormatter: BigNumberFormatter by lazy { BigNumberFormatter(requireContext()) }



    private lateinit var binding: TrackerdetailsFragmentBinding
@@ -59,7 +59,6 @@ class TrackerDetailsFragment : NavToolbarFragment(R.layout.trackerdetails_fragme 
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

        super.onViewCreated(view, savedInstanceState)

        binding = TrackerdetailsFragmentBinding.bind(view)

        numberFormatter = BigNumberFormatter(requireContext())



        binding.blockAllToggle.setOnClickListener {

            viewModel.onToggleBlockAll(binding.blockAllToggle.isChecked)