From 2acc6787b2ff0c4e75dcc7ecaca09f20b4248b46 Mon Sep 17 00:00:00 2001 From: Mike Date: Thu, 3 Aug 2023 21:47:47 +1000 Subject: [PATCH] Fix some object colours, splash screen --- .../compose/view/ProgressImageView.kt | 4 +- .../components/timeline/TimelineFragment.kt | 2 +- .../viewthread/ViewThreadFragment.kt | 2 +- .../res/drawable/chinwag_smalltext_splash.xml | 233 ++++++++++++++++++ app/src/main/res/drawable/ic_flag_24dp.xml | 2 +- app/src/main/res/drawable/ic_launcher.xml | 80 ------ .../main/res/drawable/ic_launcher_chinwag.xml | 41 +++ .../res/drawable/ic_launcher_chinwag_mono.xml | 41 +++ app/src/main/res/drawable/ic_splash.xml | 8 +- .../res/mipmap-anydpi-v26/ic_launcher.xml | 9 +- 10 files changed, 325 insertions(+), 97 deletions(-) create mode 100644 app/src/main/res/drawable/chinwag_smalltext_splash.xml delete mode 100644 app/src/main/res/drawable/ic_launcher.xml create mode 100644 app/src/main/res/drawable/ic_launcher_chinwag.xml create mode 100644 app/src/main/res/drawable/ic_launcher_chinwag_mono.xml diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ProgressImageView.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ProgressImageView.kt index 6678356e..2c812cae 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ProgressImageView.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/view/ProgressImageView.kt @@ -37,7 +37,7 @@ class ProgressImageView private val progressRect = RectF() private val biggerRect = RectF() private val circlePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { - color = context.getColor(R.color.tusky_blue) + color = context.getColor(R.color.chinwag_green) strokeWidth = Utils.dpToPx(context, 4).toFloat() style = Paint.Style.STROKE } @@ -69,7 +69,7 @@ class ProgressImageView fun setChecked(checked: Boolean) { markBgPaint.color = - context.getColor(if (checked) R.color.tusky_blue else R.color.tusky_grey_10) + context.getColor(if (checked) R.color.chinwag_green else R.color.tusky_grey_10) invalidate() } diff --git a/app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineFragment.kt index f8395c56..7fd49e31 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/timeline/TimelineFragment.kt @@ -322,7 +322,7 @@ class TimelineFragment : private fun setupSwipeRefreshLayout() { binding.swipeRefreshLayout.isEnabled = isSwipeToRefreshEnabled binding.swipeRefreshLayout.setOnRefreshListener(this) - binding.swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue) + binding.swipeRefreshLayout.setColorSchemeResources(R.color.chinwag_green) } private fun setupRecyclerView() { diff --git a/app/src/main/java/com/keylesspalace/tusky/components/viewthread/ViewThreadFragment.kt b/app/src/main/java/com/keylesspalace/tusky/components/viewthread/ViewThreadFragment.kt index cb361f5d..5a0e308b 100644 --- a/app/src/main/java/com/keylesspalace/tusky/components/viewthread/ViewThreadFragment.kt +++ b/app/src/main/java/com/keylesspalace/tusky/components/viewthread/ViewThreadFragment.kt @@ -127,7 +127,7 @@ class ViewThreadFragment : SFragment(), OnRefreshListener, StatusActionListener, } binding.swipeRefreshLayout.setOnRefreshListener(this) - binding.swipeRefreshLayout.setColorSchemeResources(R.color.tusky_blue) + binding.swipeRefreshLayout.setColorSchemeResources(R.color.chinwag_green) binding.recyclerView.setHasFixedSize(true) binding.recyclerView.layoutManager = LinearLayoutManager(context) diff --git a/app/src/main/res/drawable/chinwag_smalltext_splash.xml b/app/src/main/res/drawable/chinwag_smalltext_splash.xml new file mode 100644 index 00000000..a77ee6ac --- /dev/null +++ b/app/src/main/res/drawable/chinwag_smalltext_splash.xml @@ -0,0 +1,233 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_flag_24dp.xml b/app/src/main/res/drawable/ic_flag_24dp.xml index 14529c0a..d101077c 100644 --- a/app/src/main/res/drawable/ic_flag_24dp.xml +++ b/app/src/main/res/drawable/ic_flag_24dp.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" - android:tint="@color/tusky_blue"> + android:tint="@color/chinwag_green"> diff --git a/app/src/main/res/drawable/ic_launcher.xml b/app/src/main/res/drawable/ic_launcher.xml deleted file mode 100644 index 361ebe25..00000000 --- a/app/src/main/res/drawable/ic_launcher.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_chinwag.xml b/app/src/main/res/drawable/ic_launcher_chinwag.xml new file mode 100644 index 00000000..55ccb93b --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_chinwag.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_chinwag_mono.xml b/app/src/main/res/drawable/ic_launcher_chinwag_mono.xml new file mode 100644 index 00000000..675355cd --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_chinwag_mono.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_splash.xml b/app/src/main/res/drawable/ic_splash.xml index c9f4c937..1c8b25b1 100644 --- a/app/src/main/res/drawable/ic_splash.xml +++ b/app/src/main/res/drawable/ic_splash.xml @@ -3,13 +3,9 @@ android:layout_height="240dp" android:layout_width="240dp"> - + + android:drawable="@drawable/ic_launcher_chinwag" /> \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 52c036e5..f58f18d3 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,9 +1,6 @@ - - - - + + + \ No newline at end of file