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

Commit 787c5e48 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Update icon resolutions, names and action bar icon color

parent 38ecd7a4

app/src/main/java/at/bitfire/davdroid/DavService.kt

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ class DavService: android.app.Service() { 
            debugIntent.putExtra(DebugInfoActivity.KEY_ACCOUNT, account)



            val notify = NotificationUtils.newBuilder(this, NotificationUtils.CHANNEL_GENERAL)

                    .setSmallIcon(R.drawable.ic_sync_error_notification)

                    .setSmallIcon(R.drawable.ic_sync_problem_notify)

                    .setContentTitle(getString(R.string.dav_service_refresh_failed))

                    .setContentText(getString(R.string.dav_service_refresh_couldnt_refresh))

                    .setContentIntent(PendingIntent.getActivity(this, 0, debugIntent, PendingIntent.FLAG_UPDATE_CURRENT))

app/src/main/java/at/bitfire/davdroid/log/Logger.kt

+2 −2
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ object Logger : SharedPreferences.OnSharedPreferenceChangeListener { 
        // log to external file according to preferences

        if (logToFile) {

            val builder = NotificationUtils.newBuilder(context, NotificationUtils.CHANNEL_DEBUG)

            builder .setSmallIcon(R.drawable.ic_sd_storage_notification)

            builder .setSmallIcon(R.drawable.ic_sd_card_notify)

                    .setContentTitle(context.getString(R.string.logging_notification_title))



            val logDir = debugDir(context) ?: return
@@ -103,7 +103,7 @@ object Logger : SharedPreferences.OnSharedPreferenceChangeListener { 
                shareIntent.type = "text/plain"

                shareIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_ACTIVITY_NEW_TASK)

                val chooserIntent = Intent.createChooser(shareIntent, null)

                val shareAction = NotificationCompat.Action.Builder(R.drawable.ic_share_action_notification,

                val shareAction = NotificationCompat.Action.Builder(R.drawable.ic_share_notify,

                        context.getString(R.string.logging_notification_send_log),

                        PendingIntent.getActivity(context, 0, chooserIntent, PendingIntent.FLAG_UPDATE_CURRENT))

                builder.addAction(shareAction.build())

app/src/main/java/at/bitfire/davdroid/syncadapter/SyncAdapterService.kt

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ abstract class SyncAdapterService: Service() { 


        protected fun notifyPermissions(intent: Intent) {

            val notify = NotificationUtils.newBuilder(context, NotificationUtils.CHANNEL_SYNC_ERRORS)

                    .setSmallIcon(R.drawable.ic_sync_error_notification)

                    .setSmallIcon(R.drawable.ic_sync_problem_notify)

                    .setContentTitle(context.getString(R.string.sync_error_permissions))

                    .setContentText(context.getString(R.string.sync_error_permissions_text))

                    .setContentIntent(PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT))

app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.kt

+1 −1
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ abstract class SyncManager<ResourceType: LocalResource<*>, out CollectionType: L 
        }



        val builder = NotificationUtils.newBuilder(context, channel)

        builder .setSmallIcon(R.drawable.ic_sync_error_notification)

        builder .setSmallIcon(R.drawable.ic_sync_problem_notify)

                .setContentTitle(localCollection.title)

                .setContentText(message)

                .setStyle(NotificationCompat.BigTextStyle(builder).bigText(message))

app/src/main/java/at/bitfire/davdroid/syncadapter/TasksSyncAdapterService.kt

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ class TasksSyncAdapterService: SyncAdapterService() { 
                val nm = NotificationManagerCompat.from(context)

                val message = context.getString(R.string.sync_error_opentasks_required_version, e.provider.minVersionName, e.installedVersionName)

                val notify = NotificationUtils.newBuilder(context, NotificationUtils.CHANNEL_SYNC_ERRORS)

                        .setSmallIcon(R.drawable.ic_sync_error_notification)

                        .setSmallIcon(R.drawable.ic_sync_problem_notify)

                        .setContentTitle(context.getString(R.string.sync_error_opentasks_too_old))

                        .setContentText(message)

                        .setStyle(NotificationCompat.BigTextStyle().bigText(message))