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

Commit 37eab511 authored by Abhishek Aggarwal's avatar Abhishek Aggarwal
Browse files

Merge branch '4923_permission_dialog_issue' into 'epic_176-all-refactorAndGplay' 

APP Lounge: Properly reformat permission dialog

See merge request ecorp/apps/apps!29
parents 7672cf68 10932680

app/src/main/java/foundation/e/apps/application/ApplicationFragment.kt

+8 −1
Original line number Diff line number Diff line
@@ -302,11 +302,18 @@ class ApplicationFragment : Fragment(R.layout.fragment_application) { 


            // Privacy widgets

            binding.privacyInclude.apply {

                var permission =

                    applicationViewModel.transformPermsToString(it.perms.toMutableList())

                if (permission.isEmpty()) {

                    permission = getString(

                        R.string.no_permission_found

                    )

                }

                appPermissions.setOnClickListener { _ ->

                    ApplicationDialogFragment(

                        R.drawable.ic_perm,

                        getString(R.string.permissions),

                        applicationViewModel.transformPermsToString(it.perms.toMutableList())

                        permission

                    ).show(childFragmentManager, TAG)

                }

                appTrackers.setOnClickListener {

app/src/main/java/foundation/e/apps/application/ApplicationViewModel.kt

+2 −2
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ class ApplicationViewModel @Inject constructor( 
            it.replace("[^>]*permission\\.".toRegex(), "")

        }

        // Make it a dialog-friendly string and return it

        val permString = list.toString().replace(", ", "\n")

        return permString.substring(1, permString.length - 1)

        return list.joinToString(separator = "") { "$it<br />" }



    }



    fun handleRatingFormat(rating: Double): String {

app/src/main/res/values/strings.xml

+2 −1
Original line number Diff line number Diff line
@@ -131,7 +131,8 @@ 
    <string name="manually_install_updates_notification_text">App updates will not be installed automatically</string>

    <string name="updates_notification_unmetered_network_warning">Waiting for un-metered network</string>



    <!-- Trackers_dialog-->

    <!-- Trackers & Permission Dialog-->

    <string name="no_permission_found">No runtime android permission found!</string>

    <string name="privacy_computed_using_text">Computed using &lt;a href="<xliff:g id="exodus">%1$s</xliff:g>"&gt; Exodus Privacy Analysis</string>

    <string name="no_tracker_found">No Tracker Found!</string>