diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e696dee..4589be08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,11 @@ # Changelog +### v3.18.0 (Jun 20, 2024) with Chat SDK `v4.16.4` +* Updated dependencies + * update compileSdkVersion to 34 + * [Gradle Plugin] Gradle 8.6 + * [Gradle Plugin] Android Gradle Plugin 8.4.1 +* Deprecated `enableReactionsSupergroup(Boolean)` in `ChannelConfig`, which is not allowed by default. If you wish to use this feature, [contact us](https://dashboard.sendbird.com/settings/contact_us?category=feedback_and_feature_requests&product=UIKit&subject=%5BFeature%20Request%5D%20Enable%20reactions%20for%20supergroup%20in%20UIKit). +* Added a new set of `color` resources for UIKit. ### v3.17.1 (Jun 7, 2024) with Chat SDK `v4.16.4` * Fixed an intermittent crash due to variable initialization when entering a notification channel. * Optimized ChatBot streaming message animation.### v3.17.0 (May 23, 2024) with Chat SDK `v4.16.3` diff --git a/build.gradle b/build.gradle index 0e2a004d..83c8202e 100644 --- a/build.gradle +++ b/build.gradle @@ -8,8 +8,8 @@ buildscript { } } plugins { - id 'com.android.application' version '7.4.2' apply false - id 'com.android.library' version '7.4.2' apply false + id 'com.android.application' version '8.4.1' apply false + id 'com.android.library' version '8.4.1' apply false id 'org.jetbrains.kotlin.android' version "$kotlin_version" apply false id 'com.google.gms.google-services' version '4.3.15' apply false } diff --git a/gradle.properties b/gradle.properties index 3006f32e..a18ed14a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,5 +16,11 @@ org.gradle.jvmargs=-Xmx1536m # https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true -UIKIT_VERSION = 3.17.1 +# for backwards compatibility +# (https://developer.android.com/build/releases/past-releases/agp-8-0-0-release-notes?hl=en#default-changes) +android.nonTransitiveRClass=false +android.nonFinalResIds=false +android.enableR8.fullMode=false + +UIKIT_VERSION = 3.18.0 UIKIT_VERSION_CODE = 1 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e845d47e..a09cf491 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Mon May 02 15:36:41 KST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/uikit-samples/build.gradle b/uikit-samples/build.gradle index 3079f5d2..7a0681e2 100644 --- a/uikit-samples/build.gradle +++ b/uikit-samples/build.gradle @@ -7,12 +7,12 @@ plugins { version = UIKIT_VERSION android { namespace 'com.sendbird.uikit.samples' - compileSdk 33 + compileSdk 34 defaultConfig { applicationId "com.sendbird.uikit.samples" minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode 1 versionName UIKIT_VERSION multiDexEnabled true @@ -29,6 +29,7 @@ android { } buildFeatures { viewBinding true + buildConfig = true } } diff --git a/uikit-samples/src/main/AndroidManifest.xml b/uikit-samples/src/main/AndroidManifest.xml index b68a2d75..8415c6fe 100644 --- a/uikit-samples/src/main/AndroidManifest.xml +++ b/uikit-samples/src/main/AndroidManifest.xml @@ -91,7 +91,7 @@ android:resource="@drawable/icon_push_lollipop" /> + android:resource="@color/primary_main" /> diff --git a/uikit-samples/src/main/java/com/sendbird/uikit/samples/aichatbot/AIChatBotHomeActivity.kt b/uikit-samples/src/main/java/com/sendbird/uikit/samples/aichatbot/AIChatBotHomeActivity.kt index cf6b7150..47e076c1 100644 --- a/uikit-samples/src/main/java/com/sendbird/uikit/samples/aichatbot/AIChatBotHomeActivity.kt +++ b/uikit-samples/src/main/java/com/sendbird/uikit/samples/aichatbot/AIChatBotHomeActivity.kt @@ -5,6 +5,7 @@ import com.sendbird.uikit.SendbirdUIKit import com.sendbird.uikit.samples.R import com.sendbird.uikit.samples.common.ThemeHomeActivity import com.sendbird.uikit.samples.common.extensions.logout +import com.sendbird.uikit.samples.common.extensions.setTextColorResource import com.sendbird.uikit.samples.common.preferences.PreferenceUtils import com.sendbird.uikit.samples.common.widgets.WaitingDialog import com.sendbird.uikit.samples.databinding.ActivityAiChatbotHomeBinding @@ -20,6 +21,7 @@ class AIChatBotHomeActivity : ThemeHomeActivity() { override fun applyTheme() { super.applyTheme() + binding.mainTitle.setTextColorResource(if (isDarkTheme) R.color.ondark_text_high_emphasis else R.color.onlight_text_high_emphasis) binding.btSignOut.setBackgroundResource( if (isDarkTheme) R.drawable.selector_home_signout_button_dark else R.drawable.selector_home_signout_button diff --git a/uikit-samples/src/main/java/com/sendbird/uikit/samples/basic/BasicHomeActivity.kt b/uikit-samples/src/main/java/com/sendbird/uikit/samples/basic/BasicHomeActivity.kt index bff20306..7c4e5cf6 100644 --- a/uikit-samples/src/main/java/com/sendbird/uikit/samples/basic/BasicHomeActivity.kt +++ b/uikit-samples/src/main/java/com/sendbird/uikit/samples/basic/BasicHomeActivity.kt @@ -66,7 +66,7 @@ class BasicHomeActivity : ThemeHomeActivity() { override fun applyTheme() { super.applyTheme() - binding.mainTitle.setTextColorResource(if (isDarkTheme) R.color.ondark_01 else R.color.onlight_01) + binding.mainTitle.setTextColorResource(if (isDarkTheme) R.color.ondark_text_high_emphasis else R.color.onlight_text_high_emphasis) binding.btSignOut.setBackgroundResource( if (isDarkTheme) R.drawable.selector_home_signout_button_dark else R.drawable.selector_home_signout_button @@ -133,7 +133,7 @@ class BasicHomeActivity : ThemeHomeActivity() { val dialog = builder.create() dialog.show() dialog.getButton(AlertDialog.BUTTON_POSITIVE) - .setTextColor(ContextCompat.getColor(this, com.sendbird.uikit.R.color.secondary_300)) + .setTextColor(ContextCompat.getColor(this, com.sendbird.uikit.R.color.secondary_main)) } companion object { diff --git a/uikit-samples/src/main/java/com/sendbird/uikit/samples/basic/openchannel/OpenChannelMainActivity.kt b/uikit-samples/src/main/java/com/sendbird/uikit/samples/basic/openchannel/OpenChannelMainActivity.kt index ce76e163..64db2fe3 100644 --- a/uikit-samples/src/main/java/com/sendbird/uikit/samples/basic/openchannel/OpenChannelMainActivity.kt +++ b/uikit-samples/src/main/java/com/sendbird/uikit/samples/basic/openchannel/OpenChannelMainActivity.kt @@ -37,12 +37,12 @@ class OpenChannelMainActivity : AppCompatActivity() { titleBar.setBackgroundResource(if (isDarkMode) R.color.background_500 else R.color.background_50) titleBar.setTitleTextColor( ResourcesCompat.getColor( - resources, if (isDarkMode) R.color.ondark_01 else R.color.onlight_01, null + resources, if (isDarkMode) R.color.ondark_text_high_emphasis else R.color.onlight_text_high_emphasis, null ) ) description.setTextColor( ResourcesCompat.getColor( - resources, if (isDarkMode) R.color.ondark_02 else R.color.onlight_02, null + resources, if (isDarkMode) R.color.ondark_text_mid_emphasis else R.color.onlight_text_mid_emphasis, null ) ) setSupportActionBar(titleBar) diff --git a/uikit-samples/src/main/java/com/sendbird/uikit/samples/basic/openchannel/livestream/LiveStreamListAdapter.kt b/uikit-samples/src/main/java/com/sendbird/uikit/samples/basic/openchannel/livestream/LiveStreamListAdapter.kt index 2e16613a..038726b2 100644 --- a/uikit-samples/src/main/java/com/sendbird/uikit/samples/basic/openchannel/livestream/LiveStreamListAdapter.kt +++ b/uikit-samples/src/main/java/com/sendbird/uikit/samples/basic/openchannel/livestream/LiveStreamListAdapter.kt @@ -35,9 +35,9 @@ class LiveStreamListAdapter : OpenChannelListAdapter() { with(binding) { val isDark = PreferenceUtils.themeMode.isUsingDarkTheme() background.setBackgroundResource(if (isDark) R.drawable.selector_list_background_dark else R.drawable.selector_list_background_light) - tvLiveTitle.setTextColorResource(if (isDark) R.color.ondark_01 else R.color.onlight_01) - tvCreator.setTextColorResource(if (isDark) R.color.ondark_02 else R.color.onlight_02) - tvBadge.setTextColorResource(if (isDark) R.color.ondark_02 else R.color.onlight_02) + tvLiveTitle.setTextColorResource(if (isDark) R.color.ondark_text_high_emphasis else R.color.onlight_text_high_emphasis) + tvCreator.setTextColorResource(if (isDark) R.color.ondark_text_mid_emphasis else R.color.onlight_text_mid_emphasis) + tvBadge.setTextColorResource(if (isDark) R.color.ondark_text_mid_emphasis else R.color.onlight_text_mid_emphasis) tvBadge.setBackgroundResource(if (isDark) R.drawable.shape_live_badge_dark else R.drawable.shape_live_badge_light) } } @@ -68,7 +68,7 @@ class LiveStreamListAdapter : OpenChannelListAdapter() { .diskCacheStrategy(DiskCacheStrategy.ALL) .error(R.color.background_600) .into(ivLiveThumbnail) - val iconTint = if (SendbirdUIKit.isDarkMode()) R.color.onlight_01 else R.color.ondark_01 + val iconTint = if (SendbirdUIKit.isDarkMode()) R.color.onlight_text_high_emphasis else R.color.ondark_text_high_emphasis val backgroundTint = if (SendbirdUIKit.isDarkMode()) R.color.background_400 else R.color.background_300 val errorIcon = context.createOvalIcon(backgroundTint, R.drawable.icon_channels, iconTint) diff --git a/uikit-samples/src/main/java/com/sendbird/uikit/samples/common/SampleSettingsFragment.kt b/uikit-samples/src/main/java/com/sendbird/uikit/samples/common/SampleSettingsFragment.kt index 20a08e48..a9e591f9 100644 --- a/uikit-samples/src/main/java/com/sendbird/uikit/samples/common/SampleSettingsFragment.kt +++ b/uikit-samples/src/main/java/com/sendbird/uikit/samples/common/SampleSettingsFragment.kt @@ -130,7 +130,7 @@ class SampleSettingsFragment : Fragment() { text.setTextColor( ResourcesCompat.getColor( resources, - if (isDark) R.color.primary_200 else R.color.primary_300, + if (isDark) R.color.primary_light else R.color.primary_main, null ) ) @@ -194,7 +194,7 @@ class SampleSettingsFragment : Fragment() { val dialog = builder.create() dialog.show() dialog.getButton(AlertDialog.BUTTON_POSITIVE) - .setTextColor(ContextCompat.getColor(requireContext(), com.sendbird.uikit.R.color.secondary_300)) + .setTextColor(ContextCompat.getColor(requireContext(), com.sendbird.uikit.R.color.secondary_main)) } private fun initPage() { @@ -208,7 +208,7 @@ class SampleSettingsFragment : Fragment() { tvNickname.setTextColor( ResourcesCompat.getColor( resources, - if (isDarkTheme) R.color.ondark_01 else R.color.onlight_01, + if (isDarkTheme) R.color.ondark_text_high_emphasis else R.color.onlight_text_high_emphasis, null ) ) @@ -216,14 +216,14 @@ class SampleSettingsFragment : Fragment() { tvUserIdBadge.setTextColor( ResourcesCompat.getColor( resources, - if (isDarkTheme) R.color.ondark_02 else R.color.onlight_02, + if (isDarkTheme) R.color.ondark_text_mid_emphasis else R.color.onlight_text_mid_emphasis, null ) ) tvUserId.setTextColor( ResourcesCompat.getColor( resources, - if (isDarkTheme) R.color.ondark_01 else R.color.onlight_01, + if (isDarkTheme) R.color.ondark_text_high_emphasis else R.color.onlight_text_high_emphasis, null ) ) @@ -232,7 +232,7 @@ class SampleSettingsFragment : Fragment() { tvDarkThemeName.setTextColor( ResourcesCompat.getColor( resources, - if (isDarkTheme) R.color.ondark_01 else R.color.onlight_01, + if (isDarkTheme) R.color.ondark_text_high_emphasis else R.color.onlight_text_high_emphasis, null ) ) @@ -241,7 +241,7 @@ class SampleSettingsFragment : Fragment() { tvDisturbName.setTextColor( ResourcesCompat.getColor( resources, - if (isDarkTheme) R.color.ondark_01 else R.color.onlight_01, + if (isDarkTheme) R.color.ondark_text_high_emphasis else R.color.onlight_text_high_emphasis, null ) ) @@ -250,7 +250,7 @@ class SampleSettingsFragment : Fragment() { tvHomeName.setTextColor( ResourcesCompat.getColor( resources, - if (isDarkTheme) R.color.ondark_01 else R.color.onlight_01, + if (isDarkTheme) R.color.ondark_text_high_emphasis else R.color.onlight_text_high_emphasis, null ) ) @@ -300,7 +300,7 @@ class SampleSettingsFragment : Fragment() { Logger.d("++ dark theme clicked") updateDarkTheme() } - val disturbBackgroundTint = if (SendbirdUIKit.isDarkMode()) R.color.secondary_200 else R.color.secondary_300 + val disturbBackgroundTint = if (SendbirdUIKit.isDarkMode()) R.color.secondary_light else R.color.secondary_main binding.ivDisturbIcon.setImageDrawable( requireContext().getDrawable(R.drawable.icon_notifications_filled, iconTint) ) diff --git a/uikit-samples/src/main/java/com/sendbird/uikit/samples/common/SelectServiceActivity.kt b/uikit-samples/src/main/java/com/sendbird/uikit/samples/common/SelectServiceActivity.kt index 7a569448..2e55b652 100644 --- a/uikit-samples/src/main/java/com/sendbird/uikit/samples/common/SelectServiceActivity.kt +++ b/uikit-samples/src/main/java/com/sendbird/uikit/samples/common/SelectServiceActivity.kt @@ -72,6 +72,6 @@ class SelectServiceActivity : AppCompatActivity() { val dialog = builder.create() dialog.show() dialog.getButton(AlertDialog.BUTTON_POSITIVE) - .setTextColor(ContextCompat.getColor(this@SelectServiceActivity, com.sendbird.uikit.R.color.secondary_300)) + .setTextColor(ContextCompat.getColor(this@SelectServiceActivity, com.sendbird.uikit.R.color.secondary_main)) } } diff --git a/uikit-samples/src/main/java/com/sendbird/uikit/samples/common/fcm/MyFirebaseMessagingService.kt b/uikit-samples/src/main/java/com/sendbird/uikit/samples/common/fcm/MyFirebaseMessagingService.kt index 0d20b762..1b412042 100644 --- a/uikit-samples/src/main/java/com/sendbird/uikit/samples/common/fcm/MyFirebaseMessagingService.kt +++ b/uikit-samples/src/main/java/com/sendbird/uikit/samples/common/fcm/MyFirebaseMessagingService.kt @@ -118,7 +118,7 @@ class MyFirebaseMessagingService : SendbirdPushHandler() { val defaultSoundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION) val notificationBuilder = NotificationCompat.Builder(context, channelId) .setSmallIcon(R.drawable.icon_push_lollipop) - .setColor(ContextCompat.getColor(context, R.color.primary_300)) // small icon background color + .setColor(ContextCompat.getColor(context, R.color.primary_main)) // small icon background color .setLargeIcon(BitmapFactory.decodeResource(context.resources, R.drawable.icon_push_oreo)) .setContentTitle(pushTitle) .setAutoCancel(true) diff --git a/uikit-samples/src/main/java/com/sendbird/uikit/samples/notification/FeedChannelListFragment.kt b/uikit-samples/src/main/java/com/sendbird/uikit/samples/notification/FeedChannelListFragment.kt index 5717c282..8966bc49 100644 --- a/uikit-samples/src/main/java/com/sendbird/uikit/samples/notification/FeedChannelListFragment.kt +++ b/uikit-samples/src/main/java/com/sendbird/uikit/samples/notification/FeedChannelListFragment.kt @@ -36,7 +36,7 @@ class FeedChannelListFragment : Fragment() { SendbirdChat.appInfo?.notificationInfo?.feedChannels?.let { feedChannels -> val background = if (themeMode == SendbirdUIKit.ThemeMode.Light) R.drawable.selector_rectangle_light else R.drawable.selector_rectangle_dark600 - val dividerColor = if (themeMode == SendbirdUIKit.ThemeMode.Light) R.color.onlight_04 else R.color.ondark_04 + val dividerColor = if (themeMode == SendbirdUIKit.ThemeMode.Light) R.color.onlight_text_disabled else R.color.ondark_text_disabled val channelKeyStyle = if (themeMode == SendbirdUIKit.ThemeMode.Light) R.style.SendbirdSubtitle1OnLight01 else R.style.SendbirdSubtitle1OnDark01 val channelUrlStyle = if (themeMode == SendbirdUIKit.ThemeMode.Light) R.style.SendbirdBody3OnLight03 else R.style.SendbirdBody3OnDark03 feedChannels.entries.forEach { entry -> diff --git a/uikit-samples/src/main/java/com/sendbird/uikit/samples/notification/NotificationHomeActivity.kt b/uikit-samples/src/main/java/com/sendbird/uikit/samples/notification/NotificationHomeActivity.kt index d00d5e66..65883615 100644 --- a/uikit-samples/src/main/java/com/sendbird/uikit/samples/notification/NotificationHomeActivity.kt +++ b/uikit-samples/src/main/java/com/sendbird/uikit/samples/notification/NotificationHomeActivity.kt @@ -59,7 +59,7 @@ class NotificationHomeActivity : ThemeHomeActivity() { override fun applyTheme() { super.applyTheme() - binding.mainTitle.setTextColorResource(if (isDarkTheme) R.color.ondark_01 else R.color.onlight_01) + binding.mainTitle.setTextColorResource(if (isDarkTheme) R.color.ondark_text_high_emphasis else R.color.onlight_text_high_emphasis) binding.btSignOut.setBackgroundResource( if (isDarkTheme) R.drawable.selector_home_signout_button_dark else R.drawable.selector_home_signout_button @@ -88,6 +88,6 @@ class NotificationHomeActivity : ThemeHomeActivity() { val dialog = builder.create() dialog.show() dialog.getButton(AlertDialog.BUTTON_POSITIVE) - .setTextColor(ContextCompat.getColor(this, com.sendbird.uikit.R.color.secondary_300)) + .setTextColor(ContextCompat.getColor(this, com.sendbird.uikit.R.color.secondary_main)) } } diff --git a/uikit-samples/src/main/res/color/selector_primary.xml b/uikit-samples/src/main/res/color/selector_primary.xml index 28f2b0a1..43ae5d50 100644 --- a/uikit-samples/src/main/res/color/selector_primary.xml +++ b/uikit-samples/src/main/res/color/selector_primary.xml @@ -2,9 +2,9 @@ + android:color="@color/primary_dark"/> + android:color="@color/primary_main"/> diff --git a/uikit-samples/src/main/res/drawable/selector_edit_text_clear_button_dark.xml b/uikit-samples/src/main/res/drawable/selector_edit_text_clear_button_dark.xml index a410dc0f..250f6b5b 100644 --- a/uikit-samples/src/main/res/drawable/selector_edit_text_clear_button_dark.xml +++ b/uikit-samples/src/main/res/drawable/selector_edit_text_clear_button_dark.xml @@ -4,7 +4,7 @@ - + @@ -23,7 +23,7 @@ - + diff --git a/uikit-samples/src/main/res/drawable/selector_edit_text_clear_button_light.xml b/uikit-samples/src/main/res/drawable/selector_edit_text_clear_button_light.xml index ef74e70b..fcebb7a3 100644 --- a/uikit-samples/src/main/res/drawable/selector_edit_text_clear_button_light.xml +++ b/uikit-samples/src/main/res/drawable/selector_edit_text_clear_button_light.xml @@ -4,7 +4,7 @@ - + @@ -23,7 +23,7 @@ - + diff --git a/uikit-samples/src/main/res/drawable/selector_home_channel_type_button_dark.xml b/uikit-samples/src/main/res/drawable/selector_home_channel_type_button_dark.xml index 3fe62e15..17b2946d 100644 --- a/uikit-samples/src/main/res/drawable/selector_home_channel_type_button_dark.xml +++ b/uikit-samples/src/main/res/drawable/selector_home_channel_type_button_dark.xml @@ -2,7 +2,7 @@ - + diff --git a/uikit-samples/src/main/res/drawable/selector_home_signout_button_dark.xml b/uikit-samples/src/main/res/drawable/selector_home_signout_button_dark.xml index 328f550e..2179ddaa 100644 --- a/uikit-samples/src/main/res/drawable/selector_home_signout_button_dark.xml +++ b/uikit-samples/src/main/res/drawable/selector_home_signout_button_dark.xml @@ -3,17 +3,17 @@ - - + - - + diff --git a/uikit-samples/src/main/res/drawable/selector_tab_tint.xml b/uikit-samples/src/main/res/drawable/selector_tab_tint.xml index 373421b6..7d8dbfd3 100644 --- a/uikit-samples/src/main/res/drawable/selector_tab_tint.xml +++ b/uikit-samples/src/main/res/drawable/selector_tab_tint.xml @@ -2,8 +2,8 @@ + android:color="@color/primary_main"/> + android:color="@color/onlight_text_low_emphasis"/> \ No newline at end of file diff --git a/uikit-samples/src/main/res/drawable/selector_tab_tint_dark.xml b/uikit-samples/src/main/res/drawable/selector_tab_tint_dark.xml index 04fd7b36..a55ea6c6 100644 --- a/uikit-samples/src/main/res/drawable/selector_tab_tint_dark.xml +++ b/uikit-samples/src/main/res/drawable/selector_tab_tint_dark.xml @@ -2,8 +2,8 @@ + android:color="@color/primary_light"/> + android:color="@color/ondark_text_low_emphasis"/> \ No newline at end of file diff --git a/uikit-samples/src/main/res/drawable/shape_badge_background.xml b/uikit-samples/src/main/res/drawable/shape_badge_background.xml index 9749dd4f..9342258e 100644 --- a/uikit-samples/src/main/res/drawable/shape_badge_background.xml +++ b/uikit-samples/src/main/res/drawable/shape_badge_background.xml @@ -3,7 +3,7 @@ android:shape="rectangle"> + android:color="@color/error_main"/> diff --git a/uikit-samples/src/main/res/drawable/shape_badge_background_dark.xml b/uikit-samples/src/main/res/drawable/shape_badge_background_dark.xml index a198d677..2d9c1181 100644 --- a/uikit-samples/src/main/res/drawable/shape_badge_background_dark.xml +++ b/uikit-samples/src/main/res/drawable/shape_badge_background_dark.xml @@ -3,7 +3,7 @@ android:shape="rectangle"> + android:color="@color/error_light"/> diff --git a/uikit-samples/src/main/res/drawable/shape_cursor_drawable.xml b/uikit-samples/src/main/res/drawable/shape_cursor_drawable.xml index 034c0113..626dbb3c 100644 --- a/uikit-samples/src/main/res/drawable/shape_cursor_drawable.xml +++ b/uikit-samples/src/main/res/drawable/shape_cursor_drawable.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - + \ No newline at end of file diff --git a/uikit-samples/src/main/res/drawable/shape_edit_text_background_dark.xml b/uikit-samples/src/main/res/drawable/shape_edit_text_background_dark.xml index a3dfa926..330258b9 100644 --- a/uikit-samples/src/main/res/drawable/shape_edit_text_background_dark.xml +++ b/uikit-samples/src/main/res/drawable/shape_edit_text_background_dark.xml @@ -17,7 +17,7 @@ + android:color="@color/ondark_text_disabled" /> \ No newline at end of file diff --git a/uikit-samples/src/main/res/drawable/shape_edit_text_background_light.xml b/uikit-samples/src/main/res/drawable/shape_edit_text_background_light.xml index 2a647028..48fff59a 100644 --- a/uikit-samples/src/main/res/drawable/shape_edit_text_background_light.xml +++ b/uikit-samples/src/main/res/drawable/shape_edit_text_background_light.xml @@ -17,7 +17,7 @@ + android:color="@color/onlight_text_disabled" /> \ No newline at end of file diff --git a/uikit-samples/src/main/res/drawable/shape_live_indicator.xml b/uikit-samples/src/main/res/drawable/shape_live_indicator.xml index 006a6cc0..1729330f 100644 --- a/uikit-samples/src/main/res/drawable/shape_live_indicator.xml +++ b/uikit-samples/src/main/res/drawable/shape_live_indicator.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/uikit-samples/src/main/res/drawable/shape_round_rect_background_100_with_underline.xml b/uikit-samples/src/main/res/drawable/shape_round_rect_background_100_with_underline.xml index 73f8cd7e..7010c8b5 100644 --- a/uikit-samples/src/main/res/drawable/shape_round_rect_background_100_with_underline.xml +++ b/uikit-samples/src/main/res/drawable/shape_round_rect_background_100_with_underline.xml @@ -12,7 +12,7 @@ + android:color="@color/primary_main" /> diff --git a/uikit-samples/src/main/res/drawable/shape_round_rect_primary_300.xml b/uikit-samples/src/main/res/drawable/shape_round_rect_primary_300.xml index 399c1767..af707e54 100644 --- a/uikit-samples/src/main/res/drawable/shape_round_rect_primary_300.xml +++ b/uikit-samples/src/main/res/drawable/shape_round_rect_primary_300.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - + \ No newline at end of file diff --git a/uikit-samples/src/main/res/layout-land/activity_live_stream.xml b/uikit-samples/src/main/res/layout-land/activity_live_stream.xml index dcce1648..9fb8c5f9 100644 --- a/uikit-samples/src/main/res/layout-land/activity_live_stream.xml +++ b/uikit-samples/src/main/res/layout-land/activity_live_stream.xml @@ -24,7 +24,7 @@ android:id="@+id/ivLiveOverlay" android:layout_width="@dimen/sb_size_0" android:layout_height="@dimen/sb_size_0" - android:background="@color/overlay_02" + android:background="@color/overlay_light" app:layout_constraintTop_toTopOf="@id/ivLive" app:layout_constraintBottom_toBottomOf="@id/ivLive" app:layout_constraintStart_toStartOf="@id/ivLive" @@ -36,7 +36,7 @@ android:layout_width="@dimen/sb_size_24" android:layout_height="@dimen/sb_size_24" android:src="@drawable/icon_close" - android:tint="@color/ondark_01" + android:tint="@color/ondark_text_high_emphasis" android:visibility="gone" app:layout_constraintTop_toTopOf="@id/ivLive" app:layout_constraintStart_toStartOf="@id/ivLive" diff --git a/uikit-samples/src/main/res/layout/activity_ai_chatbot_home.xml b/uikit-samples/src/main/res/layout/activity_ai_chatbot_home.xml index 9149bab6..0192d845 100644 --- a/uikit-samples/src/main/res/layout/activity_ai_chatbot_home.xml +++ b/uikit-samples/src/main/res/layout/activity_ai_chatbot_home.xml @@ -10,10 +10,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:paddingTop="@dimen/sb_size_24" - android:background="@color/background_100"> + android:paddingTop="@dimen/sb_size_24"> @@ -45,9 +44,8 @@ android:textSize="@dimen/sb_text_size_14" android:fontFamily="sans-serif" android:textStyle="bold" - android:textColor="@color/onlight_01" + android:textColor="@color/onlight_text_high_emphasis" android:lineSpacingExtra="@dimen/sb_size_2" - android:background="@drawable/selector_home_signout_button" android:text="@string/text_sign_out" /> diff --git a/uikit-samples/src/main/res/layout/activity_customization_home.xml b/uikit-samples/src/main/res/layout/activity_customization_home.xml index aff1a7bd..fced1f08 100644 --- a/uikit-samples/src/main/res/layout/activity_customization_home.xml +++ b/uikit-samples/src/main/res/layout/activity_customization_home.xml @@ -46,7 +46,7 @@ + android:background="@color/onlight_text_disabled"/> @@ -54,9 +53,8 @@ android:textSize="@dimen/sb_text_size_14" android:fontFamily="sans-serif" android:textStyle="bold" - android:textColor="@color/onlight_01" + android:textColor="@color/onlight_text_high_emphasis" android:lineSpacingExtra="@dimen/sb_size_2" - android:background="@drawable/selector_home_signout_button" android:text="@string/text_sign_out" /> diff --git a/uikit-samples/src/main/res/layout/activity_live_stream.xml b/uikit-samples/src/main/res/layout/activity_live_stream.xml index b63467c9..2e5a7b83 100644 --- a/uikit-samples/src/main/res/layout/activity_live_stream.xml +++ b/uikit-samples/src/main/res/layout/activity_live_stream.xml @@ -24,7 +24,7 @@ android:id="@+id/ivLiveOverlay" android:layout_width="@dimen/sb_size_0" android:layout_height="@dimen/sb_size_0" - android:background="@color/overlay_02" + android:background="@color/overlay_light" app:layout_constraintTop_toTopOf="@id/ivLive" app:layout_constraintBottom_toBottomOf="@id/ivLive" app:layout_constraintStart_toStartOf="@id/ivLive" @@ -36,7 +36,7 @@ android:layout_width="@dimen/sb_size_24" android:layout_height="@dimen/sb_size_24" android:src="@drawable/icon_close" - android:tint="@color/ondark_01" + android:tint="@color/ondark_text_high_emphasis" android:visibility="gone" app:layout_constraintTop_toTopOf="@id/ivLive" app:layout_constraintStart_toStartOf="@id/ivLive" diff --git a/uikit-samples/src/main/res/layout/activity_login.xml b/uikit-samples/src/main/res/layout/activity_login.xml index bb740f55..5be06c6b 100644 --- a/uikit-samples/src/main/res/layout/activity_login.xml +++ b/uikit-samples/src/main/res/layout/activity_login.xml @@ -31,7 +31,7 @@ android:layout_marginBottom="@dimen/sb_size_44" android:textSize="@dimen/sb_text_size_16" android:textStyle="bold" - android:textColor="@color/onlight_01" + android:textColor="@color/onlight_text_high_emphasis" android:text="@string/text_title_uikit_sample_app" app:layout_constraintTop_toBottomOf="@id/logoImageView" app:layout_constraintStart_toStartOf="parent" @@ -47,7 +47,7 @@ android:layout_marginTop="@dimen/sb_size_4" android:textSize="@dimen/sb_text_size_16" android:textStyle="bold" - android:textColor="@color/onlight_01" + android:textColor="@color/onlight_text_high_emphasis" android:text="@string/text_title_uikit_sample_app" android:layout_marginBottom="@dimen/sb_size_32" app:layout_constraintTop_toBottomOf="@id/logoImageView" @@ -70,7 +70,7 @@ android:gravity="center_vertical" android:paddingLeft="@dimen/sb_size_16" android:paddingRight="@dimen/sb_size_16" - app:hintTextColor="@color/primary_300" + app:hintTextColor="@color/primary_main" app:boxBackgroundMode="outline" android:background="@drawable/selector_edittext_background_with_focusable" android:layout_marginTop="@dimen/sb_size_24" @@ -99,7 +99,7 @@ android:textSize="@dimen/sb_text_size_14" android:fontFamily="sans-serif" android:textStyle="bold" - android:textColor="@color/ondark_01" + android:textColor="@color/ondark_text_high_emphasis" android:layout_width="wrap_content" android:layout_height="@dimen/sb_size_56" android:textAllCaps="false" @@ -117,9 +117,9 @@ android:paddingRight="@dimen/sb_size_16" android:layout_marginTop="@dimen/sb_size_24" android:visibility="gone" - app:boxStrokeColor="@color/primary_300" + app:boxStrokeColor="@color/primary_main" android:background="@drawable/selector_edittext_background_with_focusable" - app:hintTextColor="@color/primary_300" + app:hintTextColor="@color/primary_main" app:boxBackgroundMode="outline" app:layout_constraintTop_toBottomOf="@id/applicationIdLayout" app:layout_constraintStart_toStartOf="parent" @@ -149,9 +149,9 @@ android:paddingLeft="@dimen/sb_size_16" android:paddingRight="@dimen/sb_size_16" android:layout_marginTop="@dimen/sb_size_24" - app:boxStrokeColor="@color/primary_300" + app:boxStrokeColor="@color/primary_main" android:background="@drawable/selector_edittext_background_with_focusable" - app:hintTextColor="@color/primary_300" + app:hintTextColor="@color/primary_main" app:boxBackgroundMode="outline" app:layout_constraintTop_toBottomOf="@id/botIdLayout" app:layout_constraintStart_toStartOf="parent" @@ -183,7 +183,7 @@ android:gravity="center_vertical" android:paddingLeft="@dimen/sb_size_16" android:paddingRight="@dimen/sb_size_16" - app:hintTextColor="@color/primary_300" + app:hintTextColor="@color/primary_main" app:boxBackgroundMode="outline" android:background="@drawable/selector_edittext_background_with_focusable" android:layout_marginTop="@dimen/sb_size_24" @@ -211,7 +211,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/text_use_feed_channel_only" - android:buttonTint="@color/primary_300" + android:buttonTint="@color/primary_main" android:layout_marginTop="@dimen/sb_size_24" android:visibility="gone" android:checked="true" @@ -229,7 +229,7 @@ android:textSize="@dimen/sb_text_size_14" android:fontFamily="sans-serif" android:textStyle="bold" - android:textColor="@color/ondark_01" + android:textColor="@color/ondark_text_high_emphasis" android:lineSpacingExtra="@dimen/sb_text_size_2" android:background="@drawable/selector_button_primary_300" android:text="@string/text_sign_in" @@ -290,7 +290,7 @@ android:textSize="@dimen/sb_text_size_12" android:paddingTop="@dimen/sb_size_24" android:layout_marginBottom="@dimen/sb_size_16" - android:textColor="@color/onlight_02" + android:textColor="@color/onlight_text_mid_emphasis" app:layout_constraintHeight_min="@dimen/sb_size_36" app:layout_constraintTop_toBottomOf="@id/selectSampleLayout" app:layout_constraintStart_toStartOf="parent" diff --git a/uikit-samples/src/main/res/layout/activity_notification_home.xml b/uikit-samples/src/main/res/layout/activity_notification_home.xml index db08c1a0..70a6833e 100644 --- a/uikit-samples/src/main/res/layout/activity_notification_home.xml +++ b/uikit-samples/src/main/res/layout/activity_notification_home.xml @@ -21,7 +21,6 @@ android:layout_marginBottom="@dimen/sb_size_24" android:textSize="@dimen/sb_text_size_24" android:textStyle="bold" - android:textColor="@color/onlight_01" android:fontFamily="sans-serif" android:text="@string/text_business_messaging"/> @@ -53,9 +52,8 @@ android:textSize="@dimen/sb_text_size_14" android:fontFamily="sans-serif" android:textStyle="bold" - android:textColor="@color/onlight_01" + android:textColor="@color/onlight_text_high_emphasis" android:lineSpacingExtra="@dimen/sb_size_2" - android:background="@drawable/selector_home_signout_button" android:text="@string/text_sign_out" /> diff --git a/uikit-samples/src/main/res/layout/activity_open_channel_main.xml b/uikit-samples/src/main/res/layout/activity_open_channel_main.xml index 63dd0ae7..7c62259b 100644 --- a/uikit-samples/src/main/res/layout/activity_open_channel_main.xml +++ b/uikit-samples/src/main/res/layout/activity_open_channel_main.xml @@ -24,7 +24,7 @@ android:id="@+id/border" android:layout_width="@dimen/sb_size_0" android:layout_height="@dimen/sb_size_1" - android:background="@color/onlight_04" + android:background="@color/onlight_text_disabled" app:layout_constraintTop_toBottomOf="@id/titleBar" app:layout_constraintBottom_toTopOf="@id/description" app:layout_constraintStart_toStartOf="parent" diff --git a/uikit-samples/src/main/res/layout/activity_select_service.xml b/uikit-samples/src/main/res/layout/activity_select_service.xml index 4e89b752..7e6e0170 100644 --- a/uikit-samples/src/main/res/layout/activity_select_service.xml +++ b/uikit-samples/src/main/res/layout/activity_select_service.xml @@ -25,7 +25,7 @@ android:layout_marginBottom="@dimen/sb_size_24" android:textSize="@dimen/sb_text_size_24" android:textStyle="bold" - android:textColor="@color/onlight_01" + android:textColor="@color/onlight_text_high_emphasis" android:fontFamily="sans-serif" android:text="@string/text_title_login_activity" app:layout_constraintTop_toTopOf="parent" @@ -96,7 +96,7 @@ android:textSize="@dimen/sb_text_size_12" android:paddingTop="@dimen/sb_size_24" android:layout_marginBottom="@dimen/sb_size_16" - android:textColor="@color/onlight_02" + android:textColor="@color/onlight_text_mid_emphasis" app:layout_constraintHeight_min="@dimen/sb_size_36" app:layout_constraintTop_toBottomOf="@id/notificationSampleButton" app:layout_constraintStart_toStartOf="parent" diff --git a/uikit-samples/src/main/res/layout/activity_splash.xml b/uikit-samples/src/main/res/layout/activity_splash.xml index 22f56a4a..0fdbdca4 100644 --- a/uikit-samples/src/main/res/layout/activity_splash.xml +++ b/uikit-samples/src/main/res/layout/activity_splash.xml @@ -2,7 +2,6 @@ diff --git a/uikit-samples/src/main/res/layout/view_custom_header.xml b/uikit-samples/src/main/res/layout/view_custom_header.xml index bfe7719c..a7f42c0e 100644 --- a/uikit-samples/src/main/res/layout/view_custom_header.xml +++ b/uikit-samples/src/main/res/layout/view_custom_header.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - android:background="@color/secondary_300" + android:background="@color/secondary_main" xmlns:app="http://schemas.android.com/apk/res-auto" tools:ignore="MissingDefaultResource"> diff --git a/uikit-samples/src/main/res/layout/view_customization_list_header.xml b/uikit-samples/src/main/res/layout/view_customization_list_header.xml index 51276df3..3d13dcf1 100644 --- a/uikit-samples/src/main/res/layout/view_customization_list_header.xml +++ b/uikit-samples/src/main/res/layout/view_customization_list_header.xml @@ -29,7 +29,7 @@ android:layout_width="@dimen/sb_size_16" android:layout_height="@dimen/sb_size_16" android:src="@drawable/icon_chevron_down" - android:tint="@color/onlight_01" + android:tint="@color/onlight_text_high_emphasis" android:alpha="0.5" android:layout_marginEnd="@dimen/sb_size_16" app:layout_constraintTop_toTopOf="parent" @@ -41,7 +41,7 @@ android:id="@+id/bottomDivider" android:layout_width="match_parent" android:layout_height="@dimen/sb_size_1" - android:background="@color/onlight_04" + android:background="@color/onlight_text_disabled" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent"/> @@ -50,7 +50,7 @@ android:id="@+id/topDivider" android:layout_width="match_parent" android:layout_height="@dimen/sb_size_1" - android:background="@color/onlight_04" + android:background="@color/onlight_text_disabled" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent"/> diff --git a/uikit-samples/src/main/res/layout/view_entry_button.xml b/uikit-samples/src/main/res/layout/view_entry_button.xml index 7905cb70..6f06ed72 100644 --- a/uikit-samples/src/main/res/layout/view_entry_button.xml +++ b/uikit-samples/src/main/res/layout/view_entry_button.xml @@ -29,7 +29,7 @@ android:textSize="@dimen/sb_text_size_14" android:fontFamily="sans-serif-medium" android:textStyle="normal" - android:textColor="@color/onlight_02" + android:textColor="@color/onlight_text_mid_emphasis" android:lineSpacingExtra="@dimen/sb_text_size_2" android:layout_marginStart="@dimen/sb_size_24" android:layout_marginTop="@dimen/sb_size_4" diff --git a/uikit-samples/src/main/res/layout/view_feed_channel_item.xml b/uikit-samples/src/main/res/layout/view_feed_channel_item.xml index 5232fbc4..efaf72fb 100644 --- a/uikit-samples/src/main/res/layout/view_feed_channel_item.xml +++ b/uikit-samples/src/main/res/layout/view_feed_channel_item.xml @@ -54,7 +54,7 @@ android:layout_width="0dp" android:layout_height="@dimen/sb_size_1" android:layout_marginTop="@dimen/sb_size_15" - android:background="@color/onlight_04" + android:background="@color/onlight_text_disabled" app:layout_constraintStart_toEndOf="@id/guideline" app:layout_constraintTop_toBottomOf="@id/tvChannelUrl" app:layout_constraintEnd_toEndOf="parent" diff --git a/uikit-samples/src/main/res/layout/view_live_stream_list_item.xml b/uikit-samples/src/main/res/layout/view_live_stream_list_item.xml index 79345fcb..51ad6d71 100644 --- a/uikit-samples/src/main/res/layout/view_live_stream_list_item.xml +++ b/uikit-samples/src/main/res/layout/view_live_stream_list_item.xml @@ -23,7 +23,7 @@ diff --git a/uikit-samples/src/main/res/values/colors.xml b/uikit-samples/src/main/res/values/colors.xml index 67e304a1..744447ea 100644 --- a/uikit-samples/src/main/res/values/colors.xml +++ b/uikit-samples/src/main/res/values/colors.xml @@ -6,6 +6,7 @@ + @@ -21,14 +22,6 @@ - - - - - - - - @@ -40,4 +33,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/uikit-samples/src/main/res/values/styles.xml b/uikit-samples/src/main/res/values/styles.xml index b19d6c56..1b399821 100644 --- a/uikit-samples/src/main/res/values/styles.xml +++ b/uikit-samples/src/main/res/values/styles.xml @@ -3,9 +3,9 @@ @@ -41,13 +41,13 @@ sans-serif bold 20sp - @color/onlight_01 + @color/onlight_text_high_emphasis diff --git a/uikit-samples/src/main/res/values/styles_custom.xml b/uikit-samples/src/main/res/values/styles_custom.xml index c3110e6e..af7d7996 100755 --- a/uikit-samples/src/main/res/values/styles_custom.xml +++ b/uikit-samples/src/main/res/values/styles_custom.xml @@ -1,6 +1,6 @@ - + @@ -181,7 +181,7 @@ - + @@ -191,9 +191,9 @@ - + - + @@ -208,9 +208,9 @@ - - - + + + @@ -221,7 +221,7 @@ - + @@ -229,7 +229,7 @@ - + @@ -245,7 +245,7 @@ - + @@ -257,7 +257,7 @@ - + @@ -287,7 +287,7 @@ - + @@ -302,12 +302,12 @@ - + - + @@ -335,7 +335,7 @@ - + @@ -365,7 +365,7 @@ - + @@ -373,7 +373,7 @@ - + @@ -383,27 +383,27 @@ - + - + - + - + - + @@ -414,7 +414,7 @@ - + @@ -425,7 +425,7 @@ - + @@ -433,7 +433,7 @@ - + @@ -445,7 +445,7 @@ - + @@ -465,7 +465,7 @@ - + @@ -477,7 +477,7 @@ - + @@ -499,13 +499,13 @@ - + - + @@ -513,7 +513,7 @@ - + @@ -526,7 +526,7 @@ - + @@ -551,7 +551,7 @@ - + @@ -564,7 +564,7 @@ - + @@ -582,7 +582,7 @@ - + @@ -590,7 +590,7 @@ - + @@ -603,7 +603,7 @@ - + @@ -616,14 +616,14 @@ - + - + @@ -641,13 +641,13 @@ - + - + - + @@ -687,7 +687,7 @@ - + @@ -701,7 +701,7 @@ - + @@ -721,7 +721,7 @@ - + @@ -738,7 +738,7 @@ - + @@ -787,11 +787,11 @@ - + - + @@ -809,7 +809,7 @@ - + @@ -818,11 +818,11 @@ - + - + @@ -830,11 +830,11 @@ - + - + @@ -848,8 +848,8 @@ - - + + @@ -865,8 +865,8 @@ - - + + @@ -899,16 +899,16 @@ - + - + - + - + @@ -916,7 +916,7 @@ - + @@ -924,7 +924,7 @@ - + @@ -937,19 +937,19 @@ - + - + - + - + @@ -957,14 +957,14 @@ - + - - + + @@ -974,7 +974,7 @@ - + @@ -982,31 +982,31 @@ - + - + - + - + - + - + @@ -1043,9 +1043,9 @@ - + - + @@ -1094,9 +1094,9 @@ - + - + @@ -1117,7 +1117,7 @@ - + diff --git a/uikit-samples/src/main/res/values/styles_dark.xml b/uikit-samples/src/main/res/values/styles_dark.xml index d33afb48..af7d0b11 100644 --- a/uikit-samples/src/main/res/values/styles_dark.xml +++ b/uikit-samples/src/main/res/values/styles_dark.xml @@ -3,9 +3,9 @@ diff --git a/uikit-samples/src/main/res/values/text_appearance_custom.xml b/uikit-samples/src/main/res/values/text_appearance_custom.xml index 95b6be8a..f3f5a2cc 100755 --- a/uikit-samples/src/main/res/values/text_appearance_custom.xml +++ b/uikit-samples/src/main/res/values/text_appearance_custom.xml @@ -20,79 +20,79 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -100,7 +100,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -116,7 +116,7 @@ - + @@ -124,7 +124,7 @@ - + @@ -132,7 +132,7 @@ - + @@ -140,7 +140,7 @@ - + @@ -148,7 +148,7 @@ - + @@ -156,7 +156,7 @@ - + @@ -164,7 +164,7 @@ - + @@ -172,7 +172,7 @@ - + @@ -180,7 +180,7 @@ - + @@ -188,7 +188,7 @@ - + @@ -196,7 +196,7 @@ - + @@ -204,7 +204,7 @@ - + @@ -212,7 +212,7 @@ - + @@ -220,7 +220,7 @@ - + @@ -228,7 +228,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -244,7 +244,7 @@ - + @@ -252,7 +252,7 @@ - + @@ -260,7 +260,7 @@ - + @@ -268,7 +268,7 @@ - + @@ -276,7 +276,7 @@ - + @@ -284,7 +284,7 @@ - + @@ -292,7 +292,7 @@ - + @@ -300,7 +300,7 @@ - + @@ -308,7 +308,7 @@ - + @@ -316,203 +316,203 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -520,7 +520,7 @@ - + @@ -528,7 +528,7 @@ - + @@ -536,7 +536,7 @@ - + @@ -544,7 +544,7 @@ - + @@ -552,7 +552,7 @@ - + @@ -560,7 +560,7 @@ - + @@ -568,7 +568,7 @@ - + @@ -576,7 +576,7 @@ - + @@ -584,7 +584,7 @@ - + @@ -592,7 +592,7 @@ - + @@ -601,7 +601,7 @@ - + @@ -609,7 +609,7 @@ - + @@ -617,7 +617,7 @@ - + @@ -625,594 +625,594 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/uikit/build.gradle b/uikit/build.gradle index a7406ea7..2cde927f 100644 --- a/uikit/build.gradle +++ b/uikit/build.gradle @@ -8,12 +8,13 @@ plugins { version = UIKIT_VERSION android { - compileSdk 33 + namespace 'com.sendbird.uikit' + compileSdk 34 version = UIKIT_VERSION defaultConfig { minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode Integer.parseInt(UIKIT_VERSION_CODE) versionName UIKIT_VERSION @@ -22,7 +23,6 @@ android { buildTypes { release { - debuggable false minifyEnabled false consumerProguardFile 'consumer-rules.pro' versionNameSuffix UIKIT_VERSION @@ -45,6 +45,7 @@ android { buildFeatures { viewBinding true + buildConfig = true } compileOptions { @@ -66,15 +67,15 @@ dependencies { // Sendbird api 'com.sendbird.sdk:sendbird-chat:4.16.4' - implementation 'com.github.bumptech.glide:glide:4.13.0' - annotationProcessor 'com.github.bumptech.glide:compiler:4.13.0' + implementation 'com.github.bumptech.glide:glide:4.16.0' + annotationProcessor 'com.github.bumptech.glide:compiler:4.16.0' - implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'androidx.constraintlayout:constraintlayout:2.1.3' - implementation 'androidx.recyclerview:recyclerview:1.2.1' + implementation 'androidx.appcompat:appcompat:1.7.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.recyclerview:recyclerview:1.3.2' implementation 'com.github.chrisbanes:PhotoView:2.3.0' - implementation "androidx.viewpager2:viewpager2:1.0.0" - implementation 'com.google.android.material:material:1.5.0' + implementation "androidx.viewpager2:viewpager2:1.1.0" + implementation 'com.google.android.material:material:1.12.0' implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" diff --git a/uikit/consumer-rules.pro b/uikit/consumer-rules.pro index 82134776..8b8bbc2d 100644 --- a/uikit/consumer-rules.pro +++ b/uikit/consumer-rules.pro @@ -1,15 +1,5 @@ -# Proguard Glide --keep public class * implements com.bumptech.glide.module.GlideModule --keep class * extends com.bumptech.glide.module.AppGlideModule { - (...); -} --keep public enum com.bumptech.glide.load.ImageHeaderParser$** { - **[] $VALUES; - public *; -} --keep class com.bumptech.glide.load.data.ParcelFileDescriptorRewinder$InternalRewinder { - *** rewind(); -} +# Uncomment for DexGuard only +#-keepresourcexmlelements manifest/application/meta-data@value=GlideModule # Kotlin Serialization -keepclassmembers,allowoptimization class com.sendbird.uikit.** { diff --git a/uikit/internal.gradle b/uikit/internal.gradle index 0ae6bd5b..fcc399f6 100644 --- a/uikit/internal.gradle +++ b/uikit/internal.gradle @@ -12,7 +12,6 @@ android { } buildTypes { debug { - debuggable true buildConfigField "String", "AUTHORIZATION", "$System.env.MESSAGING_ANDROID_BASIC_AUTH" buildConfigField "String", "SECRET_KEY", "$System.env.MESSAGING_ANDROID_SECRET_KEY" buildConfigField "String", "WS_HOST", "\"wss://ws-preprod.sendbird.com\"" @@ -29,19 +28,18 @@ dependencies { } } - androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation "androidx.test:rules:1.4.0" + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation "androidx.test:rules:1.5.0" androidTestImplementation 'com.squareup.okhttp3:okhttp:4.10.0' - androidTestImplementation "androidx.arch.core:core-testing:2.1.0" + androidTestImplementation "androidx.arch.core:core-testing:2.2.0" androidTestImplementation 'io.kotest:kotest-assertions-core:5.3.0' testImplementation 'junit:junit:4.13.2' - testImplementation 'org.robolectric:robolectric:4.8' + testImplementation 'org.robolectric:robolectric:4.10' testImplementation 'androidx.test:core:1.5.0' testImplementation 'io.kotest:kotest-assertions-core:5.6.0' testImplementation "io.mockk:mockk:1.13.4" testImplementation 'androidx.arch.core:core-testing:2.2.0' - testImplementation "org.jetbrains.kotlin:kotlin-reflect:1.8.20" testImplementation("pl.pragmatists:JUnitParams:1.1.0") } diff --git a/uikit/src/main/AndroidManifest.xml b/uikit/src/main/AndroidManifest.xml index dcd29ea2..5dab1bd5 100644 --- a/uikit/src/main/AndroidManifest.xml +++ b/uikit/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> diff --git a/uikit/src/main/java/com/sendbird/uikit/SendbirdUIKit.java b/uikit/src/main/java/com/sendbird/uikit/SendbirdUIKit.java index dee14b07..175a20b4 100644 --- a/uikit/src/main/java/com/sendbird/uikit/SendbirdUIKit.java +++ b/uikit/src/main/java/com/sendbird/uikit/SendbirdUIKit.java @@ -107,11 +107,11 @@ public enum ThemeMode { /** * Light mode. */ - Light(R.style.AppTheme_Sendbird, R.color.primary_300, R.color.secondary_300, R.color.onlight_03, R.color.error_300), + Light(R.style.AppTheme_Sendbird, R.color.primary_main, R.color.secondary_main, R.color.onlight_text_low_emphasis, R.color.error_main), /** * Dark mode. */ - Dark(R.style.AppTheme_Dark_Sendbird, R.color.primary_200, R.color.secondary_200, R.color.ondark_03, R.color.error_200); + Dark(R.style.AppTheme_Dark_Sendbird, R.color.primary_light, R.color.secondary_light, R.color.ondark_text_low_emphasis, R.color.error_light); @StyleRes final int resId; diff --git a/uikit/src/main/java/com/sendbird/uikit/fragments/PermissionFragment.java b/uikit/src/main/java/com/sendbird/uikit/fragments/PermissionFragment.java index 65a1ffd2..64cf6de0 100644 --- a/uikit/src/main/java/com/sendbird/uikit/fragments/PermissionFragment.java +++ b/uikit/src/main/java/com/sendbird/uikit/fragments/PermissionFragment.java @@ -133,7 +133,7 @@ private void showPermissionRationalePopup(@NonNull String permission, @NonNull P }); AlertDialog dialog = builder.create(); dialog.show(); - dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(ContextCompat.getColor(requireContext(), R.color.secondary_300)); + dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(ContextCompat.getColor(requireContext(), R.color.secondary_main)); } private static final class PermissionInformation { diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/channels/ChannelCoverView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/channels/ChannelCoverView.kt index aa21be6e..cd7da1db 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/channels/ChannelCoverView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/channels/ChannelCoverView.kt @@ -64,7 +64,7 @@ internal class ChannelCoverView @JvmOverloads constructor( } else { @ColorRes val iconTint: Int = - if (SendbirdUIKit.isDarkMode()) R.color.onlight_01 else R.color.ondark_01 + if (SendbirdUIKit.isDarkMode()) R.color.onlight_text_high_emphasis else R.color.ondark_text_high_emphasis @ColorRes val backgroundTint: Int = R.color.background_300 @@ -79,7 +79,7 @@ internal class ChannelCoverView @JvmOverloads constructor( val imageView: ImageView = prepareSingleImageView() @ColorRes - val iconTint: Int = if (SendbirdUIKit.isDarkMode()) R.color.onlight_01 else R.color.ondark_01 + val iconTint: Int = if (SendbirdUIKit.isDarkMode()) R.color.onlight_text_high_emphasis else R.color.ondark_text_high_emphasis @ColorRes val backgroundTint = SendbirdUIKit.getDefaultThemeMode().secondaryTintResId diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/components/ChannelPushSettingView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/components/ChannelPushSettingView.kt index 5514ccd0..7236a10a 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/components/ChannelPushSettingView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/components/ChannelPushSettingView.kt @@ -89,7 +89,7 @@ internal class ChannelPushSettingView @JvmOverloads constructor( ) val dividerColor = a.getResourceId( R.styleable.ChannelPushSettings_sb_channel_push_option_item_divider_color, - R.color.onlight_04 + R.color.onlight_text_disabled ) val switchTrackTint = a.getResourceId( R.styleable.ChannelPushSettings_sb_channel_switch_track_tint, diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/components/HeaderView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/components/HeaderView.kt index ead9f445..ae7e0416 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/components/HeaderView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/components/HeaderView.kt @@ -111,7 +111,7 @@ internal class HeaderView @JvmOverloads constructor( R.styleable.HeaderComponent_sb_appbar_right_button_background, R.drawable.sb_button_uncontained_background_light ) - val dividerColor = a.getResourceId(R.styleable.HeaderComponent_sb_appbar_divider_color, R.color.onlight_04) + val dividerColor = a.getResourceId(R.styleable.HeaderComponent_sb_appbar_divider_color, R.color.onlight_text_disabled) binding.getRoot().setBackgroundResource(background) binding.title.text = titleText binding.title.setAppearance(context, titleTextAppearance) diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/components/SearchBarView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/components/SearchBarView.kt index b6dcbb3a..30552561 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/components/SearchBarView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/components/SearchBarView.kt @@ -43,7 +43,7 @@ internal class SearchBarView @JvmOverloads constructor( binding = SbViewSearchBarBinding.inflate(LayoutInflater.from(getContext())) addView(binding.root, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT) val itemBackground = a.getResourceId(R.styleable.SearchBar_sb_search_bar_background, R.color.background_50) - val dividerColor = a.getResourceId(R.styleable.SearchBar_sb_search_divider_color, R.color.onlight_04) + val dividerColor = a.getResourceId(R.styleable.SearchBar_sb_search_divider_color, R.color.onlight_text_disabled) val inputBackground = a.getResourceId( R.styleable.SearchBar_sb_search_bar_text_input_background, R.drawable.sb_shape_search_background diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/components/StateHeaderView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/components/StateHeaderView.kt index 76b15824..3563641d 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/components/StateHeaderView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/components/StateHeaderView.kt @@ -74,7 +74,7 @@ internal class StateHeaderView @JvmOverloads constructor( R.styleable.HeaderComponent_sb_appbar_right_button_background, R.drawable.sb_button_uncontained_background_light ) - val dividerColor = a.getResourceId(R.styleable.HeaderComponent_sb_appbar_divider_color, R.color.onlight_04) + val dividerColor = a.getResourceId(R.styleable.HeaderComponent_sb_appbar_divider_color, R.color.onlight_text_disabled) binding.root.setBackgroundResource(background) binding.title.text = titleText binding.title.setAppearance(context, titleTextAppearance) diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/FeedNotificationView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/FeedNotificationView.kt index 2d4cc540..0af36417 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/FeedNotificationView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/FeedNotificationView.kt @@ -59,7 +59,7 @@ internal class FeedNotificationView @JvmOverloads internal constructor( ) val unreadIndicatorColor = a.getResourceId( R.styleable.MessageView_FeedNotification_sb_feed_notification_unread_indicator_color, - R.color.secondary_300 + R.color.secondary_main ) binding.contentPanel.setBackgroundResource(messageBackground) diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/FormFieldView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/FormFieldView.kt index 76a4b9bc..1353552c 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/FormFieldView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/FormFieldView.kt @@ -68,7 +68,7 @@ internal class FormFieldView @JvmOverloads internal constructor( ) binding.etFormField.setHintTextColor( - ContextCompat.getColor(context, if (isDarkMode) R.color.ondark_03 else R.color.onlight_03) + ContextCompat.getColor(context, if (isDarkMode) R.color.ondark_text_low_emphasis else R.color.onlight_text_low_emphasis) ) binding.tvFormFieldError.setAppearance( @@ -83,7 +83,7 @@ internal class FormFieldView @JvmOverloads internal constructor( ResourcesCompat.getDrawable(resources, R.drawable.sb_shape_round_rect_background_ondark_02, null) } binding.iconDone.setColorFilter( - ContextCompat.getColor(context, if (isDarkMode) R.color.secondary_300 else R.color.secondary_200) + ContextCompat.getColor(context, if (isDarkMode) R.color.secondary_main else R.color.secondary_light) ) binding.tvAnswer.setAppearance( diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/FormMessageView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/FormMessageView.kt index 67461578..5b01af44 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/FormMessageView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/FormMessageView.kt @@ -84,7 +84,7 @@ internal class FormMessageView @JvmOverloads internal constructor( val linkTextColor = a.getColorStateList(R.styleable.MessageView_User_sb_message_other_link_text_color) val clickedLinkBackgroundColor = a.getResourceId( R.styleable.MessageView_User_sb_message_other_clicked_link_background_color, - R.color.primary_100 + R.color.primary_extra_light ) binding.tvMessageFormDisabled.setLinkTextColor(linkTextColor) binding.tvMessageFormDisabled.clickedLinkBackgroundColor = ContextCompat.getColor(context, clickedLinkBackgroundColor) diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MessagePreview.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MessagePreview.kt index 2448fb9b..1c8d3c47 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MessagePreview.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MessagePreview.kt @@ -61,7 +61,7 @@ internal class MessagePreview @JvmOverloads constructor( R.style.SendbirdCaption2OnLight02 ) val dividerColor = - a.getResourceId(R.styleable.MessagePreview_sb_message_preview_divider_color, R.color.onlight_04) + a.getResourceId(R.styleable.MessagePreview_sb_message_preview_divider_color, R.color.onlight_text_disabled) val metaphorBackgroundColor = a.getResourceId(R.styleable.MessagePreview_sb_message_preview_message_metaphor_background_color, 0) metaphorTintColor = diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyQuotedMessageView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyQuotedMessageView.kt index 748e3c3b..c06eae6c 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyQuotedMessageView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyQuotedMessageView.kt @@ -116,7 +116,7 @@ internal class MyQuotedMessageView @JvmOverloads constructor( val requestListener: RequestListener = object : RequestListener { override fun onLoadFailed( e: GlideException?, - model: Any, + model: Any?, target: Target, isFirstResource: Boolean ): Boolean { @@ -125,7 +125,7 @@ internal class MyQuotedMessageView @JvmOverloads constructor( } override fun onResourceReady( - resource: Drawable?, + resource: Drawable, model: Any, target: Target, dataSource: DataSource, @@ -152,7 +152,7 @@ internal class MyQuotedMessageView @JvmOverloads constructor( binding.quoteReplyThumbnailPanel.visibility = VISIBLE binding.ivQuoteReplyThumbnailIcon.setImageDrawable( DrawableUtils.createOvalIcon( - context, R.color.background_50, R.drawable.icon_gif, R.color.onlight_03 + context, R.color.background_50, R.drawable.icon_gif, R.color.onlight_text_low_emphasis ) ) when (parentMessage) { @@ -182,7 +182,7 @@ internal class MyQuotedMessageView @JvmOverloads constructor( binding.quoteReplyThumbnailPanel.visibility = VISIBLE binding.ivQuoteReplyThumbnailIcon.setImageDrawable( DrawableUtils.createOvalIcon( - context, R.color.background_50, R.drawable.icon_play, R.color.onlight_03 + context, R.color.background_50, R.drawable.icon_play, R.color.onlight_text_low_emphasis ) ) diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyUserMessageView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyUserMessageView.kt index 2bc47bbd..7537dab3 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyUserMessageView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyUserMessageView.kt @@ -65,7 +65,7 @@ internal class MyUserMessageView @JvmOverloads internal constructor( val linkTextColor = a.getColorStateList(R.styleable.MessageView_User_sb_message_me_link_text_color) val clickedLinkBackgroundColor = a.getResourceId( R.styleable.MessageView_User_sb_message_me_clicked_link_background_color, - R.color.primary_400 + R.color.primary_dark ) editedAppearance = a.getResourceId( R.styleable.MessageView_User_sb_message_my_edited_mark_text_appearance, diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyVoiceMessageView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyVoiceMessageView.kt index d5290d7e..618ba512 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyVoiceMessageView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/MyVoiceMessageView.kt @@ -46,9 +46,9 @@ internal class MyVoiceMessageView @JvmOverloads internal constructor( R.drawable.sb_shape_chat_bubble_reactions_light ) val progressColor = - a.getResourceId(R.styleable.MessageView_File_sb_voice_message_progress_color, R.color.onlight_03) + a.getResourceId(R.styleable.MessageView_File_sb_voice_message_progress_color, R.color.onlight_text_low_emphasis) val progressTrackColor = - a.getResourceId(R.styleable.MessageView_File_sb_voice_message_progress_track_color, R.color.primary_300) + a.getResourceId(R.styleable.MessageView_File_sb_voice_message_progress_track_color, R.color.primary_main) val timelineTextAppearance = a.getResourceId( R.styleable.MessageView_File_sb_voice_message_timeline_text_appearance, @@ -68,11 +68,11 @@ internal class MyVoiceMessageView @JvmOverloads internal constructor( ) binding.voiceMessage.setProgressProgressColor(AppCompatResources.getColorStateList(context, progressColor)) binding.voiceMessage.setTimelineTextAppearance(timelineTextAppearance) - val loadingTint = if (SendbirdUIKit.isDarkMode()) R.color.primary_300 else R.color.primary_200 + val loadingTint = if (SendbirdUIKit.isDarkMode()) R.color.primary_main else R.color.primary_light val loading = DrawableUtils.setTintList(context, R.drawable.sb_progress, loadingTint) binding.voiceMessage.setLoadingDrawable(loading) val buttonBackgroundTint = if (SendbirdUIKit.isDarkMode()) R.color.background_600 else R.color.background_50 - val buttonTint = if (SendbirdUIKit.isDarkMode()) R.color.primary_200 else R.color.primary_300 + val buttonTint = if (SendbirdUIKit.isDarkMode()) R.color.primary_light else R.color.primary_main val inset = context.resources.getDimension(R.dimen.sb_size_12).toInt() val playIcon = DrawableUtils.createOvalIcon( diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OgtagView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OgtagView.kt index 9ba031f5..3c0c2285 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OgtagView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OgtagView.kt @@ -54,7 +54,7 @@ internal class OgtagView private constructor( } else { ogMetaData.ogImage?.url } - val thumbnailIconTint = if (SendbirdUIKit.isDarkMode()) R.color.ondark_02 else R.color.onlight_02 + val thumbnailIconTint = if (SendbirdUIKit.isDarkMode()) R.color.ondark_text_mid_emphasis else R.color.onlight_text_mid_emphasis val builder = Glide.with(context) .asDrawable() .diskCacheStrategy(DiskCacheStrategy.ALL) @@ -84,7 +84,7 @@ internal class OgtagView private constructor( builder.load(ogImageUrl).centerCrop().listener(object : RequestListener { override fun onLoadFailed( e: GlideException?, - model: Any, + model: Any?, target: Target, isFirstResource: Boolean ): Boolean { @@ -92,7 +92,7 @@ internal class OgtagView private constructor( } override fun onResourceReady( - resource: Drawable?, + resource: Drawable, model: Any, target: Target, dataSource: DataSource, diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OpenChannelOgtagView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OpenChannelOgtagView.kt index eeb69c0c..89b83452 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OpenChannelOgtagView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OpenChannelOgtagView.kt @@ -56,7 +56,7 @@ internal class OpenChannelOgtagView private constructor( } else { metaData.ogImage?.url } - val thumbnailIconTint = if (SendbirdUIKit.isDarkMode()) R.color.ondark_02 else R.color.onlight_02 + val thumbnailIconTint = if (SendbirdUIKit.isDarkMode()) R.color.ondark_text_mid_emphasis else R.color.onlight_text_mid_emphasis val builder = Glide.with(context) .asDrawable() .diskCacheStrategy(DiskCacheStrategy.ALL) @@ -87,7 +87,7 @@ internal class OpenChannelOgtagView private constructor( builder.load(ogImageUrl).centerCrop().listener(object : RequestListener { override fun onLoadFailed( e: GlideException?, - model: Any, + model: Any?, target: Target, isFirstResource: Boolean ): Boolean { @@ -95,7 +95,7 @@ internal class OpenChannelOgtagView private constructor( } override fun onResourceReady( - resource: Drawable?, + resource: Drawable, model: Any, target: Target, dataSource: DataSource, diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OpenChannelUserMessageView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OpenChannelUserMessageView.kt index 4aee6653..d571e936 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OpenChannelUserMessageView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OpenChannelUserMessageView.kt @@ -51,7 +51,7 @@ internal class OpenChannelUserMessageView @JvmOverloads internal constructor( a.getResourceId(R.styleable.MessageView_sb_message_text_appearance, R.style.SendbirdBody3OnLight01) val contentBackground = a.getResourceId(R.styleable.MessageView_sb_message_background, R.drawable.selector_rectangle_light) - val linkTextColor = a.getResourceId(R.styleable.MessageView_sb_message_link_text_color, R.color.ondark_01) + val linkTextColor = a.getResourceId(R.styleable.MessageView_sb_message_link_text_color, R.color.ondark_text_high_emphasis) val ogtagBackground = a.getResourceId( R.styleable.MessageView_sb_message_ogtag_background, R.drawable.selector_open_channel_message_bg_light diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherQuotedMessageView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherQuotedMessageView.kt index 4cdd7cb9..340f0f0f 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherQuotedMessageView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherQuotedMessageView.kt @@ -139,7 +139,7 @@ internal class OtherQuotedMessageView @JvmOverloads constructor( val requestListener: RequestListener = object : RequestListener { override fun onLoadFailed( e: GlideException?, - model: Any, + model: Any?, target: Target, isFirstResource: Boolean ): Boolean { @@ -148,7 +148,7 @@ internal class OtherQuotedMessageView @JvmOverloads constructor( } override fun onResourceReady( - resource: Drawable?, + resource: Drawable, model: Any, target: Target, dataSource: DataSource, @@ -174,7 +174,7 @@ internal class OtherQuotedMessageView @JvmOverloads constructor( binding.quoteReplyThumbnailPanel.visibility = VISIBLE binding.ivQuoteReplyThumbnailIcon.setImageDrawable( DrawableUtils.createOvalIcon( - context, R.color.background_50, R.drawable.icon_gif, R.color.onlight_03 + context, R.color.background_50, R.drawable.icon_gif, R.color.onlight_text_low_emphasis ) ) when (parentMessage) { @@ -204,7 +204,7 @@ internal class OtherQuotedMessageView @JvmOverloads constructor( binding.quoteReplyThumbnailPanel.visibility = VISIBLE binding.ivQuoteReplyThumbnailIcon.setImageDrawable( DrawableUtils.createOvalIcon( - context, R.color.background_50, R.drawable.icon_play, R.color.onlight_03 + context, R.color.background_50, R.drawable.icon_play, R.color.onlight_text_low_emphasis ) ) when (parentMessage) { diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherUserMessageView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherUserMessageView.kt index 5ebe4908..90ef1b87 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherUserMessageView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherUserMessageView.kt @@ -90,7 +90,7 @@ internal class OtherUserMessageView @JvmOverloads internal constructor( val linkTextColor = a.getColorStateList(R.styleable.MessageView_User_sb_message_other_link_text_color) val clickedLinkBackgroundColor = a.getResourceId( R.styleable.MessageView_User_sb_message_other_clicked_link_background_color, - R.color.primary_100 + R.color.primary_extra_light ) editedAppearance = a.getResourceId( R.styleable.MessageView_User_sb_message_other_edited_mark_text_appearance, diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherVoiceMessageView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherVoiceMessageView.kt index a9223e18..98d90b86 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherVoiceMessageView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/OtherVoiceMessageView.kt @@ -102,7 +102,7 @@ internal class OtherVoiceMessageView @JvmOverloads constructor( R.drawable.sb_shape_chat_bubble_reactions_light ) val progressColor = - a.getResourceId(R.styleable.MessageView_File_sb_voice_message_progress_color, R.color.ondark_03) + a.getResourceId(R.styleable.MessageView_File_sb_voice_message_progress_color, R.color.ondark_text_low_emphasis) val progressTrackColor = a.getResourceId(R.styleable.MessageView_File_sb_voice_message_progress_track_color, R.color.background_100) val timelineTextAppearance = @@ -124,7 +124,7 @@ internal class OtherVoiceMessageView @JvmOverloads constructor( binding.voiceMessage.setProgressProgressColor(AppCompatResources.getColorStateList(context, progressColor)) binding.voiceMessage.setTimelineTextAppearance(timelineTextAppearance) val buttonBackgroundTint = if (SendbirdUIKit.isDarkMode()) R.color.background_600 else R.color.background_50 - val buttonTint = if (SendbirdUIKit.isDarkMode()) R.color.primary_200 else R.color.primary_300 + val buttonTint = if (SendbirdUIKit.isDarkMode()) R.color.primary_light else R.color.primary_main val inset = context.resources.getDimension(R.dimen.sb_size_12).toInt() val playIcon = DrawableUtils.createOvalIcon( diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/ParentMessageInfoView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/ParentMessageInfoView.kt index 288b65d8..9827bbf5 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/ParentMessageInfoView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/ParentMessageInfoView.kt @@ -193,7 +193,7 @@ internal class ParentMessageInfoView @JvmOverloads constructor( ) val moreIconTint = a.getResourceId( R.styleable.ParentMessageInfoView_sb_parent_message_info_more_icon_tint, - R.color.onlight_02 + R.color.onlight_text_mid_emphasis ) val fileMessageBackground = a.getResourceId( R.styleable.ParentMessageInfoView_sb_parent_message_info_file_message_background, @@ -213,12 +213,12 @@ internal class ParentMessageInfoView @JvmOverloads constructor( ) val dividerColor = a.getResourceId( R.styleable.ParentMessageInfoView_sb_parent_message_info_divider_line_color, - R.color.onlight_04 + R.color.onlight_text_disabled ) val progressColor = a.getResourceId( R.styleable.ParentMessageInfoView_sb_parent_message_info_voice_message_progress_color, - R.color.ondark_03 + R.color.ondark_text_low_emphasis ) val progressTrackColor = a.getResourceId( @@ -268,8 +268,8 @@ internal class ParentMessageInfoView @JvmOverloads constructor( binding.tvTextMessage.setLinkTextColor( if (SendbirdUIKit.isDarkMode()) ContextCompat.getColor( context, - R.color.ondark_02 - ) else ContextCompat.getColor(context, R.color.onlight_02) + R.color.ondark_text_mid_emphasis + ) else ContextCompat.getColor(context, R.color.onlight_text_mid_emphasis) ) binding.voiceMessage.setProgressCornerRadius(context.resources.getDimension(R.dimen.sb_size_16)) binding.voiceMessage.setProgressTrackColor( @@ -281,7 +281,7 @@ internal class ParentMessageInfoView @JvmOverloads constructor( binding.voiceMessage.setProgressProgressColor(AppCompatResources.getColorStateList(context, progressColor)) binding.voiceMessage.setTimelineTextAppearance(timelineTextAppearance) val buttonBackgroundTint = if (SendbirdUIKit.isDarkMode()) R.color.background_600 else R.color.background_50 - val buttonTint = if (SendbirdUIKit.isDarkMode()) R.color.primary_200 else R.color.primary_300 + val buttonTint = if (SendbirdUIKit.isDarkMode()) R.color.primary_light else R.color.primary_main val inset = context.resources.getDimension(R.dimen.sb_size_12).toInt() val playIcon = DrawableUtils.createOvalIcon( diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/ThreadInfoView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/ThreadInfoView.kt index 7088d96c..3c643d3b 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/ThreadInfoView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/ThreadInfoView.kt @@ -76,7 +76,7 @@ internal class ThreadInfoView @JvmOverloads internal constructor( context, R.color.background_300, R.drawable.icon_user, - if (SendbirdUIKit.isDarkMode()) R.color.onlight_01 else R.color.ondark_01 + if (SendbirdUIKit.isDarkMode()) R.color.onlight_text_high_emphasis else R.color.ondark_text_high_emphasis ) ) .transform(transformation) @@ -108,13 +108,13 @@ internal class ThreadInfoView @JvmOverloads internal constructor( ) val moreIconTint = a.getResourceId( R.styleable.ThreadInfoView_sb_thread_info_more_icon_tint, - R.color.ondark_01 + R.color.ondark_text_high_emphasis ) binding.tvReplyCount.setAppearance(context, replyCountTextAppearance) moreDrawable = DrawableUtils.createOvalIcon( context, - R.color.overlay_01, + R.color.overlay_dark, 140, moreIconRes, moreIconTint diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/TypingIndicatorDotsView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/TypingIndicatorDotsView.kt index 4ac0fd5a..db5e3316 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/TypingIndicatorDotsView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/TypingIndicatorDotsView.kt @@ -31,14 +31,14 @@ internal class TypingIndicatorDotsView @JvmOverloads internal constructor( init { val messageBackground = R.drawable.sb_shape_chat_bubble val messageBackgroundTint = if (SendbirdUIKit.isDarkMode()) { - AppCompatResources.getColorStateList(context, R.color.ondark_04) + AppCompatResources.getColorStateList(context, R.color.ondark_text_disabled) } else { - AppCompatResources.getColorStateList(context, R.color.onlight_04) + AppCompatResources.getColorStateList(context, R.color.onlight_text_disabled) } val dotImageTintList = if (SendbirdUIKit.isDarkMode()) { - AppCompatResources.getColorStateList(context, R.color.ondark_01) + AppCompatResources.getColorStateList(context, R.color.ondark_text_high_emphasis) } else { - AppCompatResources.getColorStateList(context, R.color.onlight_01) + AppCompatResources.getColorStateList(context, R.color.onlight_text_high_emphasis) } binding.root.background = diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/TypingMemberView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/TypingMemberView.kt index 66ac8aa5..da4941ff 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/TypingMemberView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/messages/TypingMemberView.kt @@ -46,11 +46,11 @@ internal class TypingMemberView @JvmOverloads internal constructor( if (SendbirdUIKit.isDarkMode()) { backgroundResourceId = R.drawable.sb_typing_member_message_background_light - textColorResourceId = R.color.ondark_02 + textColorResourceId = R.color.ondark_text_mid_emphasis textBackgroundResourceId = R.color.background_400 } else { backgroundResourceId = R.drawable.sb_typing_member_message_background_dark - textColorResourceId = R.color.onlight_02 + textColorResourceId = R.color.onlight_text_mid_emphasis textBackgroundResourceId = R.color.background_100 } diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/reactions/EmojiReactionUserListView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/reactions/EmojiReactionUserListView.kt index e281955d..2428240a 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/reactions/EmojiReactionUserListView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/reactions/EmojiReactionUserListView.kt @@ -46,7 +46,7 @@ internal class EmojiReactionUserListView @JvmOverloads constructor( ) val indicatorColor = a.getColor( R.styleable.EmojiReactionCountList_sb_emoji_reaction_count_tab_indicator_color, - ContextCompat.getColor(context, R.color.primary_300) + ContextCompat.getColor(context, R.color.primary_main) ) binding.tabLayoutPanel.setBackgroundResource(tabLayoutBackgroundResId) binding.tabLayout.setSelectedTabIndicatorColor(indicatorColor) diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/ImageWaffleView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/ImageWaffleView.kt index f14da71d..6507e013 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/ImageWaffleView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/ImageWaffleView.kt @@ -158,7 +158,7 @@ internal open class ImageWaffleView @JvmOverloads internal constructor( val paddingBottom = paddingBottom canvasBounds.set(0f, 0f, width.toFloat(), height.toFloat()) borderPaint.color = - ContextCompat.getColor(context, if (SendbirdUIKit.isDarkMode()) R.color.ondark_04 else R.color.onlight_04) + ContextCompat.getColor(context, if (SendbirdUIKit.isDarkMode()) R.color.ondark_text_disabled else R.color.onlight_text_disabled) canvas.drawRoundRect( canvasBounds, (width / 2).toFloat(), diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/SingleMenuItemView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/SingleMenuItemView.kt index fbd4fbdc..1d4afc1d 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/SingleMenuItemView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/SingleMenuItemView.kt @@ -107,7 +107,7 @@ internal class SingleMenuItemView @JvmOverloads constructor( binding.tvDescription.setAppearance(context, descriptionAppearance) binding.vgMenuItem.setBackgroundResource(itemBackground) val useDarkTheme = SendbirdUIKit.isDarkMode() - val nextTint = if (useDarkTheme) R.color.ondark_01 else R.color.onlight_01 + val nextTint = if (useDarkTheme) R.color.ondark_text_high_emphasis else R.color.onlight_text_high_emphasis val divider = if (useDarkTheme) R.drawable.sb_line_divider_dark else R.drawable.sb_line_divider_light val switchTrackTint = if (useDarkTheme) R.color.sb_switch_track_dark else R.color.sb_switch_track_light val switchThumbTint = if (useDarkTheme) R.color.sb_switch_thumb_dark else R.color.sb_switch_thumb_light diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/ThemeableRecyclerView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/ThemeableRecyclerView.kt index 0af72415..76e5fc95 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/ThemeableRecyclerView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/ThemeableRecyclerView.kt @@ -69,7 +69,7 @@ internal open class ThemeableRecyclerView @JvmOverloads constructor( a.getResourceId(R.styleable.ListComponent_sb_recycler_view_background, R.color.background_50) dividerColor = a.getColor( R.styleable.ListComponent_sb_recycler_view_divide_line_color, - ContextCompat.getColor(context, R.color.onlight_04) + ContextCompat.getColor(context, R.color.onlight_text_disabled) ) dividerHeight = a.getDimension( R.styleable.ListComponent_sb_recycler_view_divide_line_height, diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/ThemeableSnackbar.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/ThemeableSnackbar.kt index 510b60c4..4218f341 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/ThemeableSnackbar.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/ThemeableSnackbar.kt @@ -70,7 +70,7 @@ internal class ThemeableSnackbar @JvmOverloads constructor( val background = a.getResourceId(R.styleable.ThemeableSnackbar_sb_snackbar_background, R.color.background_50) val rooflineColor = - a.getResourceId(R.styleable.ThemeableSnackbar_sb_snackbar_roof_line_color, R.color.onlight_04) + a.getResourceId(R.styleable.ThemeableSnackbar_sb_snackbar_roof_line_color, R.color.onlight_text_disabled) val textAppearance = a.getResourceId( R.styleable.ThemeableSnackbar_sb_snackbar_text_appearance, R.style.SendbirdBody3OnLight02 diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/ToastView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/ToastView.kt index 267f6f86..abf79816 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/ToastView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/ToastView.kt @@ -26,8 +26,8 @@ internal class ToastView @JvmOverloads constructor( a.getResourceId(R.styleable.ToastView_sb_toast_background, R.drawable.sb_toast_background_light) val textAppearance = a.getResourceId(R.styleable.ToastView_sb_toast_text_appearance, R.style.SendbirdBody3OnDark01) - val successTint = if (SendbirdUIKit.isDarkMode()) R.color.secondary_500 else R.color.secondary_200 - val errorTint = if (SendbirdUIKit.isDarkMode()) R.color.error_300 else R.color.error_200 + val successTint = if (SendbirdUIKit.isDarkMode()) R.color.secondary_extra_dark else R.color.secondary_light + val errorTint = if (SendbirdUIKit.isDarkMode()) R.color.error_main else R.color.error_light toastPanel.setBackgroundResource(background) toastPanel.background.alpha = 163 tvToastText.setAppearance(context, textAppearance) diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/UserProfile.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/UserProfile.kt index 1aa14661..46fbefc4 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/UserProfile.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/UserProfile.kt @@ -53,7 +53,7 @@ internal class UserProfile @JvmOverloads constructor( R.style.SendbirdButtonOnLight01 ) val dividerColor = - a.getResourceId(R.styleable.UserProfile_sb_user_profile_divider_color, R.color.onlight_04) + a.getResourceId(R.styleable.UserProfile_sb_user_profile_divider_color, R.color.onlight_text_disabled) val infoTitleTextAppearance = a.getResourceId( R.styleable.UserProfile_sb_user_profile_information_title_text_appearance, R.style.SendbirdBody2OnLight02 diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/VoiceMessageInputView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/VoiceMessageInputView.kt index 44b534b4..8d7d47bb 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/VoiceMessageInputView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/VoiceMessageInputView.kt @@ -78,7 +78,7 @@ internal class VoiceMessageInputView @JvmOverloads constructor( ) val recordButtonTint = a.getResourceId( R.styleable.VoiceMessageInputView_sb_voice_message_input_record_button_tint, - R.color.error_300 + R.color.error_main ) val recordButtonBackground = a.getResourceId( R.styleable.VoiceMessageInputView_sb_voice_message_input_record_button_background, @@ -94,7 +94,7 @@ internal class VoiceMessageInputView @JvmOverloads constructor( ) val playButtonTint = a.getResourceId( R.styleable.VoiceMessageInputView_sb_voice_message_input_play_button_tint, - R.color.onlight_01 + R.color.onlight_text_high_emphasis ) val playButtonBackground = a.getResourceId( R.styleable.VoiceMessageInputView_sb_voice_message_input_play_button_background, @@ -110,7 +110,7 @@ internal class VoiceMessageInputView @JvmOverloads constructor( ) val pauseButtonTint = a.getResourceId( R.styleable.VoiceMessageInputView_sb_voice_message_input_pause_button_tint, - R.color.onlight_01 + R.color.onlight_text_high_emphasis ) val pauseButtonBackground = a.getResourceId( R.styleable.VoiceMessageInputView_sb_voice_message_input_pause_button_background, @@ -126,7 +126,7 @@ internal class VoiceMessageInputView @JvmOverloads constructor( ) val stopButtonTint = a.getResourceId( R.styleable.VoiceMessageInputView_sb_voice_message_input_stop_button_tint, - R.color.onlight_01 + R.color.onlight_text_high_emphasis ) val stopButtonBackground = a.getResourceId( R.styleable.VoiceMessageInputView_sb_voice_message_input_stop_button_background, @@ -142,7 +142,7 @@ internal class VoiceMessageInputView @JvmOverloads constructor( ) val sendButtonTint = a.getResourceId( R.styleable.VoiceMessageInputView_sb_voice_message_input_send_button_tint, - R.color.primary_300 + R.color.primary_main ) val sendButtonBackground = a.getResourceId( R.styleable.VoiceMessageInputView_sb_voice_message_input_send_button_background, @@ -184,7 +184,7 @@ internal class VoiceMessageInputView @JvmOverloads constructor( binding.btnCancel.setTextColor(AppCompatResources.getColorStateList(context, cancelButtonTextColor)) binding.recordingIcon.imageTintList = AppCompatResources.getColorStateList( context, - if (SendbirdUIKit.isDarkMode()) R.color.error_200 else R.color.error_300 + if (SendbirdUIKit.isDarkMode()) R.color.error_light else R.color.error_main ) binding.ibtnRecord.background = DrawableUtils.setTintList( diff --git a/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/VoiceProgressView.kt b/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/VoiceProgressView.kt index d1165cf8..84b1ec14 100644 --- a/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/VoiceProgressView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/internal/ui/widgets/VoiceProgressView.kt @@ -57,9 +57,9 @@ internal class VoiceProgressView @JvmOverloads constructor( progressRectF.set(0F, 0F, progress * w.toFloat() / max, h.toFloat()) } - override fun onDraw(canvas: Canvas?) { + override fun onDraw(canvas: Canvas) { super.onDraw(canvas) - canvas?.apply { + canvas.apply { clipPath(trackRectPath) drawRect(trackRectF, trackPaint) drawRect(progressRectF, progressPaint) diff --git a/uikit/src/main/java/com/sendbird/uikit/model/configurations/ChannelConfig.kt b/uikit/src/main/java/com/sendbird/uikit/model/configurations/ChannelConfig.kt index 52672df6..8e675a9a 100644 --- a/uikit/src/main/java/com/sendbird/uikit/model/configurations/ChannelConfig.kt +++ b/uikit/src/main/java/com/sendbird/uikit/model/configurations/ChannelConfig.kt @@ -299,8 +299,9 @@ data class ChannelConfig internal constructor( * @param value true if the reactions is enabled in the supergroup channel, false otherwise * @since 3.15.0 */ + @Deprecated("This method is deprecated since 3.18.0. If you wish to use this feature, contact us.", level = DeprecationLevel.HIDDEN) set(value) { - enableReactionsSupergroupMutable = value + enableReactionsSupergroupMutable = null } var enableVoiceMessage: Boolean /** diff --git a/uikit/src/main/java/com/sendbird/uikit/modules/OpenChannelModule.java b/uikit/src/main/java/com/sendbird/uikit/modules/OpenChannelModule.java index af620b3f..867476c4 100644 --- a/uikit/src/main/java/com/sendbird/uikit/modules/OpenChannelModule.java +++ b/uikit/src/main/java/com/sendbird/uikit/modules/OpenChannelModule.java @@ -87,7 +87,7 @@ public View onCreateView(@NonNull Context context, @NonNull LayoutInflater infla parent.setOrientation(LinearLayout.VERTICAL); if (params.useOverlayMode) { - parent.setBackgroundResource(R.color.onlight_03); + parent.setBackgroundResource(R.color.onlight_text_low_emphasis); } final TypedValue values = new TypedValue(); diff --git a/uikit/src/main/java/com/sendbird/uikit/modules/components/OpenChannelSettingsMenuComponent.java b/uikit/src/main/java/com/sendbird/uikit/modules/components/OpenChannelSettingsMenuComponent.java index f23a5f67..9afdc9f0 100644 --- a/uikit/src/main/java/com/sendbird/uikit/modules/components/OpenChannelSettingsMenuComponent.java +++ b/uikit/src/main/java/com/sendbird/uikit/modules/components/OpenChannelSettingsMenuComponent.java @@ -244,7 +244,7 @@ private View createDefaultMenuView(@NonNull Context context, @NonNull Menu menu) menuView.setName(context.getString(R.string.sb_text_channel_settings_delete_channel)); menuView.setMenuType(SingleMenuType.NONE); menuView.setIcon(R.drawable.icon_delete); - menuView.setIconTint(AppCompatResources.getColorStateList(context, SendbirdUIKit.isDarkMode() ? R.color.error_200 : R.color.error_300)); + menuView.setIconTint(AppCompatResources.getColorStateList(context, SendbirdUIKit.isDarkMode() ? R.color.error_light : R.color.error_main)); break; } return menuView; diff --git a/uikit/src/main/java/com/sendbird/uikit/utils/ViewUtils.java b/uikit/src/main/java/com/sendbird/uikit/utils/ViewUtils.java index 11752a10..bddfbdab 100644 --- a/uikit/src/main/java/com/sendbird/uikit/utils/ViewUtils.java +++ b/uikit/src/main/java/com/sendbird/uikit/utils/ViewUtils.java @@ -309,7 +309,7 @@ public static void drawNickname( } public static void drawNotificationProfile(@NonNull ImageView ivProfile, @Nullable BaseMessage message) { - int iconTint = SendbirdUIKit.isDarkMode() ? R.color.onlight_01 : R.color.ondark_01; + int iconTint = SendbirdUIKit.isDarkMode() ? R.color.onlight_text_high_emphasis : R.color.ondark_text_high_emphasis; int backgroundTint = R.color.background_300; int inset = ivProfile.getContext().getResources().getDimensionPixelSize(R.dimen.sb_size_6); final Drawable profile = DrawableUtils.createOvalIconWithInset(ivProfile.getContext(), backgroundTint, R.drawable.icon_channels, iconTint, inset); @@ -333,7 +333,7 @@ public static void drawProfile(@NonNull ImageView ivProfile, @Nullable BaseMessa } public static void drawProfile(@NonNull ImageView ivProfile, @Nullable String url, @Nullable String plainUrl) { - int iconTint = SendbirdUIKit.isDarkMode() ? R.color.onlight_01 : R.color.ondark_01; + int iconTint = SendbirdUIKit.isDarkMode() ? R.color.onlight_text_high_emphasis : R.color.ondark_text_high_emphasis; int backgroundTint = R.color.background_300; Drawable errorDrawable = DrawableUtils.createOvalIcon(ivProfile.getContext(), backgroundTint, R.drawable.icon_user, iconTint); @@ -420,7 +420,7 @@ public static void drawThumbnail( if (fileType.toLowerCase().contains(StringSet.image) && !fileType.toLowerCase().contains(StringSet.gif)) { view.getContent().setScaleType(ImageView.ScaleType.CENTER); - int thumbnailIconTint = SendbirdUIKit.isDarkMode() ? R.color.ondark_02 : R.color.onlight_02; + int thumbnailIconTint = SendbirdUIKit.isDarkMode() ? R.color.ondark_text_mid_emphasis : R.color.onlight_text_mid_emphasis; builder = builder.placeholder(DrawableUtils.setTintList(ImageUtils.resize(context.getResources(), AppCompatResources.getDrawable(context, R.drawable.icon_photo), iconSize, iconSize), AppCompatResources.getColorStateList(context, thumbnailIconTint))).error(DrawableUtils.setTintList(ImageUtils.resize(context.getResources(), AppCompatResources.getDrawable(context, R.drawable.icon_thumbnail_none), iconSize, iconSize), AppCompatResources.getColorStateList(context, thumbnailIconTint))); } @@ -458,8 +458,8 @@ public static void drawThumbnailIcon(@NonNull ImageView imageView, @NonNull File public static void drawThumbnailIcon(@NonNull ImageView imageView, @NonNull String fileType) { Context context = imageView.getContext(); - int backgroundTint = R.color.ondark_01; - int iconTint = R.color.onlight_02; + int backgroundTint = R.color.ondark_text_high_emphasis; + int iconTint = R.color.onlight_text_mid_emphasis; if (fileType.toLowerCase().contains(StringSet.gif)) { imageView.setImageDrawable(DrawableUtils.createOvalIcon(context, backgroundTint, R.drawable.icon_gif, iconTint)); } else if (fileType.toLowerCase().contains(StringSet.video)) { @@ -495,7 +495,7 @@ public static void drawFileMessageIconToReply(@NonNull ImageView imageView, @Non public static void drawFileMessageIconToReply(@NonNull ImageView imageView, @NonNull String fileType) { Context context = imageView.getContext(); int backgroundTint = SendbirdUIKit.isDarkMode() ? R.color.background_500 : R.color.background_100; - int iconTint = SendbirdUIKit.isDarkMode() ? R.color.ondark_02 : R.color.onlight_02; + int iconTint = SendbirdUIKit.isDarkMode() ? R.color.ondark_text_mid_emphasis : R.color.onlight_text_mid_emphasis; int inset = (int) context.getResources().getDimension(R.dimen.sb_size_8); Drawable background = DrawableUtils.setTintList(context, R.drawable.sb_rounded_rectangle_light_corner_10, backgroundTint); diff --git a/uikit/src/main/java/com/sendbird/uikit/widgets/MessageInputView.kt b/uikit/src/main/java/com/sendbird/uikit/widgets/MessageInputView.kt index c3fa5bd0..6003f1ce 100644 --- a/uikit/src/main/java/com/sendbird/uikit/widgets/MessageInputView.kt +++ b/uikit/src/main/java/com/sendbird/uikit/widgets/MessageInputView.kt @@ -377,7 +377,7 @@ class MessageInputView @JvmOverloads constructor( binding.ivQuoteReplyClose.setImageResource(replyRightButtonIcon) binding.ivQuoteReplyClose.imageTintList = replyRightButtonTint binding.ivQuoteReplyClose.setBackgroundResource(replyRightButtonBackground) - val dividerColor = if (SendbirdUIKit.isDarkMode()) R.color.ondark_04 else R.color.onlight_04 + val dividerColor = if (SendbirdUIKit.isDarkMode()) R.color.ondark_text_disabled else R.color.onlight_text_disabled binding.ivReplyDivider.setBackgroundColor(ContextCompat.getColor(context, dividerColor)) binding.etInputText.setOnClickListener { showKeyboard() } binding.etInputText.addTextChangedListener(object : TextWatcher { diff --git a/uikit/src/main/res/color/sb_button_contained_text_color_dark.xml b/uikit/src/main/res/color/sb_button_contained_text_color_dark.xml index a6038e63..7029de16 100644 --- a/uikit/src/main/res/color/sb_button_contained_text_color_dark.xml +++ b/uikit/src/main/res/color/sb_button_contained_text_color_dark.xml @@ -2,12 +2,12 @@ + android:color="@color/onlight_text_high_emphasis"/> + android:color="@color/ondark_text_disabled"/> + android:color="@color/onlight_text_high_emphasis"/> \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_button_contained_text_color_light.xml b/uikit/src/main/res/color/sb_button_contained_text_color_light.xml index 9d5dfdc1..21c8e1bc 100644 --- a/uikit/src/main/res/color/sb_button_contained_text_color_light.xml +++ b/uikit/src/main/res/color/sb_button_contained_text_color_light.xml @@ -2,13 +2,13 @@ + android:color="@color/ondark_text_high_emphasis"/> + android:color="@color/onlight_text_disabled"/> + android:color="@color/ondark_text_high_emphasis"/> \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_button_uncontained_text_color_alert_dark.xml b/uikit/src/main/res/color/sb_button_uncontained_text_color_alert_dark.xml index 31bc3914..596dffae 100644 --- a/uikit/src/main/res/color/sb_button_uncontained_text_color_alert_dark.xml +++ b/uikit/src/main/res/color/sb_button_uncontained_text_color_alert_dark.xml @@ -2,12 +2,12 @@ + android:color="@color/error_light"/> + android:color="@color/onlight_text_disabled"/> + android:color="@color/error_light"/> \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_button_uncontained_text_color_alert_light.xml b/uikit/src/main/res/color/sb_button_uncontained_text_color_alert_light.xml index 472ef076..122688fd 100644 --- a/uikit/src/main/res/color/sb_button_uncontained_text_color_alert_light.xml +++ b/uikit/src/main/res/color/sb_button_uncontained_text_color_alert_light.xml @@ -2,12 +2,12 @@ + android:color="@color/error_main"/> + android:color="@color/onlight_text_disabled"/> + android:color="@color/error_main"/> \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_button_uncontained_text_color_cancel_dark.xml b/uikit/src/main/res/color/sb_button_uncontained_text_color_cancel_dark.xml index ffc14e7d..728b45be 100644 --- a/uikit/src/main/res/color/sb_button_uncontained_text_color_cancel_dark.xml +++ b/uikit/src/main/res/color/sb_button_uncontained_text_color_cancel_dark.xml @@ -2,12 +2,12 @@ + android:color="@color/ondark_text_mid_emphasis"/> + android:color="@color/ondark_text_disabled"/> + android:color="@color/ondark_text_mid_emphasis"/> \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_button_uncontained_text_color_cancel_light.xml b/uikit/src/main/res/color/sb_button_uncontained_text_color_cancel_light.xml index 3560ed44..c40b085f 100644 --- a/uikit/src/main/res/color/sb_button_uncontained_text_color_cancel_light.xml +++ b/uikit/src/main/res/color/sb_button_uncontained_text_color_cancel_light.xml @@ -2,12 +2,12 @@ + android:color="@color/onlight_text_mid_emphasis"/> + android:color="@color/ondark_text_disabled"/> + android:color="@color/onlight_text_mid_emphasis"/> \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_button_uncontained_text_color_dark.xml b/uikit/src/main/res/color/sb_button_uncontained_text_color_dark.xml index d56b9184..d95e761b 100644 --- a/uikit/src/main/res/color/sb_button_uncontained_text_color_dark.xml +++ b/uikit/src/main/res/color/sb_button_uncontained_text_color_dark.xml @@ -2,12 +2,12 @@ + android:color="@color/primary_light"/> + android:color="@color/ondark_text_disabled"/> + android:color="@color/primary_light"/> \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_button_uncontained_text_color_light.xml b/uikit/src/main/res/color/sb_button_uncontained_text_color_light.xml index 27e9df7d..e827ef13 100644 --- a/uikit/src/main/res/color/sb_button_uncontained_text_color_light.xml +++ b/uikit/src/main/res/color/sb_button_uncontained_text_color_light.xml @@ -2,11 +2,11 @@ + android:color="@color/primary_main"/> + android:color="@color/onlight_text_disabled"/> - + \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_button_uncontained_text_color_overlay.xml b/uikit/src/main/res/color/sb_button_uncontained_text_color_overlay.xml index 2ce4170d..fb95c9c1 100644 --- a/uikit/src/main/res/color/sb_button_uncontained_text_color_overlay.xml +++ b/uikit/src/main/res/color/sb_button_uncontained_text_color_overlay.xml @@ -2,12 +2,12 @@ + android:color="@color/ondark_text_mid_emphasis"/> + android:color="@color/ondark_text_disabled"/> + android:color="@color/ondark_text_high_emphasis"/> \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_checkbox_tint_dark.xml b/uikit/src/main/res/color/sb_checkbox_tint_dark.xml index 0c52ad5c..c7022374 100644 --- a/uikit/src/main/res/color/sb_checkbox_tint_dark.xml +++ b/uikit/src/main/res/color/sb_checkbox_tint_dark.xml @@ -2,11 +2,11 @@ + android:color="@color/ondark_text_disabled"/> + android:color="@color/primary_light"/> - + \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_checkbox_tint_light.xml b/uikit/src/main/res/color/sb_checkbox_tint_light.xml index 3f1ac921..ea079465 100644 --- a/uikit/src/main/res/color/sb_checkbox_tint_light.xml +++ b/uikit/src/main/res/color/sb_checkbox_tint_light.xml @@ -2,12 +2,12 @@ + android:color="@color/onlight_text_disabled"/> + android:color="@color/primary_main"/> - + \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_message_me_tint_dark.xml b/uikit/src/main/res/color/sb_message_me_tint_dark.xml index 9c5b911b..061e926a 100644 --- a/uikit/src/main/res/color/sb_message_me_tint_dark.xml +++ b/uikit/src/main/res/color/sb_message_me_tint_dark.xml @@ -2,7 +2,7 @@ + android:color="@color/primary_main"/> - + \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_message_me_tint_light.xml b/uikit/src/main/res/color/sb_message_me_tint_light.xml index 47029b2f..4c492aa1 100644 --- a/uikit/src/main/res/color/sb_message_me_tint_light.xml +++ b/uikit/src/main/res/color/sb_message_me_tint_light.xml @@ -2,7 +2,7 @@ + android:color="@color/primary_dark"/> - + \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_message_other_tint_dark.xml b/uikit/src/main/res/color/sb_message_other_tint_dark.xml index 13592b8f..503b6c30 100644 --- a/uikit/src/main/res/color/sb_message_other_tint_dark.xml +++ b/uikit/src/main/res/color/sb_message_other_tint_dark.xml @@ -2,7 +2,7 @@ + android:color="@color/primary_extra_dark"/> \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_message_other_tint_light.xml b/uikit/src/main/res/color/sb_message_other_tint_light.xml index 09922ae4..cfd2d1b7 100644 --- a/uikit/src/main/res/color/sb_message_other_tint_light.xml +++ b/uikit/src/main/res/color/sb_message_other_tint_light.xml @@ -2,7 +2,7 @@ + android:color="@color/primary_extra_light"/> \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_selector_enabled_01_dark.xml b/uikit/src/main/res/color/sb_selector_enabled_01_dark.xml index 6b4159d2..65466b37 100644 --- a/uikit/src/main/res/color/sb_selector_enabled_01_dark.xml +++ b/uikit/src/main/res/color/sb_selector_enabled_01_dark.xml @@ -2,7 +2,7 @@ + android:color="@color/ondark_text_disabled"/> - + \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_selector_enabled_01_light.xml b/uikit/src/main/res/color/sb_selector_enabled_01_light.xml index 7914a080..42781d49 100644 --- a/uikit/src/main/res/color/sb_selector_enabled_01_light.xml +++ b/uikit/src/main/res/color/sb_selector_enabled_01_light.xml @@ -2,7 +2,7 @@ + android:color="@color/onlight_text_disabled"/> - + \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_selector_enabled_primary_dark.xml b/uikit/src/main/res/color/sb_selector_enabled_primary_dark.xml index dadfa563..d4ece0a4 100644 --- a/uikit/src/main/res/color/sb_selector_enabled_primary_dark.xml +++ b/uikit/src/main/res/color/sb_selector_enabled_primary_dark.xml @@ -2,7 +2,7 @@ + android:color="@color/ondark_text_disabled"/> - + \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_selector_enabled_primary_light.xml b/uikit/src/main/res/color/sb_selector_enabled_primary_light.xml index 3a537a80..4cd7517b 100644 --- a/uikit/src/main/res/color/sb_selector_enabled_primary_light.xml +++ b/uikit/src/main/res/color/sb_selector_enabled_primary_light.xml @@ -2,7 +2,7 @@ + android:color="@color/onlight_text_disabled"/> - + \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_selector_icon_more_color_dark.xml b/uikit/src/main/res/color/sb_selector_icon_more_color_dark.xml index a742e20a..88ec57e0 100644 --- a/uikit/src/main/res/color/sb_selector_icon_more_color_dark.xml +++ b/uikit/src/main/res/color/sb_selector_icon_more_color_dark.xml @@ -2,12 +2,12 @@ + android:color="@color/ondark_text_high_emphasis"/> + android:color="@color/ondark_text_disabled"/> + android:color="@color/ondark_text_high_emphasis"/> \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_selector_icon_more_color_light.xml b/uikit/src/main/res/color/sb_selector_icon_more_color_light.xml index 57a3d16e..bccc4d52 100644 --- a/uikit/src/main/res/color/sb_selector_icon_more_color_light.xml +++ b/uikit/src/main/res/color/sb_selector_icon_more_color_light.xml @@ -2,12 +2,12 @@ + android:color="@color/onlight_text_high_emphasis"/> + android:color="@color/onlight_text_disabled"/> + android:color="@color/onlight_text_high_emphasis"/> \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_selector_input_add_color_dark.xml b/uikit/src/main/res/color/sb_selector_input_add_color_dark.xml index d56b9184..d95e761b 100644 --- a/uikit/src/main/res/color/sb_selector_input_add_color_dark.xml +++ b/uikit/src/main/res/color/sb_selector_input_add_color_dark.xml @@ -2,12 +2,12 @@ + android:color="@color/primary_light"/> + android:color="@color/ondark_text_disabled"/> + android:color="@color/primary_light"/> \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_selector_input_add_color_light.xml b/uikit/src/main/res/color/sb_selector_input_add_color_light.xml index 3362c325..e2d4e74e 100644 --- a/uikit/src/main/res/color/sb_selector_input_add_color_light.xml +++ b/uikit/src/main/res/color/sb_selector_input_add_color_light.xml @@ -2,12 +2,12 @@ + android:color="@color/primary_main"/> + android:color="@color/onlight_text_disabled"/> + android:color="@color/primary_main"/> \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_selector_input_add_color_overlay.xml b/uikit/src/main/res/color/sb_selector_input_add_color_overlay.xml index a742e20a..88ec57e0 100644 --- a/uikit/src/main/res/color/sb_selector_input_add_color_overlay.xml +++ b/uikit/src/main/res/color/sb_selector_input_add_color_overlay.xml @@ -2,12 +2,12 @@ + android:color="@color/ondark_text_high_emphasis"/> + android:color="@color/ondark_text_disabled"/> + android:color="@color/ondark_text_high_emphasis"/> \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_selector_input_voice_color_dark.xml b/uikit/src/main/res/color/sb_selector_input_voice_color_dark.xml index d56b9184..d95e761b 100644 --- a/uikit/src/main/res/color/sb_selector_input_voice_color_dark.xml +++ b/uikit/src/main/res/color/sb_selector_input_voice_color_dark.xml @@ -2,12 +2,12 @@ + android:color="@color/primary_light"/> + android:color="@color/ondark_text_disabled"/> + android:color="@color/primary_light"/> \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_selector_input_voice_color_light.xml b/uikit/src/main/res/color/sb_selector_input_voice_color_light.xml index 3362c325..e2d4e74e 100644 --- a/uikit/src/main/res/color/sb_selector_input_voice_color_light.xml +++ b/uikit/src/main/res/color/sb_selector_input_voice_color_light.xml @@ -2,12 +2,12 @@ + android:color="@color/primary_main"/> + android:color="@color/onlight_text_disabled"/> + android:color="@color/primary_main"/> \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_selector_thumbnail_overlay.xml b/uikit/src/main/res/color/sb_selector_thumbnail_overlay.xml index c07da134..d6079f9e 100644 --- a/uikit/src/main/res/color/sb_selector_thumbnail_overlay.xml +++ b/uikit/src/main/res/color/sb_selector_thumbnail_overlay.xml @@ -2,7 +2,7 @@ + android:color="@color/overlay_light" /> diff --git a/uikit/src/main/res/color/sb_switch_thumb_dark.xml b/uikit/src/main/res/color/sb_switch_thumb_dark.xml index c28ae347..0a8780a1 100644 --- a/uikit/src/main/res/color/sb_switch_thumb_dark.xml +++ b/uikit/src/main/res/color/sb_switch_thumb_dark.xml @@ -4,5 +4,5 @@ android:state_checked="false" android:color="@color/background_200"/> - + \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_switch_thumb_light.xml b/uikit/src/main/res/color/sb_switch_thumb_light.xml index f14989f3..79056a10 100644 --- a/uikit/src/main/res/color/sb_switch_thumb_light.xml +++ b/uikit/src/main/res/color/sb_switch_thumb_light.xml @@ -4,5 +4,5 @@ android:state_checked="false" android:color="@color/background_200"/> - + \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_switch_track_dark.xml b/uikit/src/main/res/color/sb_switch_track_dark.xml index 5e576ee2..23c898f4 100644 --- a/uikit/src/main/res/color/sb_switch_track_dark.xml +++ b/uikit/src/main/res/color/sb_switch_track_dark.xml @@ -4,5 +4,5 @@ android:state_checked="false" android:color="@color/background_300"/> - + \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_switch_track_light.xml b/uikit/src/main/res/color/sb_switch_track_light.xml index 5e576ee2..23c898f4 100644 --- a/uikit/src/main/res/color/sb_switch_track_light.xml +++ b/uikit/src/main/res/color/sb_switch_track_light.xml @@ -4,5 +4,5 @@ android:state_checked="false" android:color="@color/background_300"/> - + \ No newline at end of file diff --git a/uikit/src/main/res/color/sb_voice_message_recorder_progress_background_dark.xml b/uikit/src/main/res/color/sb_voice_message_recorder_progress_background_dark.xml index 32a56792..7046dbbc 100644 --- a/uikit/src/main/res/color/sb_voice_message_recorder_progress_background_dark.xml +++ b/uikit/src/main/res/color/sb_voice_message_recorder_progress_background_dark.xml @@ -4,5 +4,5 @@ android:state_enabled="false" android:color="@color/background_400"/> - + diff --git a/uikit/src/main/res/color/sb_voice_message_recorder_progress_background_light.xml b/uikit/src/main/res/color/sb_voice_message_recorder_progress_background_light.xml index f49db026..7b8ac5ae 100644 --- a/uikit/src/main/res/color/sb_voice_message_recorder_progress_background_light.xml +++ b/uikit/src/main/res/color/sb_voice_message_recorder_progress_background_light.xml @@ -4,5 +4,5 @@ android:state_enabled="false" android:color="@color/background_100"/> - + diff --git a/uikit/src/main/res/color/sb_voice_message_recorder_send_background_dark.xml b/uikit/src/main/res/color/sb_voice_message_recorder_send_background_dark.xml index 243d5dac..e5345153 100644 --- a/uikit/src/main/res/color/sb_voice_message_recorder_send_background_dark.xml +++ b/uikit/src/main/res/color/sb_voice_message_recorder_send_background_dark.xml @@ -1,6 +1,6 @@ - + - + diff --git a/uikit/src/main/res/color/sb_voice_message_recorder_send_background_light.xml b/uikit/src/main/res/color/sb_voice_message_recorder_send_background_light.xml index df6b8ab0..6a0dd045 100644 --- a/uikit/src/main/res/color/sb_voice_message_recorder_send_background_light.xml +++ b/uikit/src/main/res/color/sb_voice_message_recorder_send_background_light.xml @@ -1,6 +1,6 @@ - + - + diff --git a/uikit/src/main/res/color/sb_voice_message_recorder_send_icon_dark.xml b/uikit/src/main/res/color/sb_voice_message_recorder_send_icon_dark.xml index 728a0d75..0ba97f9a 100644 --- a/uikit/src/main/res/color/sb_voice_message_recorder_send_icon_dark.xml +++ b/uikit/src/main/res/color/sb_voice_message_recorder_send_icon_dark.xml @@ -2,7 +2,7 @@ + android:color="@color/ondark_text_disabled"/> - + diff --git a/uikit/src/main/res/color/sb_voice_message_recorder_send_icon_light.xml b/uikit/src/main/res/color/sb_voice_message_recorder_send_icon_light.xml index e44a434f..0bae4d95 100644 --- a/uikit/src/main/res/color/sb_voice_message_recorder_send_icon_light.xml +++ b/uikit/src/main/res/color/sb_voice_message_recorder_send_icon_light.xml @@ -2,7 +2,7 @@ + android:color="@color/onlight_text_disabled"/> - + diff --git a/uikit/src/main/res/color/sb_voice_message_recorder_timeline_dark.xml b/uikit/src/main/res/color/sb_voice_message_recorder_timeline_dark.xml index 7890ec53..9cdf81df 100644 --- a/uikit/src/main/res/color/sb_voice_message_recorder_timeline_dark.xml +++ b/uikit/src/main/res/color/sb_voice_message_recorder_timeline_dark.xml @@ -2,7 +2,7 @@ + android:color="@color/ondark_text_low_emphasis"/> - + diff --git a/uikit/src/main/res/color/sb_voice_message_recorder_timeline_light.xml b/uikit/src/main/res/color/sb_voice_message_recorder_timeline_light.xml index 7fb7ccf4..e6f161f5 100644 --- a/uikit/src/main/res/color/sb_voice_message_recorder_timeline_light.xml +++ b/uikit/src/main/res/color/sb_voice_message_recorder_timeline_light.xml @@ -2,7 +2,7 @@ + android:color="@color/onlight_text_low_emphasis"/> - + diff --git a/uikit/src/main/res/drawable/sb_button_contained_background_dark.xml b/uikit/src/main/res/drawable/sb_button_contained_background_dark.xml index 35fccdd0..51bd5cfd 100644 --- a/uikit/src/main/res/drawable/sb_button_contained_background_dark.xml +++ b/uikit/src/main/res/drawable/sb_button_contained_background_dark.xml @@ -2,7 +2,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/uikit/src/main/res/drawable/sb_button_contained_background_light.xml b/uikit/src/main/res/drawable/sb_button_contained_background_light.xml index e4562a41..c10a2ebf 100644 --- a/uikit/src/main/res/drawable/sb_button_contained_background_light.xml +++ b/uikit/src/main/res/drawable/sb_button_contained_background_light.xml @@ -2,7 +2,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/uikit/src/main/res/drawable/sb_button_contained_background_overlay.xml b/uikit/src/main/res/drawable/sb_button_contained_background_overlay.xml index d04afeba..9b48c544 100644 --- a/uikit/src/main/res/drawable/sb_button_contained_background_overlay.xml +++ b/uikit/src/main/res/drawable/sb_button_contained_background_overlay.xml @@ -2,7 +2,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/uikit/src/main/res/drawable/sb_emoji_background_dark.xml b/uikit/src/main/res/drawable/sb_emoji_background_dark.xml index 7540bdc8..abc0b4f1 100644 --- a/uikit/src/main/res/drawable/sb_emoji_background_dark.xml +++ b/uikit/src/main/res/drawable/sb_emoji_background_dark.xml @@ -2,14 +2,14 @@ - + - + diff --git a/uikit/src/main/res/drawable/sb_emoji_background_light.xml b/uikit/src/main/res/drawable/sb_emoji_background_light.xml index 6dd7a813..bc897dcb 100644 --- a/uikit/src/main/res/drawable/sb_emoji_background_light.xml +++ b/uikit/src/main/res/drawable/sb_emoji_background_light.xml @@ -2,14 +2,14 @@ - + - + diff --git a/uikit/src/main/res/drawable/sb_emoji_reaction_background_dark.xml b/uikit/src/main/res/drawable/sb_emoji_reaction_background_dark.xml index 8ed34999..c28b89d2 100644 --- a/uikit/src/main/res/drawable/sb_emoji_reaction_background_dark.xml +++ b/uikit/src/main/res/drawable/sb_emoji_reaction_background_dark.xml @@ -2,14 +2,14 @@ - + - + diff --git a/uikit/src/main/res/drawable/sb_emoji_reaction_background_light.xml b/uikit/src/main/res/drawable/sb_emoji_reaction_background_light.xml index 942b4a4a..f01acaee 100644 --- a/uikit/src/main/res/drawable/sb_emoji_reaction_background_light.xml +++ b/uikit/src/main/res/drawable/sb_emoji_reaction_background_light.xml @@ -2,14 +2,14 @@ - + - + diff --git a/uikit/src/main/res/drawable/sb_feedback_background_dark.xml b/uikit/src/main/res/drawable/sb_feedback_background_dark.xml index 3caba58a..091cec5d 100644 --- a/uikit/src/main/res/drawable/sb_feedback_background_dark.xml +++ b/uikit/src/main/res/drawable/sb_feedback_background_dark.xml @@ -2,13 +2,13 @@ - + - + diff --git a/uikit/src/main/res/drawable/sb_feedback_background_light.xml b/uikit/src/main/res/drawable/sb_feedback_background_light.xml index 1453c2e0..976bdce2 100644 --- a/uikit/src/main/res/drawable/sb_feedback_background_light.xml +++ b/uikit/src/main/res/drawable/sb_feedback_background_light.xml @@ -2,13 +2,13 @@ - + - + diff --git a/uikit/src/main/res/drawable/sb_line_divider_dark.xml b/uikit/src/main/res/drawable/sb_line_divider_dark.xml index 67d885a1..80c086ab 100644 --- a/uikit/src/main/res/drawable/sb_line_divider_dark.xml +++ b/uikit/src/main/res/drawable/sb_line_divider_dark.xml @@ -1,5 +1,5 @@ - + diff --git a/uikit/src/main/res/drawable/sb_line_divider_light.xml b/uikit/src/main/res/drawable/sb_line_divider_light.xml index 8139cab2..d0908fc3 100644 --- a/uikit/src/main/res/drawable/sb_line_divider_light.xml +++ b/uikit/src/main/res/drawable/sb_line_divider_light.xml @@ -1,5 +1,5 @@ - + diff --git a/uikit/src/main/res/drawable/sb_message_input_cursor_dark.xml b/uikit/src/main/res/drawable/sb_message_input_cursor_dark.xml index 753edc84..eb08d741 100644 --- a/uikit/src/main/res/drawable/sb_message_input_cursor_dark.xml +++ b/uikit/src/main/res/drawable/sb_message_input_cursor_dark.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/uikit/src/main/res/drawable/sb_message_input_cursor_light.xml b/uikit/src/main/res/drawable/sb_message_input_cursor_light.xml index 8795a99c..f95bcbbb 100644 --- a/uikit/src/main/res/drawable/sb_message_input_cursor_light.xml +++ b/uikit/src/main/res/drawable/sb_message_input_cursor_light.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/uikit/src/main/res/drawable/sb_message_input_cursor_overlay.xml b/uikit/src/main/res/drawable/sb_message_input_cursor_overlay.xml index 32cda779..5d2a024a 100644 --- a/uikit/src/main/res/drawable/sb_message_input_cursor_overlay.xml +++ b/uikit/src/main/res/drawable/sb_message_input_cursor_overlay.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/uikit/src/main/res/drawable/sb_shape_category_filter_primary_200.xml b/uikit/src/main/res/drawable/sb_shape_category_filter_primary_200.xml index 1b654367..2d8eadc2 100644 --- a/uikit/src/main/res/drawable/sb_shape_category_filter_primary_200.xml +++ b/uikit/src/main/res/drawable/sb_shape_category_filter_primary_200.xml @@ -1,5 +1,5 @@ - + diff --git a/uikit/src/main/res/drawable/sb_shape_category_filter_primary_300.xml b/uikit/src/main/res/drawable/sb_shape_category_filter_primary_300.xml index 04b5e360..ab04e03f 100644 --- a/uikit/src/main/res/drawable/sb_shape_category_filter_primary_300.xml +++ b/uikit/src/main/res/drawable/sb_shape_category_filter_primary_300.xml @@ -1,5 +1,5 @@ - + diff --git a/uikit/src/main/res/drawable/sb_shape_dialog_rounded.xml b/uikit/src/main/res/drawable/sb_shape_dialog_rounded.xml index 687684f9..a6099707 100644 --- a/uikit/src/main/res/drawable/sb_shape_dialog_rounded.xml +++ b/uikit/src/main/res/drawable/sb_shape_dialog_rounded.xml @@ -3,7 +3,7 @@ - + + android:color="@color/ondark_text_disabled" /> diff --git a/uikit/src/main/res/drawable/sb_shape_edit_text_background_light.xml b/uikit/src/main/res/drawable/sb_shape_edit_text_background_light.xml index 2a647028..48fff59a 100644 --- a/uikit/src/main/res/drawable/sb_shape_edit_text_background_light.xml +++ b/uikit/src/main/res/drawable/sb_shape_edit_text_background_light.xml @@ -17,7 +17,7 @@ + android:color="@color/onlight_text_disabled" /> \ No newline at end of file diff --git a/uikit/src/main/res/drawable/sb_shape_edit_text_form_field_invalid_dark.xml b/uikit/src/main/res/drawable/sb_shape_edit_text_form_field_invalid_dark.xml index 6e0f1255..9edf1728 100644 --- a/uikit/src/main/res/drawable/sb_shape_edit_text_form_field_invalid_dark.xml +++ b/uikit/src/main/res/drawable/sb_shape_edit_text_form_field_invalid_dark.xml @@ -3,6 +3,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - - + + diff --git a/uikit/src/main/res/drawable/sb_shape_edit_text_form_field_invalid_light.xml b/uikit/src/main/res/drawable/sb_shape_edit_text_form_field_invalid_light.xml index 3b1343e9..d9493204 100644 --- a/uikit/src/main/res/drawable/sb_shape_edit_text_form_field_invalid_light.xml +++ b/uikit/src/main/res/drawable/sb_shape_edit_text_form_field_invalid_light.xml @@ -3,6 +3,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - + diff --git a/uikit/src/main/res/drawable/sb_shape_edit_text_form_field_normal_dark.xml b/uikit/src/main/res/drawable/sb_shape_edit_text_form_field_normal_dark.xml index 5f50f4f0..8dc1b03f 100644 --- a/uikit/src/main/res/drawable/sb_shape_edit_text_form_field_normal_dark.xml +++ b/uikit/src/main/res/drawable/sb_shape_edit_text_form_field_normal_dark.xml @@ -3,6 +3,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - - + + diff --git a/uikit/src/main/res/drawable/sb_shape_edit_text_form_field_normal_light.xml b/uikit/src/main/res/drawable/sb_shape_edit_text_form_field_normal_light.xml index 3dac074a..97086a69 100644 --- a/uikit/src/main/res/drawable/sb_shape_edit_text_form_field_normal_light.xml +++ b/uikit/src/main/res/drawable/sb_shape_edit_text_form_field_normal_light.xml @@ -3,6 +3,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - + diff --git a/uikit/src/main/res/drawable/sb_shape_image_message_background_dim.xml b/uikit/src/main/res/drawable/sb_shape_image_message_background_dim.xml index f264f7ed..17a57ee6 100644 --- a/uikit/src/main/res/drawable/sb_shape_image_message_background_dim.xml +++ b/uikit/src/main/res/drawable/sb_shape_image_message_background_dim.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - + \ No newline at end of file diff --git a/uikit/src/main/res/drawable/sb_shape_round_rect_background_ondark_02.xml b/uikit/src/main/res/drawable/sb_shape_round_rect_background_ondark_02.xml index 7395563b..a37d8d56 100644 --- a/uikit/src/main/res/drawable/sb_shape_round_rect_background_ondark_02.xml +++ b/uikit/src/main/res/drawable/sb_shape_round_rect_background_ondark_02.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - + diff --git a/uikit/src/main/res/drawable/sb_shape_round_rect_background_onlight_04.xml b/uikit/src/main/res/drawable/sb_shape_round_rect_background_onlight_04.xml index d06636da..83140c12 100644 --- a/uikit/src/main/res/drawable/sb_shape_round_rect_background_onlight_04.xml +++ b/uikit/src/main/res/drawable/sb_shape_round_rect_background_onlight_04.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - + diff --git a/uikit/src/main/res/drawable/sb_shape_submit_button_dark.xml b/uikit/src/main/res/drawable/sb_shape_submit_button_dark.xml index e8472ec9..b195e7b5 100644 --- a/uikit/src/main/res/drawable/sb_shape_submit_button_dark.xml +++ b/uikit/src/main/res/drawable/sb_shape_submit_button_dark.xml @@ -3,6 +3,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - + diff --git a/uikit/src/main/res/drawable/sb_shape_submit_button_light.xml b/uikit/src/main/res/drawable/sb_shape_submit_button_light.xml index caeae5d8..292eca2a 100644 --- a/uikit/src/main/res/drawable/sb_shape_submit_button_light.xml +++ b/uikit/src/main/res/drawable/sb_shape_submit_button_light.xml @@ -3,6 +3,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - + diff --git a/uikit/src/main/res/drawable/sb_shape_timeline_background.xml b/uikit/src/main/res/drawable/sb_shape_timeline_background.xml index abcb34b7..1e9f2bd3 100644 --- a/uikit/src/main/res/drawable/sb_shape_timeline_background.xml +++ b/uikit/src/main/res/drawable/sb_shape_timeline_background.xml @@ -7,5 +7,5 @@ android:radius="@dimen/sb_size_16"/> + android:color="@color/overlay_light"/> diff --git a/uikit/src/main/res/drawable/sb_shape_typing_indicator_dot.xml b/uikit/src/main/res/drawable/sb_shape_typing_indicator_dot.xml index 6ea7d638..a2083c25 100644 --- a/uikit/src/main/res/drawable/sb_shape_typing_indicator_dot.xml +++ b/uikit/src/main/res/drawable/sb_shape_typing_indicator_dot.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/uikit/src/main/res/drawable/sb_shape_unread_message_count.xml b/uikit/src/main/res/drawable/sb_shape_unread_message_count.xml index a1eefe27..fbea43e9 100644 --- a/uikit/src/main/res/drawable/sb_shape_unread_message_count.xml +++ b/uikit/src/main/res/drawable/sb_shape_unread_message_count.xml @@ -6,7 +6,7 @@ + android:color="@color/primary_main"/> + android:color="@color/primary_light"/> - + diff --git a/uikit/src/main/res/drawable/sb_suggested_mention_list_background_light.xml b/uikit/src/main/res/drawable/sb_suggested_mention_list_background_light.xml index 52fbef4c..e1bf157f 100644 --- a/uikit/src/main/res/drawable/sb_suggested_mention_list_background_light.xml +++ b/uikit/src/main/res/drawable/sb_suggested_mention_list_background_light.xml @@ -2,7 +2,7 @@ - + diff --git a/uikit/src/main/res/drawable/sb_suggested_replies_button_dark.xml b/uikit/src/main/res/drawable/sb_suggested_replies_button_dark.xml index 4df28639..9500f160 100644 --- a/uikit/src/main/res/drawable/sb_suggested_replies_button_dark.xml +++ b/uikit/src/main/res/drawable/sb_suggested_replies_button_dark.xml @@ -5,7 +5,7 @@ + android:color="@color/primary_light"/> @@ -16,7 +16,7 @@ + android:color="@color/primary_light"/> diff --git a/uikit/src/main/res/drawable/sb_suggested_replies_button_light.xml b/uikit/src/main/res/drawable/sb_suggested_replies_button_light.xml index ee4b8c14..583c001a 100644 --- a/uikit/src/main/res/drawable/sb_suggested_replies_button_light.xml +++ b/uikit/src/main/res/drawable/sb_suggested_replies_button_light.xml @@ -5,7 +5,7 @@ + android:color="@color/primary_main"/> @@ -16,7 +16,7 @@ + android:color="@color/primary_main"/> diff --git a/uikit/src/main/res/drawable/sb_tab_layout_border_background_dark.xml b/uikit/src/main/res/drawable/sb_tab_layout_border_background_dark.xml index cbeac137..27fa14ea 100644 --- a/uikit/src/main/res/drawable/sb_tab_layout_border_background_dark.xml +++ b/uikit/src/main/res/drawable/sb_tab_layout_border_background_dark.xml @@ -2,14 +2,14 @@ - + - + diff --git a/uikit/src/main/res/drawable/sb_tab_layout_border_background_light.xml b/uikit/src/main/res/drawable/sb_tab_layout_border_background_light.xml index 77e06303..46478dda 100644 --- a/uikit/src/main/res/drawable/sb_tab_layout_border_background_light.xml +++ b/uikit/src/main/res/drawable/sb_tab_layout_border_background_light.xml @@ -2,7 +2,7 @@ - + - - + + - + \ No newline at end of file diff --git a/uikit/src/main/res/drawable/selector_button_default_light.xml b/uikit/src/main/res/drawable/selector_button_default_light.xml index d0af4902..bebbe453 100644 --- a/uikit/src/main/res/drawable/selector_button_default_light.xml +++ b/uikit/src/main/res/drawable/selector_button_default_light.xml @@ -4,14 +4,14 @@ - + - + \ No newline at end of file diff --git a/uikit/src/main/res/drawable/selector_category_filter_menu_text_color_dark.xml b/uikit/src/main/res/drawable/selector_category_filter_menu_text_color_dark.xml index edddbccc..dea3accd 100644 --- a/uikit/src/main/res/drawable/selector_category_filter_menu_text_color_dark.xml +++ b/uikit/src/main/res/drawable/selector_category_filter_menu_text_color_dark.xml @@ -2,8 +2,8 @@ + android:color="@color/onlight_text_mid_emphasis"/> + android:color="@color/ondark_text_high_emphasis"/> diff --git a/uikit/src/main/res/drawable/selector_category_filter_menu_text_color_light.xml b/uikit/src/main/res/drawable/selector_category_filter_menu_text_color_light.xml index a5940fc9..21b84ef1 100644 --- a/uikit/src/main/res/drawable/selector_category_filter_menu_text_color_light.xml +++ b/uikit/src/main/res/drawable/selector_category_filter_menu_text_color_light.xml @@ -2,8 +2,8 @@ + android:color="@color/ondark_text_high_emphasis"/> + android:color="@color/onlight_text_high_emphasis"/> diff --git a/uikit/src/main/res/drawable/selector_feedback_bad_button_dark.xml b/uikit/src/main/res/drawable/selector_feedback_bad_button_dark.xml index 6a61766e..ad206e41 100644 --- a/uikit/src/main/res/drawable/selector_feedback_bad_button_dark.xml +++ b/uikit/src/main/res/drawable/selector_feedback_bad_button_dark.xml @@ -1,12 +1,12 @@ - + - + - + diff --git a/uikit/src/main/res/drawable/selector_feedback_bad_button_light.xml b/uikit/src/main/res/drawable/selector_feedback_bad_button_light.xml index 77c904b0..e0e6cb1a 100644 --- a/uikit/src/main/res/drawable/selector_feedback_bad_button_light.xml +++ b/uikit/src/main/res/drawable/selector_feedback_bad_button_light.xml @@ -1,12 +1,12 @@ - + - + - + diff --git a/uikit/src/main/res/drawable/selector_feedback_good_button_dark.xml b/uikit/src/main/res/drawable/selector_feedback_good_button_dark.xml index f14e06b6..ba3bc8cb 100644 --- a/uikit/src/main/res/drawable/selector_feedback_good_button_dark.xml +++ b/uikit/src/main/res/drawable/selector_feedback_good_button_dark.xml @@ -1,12 +1,12 @@ - + - + - + diff --git a/uikit/src/main/res/drawable/selector_feedback_good_button_light.xml b/uikit/src/main/res/drawable/selector_feedback_good_button_light.xml index 8175345a..1f67bb60 100644 --- a/uikit/src/main/res/drawable/selector_feedback_good_button_light.xml +++ b/uikit/src/main/res/drawable/selector_feedback_good_button_light.xml @@ -1,12 +1,12 @@ - + - + - + diff --git a/uikit/src/main/res/drawable/selector_message_input_hint_text_color.xml b/uikit/src/main/res/drawable/selector_message_input_hint_text_color.xml index 5ed36c46..f12450d6 100644 --- a/uikit/src/main/res/drawable/selector_message_input_hint_text_color.xml +++ b/uikit/src/main/res/drawable/selector_message_input_hint_text_color.xml @@ -2,8 +2,8 @@ + android:color="@color/onlight_text_low_emphasis" /> + android:color="@color/onlight_text_disabled" /> \ No newline at end of file diff --git a/uikit/src/main/res/drawable/selector_message_input_hint_text_color_dark.xml b/uikit/src/main/res/drawable/selector_message_input_hint_text_color_dark.xml index 90ce83e7..ef3c1bde 100644 --- a/uikit/src/main/res/drawable/selector_message_input_hint_text_color_dark.xml +++ b/uikit/src/main/res/drawable/selector_message_input_hint_text_color_dark.xml @@ -2,8 +2,8 @@ + android:color="@color/ondark_text_low_emphasis" /> + android:color="@color/ondark_text_disabled" /> \ No newline at end of file diff --git a/uikit/src/main/res/drawable/selector_message_og_image_overlay.xml b/uikit/src/main/res/drawable/selector_message_og_image_overlay.xml index fe133c82..e9543a3f 100644 --- a/uikit/src/main/res/drawable/selector_message_og_image_overlay.xml +++ b/uikit/src/main/res/drawable/selector_message_og_image_overlay.xml @@ -2,7 +2,7 @@ + android:drawable="@color/overlay_light" /> diff --git a/uikit/src/main/res/drawable/selector_radio_button_dark.xml b/uikit/src/main/res/drawable/selector_radio_button_dark.xml index d88139b4..98208767 100644 --- a/uikit/src/main/res/drawable/selector_radio_button_dark.xml +++ b/uikit/src/main/res/drawable/selector_radio_button_dark.xml @@ -1,9 +1,9 @@ - + - + \ No newline at end of file diff --git a/uikit/src/main/res/drawable/selector_radio_button_light.xml b/uikit/src/main/res/drawable/selector_radio_button_light.xml index f8c9dc5e..21681e86 100644 --- a/uikit/src/main/res/drawable/selector_radio_button_light.xml +++ b/uikit/src/main/res/drawable/selector_radio_button_light.xml @@ -1,9 +1,9 @@ - + - + \ No newline at end of file diff --git a/uikit/src/main/res/drawable/selector_rectangle_onlight_02.xml b/uikit/src/main/res/drawable/selector_rectangle_onlight_02.xml index 7077d83d..cb843c24 100644 --- a/uikit/src/main/res/drawable/selector_rectangle_onlight_02.xml +++ b/uikit/src/main/res/drawable/selector_rectangle_onlight_02.xml @@ -2,7 +2,7 @@ + android:drawable="@color/onlight_text_mid_emphasis"/> diff --git a/uikit/src/main/res/layout/sb_fragment_photo_view.xml b/uikit/src/main/res/layout/sb_fragment_photo_view.xml index 93d1d3a0..8ba7b4c2 100644 --- a/uikit/src/main/res/layout/sb_fragment_photo_view.xml +++ b/uikit/src/main/res/layout/sb_fragment_photo_view.xml @@ -16,7 +16,7 @@ android:id="@+id/vgHeader" android:layout_width="match_parent" android:layout_height="@dimen/sb_size_56" - android:background="@color/overlay_01" + android:background="@color/overlay_dark" android:orientation="horizontal"> + app:tint="@color/ondark_text_high_emphasis" /> @@ -83,7 +83,7 @@ android:layout_marginBottom="@dimen/sb_size_16" android:src="@drawable/icon_download" android:contentDescription="@string/sb_fragment_photo_view_save_description" - app:tint="@color/ondark_01" /> + app:tint="@color/ondark_text_high_emphasis" /> + app:tint="@color/ondark_text_high_emphasis" /> diff --git a/uikit/src/main/res/layout/sb_view_suggested_reply_component.xml b/uikit/src/main/res/layout/sb_view_suggested_reply_component.xml index 070b1306..09905b91 100644 --- a/uikit/src/main/res/layout/sb_view_suggested_reply_component.xml +++ b/uikit/src/main/res/layout/sb_view_suggested_reply_component.xml @@ -15,7 +15,7 @@ android:paddingEnd="@dimen/sb_size_12" android:background="@drawable/sb_suggested_replies_button_light" android:textSize="@dimen/sb_text_size_14" - android:textColor="@color/primary_300" + android:textColor="@color/primary_main" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> diff --git a/uikit/src/main/res/layout/sb_view_voice_message.xml b/uikit/src/main/res/layout/sb_view_voice_message.xml index f548ddde..2388b0d3 100644 --- a/uikit/src/main/res/layout/sb_view_voice_message.xml +++ b/uikit/src/main/res/layout/sb_view_voice_message.xml @@ -52,7 +52,7 @@ android:id="@+id/timelineView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/ondark_01" + android:textColor="@color/ondark_text_high_emphasis" android:text="00:00" android:layout_marginEnd="@dimen/sb_size_12" app:layout_constraintTop_toTopOf="parent" diff --git a/uikit/src/main/res/layout/sb_view_voice_message_input.xml b/uikit/src/main/res/layout/sb_view_voice_message_input.xml index 4948484f..caf88af6 100644 --- a/uikit/src/main/res/layout/sb_view_voice_message_input.xml +++ b/uikit/src/main/res/layout/sb_view_voice_message_input.xml @@ -29,7 +29,7 @@ app:layout_constraintTop_toTopOf="@id/progress" app:layout_constraintBottom_toBottomOf="@id/progress" app:layout_constraintEnd_toStartOf="@id/tvTimeline" - app:tint="@color/error_300" /> + app:tint="@color/error_main" /> + #491389 #6211c8 #742ddd @@ -15,14 +16,6 @@ #de360b #f66161 #fdaaaa - #000000 - #161616 - #2c2c2c - #393939 - #bdbdbd - #e0e0e0 - #eeeeee - #ffffff #8c000000 #51000000 #e1000000 @@ -33,6 +26,48 @@ #80ffffff #61ffffff #1effffff - #adc9ff + #a9bbfa + + + @color/primary_500 + @color/primary_400 + @color/primary_300 + @color/primary_200 + @color/primary_100 + @color/secondary_500 + @color/secondary_400 + @color/secondary_300 + @color/secondary_200 + @color/secondary_100 + @color/error_500 + @color/error_400 + @color/error_300 + @color/error_200 + @color/error_100 + @color/overlay_01 + @color/overlay_02 + #241389 + #362ca9 + #4a48cd + @color/information + #d1dbff + @color/onlight_01 + @color/onlight_02 + @color/onlight_03 + @color/onlight_04 + @color/ondark_01 + @color/ondark_02 + @color/ondark_03 + @color/ondark_04 + + #fff2b6 + #000000 + #161616 + #2c2c2c + #393939 + #bdbdbd + #e0e0e0 + #eeeeee + #ffffff \ No newline at end of file diff --git a/uikit/src/main/res/values/sendbird_text_appearance.xml b/uikit/src/main/res/values/sendbird_text_appearance.xml index 31ffbfbe..3a0a371f 100755 --- a/uikit/src/main/res/values/sendbird_text_appearance.xml +++ b/uikit/src/main/res/values/sendbird_text_appearance.xml @@ -19,91 +19,91 @@ sans-serif-medium normal 18sp - @color/onlight_04 + @color/onlight_text_disabled @@ -234,7 +234,7 @@ @@ -250,7 +250,7 @@ @@ -389,27 +389,27 @@ @@ -420,7 +420,7 @@ @@ -439,7 +439,7 @@ @@ -532,7 +532,7 @@ @@ -557,7 +557,7 @@ @drawable/selector_rectangle_light @style/SendbirdSubtitle2OnLight01 @style/SendbirdBody3OnLight02 - @color/onlight_04 + @color/onlight_text_disabled @style/SendbirdBody3OnLight01 @color/sb_switch_track_light @color/sb_switch_thumb_light @@ -570,7 +570,7 @@ @@ -609,7 +609,7 @@ @@ -622,14 +622,14 @@ @@ -647,13 +647,13 @@ @drawable/sb_shape_edit_text_background_light @style/SendbirdBody3OnLight01 @string/text_input_channel_name_hint - @color/onlight_03 + @color/onlight_text_low_emphasis @drawable/icon_remove - @color/onlight_03 + @color/onlight_text_low_emphasis @drawable/sb_message_input_cursor_light @drawable/sb_shape_circle_background_300 @drawable/icon_camera - @color/ondark_01 + @color/ondark_text_high_emphasis @@ -815,7 +815,7 @@ @@ -943,19 +943,19 @@ @drawable/selector_rectangle_light @drawable/sb_shape_circle_background_300 @drawable/icon_channels - @color/ondark_01 + @color/ondark_text_high_emphasis @style/SendbirdSubtitle1OnLight01 @style/SendbirdCaption1OnLight02 @drawable/icon_members - @color/onlight_02 + @color/onlight_text_mid_emphasis @drawable/icon_freeze - @color/primary_300 + @color/primary_main @@ -988,31 +988,31 @@ @@ -1130,7 +1130,7 @@ @drawable/selector_rectangle_light @style/SendbirdBody3OnLight01 @drawable/selector_open_channel_message_bg_light - @color/primary_300 + @color/primary_main @style/SendbirdBody3OnLight02 diff --git a/uikit/src/main/res/values/styles_dark.xml b/uikit/src/main/res/values/styles_dark.xml index f216891f..89050352 100644 --- a/uikit/src/main/res/values/styles_dark.xml +++ b/uikit/src/main/res/values/styles_dark.xml @@ -1,9 +1,9 @@ @@ -191,13 +191,13 @@ @drawable/sb_shape_edit_text_background_dark @style/SendbirdBody3OnDark01 @string/text_input_channel_name_hint - @color/ondark_03 + @color/ondark_text_low_emphasis @drawable/icon_remove - @color/ondark_03 + @color/ondark_text_low_emphasis @drawable/sb_message_input_cursor_dark @drawable/sb_shape_circle_background_300 @drawable/icon_camera - @color/onlight_01 + @color/onlight_text_high_emphasis @@ -325,9 +325,9 @@ @drawable/selector_button_retry_dark @drawable/icon_refresh @drawable/icon_error - @color/ondark_03 - @color/ondark_03 - @color/ondark_03 + @color/ondark_text_low_emphasis + @color/ondark_text_low_emphasis + @color/ondark_text_low_emphasis @@ -346,7 +346,7 @@ @@ -362,7 +362,7 @@ @@ -502,27 +502,27 @@ @@ -533,7 +533,7 @@ @@ -552,7 +552,7 @@ @@ -645,7 +645,7 @@ @@ -670,7 +670,7 @@ @drawable/selector_rectangle_dark600 @style/SendbirdSubtitle2OnDark01 @style/SendbirdBody3OnDark02 - @color/ondark_04 + @color/ondark_text_disabled @style/SendbirdBody3OnDark01 @color/sb_switch_track_dark @color/sb_switch_thumb_dark @@ -683,7 +683,7 @@ @@ -722,7 +722,7 @@ @@ -735,14 +735,14 @@ @@ -788,11 +788,11 @@ @@ -810,7 +810,7 @@ @@ -937,13 +937,13 @@ @drawable/selector_rectangle_dark600 @drawable/sb_shape_circle_background_300 @drawable/icon_channels - @color/onlight_01 + @color/onlight_text_high_emphasis @style/SendbirdSubtitle1OnDark01 @style/SendbirdCaption2OnDark02 @drawable/icon_members - @color/ondark_02 + @color/ondark_text_mid_emphasis @drawable/icon_freeze - @color/primary_200 + @color/primary_light @@ -1010,7 +1010,7 @@ @drawable/selector_rectangle_dark500 @style/SendbirdBody3OnDark01 @drawable/selector_open_channel_message_bg_dark - @color/primary_200 + @color/primary_light @style/SendbirdBody3OnDark02 @@ -1027,7 +1027,7 @@ @@ -1060,7 +1060,7 @@ @@ -1068,24 +1068,24 @@ @@ -158,7 +158,7 @@ @style/SendbirdBody2Primary200 @style/SendbirdCaption2OnDark01 @style/SendbirdCaption2OnDark02 - @color/primary_200 + @color/primary_light @style/SendbirdBody3OnDark02