Breaking: Use EmojiCategory#categoryNames Map<String, String> instead…

… of Android Resource for proper Multiplatform support.
vanniktech · May 26, 2022 · 42e4ab1 · 42e4ab1
1 parent 4df7ea4
commit 42e4ab1
Show file tree

Hide file tree

Showing 60 changed files with 265 additions and 283 deletions.
diff --git a/...ebook/src/androidMain/kotlin/com/vanniktech/emoji/facebook/category/ActivitiesCategory.kt b/...ebook/src/androidMain/kotlin/com/vanniktech/emoji/facebook/category/ActivitiesCategory.kt
@@ -17,7 +17,6 @@
 package com.vanniktech.emoji.facebook.category
 
 import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
 import com.vanniktech.emoji.EmojiAndroidCategory
 import com.vanniktech.emoji.EmojiCategory
 import com.vanniktech.emoji.facebook.FacebookEmoji
@@ -26,8 +25,11 @@ internal class ActivitiesCategory : EmojiCategory, EmojiAndroidCategory {
   @get:DrawableRes override val icon: Int
     get() = com.vanniktech.emoji.facebook.R.drawable.emoji_facebook_category_activities
 
-  @get:StringRes override val categoryName: Int
-    get() = com.vanniktech.emoji.facebook.R.string.emoji_facebook_category_activities
+  override val categoryNames: Map<String, String>
+    get() = mapOf(
+      "en" to "Activities",
+      "de" to "Aktivitäten",
+    )
 
   override val emojis = ALL_EMOJIS
 

diff --git a/...src/androidMain/kotlin/com/vanniktech/emoji/facebook/category/AnimalsAndNatureCategory.kt b/...src/androidMain/kotlin/com/vanniktech/emoji/facebook/category/AnimalsAndNatureCategory.kt
@@ -17,7 +17,6 @@
 package com.vanniktech.emoji.facebook.category
 
 import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
 import com.vanniktech.emoji.EmojiAndroidCategory
 import com.vanniktech.emoji.EmojiCategory
 import com.vanniktech.emoji.facebook.FacebookEmoji
@@ -26,8 +25,11 @@ internal class AnimalsAndNatureCategory : EmojiCategory, EmojiAndroidCategory {
   @get:DrawableRes override val icon: Int
     get() = com.vanniktech.emoji.facebook.R.drawable.emoji_facebook_category_animalsandnature
 
-  @get:StringRes override val categoryName: Int
-    get() = com.vanniktech.emoji.facebook.R.string.emoji_facebook_category_animalsandnature
+  override val categoryNames: Map<String, String>
+    get() = mapOf(
+      "en" to "Nature",
+      "de" to "Natur",
+    )
 
   override val emojis = ALL_EMOJIS
 

diff --git a/...i-facebook/src/androidMain/kotlin/com/vanniktech/emoji/facebook/category/FlagsCategory.kt b/...i-facebook/src/androidMain/kotlin/com/vanniktech/emoji/facebook/category/FlagsCategory.kt
@@ -17,7 +17,6 @@
 package com.vanniktech.emoji.facebook.category
 
 import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
 import com.vanniktech.emoji.EmojiAndroidCategory
 import com.vanniktech.emoji.EmojiCategory
 import com.vanniktech.emoji.facebook.FacebookEmoji
@@ -26,8 +25,11 @@ internal class FlagsCategory : EmojiCategory, EmojiAndroidCategory {
   @get:DrawableRes override val icon: Int
     get() = com.vanniktech.emoji.facebook.R.drawable.emoji_facebook_category_flags
 
-  @get:StringRes override val categoryName: Int
-    get() = com.vanniktech.emoji.facebook.R.string.emoji_facebook_category_flags
+  override val categoryNames: Map<String, String>
+    get() = mapOf(
+      "en" to "Flags",
+      "de" to "Flaggen",
+    )
 
   override val emojis = ALL_EMOJIS
 

diff --git a/...ook/src/androidMain/kotlin/com/vanniktech/emoji/facebook/category/FoodAndDrinkCategory.kt b/...ook/src/androidMain/kotlin/com/vanniktech/emoji/facebook/category/FoodAndDrinkCategory.kt
@@ -17,7 +17,6 @@
 package com.vanniktech.emoji.facebook.category
 
 import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
 import com.vanniktech.emoji.EmojiAndroidCategory
 import com.vanniktech.emoji.EmojiCategory
 import com.vanniktech.emoji.facebook.FacebookEmoji
@@ -26,8 +25,11 @@ internal class FoodAndDrinkCategory : EmojiCategory, EmojiAndroidCategory {
   @get:DrawableRes override val icon: Int
     get() = com.vanniktech.emoji.facebook.R.drawable.emoji_facebook_category_foodanddrink
 
-  @get:StringRes override val categoryName: Int
-    get() = com.vanniktech.emoji.facebook.R.string.emoji_facebook_category_foodanddrink
+  override val categoryNames: Map<String, String>
+    get() = mapOf(
+      "en" to "Food",
+      "de" to "Essen",
+    )
 
   override val emojis = ALL_EMOJIS
 

diff --git a/...facebook/src/androidMain/kotlin/com/vanniktech/emoji/facebook/category/ObjectsCategory.kt b/...facebook/src/androidMain/kotlin/com/vanniktech/emoji/facebook/category/ObjectsCategory.kt
@@ -17,7 +17,6 @@
 package com.vanniktech.emoji.facebook.category
 
 import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
 import com.vanniktech.emoji.EmojiAndroidCategory
 import com.vanniktech.emoji.EmojiCategory
 import com.vanniktech.emoji.facebook.FacebookEmoji
@@ -26,8 +25,11 @@ internal class ObjectsCategory : EmojiCategory, EmojiAndroidCategory {
   @get:DrawableRes override val icon: Int
     get() = com.vanniktech.emoji.facebook.R.drawable.emoji_facebook_category_objects
 
-  @get:StringRes override val categoryName: Int
-    get() = com.vanniktech.emoji.facebook.R.string.emoji_facebook_category_objects
+  override val categoryNames: Map<String, String>
+    get() = mapOf(
+      "en" to "Objects",
+      "de" to "Objekte",
+    )
 
   override val emojis = ALL_EMOJIS
 

diff --git a/...src/androidMain/kotlin/com/vanniktech/emoji/facebook/category/SmileysAndPeopleCategory.kt b/...src/androidMain/kotlin/com/vanniktech/emoji/facebook/category/SmileysAndPeopleCategory.kt
@@ -17,7 +17,6 @@
 package com.vanniktech.emoji.facebook.category
 
 import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
 import com.vanniktech.emoji.EmojiAndroidCategory
 import com.vanniktech.emoji.EmojiCategory
 import com.vanniktech.emoji.facebook.FacebookEmoji
@@ -26,8 +25,11 @@ internal class SmileysAndPeopleCategory : EmojiCategory, EmojiAndroidCategory {
   @get:DrawableRes override val icon: Int
     get() = com.vanniktech.emoji.facebook.R.drawable.emoji_facebook_category_smileysandpeople
 
-  @get:StringRes override val categoryName: Int
-    get() = com.vanniktech.emoji.facebook.R.string.emoji_facebook_category_smileysandpeople
+  override val categoryNames: Map<String, String>
+    get() = mapOf(
+      "en" to "Faces",
+      "de" to "Gesichter",
+    )
 
   override val emojis = ALL_EMOJIS
 

diff --git a/...facebook/src/androidMain/kotlin/com/vanniktech/emoji/facebook/category/SymbolsCategory.kt b/...facebook/src/androidMain/kotlin/com/vanniktech/emoji/facebook/category/SymbolsCategory.kt
@@ -17,7 +17,6 @@
 package com.vanniktech.emoji.facebook.category
 
 import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
 import com.vanniktech.emoji.EmojiAndroidCategory
 import com.vanniktech.emoji.EmojiCategory
 import com.vanniktech.emoji.facebook.FacebookEmoji
@@ -26,8 +25,11 @@ internal class SymbolsCategory : EmojiCategory, EmojiAndroidCategory {
   @get:DrawableRes override val icon: Int
     get() = com.vanniktech.emoji.facebook.R.drawable.emoji_facebook_category_symbols
 
-  @get:StringRes override val categoryName: Int
-    get() = com.vanniktech.emoji.facebook.R.string.emoji_facebook_category_symbols
+  override val categoryNames: Map<String, String>
+    get() = mapOf(
+      "en" to "Symbols",
+      "de" to "Symbole",
+    )
 
   override val emojis = ALL_EMOJIS
 

diff --git a/.../src/androidMain/kotlin/com/vanniktech/emoji/facebook/category/TravelAndPlacesCategory.kt b/.../src/androidMain/kotlin/com/vanniktech/emoji/facebook/category/TravelAndPlacesCategory.kt
@@ -17,7 +17,6 @@
 package com.vanniktech.emoji.facebook.category
 
 import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
 import com.vanniktech.emoji.EmojiAndroidCategory
 import com.vanniktech.emoji.EmojiCategory
 import com.vanniktech.emoji.facebook.FacebookEmoji
@@ -26,8 +25,11 @@ internal class TravelAndPlacesCategory : EmojiCategory, EmojiAndroidCategory {
   @get:DrawableRes override val icon: Int
     get() = com.vanniktech.emoji.facebook.R.drawable.emoji_facebook_category_travelandplaces
 
-  @get:StringRes override val categoryName: Int
-    get() = com.vanniktech.emoji.facebook.R.string.emoji_facebook_category_travelandplaces
+  override val categoryNames: Map<String, String>
+    get() = mapOf(
+      "en" to "Places",
+      "de" to "Orte",
+    )
 
   override val emojis = ALL_EMOJIS
 

diff --git a/emoji-facebook/src/androidMain/res/values-de/strings.xml b/emoji-facebook/src/androidMain/res/values-de/strings.xml
diff --git a/emoji-facebook/src/androidMain/res/values/strings.xml b/emoji-facebook/src/androidMain/res/values/strings.xml
diff --git a/...t/src/androidMain/kotlin/com/vanniktech/emoji/googlecompat/category/ActivitiesCategory.kt b/...t/src/androidMain/kotlin/com/vanniktech/emoji/googlecompat/category/ActivitiesCategory.kt
@@ -17,7 +17,6 @@
 package com.vanniktech.emoji.googlecompat.category
 
 import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
 import com.vanniktech.emoji.EmojiAndroidCategory
 import com.vanniktech.emoji.EmojiCategory
 import com.vanniktech.emoji.googlecompat.GoogleCompatEmoji
@@ -26,8 +25,11 @@ internal class ActivitiesCategory : EmojiCategory, EmojiAndroidCategory {
   @get:DrawableRes override val icon: Int
     get() = com.vanniktech.emoji.googlecompat.R.drawable.emoji_googlecompat_category_activities
 
-  @get:StringRes override val categoryName: Int
-    get() = com.vanniktech.emoji.googlecompat.R.string.emoji_googlecompat_category_activities
+  override val categoryNames: Map<String, String>
+    get() = mapOf(
+      "en" to "Activities",
+      "de" to "Aktivitäten",
+    )
 
   override val emojis = ALL_EMOJIS
 

diff --git a/...androidMain/kotlin/com/vanniktech/emoji/googlecompat/category/AnimalsAndNatureCategory.kt b/...androidMain/kotlin/com/vanniktech/emoji/googlecompat/category/AnimalsAndNatureCategory.kt
@@ -17,7 +17,6 @@
 package com.vanniktech.emoji.googlecompat.category
 
 import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
 import com.vanniktech.emoji.EmojiAndroidCategory
 import com.vanniktech.emoji.EmojiCategory
 import com.vanniktech.emoji.googlecompat.GoogleCompatEmoji
@@ -26,8 +25,11 @@ internal class AnimalsAndNatureCategory : EmojiCategory, EmojiAndroidCategory {
   @get:DrawableRes override val icon: Int
     get() = com.vanniktech.emoji.googlecompat.R.drawable.emoji_googlecompat_category_animalsandnature
 
-  @get:StringRes override val categoryName: Int
-    get() = com.vanniktech.emoji.googlecompat.R.string.emoji_googlecompat_category_animalsandnature
+  override val categoryNames: Map<String, String>
+    get() = mapOf(
+      "en" to "Nature",
+      "de" to "Natur",
+    )
 
   override val emojis = ALL_EMOJIS
 

diff --git a/...compat/src/androidMain/kotlin/com/vanniktech/emoji/googlecompat/category/FlagsCategory.kt b/...compat/src/androidMain/kotlin/com/vanniktech/emoji/googlecompat/category/FlagsCategory.kt
@@ -17,7 +17,6 @@
 package com.vanniktech.emoji.googlecompat.category
 
 import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
 import com.vanniktech.emoji.EmojiAndroidCategory
 import com.vanniktech.emoji.EmojiCategory
 import com.vanniktech.emoji.googlecompat.GoogleCompatEmoji
@@ -26,8 +25,11 @@ internal class FlagsCategory : EmojiCategory, EmojiAndroidCategory {
   @get:DrawableRes override val icon: Int
     get() = com.vanniktech.emoji.googlecompat.R.drawable.emoji_googlecompat_category_flags
 
-  @get:StringRes override val categoryName: Int
-    get() = com.vanniktech.emoji.googlecompat.R.string.emoji_googlecompat_category_flags
+  override val categoryNames: Map<String, String>
+    get() = mapOf(
+      "en" to "Flags",
+      "de" to "Flaggen",
+    )
 
   override val emojis = ALL_EMOJIS
 

diff --git a/...src/androidMain/kotlin/com/vanniktech/emoji/googlecompat/category/FoodAndDrinkCategory.kt b/...src/androidMain/kotlin/com/vanniktech/emoji/googlecompat/category/FoodAndDrinkCategory.kt
@@ -17,7 +17,6 @@
 package com.vanniktech.emoji.googlecompat.category
 
 import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
 import com.vanniktech.emoji.EmojiAndroidCategory
 import com.vanniktech.emoji.EmojiCategory
 import com.vanniktech.emoji.googlecompat.GoogleCompatEmoji
@@ -26,8 +25,11 @@ internal class FoodAndDrinkCategory : EmojiCategory, EmojiAndroidCategory {
   @get:DrawableRes override val icon: Int
     get() = com.vanniktech.emoji.googlecompat.R.drawable.emoji_googlecompat_category_foodanddrink
 
-  @get:StringRes override val categoryName: Int
-    get() = com.vanniktech.emoji.googlecompat.R.string.emoji_googlecompat_category_foodanddrink
+  override val categoryNames: Map<String, String>
+    get() = mapOf(
+      "en" to "Food",
+      "de" to "Essen",
+    )
 
   override val emojis = ALL_EMOJIS
 

diff --git a/...mpat/src/androidMain/kotlin/com/vanniktech/emoji/googlecompat/category/ObjectsCategory.kt b/...mpat/src/androidMain/kotlin/com/vanniktech/emoji/googlecompat/category/ObjectsCategory.kt
@@ -17,7 +17,6 @@
 package com.vanniktech.emoji.googlecompat.category
 
 import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
 import com.vanniktech.emoji.EmojiAndroidCategory
 import com.vanniktech.emoji.EmojiCategory
 import com.vanniktech.emoji.googlecompat.GoogleCompatEmoji
@@ -26,8 +25,11 @@ internal class ObjectsCategory : EmojiCategory, EmojiAndroidCategory {
   @get:DrawableRes override val icon: Int
     get() = com.vanniktech.emoji.googlecompat.R.drawable.emoji_googlecompat_category_objects
 
-  @get:StringRes override val categoryName: Int
-    get() = com.vanniktech.emoji.googlecompat.R.string.emoji_googlecompat_category_objects
+  override val categoryNames: Map<String, String>
+    get() = mapOf(
+      "en" to "Objects",
+      "de" to "Objekte",
+    )
 
   override val emojis = ALL_EMOJIS
 

diff --git a/...androidMain/kotlin/com/vanniktech/emoji/googlecompat/category/SmileysAndPeopleCategory.kt b/...androidMain/kotlin/com/vanniktech/emoji/googlecompat/category/SmileysAndPeopleCategory.kt
@@ -17,7 +17,6 @@
 package com.vanniktech.emoji.googlecompat.category
 
 import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
 import com.vanniktech.emoji.EmojiAndroidCategory
 import com.vanniktech.emoji.EmojiCategory
 import com.vanniktech.emoji.googlecompat.GoogleCompatEmoji
@@ -26,8 +25,11 @@ internal class SmileysAndPeopleCategory : EmojiCategory, EmojiAndroidCategory {
   @get:DrawableRes override val icon: Int
     get() = com.vanniktech.emoji.googlecompat.R.drawable.emoji_googlecompat_category_smileysandpeople
 
-  @get:StringRes override val categoryName: Int
-    get() = com.vanniktech.emoji.googlecompat.R.string.emoji_googlecompat_category_smileysandpeople
+  override val categoryNames: Map<String, String>
+    get() = mapOf(
+      "en" to "Faces",
+      "de" to "Gesichter",
+    )
 
   override val emojis = ALL_EMOJIS
 

diff --git a/...mpat/src/androidMain/kotlin/com/vanniktech/emoji/googlecompat/category/SymbolsCategory.kt b/...mpat/src/androidMain/kotlin/com/vanniktech/emoji/googlecompat/category/SymbolsCategory.kt
@@ -17,7 +17,6 @@
 package com.vanniktech.emoji.googlecompat.category
 
 import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
 import com.vanniktech.emoji.EmojiAndroidCategory
 import com.vanniktech.emoji.EmojiCategory
 import com.vanniktech.emoji.googlecompat.GoogleCompatEmoji
@@ -26,8 +25,11 @@ internal class SymbolsCategory : EmojiCategory, EmojiAndroidCategory {
   @get:DrawableRes override val icon: Int
     get() = com.vanniktech.emoji.googlecompat.R.drawable.emoji_googlecompat_category_symbols
 
-  @get:StringRes override val categoryName: Int
-    get() = com.vanniktech.emoji.googlecompat.R.string.emoji_googlecompat_category_symbols
+  override val categoryNames: Map<String, String>
+    get() = mapOf(
+      "en" to "Symbols",
+      "de" to "Symbole",
+    )
 
   override val emojis = ALL_EMOJIS
 

diff --git a/.../androidMain/kotlin/com/vanniktech/emoji/googlecompat/category/TravelAndPlacesCategory.kt b/.../androidMain/kotlin/com/vanniktech/emoji/googlecompat/category/TravelAndPlacesCategory.kt
@@ -17,7 +17,6 @@
 package com.vanniktech.emoji.googlecompat.category
 
 import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
 import com.vanniktech.emoji.EmojiAndroidCategory
 import com.vanniktech.emoji.EmojiCategory
 import com.vanniktech.emoji.googlecompat.GoogleCompatEmoji
@@ -26,8 +25,11 @@ internal class TravelAndPlacesCategory : EmojiCategory, EmojiAndroidCategory {
   @get:DrawableRes override val icon: Int
     get() = com.vanniktech.emoji.googlecompat.R.drawable.emoji_googlecompat_category_travelandplaces
 
-  @get:StringRes override val categoryName: Int
-    get() = com.vanniktech.emoji.googlecompat.R.string.emoji_googlecompat_category_travelandplaces
+  override val categoryNames: Map<String, String>
+    get() = mapOf(
+      "en" to "Places",
+      "de" to "Orte",
+    )
 
   override val emojis = ALL_EMOJIS
 

diff --git a/emoji-google-compat/src/androidMain/res/values-de/strings.xml b/emoji-google-compat/src/androidMain/res/values-de/strings.xml
diff --git a/emoji-google-compat/src/androidMain/res/values/strings.xml b/emoji-google-compat/src/androidMain/res/values/strings.xml