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

Commit 8027fab6 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

App Lounge: Fixes

parent f931476b
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -190,9 +190,9 @@ class ApplicationFragment : Fragment(R.layout.fragment_application) {
                                mainActivityViewModel.userType.value ?: User.UNAVAILABLE.name
                            )
                        ) {
                            User.ANONYMOUS -> getString(R.string.install_blocked_anonymous)
                            User.ANONYMOUS,
                            User.UNAVAILABLE -> getString(R.string.install_blocked_anonymous)
                            User.GOOGLE -> getString(R.string.install_blocked_google)
                            User.UNAVAILABLE -> String()
                        }
                        if (errorMsg.isNotBlank()) {
                            Snackbar.make(view, errorMsg, Snackbar.LENGTH_SHORT).show()
+2 −2
Original line number Diff line number Diff line
@@ -189,9 +189,9 @@ class ApplicationListRVAdapter(
                Status.BLOCKED -> {
                    installButton.setOnClickListener {
                        val errorMsg = when (user) {
                            User.ANONYMOUS -> view.context.getString(R.string.install_blocked_anonymous)
                            User.ANONYMOUS,
                            User.UNAVAILABLE -> view.context.getString(R.string.install_blocked_anonymous)
                            User.GOOGLE -> view.context.getString(R.string.install_blocked_google)
                            User.UNAVAILABLE -> String()
                        }
                        if (errorMsg.isNotBlank()) {
                            Snackbar.make(view, errorMsg, Snackbar.LENGTH_SHORT).show()
+2 −2
Original line number Diff line number Diff line
@@ -138,9 +138,9 @@ class HomeChildRVAdapter(
                Status.BLOCKED -> {
                    installButton.setOnClickListener {
                        val errorMsg = when (user) {
                            User.ANONYMOUS -> view.context.getString(R.string.install_blocked_anonymous)
                            User.ANONYMOUS,
                            User.UNAVAILABLE -> view.context.getString(R.string.install_blocked_anonymous)
                            User.GOOGLE -> view.context.getString(R.string.install_blocked_google)
                            User.UNAVAILABLE -> String()
                        }
                        if (errorMsg.isNotBlank()) {
                            Snackbar.make(view, errorMsg, Snackbar.LENGTH_SHORT).show()
+12 −1
Original line number Diff line number Diff line
@@ -27,7 +27,18 @@ class SignInFragment : Fragment(R.layout.fragment_sign_in) {

        binding.anonymousBT.setOnClickListener {
            viewModel.saveUserType(User.ANONYMOUS)
            view.findNavController().navigate(R.id.action_signInFragment_to_homeFragment)
        }

        viewModel.userType.observe(viewLifecycleOwner) {
            if (it.isNotBlank()) {
                when (User.valueOf(it)) {
                    User.ANONYMOUS -> {
                        view.findNavController()
                            .navigate(R.id.action_signInFragment_to_homeFragment)
                    }
                    else -> {}
                }
            }
        }
    }

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@
    <!-- TOS Fragment -->
    <string name="tos_agree">Accept</string>
    <string name="tos_disagree">Reject</string>
    <string name="tos_title">Terms of Service</string>
    <string name="tos_agree_date">Accepted</string>
    <string name="tos_warning">Before we can proceed you must read and agree to the Terms of Service.</string>

+137 −137

File changed.

Contains only whitespace changes.

Loading