Use com.vanniktech:ui library for theming Android components. (#963)

vanniktech · Mar 25, 2023 · d831e5c · d831e5c
1 parent 73d7ab6
commit d831e5c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 179 deletions.
diff --git a/emoji/api/current.txt b/emoji/api/current.txt
@@ -238,9 +238,6 @@ package com.vanniktech.emoji.internal {
     method public static inline <reified T extends android.os.Parcelable> T! parcelable(android.os.Bundle, String key);
   }
 
-  public final class ThemingKt {
-  }
-
   public final class UtilsKt {
   }
 

diff --git a/emoji/build.gradle b/emoji/build.gradle
@@ -46,6 +46,7 @@ kotlin {
         api libs.androidx.appcompat
         api libs.androidx.cardview
         api libs.androidx.recyclerview
+        api libs.ui
       }
     }
 

diff --git a/emoji/src/androidMain/kotlin/com/vanniktech/emoji/EmojiView.kt b/emoji/src/androidMain/kotlin/com/vanniktech/emoji/EmojiView.kt
@@ -37,7 +37,6 @@ import com.vanniktech.emoji.internal.EmojiVariantPopup
 import com.vanniktech.emoji.internal.RepeatListener
 import com.vanniktech.emoji.internal.emojiDrawableProvider
 import com.vanniktech.emoji.internal.hideKeyboardAndFocus
-import com.vanniktech.emoji.internal.setEdgeColor
 import com.vanniktech.emoji.internal.showKeyboardAndFocus
 import com.vanniktech.emoji.listeners.OnEmojiBackspaceClickListener
 import com.vanniktech.emoji.listeners.OnEmojiClickListener
@@ -48,6 +47,8 @@ import com.vanniktech.emoji.search.SearchEmoji
 import com.vanniktech.emoji.search.SearchEmojiManager
 import com.vanniktech.emoji.variant.VariantEmoji
 import com.vanniktech.emoji.variant.VariantEmojiManager
+import com.vanniktech.ui.Color
+import com.vanniktech.ui.themeViewPager
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 
@@ -102,7 +103,7 @@ class EmojiView @JvmOverloads constructor(
     }
     setBackgroundColor(theming.backgroundColor)
     val emojisPager: ViewPager = findViewById(R.id.emojiViewPager)
-    emojisPager.setEdgeColor(theming.secondaryColor)
+    emojisPager.themeViewPager(color = Color(theming.secondaryColor))
     val emojiDivider = findViewById<View>(R.id.emojiViewDivider)
     emojiDivider.setBackgroundColor(theming.dividerColor)
     if (pageTransformer != null) {

diff --git a/emoji/src/androidMain/kotlin/com/vanniktech/emoji/internal/EmojiSearchDialog.kt b/emoji/src/androidMain/kotlin/com/vanniktech/emoji/internal/EmojiSearchDialog.kt
@@ -19,7 +19,6 @@ package com.vanniktech.emoji.internal
 import android.app.Dialog
 import android.content.Context
 import android.content.DialogInterface
-import android.content.res.ColorStateList
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
@@ -35,7 +34,6 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.annotation.Px
 import androidx.appcompat.app.AlertDialog
-import androidx.core.view.ViewCompat
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.DiffUtil
@@ -46,6 +44,8 @@ import com.vanniktech.emoji.EmojiTheming
 import com.vanniktech.emoji.R
 import com.vanniktech.emoji.search.SearchEmoji
 import com.vanniktech.emoji.search.SearchEmojiResult
+import com.vanniktech.ui.Color
+import com.vanniktech.ui.themeEditText
 import java.util.concurrent.Executors
 import java.util.concurrent.ScheduledFuture
 import java.util.concurrent.TimeUnit
@@ -76,11 +76,11 @@ internal class EmojiSearchDialog : DialogFragment() {
 
     val editText = dialog.findViewById<EditText>(R.id.editText)!!
     editText.setTextColor(theming.textColor)
-    val secondaryColor = theming.secondaryColor
-    editText.setCursorDrawableColor(secondaryColor)
-    editText.setHandlesColor(secondaryColor)
-    editText.highlightColor = secondaryColor
-    ViewCompat.setBackgroundTintList(editText, ColorStateList.valueOf(secondaryColor))
+    editText.themeEditText(
+      color = Color(theming.secondaryColor),
+      colorText = Color(theming.textColor),
+      colorTextSecondary = Color(theming.textSecondaryColor),
+    )
 
     val recyclerView = dialog.findViewById<MaxHeightSearchRecyclerView>(R.id.recyclerView)
     val adapter = EmojiAdapter(

diff --git a/emoji/src/androidMain/kotlin/com/vanniktech/emoji/internal/Theming.kt b/emoji/src/androidMain/kotlin/com/vanniktech/emoji/internal/Theming.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -34,6 +34,7 @@ plugin-publish = { module = "com.vanniktech:gradle-maven-publish-plugin", versio
 robolectric = { module = "org.robolectric:robolectric", version = "4.9.2" }
 screengrab = { module = "tools.fastlane:screengrab", version = "2.1.1" }
 timber = { module = "com.jakewharton.timber:timber", version = "5.0.1" }
+ui = { module = "com.vanniktech:ui", version = "0.5.0" }
 
 [plugins]
 codequalitytools = { id = "com.vanniktech.code.quality.tools", version = "0.22.0" }
-Original file line number
+Diff line change
@@ Expand Up / @@ -238,9 +238,6 @@ package com.vanniktech.emoji.internal { @@
         method public static inline <reified T extends android.os.Parcelable> T! parcelable(android.os.Bundle, String key);
       }
-      public final class ThemingKt {
-      }
       public final class UtilsKt {
       }
@@ Expand Down @@