diff --git a/app/k9mail/src/main/res/values-night/colors.xml b/app/k9mail/src/main/res/values-night/colors.xml index 2359a8b483f0c0f96d3575d95e43210d67ca289d..8b7b4c3e098d883a1318236e76386c3b4d45740e 100644 --- a/app/k9mail/src/main/res/values-night/colors.xml +++ b/app/k9mail/src/main/res/values-night/colors.xml @@ -8,4 +8,5 @@ #61FFFFFF #383838 + #4b4b4b \ No newline at end of file diff --git a/app/k9mail/src/main/res/values/colors.xml b/app/k9mail/src/main/res/values/colors.xml index 124892b99a087252585b7a7b46d9b3fa5e3fee7b..43d0c5328d49dad3956a0541dc79aa5f269ffd17 100644 --- a/app/k9mail/src/main/res/values/colors.xml +++ b/app/k9mail/src/main/res/values/colors.xml @@ -8,7 +8,7 @@ #DE000000 #99000000 #61000000 - @lineageos.platform:color/color_default_divider + #14212121 @lineageos.platform:color/color_default_gray1 @lineageos.platform:color/color_default_gray2 @@ -16,4 +16,6 @@ #DCDCDC #61000000 @android:color/white + + #ededed \ No newline at end of file diff --git a/app/k9mail/src/main/res/values/themes.xml b/app/k9mail/src/main/res/values/themes.xml index 3c0e96ed7cf8fa0c32fc664ebcf8ce7800913a49..6331080f774460ed1038ad841be0f5ca09e5a6ef 100644 --- a/app/k9mail/src/main/res/values/themes.xml +++ b/app/k9mail/src/main/res/values/themes.xml @@ -28,6 +28,7 @@ @color/color_default_accent @color/color_default_primary_text @color/color_default_secondary_text + @color/color_default_ternary_text @drawable/edittext_cursor @style/Theme.k9.Dialog.Base @@ -113,7 +114,7 @@ @drawable/ic_person_plus @color/color_default_foreground #ffababab - #ccc + @color/color_contact_token_background @android:color/background_light #77aa22 #dd2222 @@ -239,7 +240,7 @@ @drawable/ic_person_plus @color/color_default_foreground #ffababab - #ccc + @color/color_contact_token_background @android:color/background_light #77aa22 #dd2222 diff --git a/app/ui/base/src/main/res/values-night/colors.xml b/app/ui/base/src/main/res/values-night/colors.xml index 8c640e934bacdec80a91b808669ea14401007f8d..21a589d687c618469db894ca6695ad8af2c3d45f 100644 --- a/app/ui/base/src/main/res/values-night/colors.xml +++ b/app/ui/base/src/main/res/values-night/colors.xml @@ -4,4 +4,6 @@ #DEFFFFFF #99FFFFFF #61FFFFFF + #474747 + #cfcfcf \ No newline at end of file diff --git a/app/ui/base/src/main/res/values/colors.xml b/app/ui/base/src/main/res/values/colors.xml index 9ade74ba47b4729dd40960969e9d5523cab1d3ea..5b0ddc7556cd9b321cbfca5669fd3535a6f79f67 100644 --- a/app/ui/base/src/main/res/values/colors.xml +++ b/app/ui/base/src/main/res/values/colors.xml @@ -11,4 +11,9 @@ #DE000000 #99000000 #61000000 + + #ededed + #3e3e3e + + #FFC300 \ No newline at end of file diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureLoader.kt b/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureLoader.kt index 7204b21f0b7902bf0b097320482c8daccf2dc964..edcbc1d83ab986f27b6b50351ba3a1007f77b8f9 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureLoader.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureLoader.kt @@ -41,8 +41,8 @@ class ContactPictureLoader( private fun setContactPicture(imageView: ImageView, contactPictureUri: Uri) { Glide.with(imageView.context) .load(contactPictureUri) - .placeholder(R.drawable.ic_contact_picture) - .error(R.drawable.ic_contact_picture) + .placeholder(R.drawable.ic_avatar) + .error(R.drawable.ic_avatar) .diskCacheStrategy(DiskCacheStrategy.NONE) .dontAnimate() .into(imageView) @@ -72,7 +72,7 @@ class ContactPictureLoader( return Glide.with(context) .asBitmap() .load(contactPictureUri) - .error(R.drawable.ic_contact_picture) + .error(R.drawable.ic_avatar) .diskCacheStrategy(DiskCacheStrategy.NONE) .dontAnimate() .submit(pictureSizeInPx, pictureSizeInPx) diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListAdapter.kt b/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListAdapter.kt index e07b709cf2305b0e391b4682e335a3c986f6efed..b09882b3c5c9b5ea5570668d9ebff8a8ad280ff2 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListAdapter.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListAdapter.kt @@ -111,8 +111,6 @@ class MessageListAdapter internal constructor( view.findViewById(R.id.contact_picture_container).isVisible = appearance.showContactPicture holder.contactPicture.setOnClickListener(contactPictureClickListener) - holder.chip.isVisible = appearance.showAccountChip - appearance.fontSizes.setViewTextSize(holder.subject, subjectViewFontSize) appearance.fontSizes.setViewTextSize(holder.date, appearance.fontSizes.messageListDate) @@ -158,12 +156,6 @@ class MessageListAdapter internal constructor( val displayThreadCount = if (appearance.showingThreadedList) threadCount else 0 val subject = MlfUtils.buildSubject(subject, res.getString(R.string.general_no_subject), displayThreadCount) - if (appearance.showAccountChip) { - val accountChipDrawable = holder.chip.drawable.mutate() - DrawableCompat.setTint(accountChipDrawable, account.chipColor) - holder.chip.setImageDrawable(accountChipDrawable) - } - if (appearance.stars) { holder.flagged.isVisible = isStarred } else { @@ -235,7 +227,7 @@ class MessageListAdapter internal constructor( if (displayAddress != null) { contactsPictureLoader.setContactPicture(contactPictureView, displayAddress) } else { - contactPictureView.setImageResource(R.drawable.ic_contact_picture) + contactPictureView.setImageResource(R.drawable.ic_avatar) } } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt index a2976bb1c5ee32eedf8c6e65d9966e7ce6385049..fcda8c1925c0dbc2596700d0e14c352523cab3cd 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt @@ -8,13 +8,9 @@ import android.net.Uri import android.os.Bundle import android.util.TypedValue import android.widget.ImageView -import android.widget.LinearLayout -import android.widget.Toast import androidx.annotation.LayoutRes -import androidx.appcompat.content.res.AppCompatResources import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat -import androidx.core.graphics.drawable.DrawableCompat import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.swiperefreshlayout.widget.SwipeRefreshLayout @@ -57,7 +53,6 @@ import com.mikepenz.materialdrawer.util.getDrawerItem import com.mikepenz.materialdrawer.util.removeAllItems import com.mikepenz.materialdrawer.widget.AccountHeaderView import com.mikepenz.materialdrawer.widget.MaterialDrawerSliderView -import java.util.ArrayList import org.koin.androidx.viewmodel.ext.android.viewModel import org.koin.core.component.KoinComponent import org.koin.core.component.inject @@ -284,16 +279,16 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K private fun addFooterItems() { sliderView.addStickyFooterItem( - PrimaryDrawerItem().apply { + FooterDrawerItem().apply { nameRes = R.string.folders_action - iconRes = folderIconProvider.iconFolderResId + iconRes = R.drawable.ic_create_new_folder identifier = DRAWER_ID_FOLDERS isSelectable = false } ) sliderView.addStickyFooterItem( - PrimaryDrawerItem().apply { + FooterDrawerItem().apply { nameRes = R.string.preferences_action iconRes = getResId(R.attr.iconActionSettings) identifier = DRAWER_ID_PREFERENCES @@ -372,14 +367,8 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K } folderList.unifiedInbox?.let { unifiedInbox -> - val unwrappedDrawable = - AppCompatResources.getDrawable(parent.applicationContext, R.drawable.ic_inbox_multiple) - val wrappedSelectedDrawable = DrawableCompat.wrap(unwrappedDrawable!!) - DrawableCompat.setTintList(wrappedSelectedDrawable, selectedTextColor) - val unifiedInboxItem = FolderDrawerItem().apply { - iconRes = R.drawable.ic_inbox_multiple //getResId(R.attr.iconUnifiedInbox) - selectedIcon = ImageHolder(wrappedSelectedDrawable) + iconRes = R.drawable.ic_inbox_multiple identifier = DRAWER_ID_UNIFIED_INBOX nameRes = R.string.integrated_inbox_title selectedColorInt = selectedBackgroundColor @@ -404,14 +393,8 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K val folder = displayFolder.folder val drawerId = accountOffset + folder.id - val iconId = folderIconProvider.getFolderIcon(folder.type) - val unwrappedDrawable = AppCompatResources.getDrawable(parent.applicationContext, iconId) - val wrappedSelectedDrawable = DrawableCompat.wrap(unwrappedDrawable!!) - DrawableCompat.setTintList(wrappedSelectedDrawable, selectedTextColor) - val drawerItem = FolderDrawerItem().apply { - iconRes = iconId - selectedIcon = ImageHolder(wrappedSelectedDrawable) + iconRes = folderIconProvider.getFolderIcon(folder.type) identifier = drawerId tag = folder nameText = getFolderDisplayName(folder) @@ -581,6 +564,17 @@ private class FolderDrawerItem : PrimaryDrawerItem() { override val layoutRes: Int = R.layout.drawer_folder_list_item } +private class FooterDrawerItem : PrimaryDrawerItem() { + override val layoutRes: Int = R.layout.drawer_footer_list_item + + override fun bindView(holder: ViewHolder, payloads: List) { + super.bindView(holder, payloads) + if (!isSelected) { + holder.itemView.setBackgroundColor(ContextCompat.getColor(holder.itemView.context, R.color.color_drawer_header_background)) + } + } +} + private class CustomProfileDrawerItem : ProfileDrawerItem() { override val layoutRes: Int @LayoutRes diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountFallbackImageProvider.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountFallbackImageProvider.kt index 53abd77c972d89bae3abdaa84853f01efe891603..b062667633c6b947f25346c9336e9f88cd73f88a 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountFallbackImageProvider.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountFallbackImageProvider.kt @@ -2,24 +2,14 @@ package com.fsck.k9.ui.account import android.content.Context import android.graphics.drawable.Drawable +import androidx.core.content.ContextCompat import com.fsck.k9.ui.R -import com.mikepenz.iconics.IconicsDrawable -import com.mikepenz.iconics.typeface.library.fontawesome.FontAwesome -import com.mikepenz.iconics.utils.backgroundColorRes -import com.mikepenz.iconics.utils.colorInt -import com.mikepenz.iconics.utils.paddingDp -import com.mikepenz.iconics.utils.sizeDp /** * Provides a [Drawable] for the account using the account's color as background color. */ class AccountFallbackImageProvider(private val context: Context) { fun getDrawable(color: Int): Drawable { - return IconicsDrawable(context, FontAwesome.Icon.faw_user_alt).apply { - colorInt = color - backgroundColorRes = R.color.material_drawer_profile_icon - sizeDp = 56 - paddingDp = 12 - } + return ContextCompat.getDrawable(context, R.drawable.ic_avatar)!! } } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageLoader.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageLoader.kt index 58f7d747cf3b50f328396f2654e67d93d83e34fc..432d867e784f1edf1bbd3c70be869fe7086585e4 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageLoader.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageLoader.kt @@ -4,6 +4,7 @@ import android.content.Context import android.widget.ImageView import com.bumptech.glide.Glide import com.bumptech.glide.load.engine.DiskCacheStrategy +import com.fsck.k9.ui.R import com.fsck.k9.ui.helper.findActivity /** @@ -14,8 +15,9 @@ class AccountImageLoader(private val accountFallbackImageProvider: AccountFallba imageView.context.ifNotDestroyed { context -> Glide.with(context) .load(AccountImage(email, color)) - .placeholder(accountFallbackImageProvider.getDrawable(color)) + .placeholder(R.drawable.ic_avatar) .diskCacheStrategy(DiskCacheStrategy.NONE) + .fallback(R.drawable.ic_avatar) .dontAnimate() .into(imageView) } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageModelLoader.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageModelLoader.kt index 4bc81b49109544ffe8efdc464fb3d843ca600a7d..7f2a0b096024abac5e2e3b9ba185ce03576cedd0 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageModelLoader.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageModelLoader.kt @@ -58,8 +58,7 @@ internal class AccountImageDataFetcher( private val accountImage: AccountImage ) : DataFetcher { override fun loadData(priority: Priority, callback: DataFetcher.DataCallback) { - val bitmap = loadAccountImage() ?: createFallbackBitmap() - callback.onDataReady(bitmap) + callback.onDataReady(loadAccountImage()) } private fun loadAccountImage(): Bitmap? { diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersActivity.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersActivity.kt index 7ee3744893d12b15c20d26c281a91d792353bfae..6d5edc31bfc10395bce2549754002968a22dfee2 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersActivity.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersActivity.kt @@ -2,7 +2,11 @@ package com.fsck.k9.ui.managefolders 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.core.os.bundleOf import androidx.navigation.NavController import androidx.navigation.ui.AppBarConfiguration @@ -35,6 +39,8 @@ class ManageFoldersActivity : K9Activity() { val appBarConfiguration = AppBarConfiguration(topLevelDestinationIds = emptySet()) setupActionBarWithNavController(navController, appBarConfiguration) + val toolbar = findViewById(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 { diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/OnboardingActivity.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/OnboardingActivity.kt index 00952cd438a4214a5ceb91169bd34036925c8a05..ae0ef86780f56b1aa8ea020a731c8a3d803fe03a 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/OnboardingActivity.kt +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/OnboardingActivity.kt @@ -2,7 +2,11 @@ package com.fsck.k9.ui.onboarding 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 OnboardingActivity : K9Activity() { navController = findNavController(R.id.nav_host_fragment) setupActionBarWithNavController(navController, appBarConfiguration) + val toolbar = findViewById(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 { diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/CustomPreferenceCategory.java b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/CustomPreferenceCategory.java index 6bde0b466e7e2b1f35064ad937d5b44b506e7df6..4a901616b5ccce31d9c29a1d6daf26af2bdf47af 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/CustomPreferenceCategory.java +++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/CustomPreferenceCategory.java @@ -2,6 +2,7 @@ package com.fsck.k9.ui.settings; import android.content.Context; +import android.graphics.Typeface; import android.util.AttributeSet; import android.widget.TextView; @@ -39,5 +40,6 @@ public class CustomPreferenceCategory extends PreferenceCategory { super.onBindViewHolder(holder); final TextView titleView = (TextView) holder.findViewById(android.R.id.title); titleView.setTextColor(ContextCompat.getColor(getContext(), R.color.color_default_primary_text)); + titleView.setTypeface(titleView.getTypeface(), Typeface.BOLD); } } diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java b/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java index 47c384edfa088e69097b854ceb116f8254ec6ef4..dfa67c473711de32c29950f9edfe73efbd339c83 100644 --- a/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java +++ b/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageHeader.java @@ -265,7 +265,7 @@ public class MessageHeader extends LinearLayout implements OnClickListener, OnLo mContactBadge.setContact(fromAddress); mContactsPictureLoader.setContactPicture(mContactBadge, fromAddress); } else { - mContactBadge.setImageResource(R.drawable.ic_contact_picture); + mContactBadge.setImageResource(R.drawable.ic_avatar); } } @@ -327,8 +327,7 @@ public class MessageHeader extends LinearLayout implements OnClickListener, OnLo private void updateAddressField(TextView v, CharSequence text, View label) { boolean hasText = !TextUtils.isEmpty(text); - - v.setText(text); + v.setText(text + " "); v.setVisibility(hasText ? View.VISIBLE : View.GONE); label.setVisibility(hasText ? View.VISIBLE : View.GONE); } diff --git a/app/ui/legacy/src/main/res/drawable/bg_recipient_token.xml b/app/ui/legacy/src/main/res/drawable/bg_recipient_token.xml new file mode 100644 index 0000000000000000000000000000000000000000..ec48cf744f7f004569f48f4bfef8592e06232fb7 --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/bg_recipient_token.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/app/ui/legacy/src/main/res/drawable/btn_check_star.xml b/app/ui/legacy/src/main/res/drawable/btn_check_star.xml index c8444f6dccd29b79501f41b509f6660e4d219d83..17ef137a4cd43f30e30cad779acf2d8c43f433cd 100644 --- a/app/ui/legacy/src/main/res/drawable/btn_check_star.xml +++ b/app/ui/legacy/src/main/res/drawable/btn_check_star.xml @@ -1,5 +1,5 @@ - - + + diff --git a/app/ui/legacy/src/main/res/drawable/header_background.xml b/app/ui/legacy/src/main/res/drawable/header_background.xml index a85d95e6a7fcd79048f74d97c1933055a31817d2..d93ad4eaf36dcad58e42e001d5e0aea269ccd2f0 100644 --- a/app/ui/legacy/src/main/res/drawable/header_background.xml +++ b/app/ui/legacy/src/main/res/drawable/header_background.xml @@ -1,6 +1,6 @@ - + diff --git a/app/ui/legacy/src/main/res/drawable/ic_alert_octagon.xml b/app/ui/legacy/src/main/res/drawable/ic_alert_octagon.xml index 8896679805e9ae055a1468ca55e6bc90772cd976..ddab9f180b0cef3115c9e0517246ce9934533a2e 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_alert_octagon.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_alert_octagon.xml @@ -1,15 +1,22 @@ - - - - - + + + + + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_alert_octagon_default.xml b/app/ui/legacy/src/main/res/drawable/ic_alert_octagon_default.xml new file mode 100644 index 0000000000000000000000000000000000000000..5f7932dc83417cca518b3d9625765f94b3dbea94 --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/ic_alert_octagon_default.xml @@ -0,0 +1,16 @@ + + + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_alert_octagon_selected.xml b/app/ui/legacy/src/main/res/drawable/ic_alert_octagon_selected.xml new file mode 100644 index 0000000000000000000000000000000000000000..aaf9a8d03f4775c579881390021e36004cac476c --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/ic_alert_octagon_selected.xml @@ -0,0 +1,16 @@ + + + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_archive.xml b/app/ui/legacy/src/main/res/drawable/ic_archive.xml index 52e4a2c3d7d686e12d8b5ecec1b65a15625ffbda..eb0734213b55a3a49abba80995d0f56decbbbc83 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_archive.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_archive.xml @@ -1,12 +1,22 @@ - - - - + + + + + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_archive_default.xml b/app/ui/legacy/src/main/res/drawable/ic_archive_default.xml new file mode 100644 index 0000000000000000000000000000000000000000..2084e35242d6eef30b221d3750e10ca3ce4400b8 --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/ic_archive_default.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_archive_selected.xml b/app/ui/legacy/src/main/res/drawable/ic_archive_selected.xml new file mode 100644 index 0000000000000000000000000000000000000000..3b34679f155355a96334c63eebb6672e63b3e52c --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/ic_archive_selected.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_avatar.xml b/app/ui/legacy/src/main/res/drawable/ic_avatar.xml new file mode 100644 index 0000000000000000000000000000000000000000..b29e9254a624e65ed2d601382efd0ce6ce88c34c --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/ic_avatar.xml @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_avatar_default.xml b/app/ui/legacy/src/main/res/drawable/ic_avatar_default.xml new file mode 100644 index 0000000000000000000000000000000000000000..00b7012ec79a5a7e288cca79ef7b19086b66331e --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/ic_avatar_default.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_avatar_selected.xml b/app/ui/legacy/src/main/res/drawable/ic_avatar_selected.xml new file mode 100644 index 0000000000000000000000000000000000000000..778ad75b5558a184dc752f0ec7a06710b53f313b --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/ic_avatar_selected.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_contact_picture.xml b/app/ui/legacy/src/main/res/drawable/ic_contact_picture.xml deleted file mode 100644 index 1bc2a71d373d2f63df10c89e62ac2674bbaffd32..0000000000000000000000000000000000000000 --- a/app/ui/legacy/src/main/res/drawable/ic_contact_picture.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - diff --git a/app/ui/legacy/src/main/res/drawable/ic_create_new_folder.xml b/app/ui/legacy/src/main/res/drawable/ic_create_new_folder.xml new file mode 100644 index 0000000000000000000000000000000000000000..4131990bac30d782fb0bbc903068168e7a07411c --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/ic_create_new_folder.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_drafts_folder.xml b/app/ui/legacy/src/main/res/drawable/ic_drafts_folder.xml index e7da3b70adb7f408b6c05a65de4bcd58ccfbb0fe..f2614bdaccf89e01ebf60915e7764561a36a0230 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_drafts_folder.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_drafts_folder.xml @@ -1,9 +1,22 @@ - - - + + + + + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_drafts_folder_default.xml b/app/ui/legacy/src/main/res/drawable/ic_drafts_folder_default.xml new file mode 100644 index 0000000000000000000000000000000000000000..6c1178307a6130f50ff3fedf654094bc83b5cb98 --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/ic_drafts_folder_default.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_drafts_folder_selected.xml b/app/ui/legacy/src/main/res/drawable/ic_drafts_folder_selected.xml new file mode 100644 index 0000000000000000000000000000000000000000..ca41f8bdb3bfe87260142745168cbea8d8f2513b --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/ic_drafts_folder_selected.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_folder.xml b/app/ui/legacy/src/main/res/drawable/ic_folder.xml index 1f96ee0bcc5363f8c350715a46d3d3cb52fa0918..141e8f9b854404ee1adddacbb1d38e0bc1ce1139 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_folder.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_folder.xml @@ -1,9 +1,22 @@ - - - + + + + + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_folder_default.xml b/app/ui/legacy/src/main/res/drawable/ic_folder_default.xml new file mode 100644 index 0000000000000000000000000000000000000000..cb5006c23fd96baa4b47522ed01b9a47a3ad24e6 --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/ic_folder_default.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_folder_selected.xml b/app/ui/legacy/src/main/res/drawable/ic_folder_selected.xml new file mode 100644 index 0000000000000000000000000000000000000000..fdbddef93f050a786e9766d007744c7687ed5a3f --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/ic_folder_selected.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_inbox.xml b/app/ui/legacy/src/main/res/drawable/ic_inbox.xml index f6d7df5b7c2e1e84ebfd5f3d46aee8cf886215d6..0f0f29095e6f537fff4af7ddfba2dea49d0a4b7d 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_inbox.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_inbox.xml @@ -1,9 +1,22 @@ - - - + + + + + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_inbox_default.xml b/app/ui/legacy/src/main/res/drawable/ic_inbox_default.xml new file mode 100644 index 0000000000000000000000000000000000000000..680c06eaaa42428d9dbf526e7cf64afad7625edb --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/ic_inbox_default.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple.xml b/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple.xml index d8e92c2082d9eefe3be5ba0c1f17753d6707a45e..a683471598687d74d346dbf54aa6293c6f27f582 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple.xml @@ -1,9 +1,22 @@ - - - + + + + + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple_default.xml b/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple_default.xml new file mode 100644 index 0000000000000000000000000000000000000000..b66dd11feb81b150dc02c40537a2d7eecc2e0120 --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple_default.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple_selected.xml b/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple_selected.xml new file mode 100644 index 0000000000000000000000000000000000000000..1ea1517e26859d0863efe332d2d8d1c3d6cf03fe --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/ic_inbox_multiple_selected.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_inbox_selected.xml b/app/ui/legacy/src/main/res/drawable/ic_inbox_selected.xml new file mode 100644 index 0000000000000000000000000000000000000000..4e8acb824c11e2acb89f12dbfeded458c37e0317 --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/ic_inbox_selected.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_magnify.xml b/app/ui/legacy/src/main/res/drawable/ic_magnify.xml index 5e56103f62cfdebe5335d33df375a7c5a1e0d152..4d3494f6c8b795a0b46e2aaefa44a9cf33b4e70e 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_magnify.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_magnify.xml @@ -1,10 +1,9 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M15.7549,14.2549H14.9649L14.6849,13.9849C15.6649,12.8449 16.2549,11.3649 16.2549,9.7549C16.2549,6.1649 13.3449,3.2549 9.7549,3.2549C6.1649,3.2549 3.2549,6.1649 3.2549,9.7549C3.2549,13.3449 6.1649,16.2549 9.7549,16.2549C11.3649,16.2549 12.8449,15.6649 13.9849,14.6849L14.2549,14.9649V15.7549L19.2549,20.7449L20.7449,19.2549L15.7549,14.2549ZM9.7549,14.2549C7.2649,14.2549 5.2549,12.2449 5.2549,9.7549C5.2549,7.2649 7.2649,5.2549 9.7549,5.2549C12.2449,5.2549 14.2549,7.2649 14.2549,9.7549C14.2549,12.2449 12.2449,14.2549 9.7549,14.2549Z" /> - diff --git a/app/ui/legacy/src/main/res/drawable/ic_messagelist_answered.xml b/app/ui/legacy/src/main/res/drawable/ic_messagelist_answered.xml index 979cfb2057456e8e3939ff6d73a30c5c41eeb638..df3550a0abdbdfa1564eeda298743389513bc555 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_messagelist_answered.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_messagelist_answered.xml @@ -1,10 +1,9 @@ diff --git a/app/ui/legacy/src/main/res/drawable/ic_messagelist_answered_forwarded.xml b/app/ui/legacy/src/main/res/drawable/ic_messagelist_answered_forwarded.xml index a50305bd08580a75e383610038480469d14b5205..89af3f5917820ebdb648be5917ad796cc4f78c78 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_messagelist_answered_forwarded.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_messagelist_answered_forwarded.xml @@ -2,15 +2,12 @@ + android:fillColor="@color/default_icon_color" + android:pathData="M8.20553,7.94632 L14.2687,14.0095 L14.2687,10.5448 C20.3319,9.67866,22.9304,5.3478,23.7966,1.01695 C21.6312,4.04855,18.5996,5.43442,14.2687,5.43442 L14.2687,1.88312 Z" /> + android:fillColor="@color/default_icon_color" + android:pathData="M15.6928,17.3127 L9.62958,23.3759 L9.62958,19.9112 C3.56638,19.0451,0.967866,14.7142,0.101695,10.3833 C2.26712,13.4149,5.29872,14.8008,9.62958,14.8008 L9.62958,11.2495 Z" /> diff --git a/app/ui/legacy/src/main/res/drawable/ic_messagelist_forwarded.xml b/app/ui/legacy/src/main/res/drawable/ic_messagelist_forwarded.xml index 93d28c9d1fa7ce443462e3e636ae4c7cf82b7730..49a489e78888823709bfe4088a421048f5091740 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_messagelist_forwarded.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_messagelist_forwarded.xml @@ -1,10 +1,9 @@ diff --git a/app/ui/legacy/src/main/res/drawable/ic_outbox.xml b/app/ui/legacy/src/main/res/drawable/ic_outbox.xml index 319f688f675127ee1b43a548d1165f0e37c232c6..8c4fbb606992a4bb831cd5bab9f4f6962407c1cf 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_outbox.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_outbox.xml @@ -1,12 +1,22 @@ - - - - + + + + + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_outbox_default.xml b/app/ui/legacy/src/main/res/drawable/ic_outbox_default.xml new file mode 100644 index 0000000000000000000000000000000000000000..d618ab2d6429c669103458ffbd190931332af325 --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/ic_outbox_default.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_outbox_selected.xml b/app/ui/legacy/src/main/res/drawable/ic_outbox_selected.xml new file mode 100644 index 0000000000000000000000000000000000000000..d912cc5b4951c31dca6afe75bdab4a5b8fe1c0a7 --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/ic_outbox_selected.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_send.xml b/app/ui/legacy/src/main/res/drawable/ic_send.xml index 1356700783e234efe3d93fdd69904aad7ac45b8f..ab27bb5a82a38cccbe06383780189ad7c6d89649 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_send.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_send.xml @@ -1,9 +1,22 @@ - - - + + + + + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_send_default.xml b/app/ui/legacy/src/main/res/drawable/ic_send_default.xml new file mode 100644 index 0000000000000000000000000000000000000000..1b6a78dc86f7fa694c5c48aa759e16ee83dc516c --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/ic_send_default.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_send_selected.xml b/app/ui/legacy/src/main/res/drawable/ic_send_selected.xml new file mode 100644 index 0000000000000000000000000000000000000000..f124280c10d55cec9b910863cebfc890e5088775 --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/ic_send_selected.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_star.xml b/app/ui/legacy/src/main/res/drawable/ic_star.xml index c879c6d16a7ba12156393a57d6fc6ba5743cfa0f..7298cfc3572e3b538d14231a609e31c0903ff1f9 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_star.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_star.xml @@ -4,6 +4,6 @@ android:viewportWidth="16" android:viewportHeight="16"> diff --git a/app/ui/legacy/src/main/res/drawable/ic_star_24dp.xml b/app/ui/legacy/src/main/res/drawable/ic_star_24dp.xml new file mode 100644 index 0000000000000000000000000000000000000000..647b76b588e5585c071b662213f7b3e8e3fe09eb --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/ic_star_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_star_border.xml b/app/ui/legacy/src/main/res/drawable/ic_star_border.xml index 34a32a725f70366c7892faa263e881174eb55fb4..09d146b3aef8ba95c581d203bd4e2cfeb7fa4326 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_star_border.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_star_border.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:pathData="M22,9.74L14.81,9.12L12,2.5L9.19,9.13L2,9.74L7.46,14.47L5.82,21.5L12,17.77L18.18,21.5L16.55,14.47L22,9.74ZM12,15.9L8.24,18.17L9.24,13.89L5.92,11.01L10.3,10.63L12,6.6L13.71,10.64L18.09,11.02L14.77,13.9L15.77,18.18L12,15.9Z" /> diff --git a/app/ui/legacy/src/main/res/drawable/ic_star_border_24dp.xml b/app/ui/legacy/src/main/res/drawable/ic_star_border_24dp.xml new file mode 100644 index 0000000000000000000000000000000000000000..16e8aa3cafef3e1bc70bf45c09c52ef45b9f1f98 --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/ic_star_border_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_trash_can.xml b/app/ui/legacy/src/main/res/drawable/ic_trash_can.xml index 4be2916631ef82a2410271533719a9f10e1a16b2..099900dbc0a30af5fb492b48af8b30cb8590ee6a 100644 --- a/app/ui/legacy/src/main/res/drawable/ic_trash_can.xml +++ b/app/ui/legacy/src/main/res/drawable/ic_trash_can.xml @@ -1,9 +1,22 @@ - - - + + + + + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_trash_can_default.xml b/app/ui/legacy/src/main/res/drawable/ic_trash_can_default.xml new file mode 100644 index 0000000000000000000000000000000000000000..53866c3e29ecd35a185f60935b949d7c257e684c --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/ic_trash_can_default.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/ui/legacy/src/main/res/drawable/ic_trash_can_selected.xml b/app/ui/legacy/src/main/res/drawable/ic_trash_can_selected.xml new file mode 100644 index 0000000000000000000000000000000000000000..4b4530cc9ac8f4b883caba55842e85a16fb11f45 --- /dev/null +++ b/app/ui/legacy/src/main/res/drawable/ic_trash_can_selected.xml @@ -0,0 +1,10 @@ + + + + diff --git a/app/ui/legacy/src/main/res/drawable/status_dots_1.xml b/app/ui/legacy/src/main/res/drawable/status_dots_1.xml index b4cf0d065a841c8f16db121df543631937c5a220..b553cf42b8d738261bd6bc95295d54e7aee757d5 100644 --- a/app/ui/legacy/src/main/res/drawable/status_dots_1.xml +++ b/app/ui/legacy/src/main/res/drawable/status_dots_1.xml @@ -1,15 +1,31 @@ - - + - + - + + android:strokeWidth="5" + android:strokeAlpha="1" + android:strokeColor="@color/default_icon_color" + android:strokeLineCap="butt" + android:strokeLineJoin="miter" /> diff --git a/app/ui/legacy/src/main/res/drawable/status_dots_2.xml b/app/ui/legacy/src/main/res/drawable/status_dots_2.xml index ebb4133cd8154ac474e565d9a7f442cc216cf831..cbf242a05d0a6f7f81601d0a168db1261cf3bae5 100644 --- a/app/ui/legacy/src/main/res/drawable/status_dots_2.xml +++ b/app/ui/legacy/src/main/res/drawable/status_dots_2.xml @@ -1,15 +1,32 @@ - - + - + - + + android:strokeWidth="5" + android:strokeAlpha="1" + android:strokeColor="@color/default_icon_color" + android:strokeLineCap="butt" + android:strokeLineJoin="miter" /> diff --git a/app/ui/legacy/src/main/res/drawable/status_dots_3.xml b/app/ui/legacy/src/main/res/drawable/status_dots_3.xml index fe2e3915d1b46d143b61bf78dfb47cc95c31aefe..cd7c8bf712b85876b1f90d40300d87dc5f8907ca 100644 --- a/app/ui/legacy/src/main/res/drawable/status_dots_3.xml +++ b/app/ui/legacy/src/main/res/drawable/status_dots_3.xml @@ -1,15 +1,33 @@ - - + - + - + + android:strokeWidth="5" + android:strokeAlpha="1" + android:strokeColor="@color/default_icon_color" + android:strokeLineCap="butt" + android:strokeLineJoin="miter" /> diff --git a/app/ui/legacy/src/main/res/drawable/status_lock_disabled.xml b/app/ui/legacy/src/main/res/drawable/status_lock_disabled.xml index c07500d1dbfb88cad3ab3dc0e4daf0927c1c4881..0f7777f6ca3f3de8414c9e6b12ab07308b70a098 100644 --- a/app/ui/legacy/src/main/res/drawable/status_lock_disabled.xml +++ b/app/ui/legacy/src/main/res/drawable/status_lock_disabled.xml @@ -1,10 +1,15 @@ - - - + + + android:strokeLineCap="butt" + android:strokeLineJoin="miter" /> diff --git a/app/ui/legacy/src/main/res/layout/account_list_item.xml b/app/ui/legacy/src/main/res/layout/account_list_item.xml index d34d78c272eef16e4855185e6ef8439343dea208..43d67b4321f4ce2194701e59f11701e5d06477ff 100644 --- a/app/ui/legacy/src/main/res/layout/account_list_item.xml +++ b/app/ui/legacy/src/main/res/layout/account_list_item.xml @@ -40,6 +40,7 @@ android:layout_marginBottom="2dp" android:textColor="@color/color_default_secondary_text" android:singleLine="true" + android:textStyle="bold" tools:text="Personal" /> diff --git a/app/ui/legacy/src/main/res/layout/custom_preference.xml b/app/ui/legacy/src/main/res/layout/custom_preference.xml new file mode 100644 index 0000000000000000000000000000000000000000..a049a9b64b0aa244d972a563dcbf925b28da2ab1 --- /dev/null +++ b/app/ui/legacy/src/main/res/layout/custom_preference.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/app/ui/legacy/src/main/res/layout/custom_profile_drawer_item.xml b/app/ui/legacy/src/main/res/layout/custom_profile_drawer_item.xml index d2f5c98ebb3f97ac5fdfe1bb8b39137d222b031d..78143be23d4847be511ceb12db53db664309b971 100644 --- a/app/ui/legacy/src/main/res/layout/custom_profile_drawer_item.xml +++ b/app/ui/legacy/src/main/res/layout/custom_profile_drawer_item.xml @@ -3,23 +3,17 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="@dimen/material_drawer_item_profile" + android:layout_height="65dp" android:clipChildren="false" - android:clipToPadding="false" - android:paddingStart="@dimen/material_drawer_vertical_padding" - android:paddingLeft="@dimen/material_drawer_vertical_padding" - android:paddingEnd="@dimen/material_drawer_vertical_padding" - android:paddingRight="@dimen/material_drawer_vertical_padding"> + android:clipToPadding="false"> + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/ui/legacy/src/main/res/layout/drawer_folder_list_item.xml b/app/ui/legacy/src/main/res/layout/drawer_folder_list_item.xml index fc3b5b4d785eee9ac0cb5d18ec33a51008e70fc8..05536ca302a4f3d61377c8af69605495daec1ef3 100644 --- a/app/ui/legacy/src/main/res/layout/drawer_folder_list_item.xml +++ b/app/ui/legacy/src/main/res/layout/drawer_folder_list_item.xml @@ -3,21 +3,13 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="@dimen/material_drawer_item_primary" - android:paddingStart="@dimen/material_drawer_vertical_padding" - android:paddingLeft="@dimen/material_drawer_vertical_padding" - android:paddingEnd="@dimen/material_drawer_vertical_padding" - android:paddingRight="@dimen/material_drawer_vertical_padding"> + android:layout_height="48dp"> @@ -26,13 +18,15 @@ android:id="@+id/material_drawer_name" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginEnd="8dp" - android:fontFamily="sans-serif-medium" + android:layout_marginStart="32dp" + android:layout_marginEnd="16dp" android:gravity="center_vertical|start" android:singleLine="true" android:ellipsize="middle" android:textDirection="anyRtl" - android:textSize="@dimen/material_drawer_item_primary_text" + android:textSize="14sp" + android:textColor="@color/color_default_secondary_text" + android:textStyle="bold" app:layout_constraintBottom_toTopOf="@id/material_drawer_description" app:layout_constraintEnd_toStartOf="@+id/material_drawer_barrier" app:layout_constraintStart_toEndOf="@id/material_drawer_icon" @@ -44,13 +38,15 @@ android:id="@+id/material_drawer_description" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginEnd="8dp" - android:fontFamily="sans-serif" + android:layout_marginStart="32dp" + android:layout_marginEnd="16dp" android:gravity="center_vertical|start" android:lines="1" android:singleLine="true" android:textDirection="anyRtl" - android:textSize="@dimen/material_drawer_item_primary_description" + android:textSize="12sp" + android:textColor="@color/color_default_secondary_text" + android:textStyle="normal" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/material_drawer_barrier" app:layout_constraintStart_toEndOf="@id/material_drawer_icon" @@ -68,16 +64,16 @@ android:id="@+id/material_drawer_badge" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="@dimen/material_drawer_padding" - android:layout_marginEnd="@dimen/material_drawer_vertical_padding" - android:fontFamily="sans-serif" + android:layout_marginStart="16dp" + android:layout_marginEnd="20dp" android:gravity="center" android:lines="1" - android:minWidth="20dp" android:paddingLeft="1dp" android:paddingRight="1dp" android:singleLine="true" - android:textSize="@dimen/material_drawer_item_primary_text" + android:textSize="14sp" + android:textColor="@color/color_default_secondary_text" + android:textStyle="normal" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/material_drawer_barrier" diff --git a/app/ui/legacy/src/main/res/layout/drawer_footer_list_item.xml b/app/ui/legacy/src/main/res/layout/drawer_footer_list_item.xml new file mode 100644 index 0000000000000000000000000000000000000000..04e769337917ab23ad0defceee2e0bdf418c6b81 --- /dev/null +++ b/app/ui/legacy/src/main/res/layout/drawer_footer_list_item.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + diff --git a/app/ui/legacy/src/main/res/layout/folder_list_item.xml b/app/ui/legacy/src/main/res/layout/folder_list_item.xml index 6a040f4359d9861ec7a19f0fd6335ee12a997be0..26eeae0c85d6210d9d25f1cc164235ee680253c1 100644 --- a/app/ui/legacy/src/main/res/layout/folder_list_item.xml +++ b/app/ui/legacy/src/main/res/layout/folder_list_item.xml @@ -9,27 +9,23 @@ android:clickable="true" android:focusable="true" android:gravity="center_vertical" - android:minHeight="56dp" android:orientation="horizontal"> diff --git a/app/ui/legacy/src/main/res/layout/message_list_item.xml b/app/ui/legacy/src/main/res/layout/message_list_item.xml index 06c96b33563feba93886d79031f7612846d7bd12..b303cdc4c091f6ecebab9449f051f8b5263ed051 100644 --- a/app/ui/legacy/src/main/res/layout/message_list_item.xml +++ b/app/ui/legacy/src/main/res/layout/message_list_item.xml @@ -23,7 +23,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@android:color/transparent" - tools:src="@drawable/ic_contact_picture" /> + tools:src="@drawable/ic_avatar" /> + android:orientation="horizontal"> + tools:text="(no subject)" /> @@ -65,32 +64,33 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" + android:layout_marginEnd="8dp" + android:layout_marginTop="13dp" android:focusable="false" android:checked="false" - style="@style/MessageStarStyle" - android:buttonTint="@color/star_color" - /> + style="@style/MessageStarStyle" /> + tools:src="@drawable/ic_avatar" /> + android:layout_marginStart="8dp" > @@ -174,25 +167,23 @@ android:layout_height="wrap_content" android:layout_alignStart="@+id/from" android:layout_alignBaseline="@+id/to" - android:paddingTop="2dp" - android:paddingStart="0dp" - android:paddingEnd="4dp" android:text="@string/message_to_label" - android:textColor="?android:attr/textColorPrimary" - android:textAppearance="@style/TextAppearance.K9.MediumSmall" - android:textStyle="bold" /> + android:paddingEnd="4dp" + android:textSize="14sp" + android:textColor="?android:attr/textColorSecondary" + android:textStyle="normal" /> + android:textSize="14sp" + android:textStyle="normal" /> + android:paddingEnd="4dp" + android:textSize="14sp" + android:textColor="?android:attr/textColorSecondary" + android:textStyle="normal" /> + android:textSize="14sp" + android:textStyle="normal" + android:textColor="?android:attr/textColorSecondary" /> + android:textSize="14sp" + android:textColor="?android:attr/textColorSecondary" + android:textStyle="normal" /> + android:textSize="14sp" + android:textStyle="normal" + android:textColor="?android:attr/textColorSecondary" /> + android:textSize="12sp" + android:textStyle="normal" + android:textColor="?android:attr/textColorTertiary" /> + android:id="@+id/status_icon_strip"> + android:layout_marginTop="9dp" + android:layout_marginBottom="13dp" + android:background="@color/color_default_divider" /> diff --git a/app/ui/legacy/src/main/res/layout/recipient_alternate_item.xml b/app/ui/legacy/src/main/res/layout/recipient_alternate_item.xml index 19d183f28714ac3ae37e7043c3c180100c0b7620..0daf7d03ed517a597204160a253af0f64d528dcb 100644 --- a/app/ui/legacy/src/main/res/layout/recipient_alternate_item.xml +++ b/app/ui/legacy/src/main/res/layout/recipient_alternate_item.xml @@ -23,7 +23,7 @@ android:layout_marginLeft="12dp" android:layout_marginRight="12dp" android:id="@+id/alternate_contact_photo" - tools:src="@drawable/ic_contact_picture" + tools:src="@drawable/ic_avatar" /> + tools:src="@drawable/ic_avatar" /> diff --git a/app/ui/legacy/src/main/res/values-night/colors.xml b/app/ui/legacy/src/main/res/values-night/colors.xml index e7c803a100fdacb27462ab8eb33d177ffc76c530..f154cb310ee1001ac1eae2dfd406090f73f05a20 100644 --- a/app/ui/legacy/src/main/res/values-night/colors.xml +++ b/app/ui/legacy/src/main/res/values-night/colors.xml @@ -8,4 +8,7 @@ #6BFFFFFF #14FFFFFF #2e2e2e + + #363636 + #2e2e2e \ No newline at end of file diff --git a/app/ui/legacy/src/main/res/values/colors.xml b/app/ui/legacy/src/main/res/values/colors.xml index a188c107bdf5da0aff2573e58ddf2a422608e758..23c9fd51fef92f51cab08602967d4b4aabb656ec 100644 --- a/app/ui/legacy/src/main/res/values/colors.xml +++ b/app/ui/legacy/src/main/res/values/colors.xml @@ -26,14 +26,14 @@ #DE000000 #99000000 #61000000 - @lineageos.platform:color/color_default_divider + #14212121 @lineageos.platform:color/color_default_gray2 #6B212121 #14212121 #f5f5f5 - @lineageos.platform:color/color_default_background - + #fafafa #145DB2FF + @android:color/white diff --git a/app/ui/legacy/src/main/res/values/styles.xml b/app/ui/legacy/src/main/res/values/styles.xml index 6d95f97556563380226242c0acbeed2d2a3e2968..3b5be0586e37ff6b5a1a4d2c0383108d5218286c 100644 --- a/app/ui/legacy/src/main/res/values/styles.xml +++ b/app/ui/legacy/src/main/res/values/styles.xml @@ -54,11 +54,11 @@