diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt index 478d8aff..bc4c336e 100644 --- a/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/AccountActivity.kt @@ -357,7 +357,7 @@ class AccountActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidI viewModel.isRefreshing.observe(this, { isRefreshing -> swipeToRefreshLayout.isRefreshing = isRefreshing == true }) - swipeToRefreshLayout.setColorSchemeResources(R.color.tusky_blue) + swipeToRefreshLayout.setColorSchemeResources(R.color.chinwag_green) } private fun onAccountChanged(account: Account?) { diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java b/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java index dcaf4169..6105febb 100644 --- a/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java +++ b/app/src/main/java/com/keylesspalace/tusky/adapter/NotificationsAdapter.java @@ -482,7 +482,7 @@ public class NotificationsAdapter extends RecyclerView.Adapter { icon = ContextCompat.getDrawable(context, R.drawable.ic_repeat_24dp); if (icon != null) { icon.setColorFilter(ContextCompat.getColor(context, - R.color.tusky_blue), PorterDuff.Mode.SRC_ATOP); + R.color.chinwag_green), PorterDuff.Mode.SRC_ATOP); } format = context.getString(R.string.notification_reblog_format); diff --git a/app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsActivity.kt index 1f86a0ab..0adcd012 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/announcements/AnnouncementsActivity.kt @@ -69,7 +69,7 @@ class AnnouncementsActivity : BottomSheetActivity(), AnnouncementActionListener, } swipeRefreshLayout.setOnRefreshListener(this::refreshAnnouncements) - swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue) + swipeRefreshLayout.setColorSchemeResources(R.color.chinwag_green) announcementsList.setHasFixedSize(true) announcementsList.layoutManager = LinearLayoutManager(this) 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 e9615d33..db081d0c 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 @@ -489,13 +489,13 @@ class ComposeActivity : BaseActivity(), @ColorInt val color = if (contentWarningShown) { composeHideMediaButton.setImageResource(R.drawable.ic_hide_media_24dp) composeHideMediaButton.isClickable = false - ContextCompat.getColor(this, R.color.transparent_tusky_blue) + ContextCompat.getColor(this, R.color.transparent_chinwag_green) } else { composeHideMediaButton.isClickable = true if (markMediaSensitive) { composeHideMediaButton.setImageResource(R.drawable.ic_hide_media_24dp) - ContextCompat.getColor(this, R.color.tusky_blue) + ContextCompat.getColor(this, R.color.chinwag_green) } else { composeHideMediaButton.setImageResource(R.drawable.ic_eye_24dp) ThemeUtils.getColor(this, android.R.attr.textColorTertiary) @@ -509,7 +509,7 @@ class ComposeActivity : BaseActivity(), @ColorInt val color = if (composeScheduleView.time == null) { ThemeUtils.getColor(this, android.R.attr.textColorTertiary) } else { - ContextCompat.getColor(this, R.color.tusky_blue) + ContextCompat.getColor(this, R.color.chinwag_green) } composeScheduleButton.drawable.colorFilter = PorterDuffColorFilter(color, PorterDuff.Mode.SRC_IN) } @@ -873,7 +873,7 @@ class ComposeActivity : BaseActivity(), composeContentWarningBar.show() composeContentWarningField.setSelection(composeContentWarningField.text.length) composeContentWarningField.requestFocus() - ContextCompat.getColor(this, R.color.tusky_blue) + ContextCompat.getColor(this, R.color.chinwag_green) } else { composeContentWarningBar.hide() composeEditField.requestFocus() 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 fde993d1..6226eeb8 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 @@ -58,7 +58,7 @@ public final class ProgressImageView extends AppCompatImageView { } private void init() { - circlePaint.setColor(ContextCompat.getColor(getContext(), R.color.tusky_blue)); + circlePaint.setColor(ContextCompat.getColor(getContext(), R.color.chinwag_green)); circlePaint.setStrokeWidth(Utils.dpToPx(getContext(), 4)); circlePaint.setStyle(Paint.Style.STROKE); @@ -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.tusky_grey_10)); + checked ? R.color.chinwag_green : R.color.tusky_grey_10)); invalidate(); } diff --git a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt index b1ab32d7..c7dab402 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/conversation/ConversationsFragment.kt @@ -102,7 +102,7 @@ class ConversationsFragment : SFragment(), StatusActionListener, Injectable, Res swipeRefreshLayout.setOnRefreshListener { viewModel.refresh() } - swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue) + swipeRefreshLayout.setColorSchemeResources(R.color.chinwag_green) } private fun onTopLoaded() { diff --git a/app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationHelper.java b/app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationHelper.java index 14c9e480..03c11e29 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationHelper.java +++ b/app/src/main/java/com/keylesspalace/tusky/components/notifications/NotificationHelper.java @@ -295,7 +295,7 @@ public class NotificationHelper { .setSmallIcon(R.drawable.ic_notify) .setContentIntent(summary ? summaryResultPendingIntent : eventResultPendingIntent) .setDeleteIntent(deletePendingIntent) - .setColor(BuildConfig.FLAVOR == "green" ? Color.parseColor("#19A341") : ContextCompat.getColor(context, R.color.tusky_blue)) + .setColor(BuildConfig.FLAVOR == "green" ? Color.parseColor("#19A341") : ContextCompat.getColor(context, R.color.chinwag_green)) .setGroup(account.getAccountId()) .setAutoCancel(true) .setShortcutId(Long.toString(account.getId())) diff --git a/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt index 703acee2..2fb4132a 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/report/fragments/ReportStatusesFragment.kt @@ -101,7 +101,7 @@ class ReportStatusesFragment : Fragment(), Injectable, AdapterHandler { } private fun setupSwipeRefreshLayout() { - swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue) + swipeRefreshLayout.setColorSchemeResources(R.color.chinwag_green) swipeRefreshLayout.setOnRefreshListener { snackbarErrorRetry?.dismiss() diff --git a/app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledTootActivity.kt b/app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledTootActivity.kt index 18b04df5..98fb5f84 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledTootActivity.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/scheduled/ScheduledTootActivity.kt @@ -56,7 +56,7 @@ class ScheduledTootActivity : BaseActivity(), ScheduledTootActionListener, Injec } swipeRefreshLayout.setOnRefreshListener(this::refreshStatuses) - swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue) + swipeRefreshLayout.setColorSchemeResources(R.color.chinwag_green) scheduledTootList.setHasFixedSize(true) scheduledTootList.layoutManager = LinearLayoutManager(this) diff --git a/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt index c5929c43..2c06431e 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/search/fragments/SearchFragment.kt @@ -56,7 +56,7 @@ abstract class SearchFragment : Fragment(), private fun setupSwipeRefreshLayout() { swipeRefreshLayout.setOnRefreshListener(this) - swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue) + swipeRefreshLayout.setColorSchemeResources(R.color.chinwag_green) } private fun subscribeObservables() { 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 ed1fbad8..1e42aa9b 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/AccountMediaFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/AccountMediaFragment.kt @@ -187,7 +187,7 @@ class AccountMediaFragment : BaseFragment(), RefreshableFragment, Injectable { swipeRefreshLayout.setOnRefreshListener { refresh() } - swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue) + swipeRefreshLayout.setColorSchemeResources(R.color.chinwag_green) } statusView.visibility = View.GONE diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java index 6014ac9b..4e4054f2 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java @@ -221,7 +221,7 @@ public class NotificationsFragment extends SFragment implements appBarOptions = rootView.findViewById(R.id.appBarOptions); swipeRefreshLayout.setOnRefreshListener(this); - swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue); + swipeRefreshLayout.setColorSchemeResources(R.color.chinwag_green); loadNotificationsFilter(); diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java index ddcb0eb0..b48b1b45 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java @@ -423,7 +423,7 @@ public class TimelineFragment extends SFragment implements swipeRefreshLayout.setEnabled(isSwipeToRefreshEnabled); if (isSwipeToRefreshEnabled) { swipeRefreshLayout.setOnRefreshListener(this); - swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue); + swipeRefreshLayout.setColorSchemeResources(R.color.chinwag_green); } } diff --git a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java index 77fb3283..7186c552 100644 --- a/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java +++ b/app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java @@ -149,7 +149,7 @@ public final class ViewThreadFragment extends SFragment implements Context context = getContext(); swipeRefreshLayout = rootView.findViewById(R.id.swipeRefreshLayout); swipeRefreshLayout.setOnRefreshListener(this); - swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue); + swipeRefreshLayout.setColorSchemeResources(R.color.chinwag_green); recyclerView = rootView.findViewById(R.id.recyclerView); recyclerView.setHasFixedSize(true); diff --git a/app/src/main/java/com/keylesspalace/tusky/receiver/SendStatusBroadcastReceiver.kt b/app/src/main/java/com/keylesspalace/tusky/receiver/SendStatusBroadcastReceiver.kt index f8bf81b3..4e1b92f5 100644 --- a/app/src/main/java/com/keylesspalace/tusky/receiver/SendStatusBroadcastReceiver.kt +++ b/app/src/main/java/com/keylesspalace/tusky/receiver/SendStatusBroadcastReceiver.kt @@ -70,7 +70,7 @@ class SendStatusBroadcastReceiver : BroadcastReceiver() { val builder = NotificationCompat.Builder(context, NotificationHelper.CHANNEL_MENTION + senderIdentifier) .setSmallIcon(R.drawable.ic_notify) - .setColor(ContextCompat.getColor(context, (R.color.tusky_blue))) + .setColor(ContextCompat.getColor(context, (R.color.chinwag_green))) .setGroup(senderFullName) .setDefaults(0) // So it doesn't ring twice, notify only in Target callback @@ -112,7 +112,7 @@ class SendStatusBroadcastReceiver : BroadcastReceiver() { val builder = NotificationCompat.Builder(context, NotificationHelper.CHANNEL_MENTION + senderIdentifier) .setSmallIcon(R.drawable.ic_notify) - .setColor(ContextCompat.getColor(context, (R.color.tusky_blue))) + .setColor(ContextCompat.getColor(context, (R.color.chinwag_green))) .setGroup(senderFullName) .setDefaults(0) // So it doesn't ring twice, notify only in Target callback diff --git a/app/src/main/java/com/keylesspalace/tusky/service/SendTootService.kt b/app/src/main/java/com/keylesspalace/tusky/service/SendTootService.kt index 328265b5..ff88239b 100644 --- a/app/src/main/java/com/keylesspalace/tusky/service/SendTootService.kt +++ b/app/src/main/java/com/keylesspalace/tusky/service/SendTootService.kt @@ -89,7 +89,7 @@ class SendTootService : Service(), Injectable { .setContentText(notificationText) .setProgress(1, 0, true) .setOngoing(true) - .setColor(ContextCompat.getColor(this, R.color.tusky_blue)) + .setColor(ContextCompat.getColor(this, R.color.chinwag_green)) .addAction(0, getString(android.R.string.cancel), cancelSendingIntent(sendingNotificationId)) if (tootsToSend.size == 0 || Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { @@ -180,7 +180,7 @@ class SendTootService : Service(), Injectable { .setSmallIcon(R.drawable.ic_notify) .setContentTitle(getString(R.string.send_toot_notification_error_title)) .setContentText(getString(R.string.send_toot_notification_saved_content)) - .setColor(ContextCompat.getColor(this@SendTootService, R.color.tusky_blue)) + .setColor(ContextCompat.getColor(this@SendTootService, R.color.chinwag_green)) notificationManager.cancel(tootId) notificationManager.notify(errorNotificationId--, builder.build()) @@ -229,7 +229,7 @@ class SendTootService : Service(), Injectable { .setSmallIcon(R.drawable.ic_notify) .setContentTitle(getString(R.string.send_toot_notification_cancel_title)) .setContentText(getString(R.string.send_toot_notification_saved_content)) - .setColor(ContextCompat.getColor(this@SendTootService, R.color.tusky_blue)) + .setColor(ContextCompat.getColor(this@SendTootService, R.color.chinwag_green)) notificationManager.notify(tootId, builder.build()) diff --git a/app/src/main/res/color/compound_button_color.xml b/app/src/main/res/color/compound_button_color.xml index 8b151c70..a02dcfc3 100644 --- a/app/src/main/res/color/compound_button_color.xml +++ b/app/src/main/res/color/compound_button_color.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/color/text_input_layout_box_stroke_color.xml b/app/src/main/res/color/text_input_layout_box_stroke_color.xml index 5b21f78f..d924f1e5 100644 --- a/app/src/main/res/color/text_input_layout_box_stroke_color.xml +++ b/app/src/main/res/color/text_input_layout_box_stroke_color.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_check_circle.xml b/app/src/main/res/drawable/ic_check_circle.xml index 7ff119e7..3ae6f242 100644 --- a/app/src/main/res/drawable/ic_check_circle.xml +++ b/app/src/main/res/drawable/ic_check_circle.xml @@ -4,5 +4,5 @@ android:width="18dp" android:viewportWidth="24" android:viewportHeight="24"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_person_add_24dp.xml b/app/src/main/res/drawable/ic_person_add_24dp.xml index dc849f04..31139ae3 100644 --- a/app/src/main/res/drawable/ic_person_add_24dp.xml +++ b/app/src/main/res/drawable/ic_person_add_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.xml b/app/src/main/res/drawable/ic_play_indicator.xml index 4cdae508..986d3fc7 100644 --- a/app/src/main/res/drawable/ic_play_indicator.xml +++ b/app/src/main/res/drawable/ic_play_indicator.xml @@ -4,5 +4,5 @@ android:pathData="M21.282,12A9.282,9.282 0,0 1,12 21.282,9.282 9.282,0 0,1 2.718,12 9.282,9.282 0,0 1,12 2.718,9.282 9.282,0 0,1 21.282,12Z" android:strokeAlpha="1" android:strokeColor="#00000000" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="8"/> - + diff --git a/app/src/main/res/drawable/ic_poll_24dp.xml b/app/src/main/res/drawable/ic_poll_24dp.xml index 5e55dc5a..c68bb746 100644 --- a/app/src/main/res/drawable/ic_poll_24dp.xml +++ b/app/src/main/res/drawable/ic_poll_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_reblog_active_24dp.xml b/app/src/main/res/drawable/ic_reblog_active_24dp.xml index 8d28a400..4ceb441e 100644 --- a/app/src/main/res/drawable/ic_reblog_active_24dp.xml +++ b/app/src/main/res/drawable/ic_reblog_active_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24" android:viewportHeight="24"> diff --git a/app/src/main/res/drawable/ic_reblog_private_active_24dp.xml b/app/src/main/res/drawable/ic_reblog_private_active_24dp.xml index 43169d14..2b1cd4ea 100644 --- a/app/src/main/res/drawable/ic_reblog_private_active_24dp.xml +++ b/app/src/main/res/drawable/ic_reblog_private_active_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/report_success_background.xml b/app/src/main/res/drawable/report_success_background.xml index 147e0485..a26c30b4 100644 --- a/app/src/main/res/drawable/report_success_background.xml +++ b/app/src/main/res/drawable/report_success_background.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml index fe9f9a73..6157f74b 100644 --- a/app/src/main/res/layout/activity_account.xml +++ b/app/src/main/res/layout/activity_account.xml @@ -190,7 +190,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/account_note_saved" - android:textColor="@color/tusky_blue" + android:textColor="@color/chinwag_green" android:visibility="gone" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/accountNoteTextInputLayout" /> diff --git a/app/src/main/res/layout/card_license.xml b/app/src/main/res/layout/card_license.xml index d5b6cdaa..e2e7d0f4 100644 --- a/app/src/main/res/layout/card_license.xml +++ b/app/src/main/res/layout/card_license.xml @@ -29,7 +29,7 @@ android:id="@+id/licenseCardLink" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/tusky_blue" /> + android:textColor="@color/chinwag_green" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_announcement.xml b/app/src/main/res/layout/item_announcement.xml index 185825f1..e8b6ea5c 100644 --- a/app/src/main/res/layout/item_announcement.xml +++ b/app/src/main/res/layout/item_announcement.xml @@ -32,7 +32,7 @@ android:checkable="false" app:chipEndPadding="4dp" app:chipIcon="@drawable/ic_plus_24dp" - app:chipSurfaceColor="@color/tusky_blue" + app:chipSurfaceColor="@color/chinwag_green" app:textEndPadding="0dp" app:textStartPadding="0dp" /> diff --git a/app/src/main/res/layout/item_emoji_pref.xml b/app/src/main/res/layout/item_emoji_pref.xml index d8755a3d..cb35fe7d 100644 --- a/app/src/main/res/layout/item_emoji_pref.xml +++ b/app/src/main/res/layout/item_emoji_pref.xml @@ -76,7 +76,7 @@ android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/download_fonts" android:focusable="true" - android:tint="@color/tusky_blue" + android:tint="@color/chinwag_green" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -92,7 +92,7 @@ android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@android:string/cancel" android:focusable="true" - android:tint="@color/tusky_blue" + android:tint="@color/chinwag_green" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/item_status.xml b/app/src/main/res/layout/item_status.xml index b6c59725..9abeaf86 100644 --- a/app/src/main/res/layout/item_status.xml +++ b/app/src/main/res/layout/item_status.xml @@ -517,8 +517,8 @@ sparkbutton:activeImage="@drawable/ic_reblog_active_24dp" sparkbutton:iconSize="28dp" sparkbutton:inactiveImage="@drawable/ic_reblog_24dp" - sparkbutton:primaryColor="@color/tusky_blue" - sparkbutton:secondaryColor="@color/tusky_blue_light" /> + sparkbutton:primaryColor="@color/chinwag_green" + sparkbutton:secondaryColor="@color/chinwag_green_light" /> + sparkbutton:primaryColor="@color/chinwag_green" + sparkbutton:secondaryColor="@color/chinwag_green_light" /> + app:chipSurfaceColor="@color/chinwag_green" /> diff --git a/app/src/main/res/values-night/theme_colors.xml b/app/src/main/res/values-night/theme_colors.xml index 3e4d032c..78454a4e 100644 --- a/app/src/main/res/values-night/theme_colors.xml +++ b/app/src/main/res/values-night/theme_colors.xml @@ -1,7 +1,7 @@ - @color/tusky_grey_30 + @color/tusky_grey_10 @color/tusky_grey_25 @color/tusky_grey_20 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 3200673e..360c65b2 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -12,17 +12,17 @@ #000 - #070b14 - #16191f - #282c37 - #313543 - #444b5d - #596378 - #6e7b92 - #9baec8 - #b9c8d8 - #d9e1e8 - #f0f0ec + #070707 + #161616 + #2c2c2c + #4b4b4b + #6e6e6e + #b3b3b3 + #cacaca + #e1e1e1 + #eaeaea + #f5f5f5 + #fafafa #8c2b90d9 @@ -33,11 +33,18 @@ #121419 - @color/tusky_blue + @color/chinwag_green #9BAEC8 #8192A6 #7F90A4 #CAD4E0 #d9e1e8 + #388e3c + #508f53 + #8c388e3c + + #cecec1 + #f0f0ec + #f2f2ef diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 693c8427..8872e124 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -32,8 +32,8 @@ @@ -42,10 +42,10 @@