From 8767d2ed3dcb265f98a6d4109bcb984a1df8de97 Mon Sep 17 00:00:00 2001 From: Konrad Pozniak Date: Thu, 30 Jan 2020 21:37:28 +0100 Subject: [PATCH] Theme refactoring (#1656) * Theme refactoring * disable the automatic tinting of surfaces with elevation in dark mode * make the media warning visible again with the dark theme * fix nav bar on api 27+ * use correct color for all media warnings --- .../keylesspalace/tusky/AccountActivity.kt | 23 +-- .../com/keylesspalace/tusky/BaseActivity.java | 2 +- .../com/keylesspalace/tusky/LoginActivity.kt | 2 +- .../com/keylesspalace/tusky/MainActivity.java | 2 +- .../java/com/keylesspalace/tusky/TabData.kt | 2 +- .../tusky/TabPreferenceActivity.kt | 1 - .../tusky/adapter/ListSelectionAdapter.kt | 15 +- .../tusky/adapter/StatusBaseViewHolder.java | 22 +-- .../keylesspalace/tusky/adapter/TabAdapter.kt | 2 +- .../components/compose/ComposeActivity.kt | 11 +- .../compose/view/ProgressImageView.java | 4 +- .../tusky/components/report/ReportActivity.kt | 5 +- .../tusky/fragment/AccountMediaFragment.kt | 7 +- .../preference/AccountPreferencesFragment.kt | 12 +- .../preference/PreferencesFragment.kt | 13 +- .../keylesspalace/tusky/util/LinkHelper.java | 2 +- .../tusky/util/StatusViewHelper.kt | 7 +- .../keylesspalace/tusky/util/ThemeUtils.java | 31 ---- .../view/ConversationLineItemDecoration.kt | 5 +- .../keylesspalace/tusky/view/LicenseCard.kt | 2 +- .../color/color_background_transparent_60.xml | 4 + ...lor_dark.xml => compound_button_color.xml} | 3 +- .../res/color/compound_button_color_light.xml | 5 - .../background_dialog_activity.xml | 5 - .../main/res/drawable-night/ic_emoji_34dp.xml | 9 - .../profile_badge_background.xml | 6 - .../drawable/autocomplete_divider_dark.xml | 6 - app/src/main/res/drawable/avatar_border.xml | 2 +- .../drawable/background_dialog_activity.xml | 2 +- .../background_dialog_activity_black.xml | 5 - .../main/res/drawable/background_splash.xml | 2 +- .../res/drawable/border_background_dark.xml | 5 - .../res/drawable/border_background_light.xml | 5 - app/src/main/res/drawable/card_frame.xml | 2 +- ..._dark.xml => conversation_thread_line.xml} | 2 +- .../conversation_thread_line_light.xml | 6 - .../res/drawable/favourite_active_dark.xml | 9 - .../res/drawable/favourite_inactive_dark.xml | 9 - .../res/drawable/favourite_inactive_light.xml | 10 -- .../ic_access_time.xml | 0 .../main/res/drawable/ic_attach_file_24dp.xml | 2 +- ...ncel_black_24dp.xml => ic_cancel_24dp.xml} | 0 app/src/main/res/drawable/ic_clear_24dp.xml | 2 +- app/src/main/res/drawable/ic_close_24dp.xml | 2 +- app/src/main/res/drawable/ic_emoji_34dp.xml | 2 +- .../main/res/drawable/ic_favourite_24dp.xml | 9 + ...light.xml => ic_favourite_active_24dp.xml} | 2 +- app/src/main/res/drawable/ic_home_24dp.xml | 2 +- .../{drawable-anydpi => drawable}/ic_list.xml | 0 .../main/res/drawable/ic_lock_open_24dp.xml | 2 +- .../res/drawable/ic_lock_outline_24dp.xml | 2 +- .../main/res/drawable/ic_more_horiz_24dp.xml | 2 +- .../res/drawable/ic_notifications_24dp.xml | 2 +- ...dicator_dark.xml => ic_play_indicator.xml} | 4 +- .../res/drawable/ic_play_indicator_light.xml | 15 -- app/src/main/res/drawable/ic_public_24dp.xml | 2 +- ..._inactive_light.xml => ic_reblog_18dp.xml} | 8 +- ...g_inactive_dark.xml => ic_reblog_24dp.xml} | 2 +- .../main/res/drawable/ic_reblog_dark_24dp.xml | 4 - ...ect_dark.xml => ic_reblog_direct_24dp.xml} | 2 +- .../res/drawable/ic_reblog_light_24dp.xml | 4 - ...te_dark.xml => ic_reblog_private_24dp.xml} | 2 +- ....xml => ic_reblog_private_active_24dp.xml} | 0 app/src/main/res/drawable/ic_repeat_24dp.xml | 2 +- app/src/main/res/drawable/ic_reply_24dp.xml | 2 +- .../main/res/drawable/ic_reply_all_24dp.xml | 2 +- app/src/main/res/drawable/ic_send_24dp.xml | 2 +- app/src/main/res/drawable/ic_star_24dp.xml | 2 +- .../drawable/media_preview_unloaded_dark.xml | 14 -- .../drawable/media_preview_unloaded_light.xml | 14 -- .../main/res/drawable/media_warning_bg.xml | 2 +- .../main/res/drawable/poll_option_shape.xml | 2 +- .../res/drawable/profile_badge_background.xml | 2 +- .../main/res/drawable/reblog_direct_light.xml | 10 -- .../res/drawable/reblog_private_light.xml | 9 - ...e_divider_light.xml => status_divider.xml} | 2 +- .../main/res/drawable/status_divider_dark.xml | 6 - .../res/drawable/status_divider_light.xml | 6 - .../res/layout-sw640dp/fragment_timeline.xml | 5 +- .../fragment_timeline_notifications.xml | 10 +- .../layout-sw640dp/fragment_view_thread.xml | 5 +- app/src/main/res/layout/activity_account.xml | 8 +- app/src/main/res/layout/activity_compose.xml | 28 +-- .../main/res/layout/activity_edit_profile.xml | 2 +- app/src/main/res/layout/activity_main.xml | 3 +- .../main/res/layout/activity_view_media.xml | 4 +- app/src/main/res/layout/dialog_add_poll.xml | 2 +- .../res/layout/fragment_accounts_in_list.xml | 2 +- .../main/res/layout/fragment_report_note.xml | 2 +- app/src/main/res/layout/fragment_search.xml | 5 +- app/src/main/res/layout/fragment_timeline.xml | 2 +- .../fragment_timeline_notifications.xml | 5 +- .../main/res/layout/fragment_view_thread.xml | 2 +- .../main/res/layout/item_add_poll_option.xml | 2 +- .../res/layout/item_autocomplete_divider.xml | 2 +- app/src/main/res/layout/item_blocked_user.xml | 2 +- app/src/main/res/layout/item_conversation.xml | 18 +- app/src/main/res/layout/item_emoji_pref.xml | 4 +- .../main/res/layout/item_follow_request.xml | 4 +- app/src/main/res/layout/item_list.xml | 2 +- app/src/main/res/layout/item_muted_domain.xml | 2 +- app/src/main/res/layout/item_muted_user.xml | 2 +- app/src/main/res/layout/item_picker_list.xml | 1 + app/src/main/res/layout/item_poll.xml | 4 +- .../main/res/layout/item_report_status.xml | 12 +- app/src/main/res/layout/item_saved_toot.xml | 2 +- .../main/res/layout/item_scheduled_toot.xml | 4 +- app/src/main/res/layout/item_status.xml | 22 +-- .../main/res/layout/item_status_detailed.xml | 22 +-- .../main/res/layout/item_tab_preference.xml | 2 +- .../main/res/layout/notifications_filter.xml | 2 +- .../main/res/layout/view_compose_options.xml | 8 +- app/src/main/res/values-large/styles.xml | 2 +- app/src/main/res/values-night-v27/styles.xml | 10 -- app/src/main/res/values-night/styles.xml | 93 ---------- .../main/res/values-night/theme_colors.xml | 23 +++ app/src/main/res/values-v27/styles.xml | 19 +- app/src/main/res/values/attrs.xml | 33 +--- app/src/main/res/values/colors.xml | 69 ++------ app/src/main/res/values/donottranslate.xml | 1 - app/src/main/res/values/styles.xml | 163 ++++++------------ app/src/main/res/values/theme_colors.xml | 23 +++ 122 files changed, 330 insertions(+), 724 deletions(-) create mode 100644 app/src/main/res/color/color_background_transparent_60.xml rename app/src/main/res/color/{compound_button_color_dark.xml => compound_button_color.xml} (75%) delete mode 100644 app/src/main/res/color/compound_button_color_light.xml delete mode 100644 app/src/main/res/drawable-night/background_dialog_activity.xml delete mode 100644 app/src/main/res/drawable-night/ic_emoji_34dp.xml delete mode 100644 app/src/main/res/drawable-night/profile_badge_background.xml delete mode 100644 app/src/main/res/drawable/autocomplete_divider_dark.xml delete mode 100644 app/src/main/res/drawable/background_dialog_activity_black.xml delete mode 100644 app/src/main/res/drawable/border_background_dark.xml delete mode 100644 app/src/main/res/drawable/border_background_light.xml rename app/src/main/res/drawable/{conversation_thread_line_dark.xml => conversation_thread_line.xml} (71%) delete mode 100644 app/src/main/res/drawable/conversation_thread_line_light.xml delete mode 100644 app/src/main/res/drawable/favourite_active_dark.xml delete mode 100644 app/src/main/res/drawable/favourite_inactive_dark.xml delete mode 100644 app/src/main/res/drawable/favourite_inactive_light.xml rename app/src/main/res/{drawable-anydpi => drawable}/ic_access_time.xml (100%) rename app/src/main/res/drawable/{ic_cancel_black_24dp.xml => ic_cancel_24dp.xml} (100%) create mode 100644 app/src/main/res/drawable/ic_favourite_24dp.xml rename app/src/main/res/drawable/{favourite_active_light.xml => ic_favourite_active_24dp.xml} (84%) rename app/src/main/res/{drawable-anydpi => drawable}/ic_list.xml (100%) rename app/src/main/res/drawable/{ic_play_indicator_dark.xml => ic_play_indicator.xml} (60%) delete mode 100644 app/src/main/res/drawable/ic_play_indicator_light.xml rename app/src/main/res/drawable/{reblog_inactive_light.xml => ic_reblog_18dp.xml} (59%) rename app/src/main/res/drawable/{reblog_inactive_dark.xml => ic_reblog_24dp.xml} (83%) delete mode 100644 app/src/main/res/drawable/ic_reblog_dark_24dp.xml rename app/src/main/res/drawable/{reblog_direct_dark.xml => ic_reblog_direct_24dp.xml} (85%) delete mode 100644 app/src/main/res/drawable/ic_reblog_light_24dp.xml rename app/src/main/res/drawable/{reblog_private_dark.xml => ic_reblog_private_24dp.xml} (88%) rename app/src/main/res/drawable/{reblog_private_active.xml => ic_reblog_private_active_24dp.xml} (100%) delete mode 100644 app/src/main/res/drawable/media_preview_unloaded_dark.xml delete mode 100644 app/src/main/res/drawable/media_preview_unloaded_light.xml delete mode 100644 app/src/main/res/drawable/reblog_direct_light.xml delete mode 100644 app/src/main/res/drawable/reblog_private_light.xml rename app/src/main/res/drawable/{autocomplete_divider_light.xml => status_divider.xml} (72%) delete mode 100644 app/src/main/res/drawable/status_divider_dark.xml delete mode 100644 app/src/main/res/drawable/status_divider_light.xml delete mode 100644 app/src/main/res/values-night-v27/styles.xml delete mode 100644 app/src/main/res/values-night/styles.xml create mode 100644 app/src/main/res/values-night/theme_colors.xml create mode 100644 app/src/main/res/values/theme_colors.xml diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt index 85a34536e..d28686316 100644 --- a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt @@ -19,13 +19,14 @@ import android.animation.ArgbEvaluator import android.content.Context import android.content.Intent import android.content.res.ColorStateList -import android.graphics.* +import android.graphics.Color +import android.graphics.PorterDuff +import android.graphics.PorterDuffColorFilter import android.os.Bundle import android.view.Menu import android.view.MenuItem import android.view.View import android.view.ViewGroup -import androidx.annotation.AttrRes import androidx.annotation.ColorInt import androidx.annotation.Px import androidx.appcompat.app.AlertDialog @@ -239,9 +240,6 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI setDisplayShowTitleEnabled(false) } - ThemeUtils.setDrawableTint(this, accountToolbar.navigationIcon, R.attr.account_toolbar_icon_tint_uncollapsed) - ThemeUtils.setDrawableTint(this, accountToolbar.overflowIcon, R.attr.account_toolbar_icon_tint_uncollapsed) - val appBarElevation = resources.getDimension(R.dimen.actionbar_elevation) val toolbarBackground = MaterialShapeDrawable.createWithElevationOverlay(this, appBarElevation) @@ -262,9 +260,6 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI // Add a listener to change the toolbar icon color when it enters/exits its collapsed state. accountAppBarLayout.addOnOffsetChangedListener(object : AppBarLayout.OnOffsetChangedListener { - @AttrRes - var priorAttribute = R.attr.account_toolbar_icon_tint_uncollapsed - override fun onOffsetChanged(appBarLayout: AppBarLayout, verticalOffset: Int) { if (verticalOffset == oldOffset) { @@ -272,20 +267,10 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI } oldOffset = verticalOffset - @AttrRes val attribute = if (titleVisibleHeight + verticalOffset < 0) { + if (titleVisibleHeight + verticalOffset < 0) { supportActionBar?.setDisplayShowTitleEnabled(true) - - R.attr.account_toolbar_icon_tint_collapsed } else { supportActionBar?.setDisplayShowTitleEnabled(false) - - R.attr.account_toolbar_icon_tint_uncollapsed - } - if (attribute != priorAttribute) { - priorAttribute = attribute - val context = accountToolbar.context - ThemeUtils.setDrawableTint(context, accountToolbar.navigationIcon, attribute) - ThemeUtils.setDrawableTint(context, accountToolbar.overflowIcon, attribute) } if (hideFab && !viewModel.isSelf && !blocking) { diff --git a/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java b/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java index 7cfe6fc61..d1718bea7 100644 --- a/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/BaseActivity.java @@ -76,7 +76,7 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab /* set the taskdescription programmatically, the theme would turn it blue */ String appName = getString(R.string.app_name); Bitmap appIcon = BitmapFactory.decodeResource(getResources(), R.mipmap.ic_launcher); - int recentsBackgroundColor = ThemeUtils.getColor(this, R.attr.recents_background_color); + int recentsBackgroundColor = ThemeUtils.getColor(this, R.attr.colorSurface); setTaskDescription(new ActivityManager.TaskDescription(appName, appIcon, recentsBackgroundColor)); diff --git a/app/src/main/java/com/keylesspalace/tusky/LoginActivity.kt b/app/src/main/java/com/keylesspalace/tusky/LoginActivity.kt index f659ab860..f68b2337c 100644 --- a/app/src/main/java/com/keylesspalace/tusky/LoginActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/LoginActivity.kt @@ -345,7 +345,7 @@ class LoginActivity : BaseActivity(), Injectable { private fun openInCustomTab(uri: Uri, context: Context): Boolean { - val toolbarColor = ThemeUtils.getColor(context, R.attr.custom_tab_toolbar) + val toolbarColor = ThemeUtils.getColor(context, R.attr.colorSurface) val customTabsIntentBuilder = CustomTabsIntent.Builder() .setToolbarColor(toolbarColor) diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.java b/app/src/main/java/com/keylesspalace/tusky/MainActivity.java index ca4b8bfa9..452cdafcf 100644 --- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.java @@ -361,7 +361,7 @@ public final class MainActivity extends BottomSheetActivity implements ActionBut ImageView background = headerResult.getHeaderBackgroundView(); background.setColorFilter(ContextCompat.getColor(this, R.color.header_background_filter)); - background.setBackgroundColor(ContextCompat.getColor(this, R.color.window_background_dark)); + background.setBackgroundColor(ContextCompat.getColor(this, R.color.tusky_grey_10)); final boolean animateAvatars = PreferenceManager.getDefaultSharedPreferences(this) .getBoolean("animateGifAvatars", false); diff --git a/app/src/main/java/com/keylesspalace/tusky/TabData.kt b/app/src/main/java/com/keylesspalace/tusky/TabData.kt index 5901d6e51..57ff95a35 100644 --- a/app/src/main/java/com/keylesspalace/tusky/TabData.kt +++ b/app/src/main/java/com/keylesspalace/tusky/TabData.kt @@ -44,7 +44,7 @@ fun createTabDataFromId(id: String, arguments: List = emptyList()): TabD NOTIFICATIONS -> TabData(NOTIFICATIONS, R.string.title_notifications, R.drawable.ic_notifications_24dp, { NotificationsFragment.newInstance() }) LOCAL -> TabData(LOCAL, R.string.title_public_local, R.drawable.ic_local_24dp, { TimelineFragment.newInstance(TimelineFragment.Kind.PUBLIC_LOCAL) }) FEDERATED -> TabData(FEDERATED, R.string.title_public_federated, R.drawable.ic_public_24dp, { TimelineFragment.newInstance(TimelineFragment.Kind.PUBLIC_FEDERATED) }) - DIRECT -> TabData(DIRECT, R.string.title_direct_messages, R.drawable.reblog_direct_dark, { ConversationsFragment.newInstance() }) + DIRECT -> TabData(DIRECT, R.string.title_direct_messages, R.drawable.ic_reblog_direct_24dp, { ConversationsFragment.newInstance() }) HASHTAG -> TabData(HASHTAG, R.string.hashtag, R.drawable.ic_hashtag, { args -> TimelineFragment.newInstance(TimelineFragment.Kind.TAG, args.getOrNull(0).orEmpty()) }, arguments) LIST -> TabData(LIST, R.string.list, R.drawable.ic_list, { args -> TimelineFragment.newInstance(TimelineFragment.Kind.LIST, args.getOrNull(0).orEmpty()) }, arguments) else -> throw IllegalArgumentException("unknown tab type") diff --git a/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt b/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt index f7b38055b..864a7208a 100644 --- a/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt @@ -41,7 +41,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers import kotlinx.android.synthetic.main.activity_tab_preference.* import kotlinx.android.synthetic.main.toolbar_basic.* -import kotlinx.android.synthetic.main.item_tab_preference.view.removeButton import java.util.regex.Pattern import javax.inject.Inject diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/ListSelectionAdapter.kt b/app/src/main/java/com/keylesspalace/tusky/adapter/ListSelectionAdapter.kt index de7604f16..e5470df6b 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/ListSelectionAdapter.kt +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/ListSelectionAdapter.kt @@ -27,19 +27,16 @@ import kotlinx.android.synthetic.main.item_picker_list.view.* class ListSelectionAdapter(context: Context) : ArrayAdapter(context, R.layout.item_autocomplete_hashtag) { override fun getView(position: Int, convertView: View?, parent: ViewGroup): View { - var view = convertView - if (convertView == null) { - val layoutInflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater - view = layoutInflater.inflate(R.layout.item_picker_list, parent, false) - } - view!! + val layoutInflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater - val list = getItem(position) - if (list != null) { + val view = convertView + ?: layoutInflater.inflate(R.layout.item_picker_list, parent, false) + + getItem(position)?.let { list -> val title = view.title title.text = list.title - val icon = ThemeUtils.getTintedDrawable(context, R.drawable.ic_list, android.R.attr.textColorTertiary) + val icon = ThemeUtils.getTintedDrawable(context, R.drawable.ic_list, R.attr.iconColor) title.setCompoundDrawablesRelativeWithIntrinsicBounds(icon, null, null, null) } diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java index b22ebd07c..6f8096376 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java @@ -153,10 +153,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder { this.avatarRadius36dp = itemView.getContext().getResources().getDimensionPixelSize(R.dimen.avatar_radius_36dp); this.avatarRadius24dp = itemView.getContext().getResources().getDimensionPixelSize(R.dimen.avatar_radius_24dp); - mediaPreviewUnloaded = itemView.getContext().getDrawable( - ThemeUtils.getDrawableId(itemView.getContext(), - R.attr.media_preview_unloaded_drawable, android.R.color.black) - ); + mediaPreviewUnloaded = new ColorDrawable(ThemeUtils.getColor(itemView.getContext(), R.attr.colorBackgroundAccent)); } protected abstract int getMediaPreviewHeight(Context context); @@ -353,12 +350,10 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder { int inactiveId; int activeId; if (visibility == Status.Visibility.PRIVATE) { - inactiveId = ThemeUtils.getDrawableId(reblogButton.getContext(), - R.attr.status_reblog_disabled_drawable, R.drawable.reblog_private_dark); - activeId = R.drawable.reblog_private_active; + inactiveId = R.drawable.ic_reblog_private_24dp; + activeId = R.drawable.ic_reblog_private_active_24dp; } else { - inactiveId = ThemeUtils.getDrawableId(reblogButton.getContext(), - R.attr.status_reblog_inactive_drawable, R.drawable.reblog_inactive_dark); + inactiveId = R.drawable.ic_reblog_24dp; activeId = R.drawable.ic_reblog_active_24dp; } reblogButton.setInactiveImage(inactiveId); @@ -366,11 +361,9 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder { } else { int disabledId; if (visibility == Status.Visibility.DIRECT) { - disabledId = ThemeUtils.getDrawableId(reblogButton.getContext(), - R.attr.status_reblog_direct_drawable, R.drawable.reblog_direct_dark); + disabledId = R.drawable.ic_reblog_direct_24dp; } else { - disabledId = ThemeUtils.getDrawableId(reblogButton.getContext(), - R.attr.status_reblog_disabled_drawable, R.drawable.reblog_private_dark); + disabledId = R.drawable.ic_reblog_private_24dp; } reblogButton.setInactiveImage(disabledId); reblogButton.setActiveImage(disabledId); @@ -468,8 +461,7 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder { BitmapDrawable blurhashBitmap = decodeBlurHash(attachment.getBlurhash()); imageView.setImageDrawable(blurhashBitmap); } else { - imageView.setImageDrawable(new ColorDrawable(ThemeUtils.getColor( - context, R.attr.sensitive_media_warning_background_color))); + imageView.setImageDrawable(mediaPreviewUnloaded); } } diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/TabAdapter.kt b/app/src/main/java/com/keylesspalace/tusky/adapter/TabAdapter.kt index bc252ab98..4d8dedfb6 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/TabAdapter.kt +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/TabAdapter.kt @@ -88,7 +88,7 @@ class TabAdapter(private var data: List, ThemeUtils.setDrawableTint( holder.itemView.context, holder.itemView.removeButton.drawable, - (if (removeButtonEnabled) android.R.attr.textColorTertiary else R.attr.image_button_disabled_tint) + (if (removeButtonEnabled) android.R.attr.textColorTertiary else R.attr.textColorDisabled) ) } diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt index b728af84b..5695e7d35 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/ComposeActivity.kt @@ -41,7 +41,6 @@ import androidx.annotation.ColorInt import androidx.annotation.StringRes import androidx.annotation.VisibleForTesting import androidx.appcompat.app.AlertDialog -import androidx.appcompat.content.res.AppCompatResources import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat import androidx.core.content.FileProvider @@ -387,9 +386,7 @@ class ComposeActivity : BaseActivity(), title = null setDisplayHomeAsUpEnabled(true) setDisplayShowHomeEnabled(true) - val closeIcon = AppCompatResources.getDrawable(this@ComposeActivity, R.drawable.ic_close_24dp) - ThemeUtils.setDrawableTint(this@ComposeActivity, closeIcon!!, R.attr.compose_close_button_tint) - setHomeAsUpIndicator(closeIcon) + setHomeAsUpIndicator(R.drawable.ic_close_24dp) } } @@ -505,7 +502,7 @@ class ComposeActivity : BaseActivity(), @ColorInt val color = if (contentWarningShown) { composeHideMediaButton.setImageResource(R.drawable.ic_hide_media_24dp) composeHideMediaButton.isClickable = false - ContextCompat.getColor(this, R.color.compose_media_visible_button_disabled_blue) + ContextCompat.getColor(this, R.color.transparent_tusky_blue) } else { composeHideMediaButton.isClickable = true @@ -826,14 +823,14 @@ class ComposeActivity : BaseActivity(), button.isEnabled = clickable ThemeUtils.setDrawableTint(this, button.drawable, if (colorActive) android.R.attr.textColorTertiary - else R.attr.image_button_disabled_tint) + else R.attr.textColorDisabled) } private fun enablePollButton(enable: Boolean) { addPollTextActionTextView.isEnabled = enable val textColor = ThemeUtils.getColor(this, if (enable) android.R.attr.textColorTertiary - else R.attr.image_button_disabled_tint) + else R.attr.textColorDisabled) addPollTextActionTextView.setTextColor(textColor) addPollTextActionTextView.compoundDrawablesRelative[0].colorFilter = PorterDuffColorFilter(textColor, PorterDuff.Mode.SRC_IN) } diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ProgressImageView.java b/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ProgressImageView.java index 836d81bd0..fde993d1e 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ProgressImageView.java +++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ProgressImageView.java @@ -66,7 +66,7 @@ public final class ProgressImageView extends AppCompatImageView { markBgPaint.setStyle(Paint.Style.FILL); markBgPaint.setColor(ContextCompat.getColor(getContext(), - R.color.description_marker_unselected)); + R.color.tusky_grey_10)); captionDrawable = AppCompatResources.getDrawable(getContext(), R.drawable.spellcheck); } @@ -82,7 +82,7 @@ public final class ProgressImageView extends AppCompatImageView { public void setChecked(boolean checked) { this.markBgPaint.setColor(ContextCompat.getColor(getContext(), - checked ? R.color.tusky_blue : R.color.description_marker_unselected)); + checked ? R.color.tusky_blue : R.color.tusky_grey_10)); invalidate(); } diff --git a/app/src/main/java/com/keylesspalace/tusky/components/report/ReportActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/report/ReportActivity.kt index 2e5e9ef98..7d3a378a2 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/report/ReportActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/report/ReportActivity.kt @@ -60,14 +60,11 @@ class ReportActivity : BottomSheetActivity(), HasAndroidInjector { setSupportActionBar(toolbar) - val closeIcon = AppCompatResources.getDrawable(this, R.drawable.ic_close_24dp) - ThemeUtils.setDrawableTint(this, closeIcon!!, R.attr.compose_close_button_tint) - supportActionBar?.apply { title = getString(R.string.report_username_format, viewModel.accountUserName) setDisplayHomeAsUpEnabled(true) setDisplayShowHomeEnabled(true) - setHomeAsUpIndicator(closeIcon) + setHomeAsUpIndicator(R.drawable.ic_close_24dp) } initViewPager() diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/AccountMediaFragment.kt b/app/src/main/java/com/keylesspalace/tusky/fragment/AccountMediaFragment.kt index 06073d86d..0f89c3e00 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/AccountMediaFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/AccountMediaFragment.kt @@ -23,7 +23,6 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView import androidx.core.app.ActivityOptionsCompat -import androidx.core.content.ContextCompat import androidx.core.view.ViewCompat import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView @@ -179,15 +178,11 @@ class AccountMediaFragment : BaseFragment(), RefreshableFragment, Injectable { val columnCount = view.context.resources.getInteger(R.integer.profile_media_column_count) val layoutManager = GridLayoutManager(view.context, columnCount) - val bgRes = ThemeUtils.getColorId(view.context, R.attr.window_background) - - adapter.baseItemColor = ContextCompat.getColor(recyclerView.context, bgRes) + adapter.baseItemColor = ThemeUtils.getColor(view.context, android.R.attr.windowBackground) recyclerView.layoutManager = layoutManager recyclerView.adapter = adapter - - if (isSwipeToRefreshEnabled) { swipeRefreshLayout.setOnRefreshListener { refresh() diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/preference/AccountPreferencesFragment.kt b/app/src/main/java/com/keylesspalace/tusky/fragment/preference/AccountPreferencesFragment.kt index dfc44fa61..093f1b409 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/preference/AccountPreferencesFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/preference/AccountPreferencesFragment.kt @@ -92,9 +92,9 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(), publicFiltersPreference = requirePreference("publicFilters") threadFiltersPreference = requirePreference("threadFilters") - notificationPreference.icon = IconicsDrawable(notificationPreference.context, GoogleMaterial.Icon.gmd_notifications).sizePx(iconSize).color(ThemeUtils.getColor(notificationPreference.context, R.attr.preference_icon_tint)) + notificationPreference.icon = IconicsDrawable(notificationPreference.context, GoogleMaterial.Icon.gmd_notifications).sizePx(iconSize).color(ThemeUtils.getColor(notificationPreference.context, R.attr.iconColor)) mutedUsersPreference.icon = getTintedIcon(R.drawable.ic_mute_24dp) - blockedUsersPreference.icon = IconicsDrawable(blockedUsersPreference.context, GoogleMaterial.Icon.gmd_block).sizePx(iconSize).color(ThemeUtils.getColor(blockedUsersPreference.context, R.attr.preference_icon_tint)) + blockedUsersPreference.icon = IconicsDrawable(blockedUsersPreference.context, GoogleMaterial.Icon.gmd_block).sizePx(iconSize).color(ThemeUtils.getColor(blockedUsersPreference.context, R.attr.iconColor)) mutedDomainsPreference.icon = getTintedIcon(R.drawable.ic_mute_24dp) notificationPreference.onPreferenceClickListener = this @@ -288,9 +288,7 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(), } private fun getTintedIcon(iconId: Int): Drawable? { - val drawable = context?.getDrawable(iconId) - ThemeUtils.setDrawableTint(context, drawable, R.attr.preference_icon_tint) - return drawable + return ThemeUtils.getTintedDrawable(requireContext(), iconId, R.attr.iconColor) } private fun launchFilterActivity(filterContext: String, titleResource: Int): Boolean { @@ -303,9 +301,7 @@ class AccountPreferencesFragment : PreferenceFragmentCompat(), } companion object { - fun newInstance(): AccountPreferencesFragment { - return AccountPreferencesFragment() - } + fun newInstance() = AccountPreferencesFragment() } } diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/preference/PreferencesFragment.kt b/app/src/main/java/com/keylesspalace/tusky/fragment/preference/PreferencesFragment.kt index d631b84ac..d7550103c 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/preference/PreferencesFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/preference/PreferencesFragment.kt @@ -38,13 +38,13 @@ class PreferencesFragment : PreferenceFragmentCompat() { addPreferencesFromResource(R.xml.preferences) val themePreference: Preference = requirePreference("appTheme") - themePreference.icon = IconicsDrawable(themePreference.context, GoogleMaterial.Icon.gmd_palette).sizePx(iconSize).color(ThemeUtils.getColor(themePreference.context, R.attr.preference_icon_tint)) + themePreference.icon = IconicsDrawable(themePreference.context, GoogleMaterial.Icon.gmd_palette).sizePx(iconSize).color(ThemeUtils.getColor(themePreference.context, R.attr.iconColor)) val emojiPreference: Preference = requirePreference("emojiCompat") - emojiPreference.icon = IconicsDrawable(emojiPreference.context, GoogleMaterial.Icon.gmd_sentiment_satisfied).sizePx(iconSize).color(ThemeUtils.getColor(emojiPreference.context, R.attr.preference_icon_tint)) + emojiPreference.icon = IconicsDrawable(emojiPreference.context, GoogleMaterial.Icon.gmd_sentiment_satisfied).sizePx(iconSize).color(ThemeUtils.getColor(emojiPreference.context, R.attr.iconColor)) val textSizePreference: Preference = requirePreference("statusTextSize") - textSizePreference.icon = IconicsDrawable(textSizePreference.context, GoogleMaterial.Icon.gmd_format_size).sizePx(iconSize).color(ThemeUtils.getColor(textSizePreference.context, R.attr.preference_icon_tint)) + textSizePreference.icon = IconicsDrawable(textSizePreference.context, GoogleMaterial.Icon.gmd_format_size).sizePx(iconSize).color(ThemeUtils.getColor(textSizePreference.context, R.attr.iconColor)) val timelineFilterPreferences: Preference = requirePreference("timelineFilterPreferences") timelineFilterPreferences.setOnPreferenceClickListener { @@ -67,12 +67,11 @@ class PreferencesFragment : PreferenceFragmentCompat() { } val languagePreference: Preference = requirePreference("language") - languagePreference.icon = IconicsDrawable(languagePreference.context, GoogleMaterial.Icon.gmd_translate).sizePx(iconSize).color(ThemeUtils.getColor(languagePreference.context, R.attr.preference_icon_tint)) + languagePreference.icon = IconicsDrawable(languagePreference.context, GoogleMaterial.Icon.gmd_translate).sizePx(iconSize).color(ThemeUtils.getColor(languagePreference.context, R.attr.iconColor)) val botIndicatorPreference = requirePreference("showBotOverlay") - val botDrawable = botIndicatorPreference.context.getDrawable(R.drawable.ic_bot_24dp) - ThemeUtils.setDrawableTint(context, botDrawable, R.attr.preference_icon_tint) - botIndicatorPreference.icon = botDrawable + + botIndicatorPreference.icon = ThemeUtils.getTintedDrawable(requireContext(), R.drawable.ic_bot_24dp, R.attr.iconColor) } override fun onResume() { diff --git a/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.java b/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.java index 85e6f2866..e74fde30f 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.java +++ b/app/src/main/java/com/keylesspalace/tusky/util/LinkHelper.java @@ -228,7 +228,7 @@ public class LinkHelper { * @param context context */ public static void openLinkInCustomTab(Uri uri, Context context) { - int toolbarColor = ThemeUtils.getColor(context, R.attr.custom_tab_toolbar); + int toolbarColor = ThemeUtils.getColor(context, R.attr.colorSurface); CustomTabsIntent.Builder customTabsIntentBuilder = new CustomTabsIntent.Builder() .setToolbarColor(toolbarColor) diff --git a/app/src/main/java/com/keylesspalace/tusky/util/StatusViewHelper.kt b/app/src/main/java/com/keylesspalace/tusky/util/StatusViewHelper.kt index 8377d73ec..840e220e4 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/StatusViewHelper.kt +++ b/app/src/main/java/com/keylesspalace/tusky/util/StatusViewHelper.kt @@ -24,6 +24,7 @@ import android.widget.ImageView import android.widget.TextView import androidx.annotation.DrawableRes import androidx.appcompat.content.res.AppCompatResources +import androidx.core.content.ContextCompat import com.bumptech.glide.Glide import com.keylesspalace.tusky.R import com.keylesspalace.tusky.entity.Attachment @@ -87,8 +88,7 @@ class StatusViewHelper(private val itemView: View) { } - val mediaPreviewUnloaded = ThemeUtils.getDrawable(context, - R.attr.media_preview_unloaded_drawable, android.R.color.black) + val mediaPreviewUnloaded = ColorDrawable(ThemeUtils.getColor(context, R.attr.colorBackgroundAccent)) val n = min(attachments.size, Status.MAX_MEDIA_ATTACHMENTS) @@ -141,8 +141,7 @@ class StatusViewHelper(private val itemView: View) { val blurhashBitmap = decodeBlurHash(context, attachment.blurhash) mediaPreviews[i].setImageDrawable(blurhashBitmap) } else { - mediaPreviews[i].setImageDrawable(ColorDrawable(ThemeUtils.getColor( - context, R.attr.sensitive_media_warning_background_color))) + mediaPreviews[i].setImageDrawable(mediaPreviewUnloaded) } } } diff --git a/app/src/main/java/com/keylesspalace/tusky/util/ThemeUtils.java b/app/src/main/java/com/keylesspalace/tusky/util/ThemeUtils.java index 9436b7a56..d98259d77 100644 --- a/app/src/main/java/com/keylesspalace/tusky/util/ThemeUtils.java +++ b/app/src/main/java/com/keylesspalace/tusky/util/ThemeUtils.java @@ -21,7 +21,6 @@ import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import androidx.annotation.AttrRes; import androidx.annotation.ColorInt; -import androidx.annotation.ColorRes; import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -42,29 +41,6 @@ public class ThemeUtils { private static final String THEME_AUTO = "auto"; private static final String THEME_SYSTEM = "auto_system"; - public static Drawable getDrawable(@NonNull Context context, @AttrRes int attribute, - @DrawableRes int fallbackDrawable) { - TypedValue value = new TypedValue(); - @DrawableRes int resourceId; - if (context.getTheme().resolveAttribute(attribute, value, true)) { - resourceId = value.resourceId; - } else { - resourceId = fallbackDrawable; - } - return context.getDrawable(resourceId); - } - - @DrawableRes - public static int getDrawableId(@NonNull Context context, @AttrRes int attribute, - @DrawableRes int fallbackDrawableId) { - TypedValue value = new TypedValue(); - if (context.getTheme().resolveAttribute(attribute, value, true)) { - return value.resourceId; - } else { - return fallbackDrawableId; - } - } - @ColorInt public static int getColor(@NonNull Context context, @AttrRes int attribute) { TypedValue value = new TypedValue(); @@ -75,13 +51,6 @@ public class ThemeUtils { } } - @ColorRes - public static int getColorId(@NonNull Context context, @AttrRes int attribute) { - TypedValue value = new TypedValue(); - context.getTheme().resolveAttribute(attribute, value, true); - return value.resourceId; - } - /** this can be replaced with drawableTint in xml once minSdkVersion >= 23 */ @Nullable public static Drawable getTintedDrawable(@NonNull Context context, @DrawableRes int drawableId, @AttrRes int colorAttr) { diff --git a/app/src/main/java/com/keylesspalace/tusky/view/ConversationLineItemDecoration.kt b/app/src/main/java/com/keylesspalace/tusky/view/ConversationLineItemDecoration.kt index 1fbc4c9b1..4011d69d3 100644 --- a/app/src/main/java/com/keylesspalace/tusky/view/ConversationLineItemDecoration.kt +++ b/app/src/main/java/com/keylesspalace/tusky/view/ConversationLineItemDecoration.kt @@ -20,15 +20,14 @@ import android.graphics.Canvas import android.graphics.drawable.Drawable import androidx.recyclerview.widget.RecyclerView import android.view.View +import androidx.core.content.ContextCompat import com.keylesspalace.tusky.R import com.keylesspalace.tusky.adapter.ThreadAdapter -import com.keylesspalace.tusky.util.ThemeUtils class ConversationLineItemDecoration(private val context: Context) : RecyclerView.ItemDecoration() { - private val divider: Drawable = ThemeUtils.getDrawable(context, R.attr.conversation_thread_line_drawable, - R.drawable.conversation_thread_line_dark) + private val divider: Drawable = ContextCompat.getDrawable(context, R.drawable.conversation_thread_line)!! override fun onDraw(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State) { val dividerStart = parent.paddingStart + context.resources.getDimensionPixelSize(R.dimen.status_line_margin_start) diff --git a/app/src/main/java/com/keylesspalace/tusky/view/LicenseCard.kt b/app/src/main/java/com/keylesspalace/tusky/view/LicenseCard.kt index 0d6364733..2c73cd54a 100644 --- a/app/src/main/java/com/keylesspalace/tusky/view/LicenseCard.kt +++ b/app/src/main/java/com/keylesspalace/tusky/view/LicenseCard.kt @@ -34,7 +34,7 @@ class LicenseCard init { inflate(context, R.layout.card_license, this) - setCardBackgroundColor(ThemeUtils.getColor(context, android.R.attr.colorBackground)) + setCardBackgroundColor(ThemeUtils.getColor(context, R.attr.colorSurface)) val a = context.theme.obtainStyledAttributes(attrs, R.styleable.LicenseCard, 0, 0) diff --git a/app/src/main/res/color/color_background_transparent_60.xml b/app/src/main/res/color/color_background_transparent_60.xml new file mode 100644 index 000000000..0a09f2aa3 --- /dev/null +++ b/app/src/main/res/color/color_background_transparent_60.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/color/compound_button_color_dark.xml b/app/src/main/res/color/compound_button_color.xml similarity index 75% rename from app/src/main/res/color/compound_button_color_dark.xml rename to app/src/main/res/color/compound_button_color.xml index bd00f6afd..8b151c702 100644 --- a/app/src/main/res/color/compound_button_color_dark.xml +++ b/app/src/main/res/color/compound_button_color.xml @@ -1,5 +1,6 @@ - + + \ No newline at end of file diff --git a/app/src/main/res/color/compound_button_color_light.xml b/app/src/main/res/color/compound_button_color_light.xml deleted file mode 100644 index 3203ee04b..000000000 --- a/app/src/main/res/color/compound_button_color_light.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-night/background_dialog_activity.xml b/app/src/main/res/drawable-night/background_dialog_activity.xml deleted file mode 100644 index 31c659707..000000000 --- a/app/src/main/res/drawable-night/background_dialog_activity.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-night/ic_emoji_34dp.xml b/app/src/main/res/drawable-night/ic_emoji_34dp.xml deleted file mode 100644 index cf11e0a96..000000000 --- a/app/src/main/res/drawable-night/ic_emoji_34dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-night/profile_badge_background.xml b/app/src/main/res/drawable-night/profile_badge_background.xml deleted file mode 100644 index 083ae544b..000000000 --- a/app/src/main/res/drawable-night/profile_badge_background.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/autocomplete_divider_dark.xml b/app/src/main/res/drawable/autocomplete_divider_dark.xml deleted file mode 100644 index fea67422c..000000000 --- a/app/src/main/res/drawable/autocomplete_divider_dark.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/avatar_border.xml b/app/src/main/res/drawable/avatar_border.xml index 1053951c2..aca56e153 100644 --- a/app/src/main/res/drawable/avatar_border.xml +++ b/app/src/main/res/drawable/avatar_border.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/background_dialog_activity.xml b/app/src/main/res/drawable/background_dialog_activity.xml index 7a636d59a..80cff382e 100644 --- a/app/src/main/res/drawable/background_dialog_activity.xml +++ b/app/src/main/res/drawable/background_dialog_activity.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/background_dialog_activity_black.xml b/app/src/main/res/drawable/background_dialog_activity_black.xml deleted file mode 100644 index 4a02e6c82..000000000 --- a/app/src/main/res/drawable/background_dialog_activity_black.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/background_splash.xml b/app/src/main/res/drawable/background_splash.xml index 6f0a29fb9..d79dee514 100644 --- a/app/src/main/res/drawable/background_splash.xml +++ b/app/src/main/res/drawable/background_splash.xml @@ -1,7 +1,7 @@ - + - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/border_background_light.xml b/app/src/main/res/drawable/border_background_light.xml deleted file mode 100644 index 6fe0dccb3..000000000 --- a/app/src/main/res/drawable/border_background_light.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/card_frame.xml b/app/src/main/res/drawable/card_frame.xml index 87e28d8b7..525731b64 100644 --- a/app/src/main/res/drawable/card_frame.xml +++ b/app/src/main/res/drawable/card_frame.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/conversation_thread_line_dark.xml b/app/src/main/res/drawable/conversation_thread_line.xml similarity index 71% rename from app/src/main/res/drawable/conversation_thread_line_dark.xml rename to app/src/main/res/drawable/conversation_thread_line.xml index f19dedfb1..6497c4b0f 100644 --- a/app/src/main/res/drawable/conversation_thread_line_dark.xml +++ b/app/src/main/res/drawable/conversation_thread_line.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/conversation_thread_line_light.xml b/app/src/main/res/drawable/conversation_thread_line_light.xml deleted file mode 100644 index 1d01884ed..000000000 --- a/app/src/main/res/drawable/conversation_thread_line_light.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/favourite_active_dark.xml b/app/src/main/res/drawable/favourite_active_dark.xml deleted file mode 100644 index f1631599e..000000000 --- a/app/src/main/res/drawable/favourite_active_dark.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/favourite_inactive_dark.xml b/app/src/main/res/drawable/favourite_inactive_dark.xml deleted file mode 100644 index cc1dc796a..000000000 --- a/app/src/main/res/drawable/favourite_inactive_dark.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/favourite_inactive_light.xml b/app/src/main/res/drawable/favourite_inactive_light.xml deleted file mode 100644 index 0683a47bd..000000000 --- a/app/src/main/res/drawable/favourite_inactive_light.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable-anydpi/ic_access_time.xml b/app/src/main/res/drawable/ic_access_time.xml similarity index 100% rename from app/src/main/res/drawable-anydpi/ic_access_time.xml rename to app/src/main/res/drawable/ic_access_time.xml diff --git a/app/src/main/res/drawable/ic_attach_file_24dp.xml b/app/src/main/res/drawable/ic_attach_file_24dp.xml index b3c693560..806cac00e 100644 --- a/app/src/main/res/drawable/ic_attach_file_24dp.xml +++ b/app/src/main/res/drawable/ic_attach_file_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_cancel_black_24dp.xml b/app/src/main/res/drawable/ic_cancel_24dp.xml similarity index 100% rename from app/src/main/res/drawable/ic_cancel_black_24dp.xml rename to app/src/main/res/drawable/ic_cancel_24dp.xml diff --git a/app/src/main/res/drawable/ic_clear_24dp.xml b/app/src/main/res/drawable/ic_clear_24dp.xml index 72af13013..0a244b997 100644 --- a/app/src/main/res/drawable/ic_clear_24dp.xml +++ b/app/src/main/res/drawable/ic_clear_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_close_24dp.xml b/app/src/main/res/drawable/ic_close_24dp.xml index 72af13013..081e405f3 100644 --- a/app/src/main/res/drawable/ic_close_24dp.xml +++ b/app/src/main/res/drawable/ic_close_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_emoji_34dp.xml b/app/src/main/res/drawable/ic_emoji_34dp.xml index c2cf2bbeb..d779af3bc 100644 --- a/app/src/main/res/drawable/ic_emoji_34dp.xml +++ b/app/src/main/res/drawable/ic_emoji_34dp.xml @@ -4,6 +4,6 @@ android:viewportHeight="24" android:viewportWidth="24"> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_favourite_24dp.xml b/app/src/main/res/drawable/ic_favourite_24dp.xml new file mode 100644 index 000000000..5826bf5a6 --- /dev/null +++ b/app/src/main/res/drawable/ic_favourite_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/favourite_active_light.xml b/app/src/main/res/drawable/ic_favourite_active_24dp.xml similarity index 84% rename from app/src/main/res/drawable/favourite_active_light.xml rename to app/src/main/res/drawable/ic_favourite_active_24dp.xml index 7efda3965..2eb3014f5 100644 --- a/app/src/main/res/drawable/favourite_active_light.xml +++ b/app/src/main/res/drawable/ic_favourite_active_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_home_24dp.xml b/app/src/main/res/drawable/ic_home_24dp.xml index 55e6239b9..4c6bc0efc 100644 --- a/app/src/main/res/drawable/ic_home_24dp.xml +++ b/app/src/main/res/drawable/ic_home_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable-anydpi/ic_list.xml b/app/src/main/res/drawable/ic_list.xml similarity index 100% rename from app/src/main/res/drawable-anydpi/ic_list.xml rename to app/src/main/res/drawable/ic_list.xml diff --git a/app/src/main/res/drawable/ic_lock_open_24dp.xml b/app/src/main/res/drawable/ic_lock_open_24dp.xml index 72d7d1233..1e9d0db67 100644 --- a/app/src/main/res/drawable/ic_lock_open_24dp.xml +++ b/app/src/main/res/drawable/ic_lock_open_24dp.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/app/src/main/res/drawable/ic_lock_outline_24dp.xml b/app/src/main/res/drawable/ic_lock_outline_24dp.xml index a01457060..a8e4201d1 100644 --- a/app/src/main/res/drawable/ic_lock_outline_24dp.xml +++ b/app/src/main/res/drawable/ic_lock_outline_24dp.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/app/src/main/res/drawable/ic_more_horiz_24dp.xml b/app/src/main/res/drawable/ic_more_horiz_24dp.xml index cba1e880a..c77413395 100644 --- a/app/src/main/res/drawable/ic_more_horiz_24dp.xml +++ b/app/src/main/res/drawable/ic_more_horiz_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_notifications_24dp.xml b/app/src/main/res/drawable/ic_notifications_24dp.xml index 86ed94867..d2f7aaca1 100644 --- a/app/src/main/res/drawable/ic_notifications_24dp.xml +++ b/app/src/main/res/drawable/ic_notifications_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_play_indicator_dark.xml b/app/src/main/res/drawable/ic_play_indicator.xml similarity index 60% rename from app/src/main/res/drawable/ic_play_indicator_dark.xml rename to app/src/main/res/drawable/ic_play_indicator.xml index 62897c4d9..4cdae508c 100644 --- a/app/src/main/res/drawable/ic_play_indicator_dark.xml +++ b/app/src/main/res/drawable/ic_play_indicator.xml @@ -1,8 +1,8 @@ - - + diff --git a/app/src/main/res/drawable/ic_play_indicator_light.xml b/app/src/main/res/drawable/ic_play_indicator_light.xml deleted file mode 100644 index b4c55df51..000000000 --- a/app/src/main/res/drawable/ic_play_indicator_light.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_public_24dp.xml b/app/src/main/res/drawable/ic_public_24dp.xml index f66427b10..6ef182e6f 100644 --- a/app/src/main/res/drawable/ic_public_24dp.xml +++ b/app/src/main/res/drawable/ic_public_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/reblog_inactive_light.xml b/app/src/main/res/drawable/ic_reblog_18dp.xml similarity index 59% rename from app/src/main/res/drawable/reblog_inactive_light.xml rename to app/src/main/res/drawable/ic_reblog_18dp.xml index cfeb3ce67..029e71198 100644 --- a/app/src/main/res/drawable/reblog_inactive_light.xml +++ b/app/src/main/res/drawable/ic_reblog_18dp.xml @@ -1,9 +1,9 @@ + android:fillColor="?android:attr/textColorTertiary" + android:pathData="M7,7h10v3l4,-4 -4,-4v3L5,5v6h2L7,7zM17,17L7,17v-3l-4,4 4,4v-3h12v-6h-2v4z" /> diff --git a/app/src/main/res/drawable/reblog_inactive_dark.xml b/app/src/main/res/drawable/ic_reblog_24dp.xml similarity index 83% rename from app/src/main/res/drawable/reblog_inactive_dark.xml rename to app/src/main/res/drawable/ic_reblog_24dp.xml index ca335ebbf..0fe908eda 100644 --- a/app/src/main/res/drawable/reblog_inactive_dark.xml +++ b/app/src/main/res/drawable/ic_reblog_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_reblog_dark_24dp.xml b/app/src/main/res/drawable/ic_reblog_dark_24dp.xml deleted file mode 100644 index 1a82a0f14..000000000 --- a/app/src/main/res/drawable/ic_reblog_dark_24dp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/reblog_direct_dark.xml b/app/src/main/res/drawable/ic_reblog_direct_24dp.xml similarity index 85% rename from app/src/main/res/drawable/reblog_direct_dark.xml rename to app/src/main/res/drawable/ic_reblog_direct_24dp.xml index 833125848..0f53287da 100644 --- a/app/src/main/res/drawable/reblog_direct_dark.xml +++ b/app/src/main/res/drawable/ic_reblog_direct_24dp.xml @@ -5,6 +5,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_reblog_light_24dp.xml b/app/src/main/res/drawable/ic_reblog_light_24dp.xml deleted file mode 100644 index 03904a03d..000000000 --- a/app/src/main/res/drawable/ic_reblog_light_24dp.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/reblog_private_dark.xml b/app/src/main/res/drawable/ic_reblog_private_24dp.xml similarity index 88% rename from app/src/main/res/drawable/reblog_private_dark.xml rename to app/src/main/res/drawable/ic_reblog_private_24dp.xml index 59db1759a..078eaf7a4 100644 --- a/app/src/main/res/drawable/reblog_private_dark.xml +++ b/app/src/main/res/drawable/ic_reblog_private_24dp.xml @@ -4,6 +4,6 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/reblog_private_active.xml b/app/src/main/res/drawable/ic_reblog_private_active_24dp.xml similarity index 100% rename from app/src/main/res/drawable/reblog_private_active.xml rename to app/src/main/res/drawable/ic_reblog_private_active_24dp.xml diff --git a/app/src/main/res/drawable/ic_repeat_24dp.xml b/app/src/main/res/drawable/ic_repeat_24dp.xml index 4b13abca8..aaa76ae0c 100644 --- a/app/src/main/res/drawable/ic_repeat_24dp.xml +++ b/app/src/main/res/drawable/ic_repeat_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_reply_24dp.xml b/app/src/main/res/drawable/ic_reply_24dp.xml index 31b63540b..6085ff0b4 100644 --- a/app/src/main/res/drawable/ic_reply_24dp.xml +++ b/app/src/main/res/drawable/ic_reply_24dp.xml @@ -5,6 +5,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/app/src/main/res/drawable/ic_reply_all_24dp.xml b/app/src/main/res/drawable/ic_reply_all_24dp.xml index 8d4c8d3c4..9da31f037 100644 --- a/app/src/main/res/drawable/ic_reply_all_24dp.xml +++ b/app/src/main/res/drawable/ic_reply_all_24dp.xml @@ -5,6 +5,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/app/src/main/res/drawable/ic_send_24dp.xml b/app/src/main/res/drawable/ic_send_24dp.xml index b5704ce0a..8916aa932 100644 --- a/app/src/main/res/drawable/ic_send_24dp.xml +++ b/app/src/main/res/drawable/ic_send_24dp.xml @@ -5,6 +5,6 @@ android:viewportHeight="24.0" android:autoMirrored="true"> diff --git a/app/src/main/res/drawable/ic_star_24dp.xml b/app/src/main/res/drawable/ic_star_24dp.xml index 47ad24899..868914287 100644 --- a/app/src/main/res/drawable/ic_star_24dp.xml +++ b/app/src/main/res/drawable/ic_star_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/media_preview_unloaded_dark.xml b/app/src/main/res/drawable/media_preview_unloaded_dark.xml deleted file mode 100644 index 2d6872b31..000000000 --- a/app/src/main/res/drawable/media_preview_unloaded_dark.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/media_preview_unloaded_light.xml b/app/src/main/res/drawable/media_preview_unloaded_light.xml deleted file mode 100644 index 790924342..000000000 --- a/app/src/main/res/drawable/media_preview_unloaded_light.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/media_warning_bg.xml b/app/src/main/res/drawable/media_warning_bg.xml index 8921a2251..93ff4e076 100644 --- a/app/src/main/res/drawable/media_warning_bg.xml +++ b/app/src/main/res/drawable/media_warning_bg.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/poll_option_shape.xml b/app/src/main/res/drawable/poll_option_shape.xml index 281c4c835..da097f3ae 100644 --- a/app/src/main/res/drawable/poll_option_shape.xml +++ b/app/src/main/res/drawable/poll_option_shape.xml @@ -3,5 +3,5 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/profile_badge_background.xml b/app/src/main/res/drawable/profile_badge_background.xml index 65a457e7e..be4bcf3ef 100644 --- a/app/src/main/res/drawable/profile_badge_background.xml +++ b/app/src/main/res/drawable/profile_badge_background.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/reblog_direct_light.xml b/app/src/main/res/drawable/reblog_direct_light.xml deleted file mode 100644 index 472c5847e..000000000 --- a/app/src/main/res/drawable/reblog_direct_light.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/reblog_private_light.xml b/app/src/main/res/drawable/reblog_private_light.xml deleted file mode 100644 index 970e207fd..000000000 --- a/app/src/main/res/drawable/reblog_private_light.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/autocomplete_divider_light.xml b/app/src/main/res/drawable/status_divider.xml similarity index 72% rename from app/src/main/res/drawable/autocomplete_divider_light.xml rename to app/src/main/res/drawable/status_divider.xml index 866944050..cb6cf0741 100644 --- a/app/src/main/res/drawable/autocomplete_divider_light.xml +++ b/app/src/main/res/drawable/status_divider.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/status_divider_dark.xml b/app/src/main/res/drawable/status_divider_dark.xml deleted file mode 100644 index 7c6fab905..000000000 --- a/app/src/main/res/drawable/status_divider_dark.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/status_divider_light.xml b/app/src/main/res/drawable/status_divider_light.xml deleted file mode 100644 index 866944050..000000000 --- a/app/src/main/res/drawable/status_divider_light.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout-sw640dp/fragment_timeline.xml b/app/src/main/res/layout-sw640dp/fragment_timeline.xml index 56150457d..e150a2d1c 100644 --- a/app/src/main/res/layout-sw640dp/fragment_timeline.xml +++ b/app/src/main/res/layout-sw640dp/fragment_timeline.xml @@ -3,13 +3,14 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" + android:background="?attr/windowBackgroundColor" android:layout_height="match_parent"> + android:background="?android:attr/colorBackground"> + + \ No newline at end of file diff --git a/app/src/main/res/layout-sw640dp/fragment_timeline_notifications.xml b/app/src/main/res/layout-sw640dp/fragment_timeline_notifications.xml index 82a13db74..e39998bfa 100644 --- a/app/src/main/res/layout-sw640dp/fragment_timeline_notifications.xml +++ b/app/src/main/res/layout-sw640dp/fragment_timeline_notifications.xml @@ -3,19 +3,20 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:background="?attr/windowBackgroundColor"> + android:background="?android:attr/colorBackground"> @@ -64,7 +65,8 @@ + android:layout_height="match_parent" + android:background="?android:attr/colorBackground" /> diff --git a/app/src/main/res/layout-sw640dp/fragment_view_thread.xml b/app/src/main/res/layout-sw640dp/fragment_view_thread.xml index b8e1cf9a9..52de2b95a 100644 --- a/app/src/main/res/layout-sw640dp/fragment_view_thread.xml +++ b/app/src/main/res/layout-sw640dp/fragment_view_thread.xml @@ -1,7 +1,8 @@ + android:layout_height="match_parent" + android:background="?attr/windowBackgroundColor"> diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml index e86209534..4bbb8a65a 100644 --- a/app/src/main/res/layout/activity_account.xml +++ b/app/src/main/res/layout/activity_account.xml @@ -33,7 +33,7 @@ android:layout_width="match_parent" android:layout_height="180dp" android:layout_alignTop="@+id/account_header_info" - android:background="?attr/account_header_background_color" + android:background="?attr/colorPrimaryDark" android:scaleType="centerCrop" app:layout_collapseMode="parallax" app:layout_constraintStart_toStartOf="parent" @@ -130,7 +130,7 @@ app:layout_constraintBottom_toBottomOf="@+id/accountUsernameTextView" app:layout_constraintStart_toEndOf="@+id/accountUsernameTextView" app:layout_constraintTop_toTopOf="@+id/accountUsernameTextView" - app:srcCompat="@drawable/reblog_private_light" + app:srcCompat="@drawable/ic_reblog_private_24dp" tools:visibility="visible" /> @@ -337,7 +337,7 @@ android:id="@+id/accountFragmentViewPager" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/tab_page_margin_color" + android:background="?android:windowBackground" app:layout_behavior="@string/appbar_scrolling_view_behavior" /> + app:buttonTint="@color/compound_button_color" /> diff --git a/app/src/main/res/layout/dialog_add_poll.xml b/app/src/main/res/layout/dialog_add_poll.xml index b70141da8..ed8abc076 100644 --- a/app/src/main/res/layout/dialog_add_poll.xml +++ b/app/src/main/res/layout/dialog_add_poll.xml @@ -49,7 +49,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:text="@string/poll_allow_multiple_choices" - app:buttonTint="?attr/compound_button_color" + app:buttonTint="@color/compound_button_color" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/addChoiceButton" /> diff --git a/app/src/main/res/layout/fragment_accounts_in_list.xml b/app/src/main/res/layout/fragment_accounts_in_list.xml index be2a51e3b..ca9348f48 100644 --- a/app/src/main/res/layout/fragment_accounts_in_list.xml +++ b/app/src/main/res/layout/fragment_accounts_in_list.xml @@ -49,7 +49,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_marginTop="8dp" - android:background="?attr/window_background" + android:background="?android:attr/windowBackground" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/fragment_report_note.xml b/app/src/main/res/layout/fragment_report_note.xml index 2eab8b2c3..12d1fcbc7 100644 --- a/app/src/main/res/layout/fragment_report_note.xml +++ b/app/src/main/res/layout/fragment_report_note.xml @@ -86,7 +86,7 @@ android:layout_marginTop="16dp" android:text="@string/report_remote_instance" android:textSize="?attr/status_text_medium" - app:buttonTint="?attr/compound_button_color" + app:buttonTint="@color/compound_button_color" app:layout_constraintEnd_toEndOf="@id/guideEnd" app:layout_constraintStart_toStartOf="@id/guideBegin" app:layout_constraintTop_toBottomOf="@id/reportDescriptionRemoteInstance" /> diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml index a4ea14020..8c993755b 100644 --- a/app/src/main/res/layout/fragment_search.xml +++ b/app/src/main/res/layout/fragment_search.xml @@ -3,8 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/layoutRoot" android:layout_width="@dimen/timeline_width" - android:layout_height="match_parent" - android:background="?attr/tab_page_margin_color"> + android:layout_height="match_parent"> diff --git a/app/src/main/res/layout/fragment_timeline.xml b/app/src/main/res/layout/fragment_timeline.xml index 94431fffe..0b5c57b8d 100644 --- a/app/src/main/res/layout/fragment_timeline.xml +++ b/app/src/main/res/layout/fragment_timeline.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/window_background"> + android:background="?android:attr/colorBackground"> @@ -58,8 +58,7 @@ + android:layout_height="match_parent" /> diff --git a/app/src/main/res/layout/fragment_view_thread.xml b/app/src/main/res/layout/fragment_view_thread.xml index a990942e3..433f1ed0f 100644 --- a/app/src/main/res/layout/fragment_view_thread.xml +++ b/app/src/main/res/layout/fragment_view_thread.xml @@ -9,7 +9,7 @@ android:id="@+id/recyclerView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/window_background" + android:background="?android:attr/colorBackground" android:scrollbars="vertical" /> diff --git a/app/src/main/res/layout/item_add_poll_option.xml b/app/src/main/res/layout/item_add_poll_option.xml index 8d396fb14..7ac77806a 100644 --- a/app/src/main/res/layout/item_add_poll_option.xml +++ b/app/src/main/res/layout/item_add_poll_option.xml @@ -20,7 +20,7 @@ \ No newline at end of file + android:background="@drawable/status_divider" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_blocked_user.xml b/app/src/main/res/layout/item_blocked_user.xml index 996da66b7..ff3abf6b0 100644 --- a/app/src/main/res/layout/item_blocked_user.xml +++ b/app/src/main/res/layout/item_blocked_user.xml @@ -19,7 +19,7 @@ @@ -473,7 +473,7 @@ + app:srcCompat="@drawable/ic_cancel_24dp" /> diff --git a/app/src/main/res/layout/item_poll.xml b/app/src/main/res/layout/item_poll.xml index a6d97d982..743d68093 100644 --- a/app/src/main/res/layout/item_poll.xml +++ b/app/src/main/res/layout/item_poll.xml @@ -27,7 +27,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="?attr/status_text_medium" - app:buttonTint="?attr/compound_button_color" + app:buttonTint="@color/compound_button_color" tools:text="Option 1" /> diff --git a/app/src/main/res/layout/item_report_status.xml b/app/src/main/res/layout/item_report_status.xml index 3f9fc25e5..26b158a01 100644 --- a/app/src/main/res/layout/item_report_status.xml +++ b/app/src/main/res/layout/item_report_status.xml @@ -148,7 +148,7 @@ app:layout_constraintEnd_toEndOf="@+id/status_media_preview_0" app:layout_constraintStart_toStartOf="@+id/status_media_preview_0" app:layout_constraintTop_toTopOf="@+id/status_media_preview_0" - app:srcCompat="?attr/play_indicator_drawable" + app:srcCompat="@drawable/ic_play_indicator" tools:ignore="ContentDescription" /> diff --git a/app/src/main/res/layout/item_saved_toot.xml b/app/src/main/res/layout/item_saved_toot.xml index 2880dbdb2..c95473f27 100644 --- a/app/src/main/res/layout/item_saved_toot.xml +++ b/app/src/main/res/layout/item_saved_toot.xml @@ -15,7 +15,7 @@ @@ -459,9 +459,9 @@ app:layout_constraintEnd_toStartOf="@id/status_bookmark" app:layout_constraintStart_toEndOf="@id/status_inset" app:layout_constraintTop_toTopOf="@id/status_inset" - sparkbutton:activeImage="?attr/status_favourite_active_drawable" + sparkbutton:activeImage="@drawable/ic_favourite_active_24dp" sparkbutton:iconSize="28dp" - sparkbutton:inactiveImage="?attr/status_favourite_inactive_drawable" + sparkbutton:inactiveImage="@drawable/ic_favourite_24dp" sparkbutton:primaryColor="@color/tusky_orange" sparkbutton:secondaryColor="@color/tusky_orange_light" /> @@ -484,7 +484,7 @@ @@ -259,7 +259,7 @@ app:layout_constraintEnd_toEndOf="@+id/status_media_preview_0" app:layout_constraintStart_toStartOf="@+id/status_media_preview_0" app:layout_constraintTop_toTopOf="@+id/status_media_preview_0" - app:srcCompat="?attr/play_indicator_drawable" + app:srcCompat="@drawable/ic_play_indicator" tools:ignore="ContentDescription" /> @@ -547,9 +547,9 @@ app:layout_constraintEnd_toStartOf="@id/status_bookmark" app:layout_constraintStart_toEndOf="@id/status_inset" app:layout_constraintTop_toTopOf="@id/status_inset" - sparkbutton:activeImage="?attr/status_favourite_active_drawable" + sparkbutton:activeImage="@drawable/ic_favourite_active_24dp" sparkbutton:iconSize="28dp" - sparkbutton:inactiveImage="?attr/status_favourite_inactive_drawable" + sparkbutton:inactiveImage="@drawable/ic_favourite_24dp" sparkbutton:primaryColor="@color/tusky_orange" sparkbutton:secondaryColor="@color/tusky_orange_light" /> @@ -572,7 +572,7 @@ + android:background="?android:attr/windowBackground"> + app:buttonTint="@color/compound_button_color" /> + app:buttonTint="@color/compound_button_color" /> + app:buttonTint="@color/compound_button_color" /> + app:buttonTint="@color/compound_button_color" /> diff --git a/app/src/main/res/values-large/styles.xml b/app/src/main/res/values-large/styles.xml index 1f7be671b..8d05f273d 100644 --- a/app/src/main/res/values-large/styles.xml +++ b/app/src/main/res/values-large/styles.xml @@ -13,7 +13,7 @@ - - diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml deleted file mode 100644 index e9164b53c..000000000 --- a/app/src/main/res/values-night/styles.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/values-night/theme_colors.xml b/app/src/main/res/values-night/theme_colors.xml new file mode 100644 index 000000000..133dfbfc4 --- /dev/null +++ b/app/src/main/res/values-night/theme_colors.xml @@ -0,0 +1,23 @@ + + + + @color/tusky_grey_30 + @color/tusky_grey_10 + + @color/tusky_grey_20 + @color/tusky_grey_10 + + @color/white + @color/tusky_grey_90 + @color/tusky_grey_70 + @color/tusky_grey_30 + + @color/tusky_grey_70 + + @color/tusky_grey_30 + + @color/tusky_orange + + false + + \ No newline at end of file diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml index 27b20b9d5..eaea6ccc0 100644 --- a/app/src/main/res/values-v27/styles.xml +++ b/app/src/main/res/values-v27/styles.xml @@ -2,26 +2,25 @@ - diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index b37506635..5de7712a5 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -9,38 +9,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 35a972cd2..81c5b7ed4 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,6 +1,5 @@ - #2b90d9 #56a7e1 #ca8f04 @@ -8,58 +7,24 @@ #19a341 #25d069 - #8f000000 + #fff + #000 + + + #070b14 + #16191f + #282c37 + #444b5d + #596378 + #6e7b92 + #9baec8 + #b9c8d8 + #d9e1e8 + #e9edf2 + + #8c2b90d9 + #8f000000 #44000000 - #333 - #ffffff - - - #4c5368 - #313543 - #1a1c23 - #282c37 - #ffffff - #d9e1e8 - #9baec8 - #d9e1e8 - #444b5d - #2f3441 - #1a1c23 - #ffffff - #586173 - #313543 - #373c4b - #424a5b - - #000000 - #111111 - #000000 - #000000 - #FFFFFF - #111111 - #111111 - #000000 - - #dfdfdf - #8f8f8f - #f4f4f4 - #f4f4f4 - #CC000000 - #3c3c3c - #5f636f - #7C000000 - #BFBFBF - #b0b0b0 - #cfcfcf - #cfcfcf - #cfcfcf - #DE000000 - #a3a5ab - #EFEFEF - #ffffff - #e0e1e6 - - #8c2b90d9 #121419 diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 4752ec303..0148c645c 100644 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -6,7 +6,6 @@ oauth2redirect com.keylesspalace.tusky.PREFERENCES - <b>%1$s</b><br>%2$s \@ # #%s diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index a13eed14e..66c5899ba 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -30,132 +30,85 @@ 22sp - - - - - - - - + + + + @@ -173,31 +126,21 @@ ?android:attr/textColorTertiary -