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

Commit 323602c4 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Update initial settings page

parent 491a5f17

app/k9mail-jmap/src/main/res/values/themes.xml

+2 −2
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 
        <item name="messageListForwarded">@drawable/ic_messagelist_forwarded</item>

        <item name="messageListAnsweredForwarded">@drawable/ic_messagelist_answered_forwarded</item>

        <item name="messageStar">@drawable/btn_check_star</item>

        <item name="messageStarColor">#EB621E</item>

        <item name="messageStarColor">#FFC300</item>

        <item name="messageViewBackgroundColor">#ffffffff</item>

        <item name="messageComposeAddContactImage">@drawable/ic_person_plus</item>

        <item name="attachmentCardBackground">#e8e8e8</item>
@@ -212,7 +212,7 @@ 
        <item name="messageListForwarded">@drawable/ic_messagelist_forwarded</item>

        <item name="messageListAnsweredForwarded">@drawable/ic_messagelist_answered_forwarded</item>

        <item name="messageStar">@drawable/btn_check_star</item>

        <item name="messageStarColor">#EB621E</item>

        <item name="messageStarColor">#FFC300</item>

        <item name="messageViewBackgroundColor">#000000</item>

        <item name="messageComposeAddContactImage">@drawable/ic_person_plus</item>

        <item name="attachmentCardBackground">#313131</item>

app/k9mail/src/main/res/values/themes.xml

+18 −18
Original line number Diff line number Diff line
@@ -59,24 +59,24 @@ 
        <item name="iconActionSingleMessageOptions">@drawable/ic_reply_all</item>

        <item name="iconActionSort">@drawable/ic_sort</item>

        <item name="iconActionSpam">@drawable/ic_alert_octagon</item>

        <item name="iconActionFlag">@lineageos.platform:drawable/ic_star_filled</item>

        <item name="iconActionUnflag">@lineageos.platform:drawable/ic_star</item>

        <item name="iconActionFlag">@drawable/ic_star</item>

        <item name="iconActionUnflag">@drawable/ic_star_border</item>

        <item name="iconActionMarkAsRead">@drawable/ic_opened_envelope</item>

        <item name="iconActionMarkAsUnread">@drawable/ic_envelope</item>

        <item name="iconActionRemoteSearch">@drawable/ic_magnify_cloud</item>

        <item name="iconActionAdd">@lineageos.platform:drawable/ic_add</item>

        <item name="iconActionAdd">@drawable/ic_plus</item>

        <item name="iconActionImportExport">@drawable/ic_arrow_up_down</item>

        <item name="iconActionUpload">@drawable/ic_file_upload</item>

        <item name="iconActionSelectAll">@drawable/ic_select_all</item>

        <item name="iconActionSave">@drawable/ic_floppy</item>

        <item name="iconActionSaveAttachment">@lineageos.platform:drawable/ic_downloads</item>

        <item name="iconActionCancel">@lineageos.platform:drawable/ic_cancel</item>

        <item name="iconActionSaveAttachment">@drawable/ic_download</item>

        <item name="iconActionCancel">@drawable/ic_clear</item>

        <item name="iconActionRequestReadReceipt">@drawable/ic_action_request_read_receipt_light</item>

        <item name="iconActionExpand">@drawable/ic_chevron_down</item>

        <item name="iconActionCollapse">@drawable/ic_chevron_up</item>

        <item name="iconPreferencesDisplay">@drawable/ic_tv</item>

        <item name="iconPreferencesInteraction">@drawable/ic_touch</item>

        <item name="iconPreferencesNotifications">@lineageos.platform:drawable/ic_notifications</item>

        <item name="iconPreferencesNotifications">@drawable/ic_notifications</item>

        <item name="iconPreferencesNetwork">@drawable/ic_arrow_up_down</item>

        <item name="iconPreferencesPrivacy">@drawable/ic_shield</item>

        <item name="iconPreferencesDebug">@drawable/ic_bug</item>
@@ -86,10 +86,10 @@ 
        <item name="iconPreferencesFetchMail">@drawable/ic_preferences_check_mail</item>

        <item name="iconPreferencesReadMail">@drawable/ic_opened_envelope</item>

        <item name="iconPreferencesCompose">@drawable/ic_pencil</item>

        <item name="iconSettingsAbout">@lineageos.platform:drawable/ic_info</item>

        <item name="iconSettingsAbout">@drawable/ic_info</item>

        <item name="iconSettingsGeneral">@drawable/ic_cog</item>

        <item name="iconSettingsAccount">@drawable/ic_envelope</item>

        <item name="iconSettingsAccountAdd">@lineageos.platform:drawable/ic_add</item>

        <item name="iconSettingsAccountAdd">@drawable/ic_plus</item>

        <item name="iconSettingsExport">@drawable/ic_export</item>

        <item name="iconSettingsImport">@drawable/ic_import</item>

        <item name="iconSettingsImportStatus">@drawable/ic_import_status</item>
@@ -119,7 +119,7 @@ 
        <item name="tintColorBulletPointNegative">#dd2222</item>

        <item name="tintColorBulletPointNeutral">#888</item>



        <item name="iconAboutVersion">@lineageos.platform:drawable/ic_info</item>

        <item name="iconAboutVersion">@drawable/ic_info</item>

        <item name="iconAboutAuthors">@drawable/ic_people</item>

        <item name="iconAboutSourceCode">@drawable/ic_code</item>

        <item name="iconAboutLicense">@drawable/ic_description</item>
@@ -185,24 +185,24 @@ 
        <item name="iconActionSingleMessageOptions">@drawable/ic_reply_all</item>

        <item name="iconActionSort">@drawable/ic_sort</item>

        <item name="iconActionSpam">@drawable/ic_alert_octagon</item>

        <item name="iconActionFlag">@lineageos.platform:drawable/ic_star_filled</item>

        <item name="iconActionUnflag">@lineageos.platform:drawable/ic_star</item>

        <item name="iconActionFlag">@drawable/ic_star</item>

        <item name="iconActionUnflag">@drawable/ic_star_border</item>

        <item name="iconActionMarkAsRead">@drawable/ic_opened_envelope</item>

        <item name="iconActionMarkAsUnread">@drawable/ic_envelope</item>

        <item name="iconActionRemoteSearch">@drawable/ic_magnify_cloud</item>

        <item name="iconActionAdd">@lineageos.platform:drawable/ic_add</item>

        <item name="iconActionAdd">@drawable/ic_plus</item>

        <item name="iconActionImportExport">@drawable/ic_arrow_up_down</item>

        <item name="iconActionUpload">@drawable/ic_file_upload</item>

        <item name="iconActionSelectAll">@drawable/ic_select_all</item>

        <item name="iconActionSave">@drawable/ic_floppy</item>

        <item name="iconActionSaveAttachment">@lineageos.platform:drawable/ic_downloads</item>

        <item name="iconActionCancel">@lineageos.platform:drawable/ic_cancel</item>

        <item name="iconActionSaveAttachment">@drawable/ic_download</item>

        <item name="iconActionCancel">@drawable/ic_clear</item>

        <item name="iconActionRequestReadReceipt">@drawable/ic_action_request_read_receipt_light</item>

        <item name="iconActionExpand">@drawable/ic_chevron_down</item>

        <item name="iconActionCollapse">@drawable/ic_chevron_up</item>

        <item name="iconPreferencesDisplay">@drawable/ic_tv</item>

        <item name="iconPreferencesInteraction">@drawable/ic_touch</item>

        <item name="iconPreferencesNotifications">@lineageos.platform:drawable/ic_notifications</item>

        <item name="iconPreferencesNotifications">@drawable/ic_notifications</item>

        <item name="iconPreferencesNetwork">@drawable/ic_arrow_up_down</item>

        <item name="iconPreferencesPrivacy">@drawable/ic_shield</item>

        <item name="iconPreferencesDebug">@drawable/ic_bug</item>
@@ -212,10 +212,10 @@ 
        <item name="iconPreferencesFetchMail">@drawable/ic_preferences_check_mail</item>

        <item name="iconPreferencesReadMail">@drawable/ic_opened_envelope</item>

        <item name="iconPreferencesCompose">@drawable/ic_pencil</item>

        <item name="iconSettingsAbout">@lineageos.platform:drawable/ic_info</item>

        <item name="iconSettingsAbout">@drawable/ic_info</item>

        <item name="iconSettingsGeneral">@drawable/ic_cog</item>

        <item name="iconSettingsAccount">@drawable/ic_envelope</item>

        <item name="iconSettingsAccountAdd">@lineageos.platform:drawable/ic_add</item>

        <item name="iconSettingsAccountAdd">@drawable/ic_plus</item>

        <item name="iconSettingsExport">@drawable/ic_export</item>

        <item name="iconSettingsImport">@drawable/ic_import</item>

        <item name="iconSettingsImportStatus">@drawable/ic_import_status</item>
@@ -245,7 +245,7 @@ 
        <item name="tintColorBulletPointNegative">#dd2222</item>

        <item name="tintColorBulletPointNeutral">#888</item>



        <item name="iconAboutVersion">@lineageos.platform:drawable/ic_info</item>

        <item name="iconAboutVersion">@drawable/ic_info</item>

        <item name="iconAboutAuthors">@drawable/ic_people</item>

        <item name="iconAboutSourceCode">@drawable/ic_code</item>

        <item name="iconAboutLicense">@drawable/ic_description</item>

app/ui/base/src/main/res/values/styles.xml

+1 −0
Original line number Diff line number Diff line
@@ -7,5 +7,6 @@ 
        <item name="actionModeCloseDrawable">@drawable/ic_close</item>

        <item name="android:textCursorDrawable">@drawable/edittext_cursor</item>

        <item name="homeAsUpIndicator">@drawable/ic_arrow_back</item>

        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>

    </style>

</resources>
 
 No newline at end of file

app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsActivity.kt

+6 −0
Original line number Diff line number Diff line
@@ -2,7 +2,11 @@ package com.fsck.k9.ui.settings 


import android.app.Activity

import android.content.Intent

import android.graphics.PorterDuff

import android.graphics.PorterDuffColorFilter

import android.os.Bundle

import androidx.appcompat.widget.Toolbar

import androidx.core.content.ContextCompat

import androidx.navigation.NavController

import androidx.navigation.ui.AppBarConfiguration

import androidx.navigation.ui.setupActionBarWithNavController
@@ -26,6 +30,8 @@ class SettingsActivity : K9Activity() { 


        navController = findNavController(R.id.nav_host_fragment)

        setupActionBarWithNavController(navController, appBarConfiguration)

        val toolbar = findViewById<Toolbar>(R.id.toolbar)

        toolbar.navigationIcon?.mutate()?.colorFilter = PorterDuffColorFilter(ContextCompat.getColor(this, R.color.color_default_primary_text), PorterDuff.Mode.SRC_OVER)

    }



    override fun onSupportNavigateUp(): Boolean {

app/ui/legacy/src/main/res/drawable/ic_cog.xml

+6 −6
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="20dp"

    android:height="20dp"

    android:viewportWidth="20"

    android:viewportHeight="20">

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

    <path

        android:pathData="M17.4318,10.98C17.4718,10.66 17.5018,10.34 17.5018,10C17.5018,9.66 17.4718,9.34 17.4318,9.02L19.5418,7.37C19.7318,7.22 19.7818,6.95 19.6618,6.73L17.6618,3.27C17.5718,3.11 17.4018,3.02 17.2218,3.02C17.1618,3.02 17.1018,3.03 17.0518,3.05L14.5618,4.05C14.0418,3.65 13.4818,3.32 12.8718,3.07L12.4918,0.42C12.4618,0.18 12.2518,0 12.0018,0H8.0018C7.7518,0 7.5418,0.18 7.5118,0.42L7.1318,3.07C6.5218,3.32 5.9618,3.66 5.4418,4.05L2.9518,3.05C2.8918,3.03 2.8318,3.02 2.7718,3.02C2.6018,3.02 2.4318,3.11 2.3418,3.27L0.3418,6.73C0.2118,6.95 0.2718,7.22 0.4618,7.37L2.5718,9.02C2.5318,9.34 2.5018,9.67 2.5018,10C2.5018,10.33 2.5318,10.66 2.5718,10.98L0.4618,12.63C0.2718,12.78 0.2218,13.05 0.3418,13.27L2.3418,16.73C2.4318,16.89 2.6018,16.98 2.7818,16.98C2.8418,16.98 2.9018,16.97 2.9518,16.95L5.4418,15.95C5.9618,16.35 6.5218,16.68 7.1318,16.93L7.5118,19.58C7.5418,19.82 7.7518,20 8.0018,20H12.0018C12.2518,20 12.4618,19.82 12.4918,19.58L12.8718,16.93C13.4818,16.68 14.0418,16.34 14.5618,15.95L17.0518,16.95C17.1118,16.97 17.1718,16.98 17.2318,16.98C17.4018,16.98 17.5718,16.89 17.6618,16.73L19.6618,13.27C19.7818,13.05 19.7318,12.78 19.5418,12.63L17.4318,10.98ZM15.4518,9.27C15.4918,9.58 15.5018,9.79 15.5018,10C15.5018,10.21 15.4818,10.43 15.4518,10.73L15.3118,11.86L16.2018,12.56L17.2818,13.4L16.5818,14.61L15.3118,14.1L14.2718,13.68L13.3718,14.36C12.9418,14.68 12.5318,14.92 12.1218,15.09L11.0618,15.52L10.9018,16.65L10.7018,18H9.3018L8.9518,15.52L7.8918,15.09C7.4618,14.91 7.0618,14.68 6.6618,14.38L5.7518,13.68L4.6918,14.11L3.4218,14.62L2.7218,13.41L3.8018,12.57L4.6918,11.87L4.5518,10.74C4.5218,10.43 4.5018,10.2 4.5018,10C4.5018,9.8 4.5218,9.57 4.5518,9.27L4.6918,8.14L3.8018,7.44L2.7218,6.6L3.4218,5.39L4.6918,5.9L5.7318,6.32L6.6318,5.64C7.0618,5.32 7.4718,5.08 7.8818,4.91L8.9418,4.48L9.1018,3.35L9.3018,2H10.6918L11.0418,4.48L12.1018,4.91C12.5318,5.09 12.9318,5.32 13.3318,5.62L14.2418,6.32L15.3018,5.89L16.5718,5.38L17.2718,6.59L16.2018,7.44L15.3118,8.14L15.4518,9.27ZM10.0018,6C7.7918,6 6.0018,7.79 6.0018,10C6.0018,12.21 7.7918,14 10.0018,14C12.2118,14 14.0018,12.21 14.0018,10C14.0018,7.79 12.2118,6 10.0018,6ZM10.0018,12C8.9018,12 8.0018,11.1 8.0018,10C8.0018,8.9 8.9018,8 10.0018,8C11.1018,8 12.0018,8.9 12.0018,10C12.0018,11.1 11.1018,12 10.0018,12Z"

        android:fillColor="@color/default_icon_color"/>

        android:fillColor="@color/default_icon_color"

        android:pathData="M19.4323,12.98C19.4723,12.66 19.5023,12.34 19.5023,12C19.5023,11.66 19.4723,11.34 19.4323,11.02L21.5423,9.37C21.7323,9.22 21.7823,8.95 21.6623,8.73L19.6623,5.27C19.5723,5.11 19.4023,5.02 19.2223,5.02C19.1623,5.02 19.1023,5.03 19.0523,5.05L16.5623,6.05C16.0423,5.65 15.4823,5.32 14.8723,5.07L14.4923,2.42C14.4623,2.18 14.2523,2 14.0023,2H10.0023C9.7523,2 9.5423,2.18 9.5123,2.42L9.1323,5.07C8.5223,5.32 7.9623,5.66 7.4423,6.05L4.9523,5.05C4.8923,5.03 4.8323,5.02 4.7723,5.02C4.6023,5.02 4.4323,5.11 4.3423,5.27L2.3423,8.73C2.2123,8.95 2.2723,9.22 2.4623,9.37L4.5723,11.02C4.5323,11.34 4.5023,11.67 4.5023,12C4.5023,12.33 4.5323,12.66 4.5723,12.98L2.4623,14.63C2.2723,14.78 2.2223,15.05 2.3423,15.27L4.3423,18.73C4.4323,18.89 4.6023,18.98 4.7823,18.98C4.8423,18.98 4.9023,18.97 4.9523,18.95L7.4423,17.95C7.9623,18.35 8.5223,18.68 9.1323,18.93L9.5123,21.58C9.5423,21.82 9.7523,22 10.0023,22H14.0023C14.2523,22 14.4623,21.82 14.4923,21.58L14.8723,18.93C15.4823,18.68 16.0423,18.34 16.5623,17.95L19.0523,18.95C19.1123,18.97 19.1723,18.98 19.2323,18.98C19.4023,18.98 19.5723,18.89 19.6623,18.73L21.6623,15.27C21.7823,15.05 21.7323,14.78 21.5423,14.63L19.4323,12.98ZM17.4523,11.27C17.4923,11.58 17.5023,11.79 17.5023,12C17.5023,12.21 17.4823,12.43 17.4523,12.73L17.3123,13.86L18.2023,14.56L19.2823,15.4L18.5823,16.61L17.3123,16.1L16.2723,15.68L15.3723,16.36C14.9423,16.68 14.5323,16.92 14.1223,17.09L13.0623,17.52L12.9023,18.65L12.7023,20H11.3023L10.9523,17.52L9.8923,17.09C9.4623,16.91 9.0623,16.68 8.6623,16.38L7.7523,15.68L6.6923,16.11L5.4223,16.62L4.7223,15.41L5.8023,14.57L6.6923,13.87L6.5523,12.74C6.5223,12.43 6.5023,12.2 6.5023,12C6.5023,11.8 6.5223,11.57 6.5523,11.27L6.6923,10.14L5.8023,9.44L4.7223,8.6L5.4223,7.39L6.6923,7.9L7.7323,8.32L8.6323,7.64C9.0623,7.32 9.4723,7.08 9.8823,6.91L10.9423,6.48L11.1023,5.35L11.3023,4H12.6923L13.0423,6.48L14.1023,6.91C14.5323,7.09 14.9323,7.32 15.3323,7.62L16.2423,8.32L17.3023,7.89L18.5723,7.38L19.2723,8.59L18.2023,9.44L17.3123,10.14L17.4523,11.27ZM12.0023,8C9.7923,8 8.0023,9.79 8.0023,12C8.0023,14.21 9.7923,16 12.0023,16C14.2123,16 16.0023,14.21 16.0023,12C16.0023,9.79 14.2123,8 12.0023,8ZM12.0023,14C10.9023,14 10.0023,13.1 10.0023,12C10.0023,10.9 10.9023,10 12.0023,10C13.1023,10 14.0023,10.9 14.0023,12C14.0023,13.1 13.1023,14 12.0023,14Z" />

</vector>