From 4aa55cd35e4a9a96745dcab2e057c14e4ac8b0f1 Mon Sep 17 00:00:00 2001 From: Tucan444 <66880425+Tucan444@users.noreply.github.com> Date: Wed, 21 Apr 2021 14:39:20 +0200 Subject: [PATCH] _ --- .../wikispot/fragments/chatFragment.kt | 48 ++++++------------- .../wikispot/modelClasses/ServerManager.kt | 1 - .../modelsForAdapters/MessagesListModel.kt | 30 ++++++++++-- .../contrasting_gradient_background.xml | 6 +-- .../ic_baseline_arrow_drop_down_24.xml | 2 +- .../main/res/drawable/ic_baseline_chat_24.xml | 2 +- .../res/drawable/ic_baseline_download_24.xml | 2 +- .../res/drawable/ic_baseline_image_24.xml | 2 +- .../main/res/drawable/ic_baseline_send_24.xml | 2 +- .../res/drawable/loacation_vector_asset.xml | 2 +- .../src/main/res/layout/explore_list_item.xml | 6 +-- .../app/src/main/res/layout/file_view.xml | 1 + .../app/src/main/res/layout/fragment_chat.xml | 1 + .../app/src/main/res/layout/fragment_home.xml | 2 +- .../app/src/main/res/layout/fragment_info.xml | 6 ++- .../src/main/res/layout/fragment_settings.xml | 2 +- .../main/res/layout/labeled_value_item.xml | 4 +- .../app/src/main/res/layout/message.xml | 2 + .../src/main/res/values-es-rES/strings.xml | 11 +++++ .../src/main/res/values-fr-rFR/strings.xml | 11 +++++ .../src/main/res/values-zh-rCN/strings.xml | 11 +++++ .../app/src/main/res/values/attrs.xml | 10 ++++ .../app/src/main/res/values/colors.xml | 16 +++++++ .../app/src/main/res/values/themes.xml | 18 +++++++ 24 files changed, 142 insertions(+), 56 deletions(-) create mode 100644 app/WikiSpot/app/src/main/res/values-es-rES/strings.xml create mode 100644 app/WikiSpot/app/src/main/res/values-fr-rFR/strings.xml create mode 100644 app/WikiSpot/app/src/main/res/values-zh-rCN/strings.xml diff --git a/app/WikiSpot/app/src/main/java/com/example/wikispot/fragments/chatFragment.kt b/app/WikiSpot/app/src/main/java/com/example/wikispot/fragments/chatFragment.kt index 6141eaf..1470859 100644 --- a/app/WikiSpot/app/src/main/java/com/example/wikispot/fragments/chatFragment.kt +++ b/app/WikiSpot/app/src/main/java/com/example/wikispot/fragments/chatFragment.kt @@ -13,7 +13,6 @@ import com.example.wikispot.modelsForAdapters.MessagesSupplier import kotlinx.android.synthetic.main.fragment_chat.* import okhttp3.* import okhttp3.HttpUrl.Companion.toHttpUrlOrNull -import org.json.JSONArray import java.io.IOException @@ -44,7 +43,7 @@ class chatFragment : Fragment(R.layout.fragment_chat) { override fun onResume() { super.onResume() - loadNamesCache() + loadIdFromCache() val dataReceiver: (String) -> Unit = { data: String -> val json = JsonManager(requireContext(), data, "JSONObject") @@ -56,7 +55,7 @@ class chatFragment : Fragment(R.layout.fragment_chat) { val r = requireContext().getRandomGenerator(GeneralVariables.id!!) - GeneralVariables.name = "${NamesDatabase.names[r.nextInt(NamesDatabase.names.size)]} - ${r.nextInt(9999).toString()}" + GeneralVariables.name = "${NamesDatabase.names[r.nextInt(NamesDatabase.names.size)]} - ${r.nextInt(9999)}" json.getAttributeContent("data") json.getAttributeContent("1") @@ -79,6 +78,8 @@ class chatFragment : Fragment(R.layout.fragment_chat) { val length = json.currentJsonAttribute1!!.length() json.clearSelectedAttribute() + MessagesSupplier.clearWaitingMessages() + for (i in 0 until length) { println("message at index n: ${json.getAttributeContentByPath("data/$i")}") val jsonOfMessage = JsonManager(requireContext(), json.getAttributeContentByPath("data/$i"), "JSONObject") @@ -86,16 +87,9 @@ class chatFragment : Fragment(R.layout.fragment_chat) { jsonOfMessage.getAttributeContent("message"), jsonOfMessage.getAttributeContent("timestamp")) - val lastMessageSentIndex = MessagesSupplier.getIndexOfLastMessageFromSelf() - if (message.senderId != GeneralVariables.id) { - if (!MessagesSupplier.checkIfContains(message)) { - MessagesSupplier.appendMessage(message) - updateRecyclerView() - } - } else { - lastMessageSentIndex?.let { - MessagesSupplier.messages[lastMessageSentIndex]!!.timestamp = jsonOfMessage.getAttributeContent("timestamp") - } + if (!MessagesSupplier.checkIfContains(message)) { + MessagesSupplier.appendMessage(message) + updateRecyclerView() } } } @@ -108,7 +102,7 @@ class chatFragment : Fragment(R.layout.fragment_chat) { override fun onPause() { super.onPause() - saveNamesCache() + saveIdToCache() ServerManagement.serverManager.deleteConnection("chatConnection") } @@ -165,31 +159,17 @@ class chatFragment : Fragment(R.layout.fragment_chat) { // loading and saving last names - private fun loadNamesCache() { - val namesCache = requireContext().getStringFromSharedPreferences("namesCache", "chatPreferences") - if (namesCache != "") { - ChatManagement.lastNames = JSONArray(namesCache) + private fun loadIdFromCache() { + val id = requireContext().getStringFromSharedPreferences("id") + if (id != "") { + GeneralVariables.id = id } } - private fun saveNamesCache() { + private fun saveIdToCache() { GeneralVariables.id?.let { - ChatManagement.lastNames.let { - val namesCache = JSONArray() - - var subtractAmount = it.length() - if (it.length() > (ChatManagement.numberOfNamesToCache - 1)) { - subtractAmount = ChatManagement.numberOfNamesToCache - 1 - } - - for (i in it.length() - subtractAmount until it.length()) { - namesCache.put(it[i]) - } - namesCache.put(GeneralVariables.id) - - requireContext().saveString("namesCache", namesCache.toString(), "chatPreferences") - } + requireContext().saveString("id", GeneralVariables.id!!) } } diff --git a/app/WikiSpot/app/src/main/java/com/example/wikispot/modelClasses/ServerManager.kt b/app/WikiSpot/app/src/main/java/com/example/wikispot/modelClasses/ServerManager.kt index f7eedc9..b2901e5 100644 --- a/app/WikiSpot/app/src/main/java/com/example/wikispot/modelClasses/ServerManager.kt +++ b/app/WikiSpot/app/src/main/java/com/example/wikispot/modelClasses/ServerManager.kt @@ -510,7 +510,6 @@ class ServerManager { if (receivedString == "Internal Server Error") { return } - val returnJsonObject = JSONObject() returnJsonObject.put("source", "messages/get") returnJsonObject.put("data", JSONArray(receivedString)) diff --git a/app/WikiSpot/app/src/main/java/com/example/wikispot/modelsForAdapters/MessagesListModel.kt b/app/WikiSpot/app/src/main/java/com/example/wikispot/modelsForAdapters/MessagesListModel.kt index 4ab21e5..739aa24 100644 --- a/app/WikiSpot/app/src/main/java/com/example/wikispot/modelsForAdapters/MessagesListModel.kt +++ b/app/WikiSpot/app/src/main/java/com/example/wikispot/modelsForAdapters/MessagesListModel.kt @@ -11,7 +11,7 @@ data class Message(var senderId: String, val content: String, var timestamp: Str init { val r = getRandomGenerator(senderId) - senderName = "${NamesDatabase.names[r.nextInt(NamesDatabase.names.size)]} - ${r.nextInt(9999).toString()}" + senderName = "${NamesDatabase.names[r.nextInt(NamesDatabase.names.size)]} - ${r.nextInt(9999)}" } private fun getRandomGenerator(seedString: String): Random { @@ -36,12 +36,20 @@ object MessagesSupplier { messages = array } - fun checkIfContains(message: Message): Boolean { + fun deleteMessageByIndex(i: Int) { + messages = messages.copyOfRange(0, i) + messages.copyOfRange(i + 1, messages.size) + } + + fun checkIfContains(message: Message, checkTimestamp: Boolean=true): Boolean { for (i in messages.indices) { messages[i]?.let { if (message.senderId == it.senderId) { if (message.content == it.content) { - if (message.timestamp == it.timestamp) { + if (checkTimestamp) { + if (message.timestamp == it.timestamp) { + return true + } + } else { return true } } @@ -51,6 +59,22 @@ object MessagesSupplier { return false } + fun clearWaitingMessages() { + val positionsOfItemsToRemove = mutableListOf() + for (i in messages.indices) { + if (messages[i]!!.timestamp == "waiting") { + positionsOfItemsToRemove.add(i) + println("waiting at: $i") + } + } + + var subtractAmount = 0 + for (index in positionsOfItemsToRemove) { + deleteMessageByIndex(index - subtractAmount) + subtractAmount += 1 + } + } + fun getIndexOfLastMessageFromSelf(): Int? { var i: Int? = null for (n in messages.indices) { diff --git a/app/WikiSpot/app/src/main/res/drawable/contrasting_gradient_background.xml b/app/WikiSpot/app/src/main/res/drawable/contrasting_gradient_background.xml index 623cbcd..02ed627 100644 --- a/app/WikiSpot/app/src/main/res/drawable/contrasting_gradient_background.xml +++ b/app/WikiSpot/app/src/main/res/drawable/contrasting_gradient_background.xml @@ -3,8 +3,8 @@ android:shape="rectangle"> + android:startColor="?attr/contrastingGradientStartColor" + android:centerColor="?attr/contrastingGradientCenterColor" + android:endColor="?attr/contrastingGradientEndColor"/> \ No newline at end of file diff --git a/app/WikiSpot/app/src/main/res/drawable/ic_baseline_arrow_drop_down_24.xml b/app/WikiSpot/app/src/main/res/drawable/ic_baseline_arrow_drop_down_24.xml index ce58346..a7ac3d3 100644 --- a/app/WikiSpot/app/src/main/res/drawable/ic_baseline_arrow_drop_down_24.xml +++ b/app/WikiSpot/app/src/main/res/drawable/ic_baseline_arrow_drop_down_24.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" - android:tint="?attr/colorControlNormal"> + android:tint="?attr/generalIconsColor"> diff --git a/app/WikiSpot/app/src/main/res/drawable/ic_baseline_chat_24.xml b/app/WikiSpot/app/src/main/res/drawable/ic_baseline_chat_24.xml index 26208ad..c69901c 100644 --- a/app/WikiSpot/app/src/main/res/drawable/ic_baseline_chat_24.xml +++ b/app/WikiSpot/app/src/main/res/drawable/ic_baseline_chat_24.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" - android:tint="?attr/colorControlNormal"> + android:tint="?attr/generalIconsColor"> diff --git a/app/WikiSpot/app/src/main/res/drawable/ic_baseline_download_24.xml b/app/WikiSpot/app/src/main/res/drawable/ic_baseline_download_24.xml index 1f61509..6c57b85 100644 --- a/app/WikiSpot/app/src/main/res/drawable/ic_baseline_download_24.xml +++ b/app/WikiSpot/app/src/main/res/drawable/ic_baseline_download_24.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" - android:tint="?attr/colorControlNormal"> + android:tint="?attr/generalIconsColor"> diff --git a/app/WikiSpot/app/src/main/res/drawable/ic_baseline_image_24.xml b/app/WikiSpot/app/src/main/res/drawable/ic_baseline_image_24.xml index 8232c4d..a18fe2c 100644 --- a/app/WikiSpot/app/src/main/res/drawable/ic_baseline_image_24.xml +++ b/app/WikiSpot/app/src/main/res/drawable/ic_baseline_image_24.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" - android:tint="?attr/colorControlNormal"> + android:tint="?attr/generalIconsColor"> diff --git a/app/WikiSpot/app/src/main/res/drawable/ic_baseline_send_24.xml b/app/WikiSpot/app/src/main/res/drawable/ic_baseline_send_24.xml index f0d63e1..e941e53 100644 --- a/app/WikiSpot/app/src/main/res/drawable/ic_baseline_send_24.xml +++ b/app/WikiSpot/app/src/main/res/drawable/ic_baseline_send_24.xml @@ -3,7 +3,7 @@ android:height="24dp" android:viewportWidth="24" android:viewportHeight="24" - android:tint="?attr/colorControlNormal" + android:tint="?attr/generalIconsColor" android:autoMirrored="true"> + android:tint="?attr/generalIconsColor"> diff --git a/app/WikiSpot/app/src/main/res/layout/explore_list_item.xml b/app/WikiSpot/app/src/main/res/layout/explore_list_item.xml index e7e91c4..b8a944f 100644 --- a/app/WikiSpot/app/src/main/res/layout/explore_list_item.xml +++ b/app/WikiSpot/app/src/main/res/layout/explore_list_item.xml @@ -29,10 +29,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="32dp" - android:layout_marginLeft="32dp" android:layout_marginTop="8dp" android:textSize="20sp" android:textStyle="bold" + android:textColor="?attr/generalTextColor" card_view:layout_constraintStart_toEndOf="@+id/item_img" card_view:layout_constraintTop_toTopOf="parent" tools:text="Title" /> @@ -41,6 +41,7 @@ android:id="@+id/item_description" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:textColor="?attr/generalTextColor" tools:text="Description" card_view:layout_constraintBottom_toBottomOf="parent" card_view:layout_constraintEnd_toStartOf="@+id/item_location_img" @@ -57,8 +58,7 @@ card_view:layout_constraintBottom_toBottomOf="parent" card_view:layout_constraintEnd_toEndOf="parent" card_view:layout_constraintTop_toTopOf="parent" - card_view:srcCompat="@drawable/loacation_vector_asset" - card_view:tint="#F1E79F" /> + card_view:srcCompat="@drawable/loacation_vector_asset" /> diff --git a/app/WikiSpot/app/src/main/res/layout/file_view.xml b/app/WikiSpot/app/src/main/res/layout/file_view.xml index 44f9463..df3fefd 100644 --- a/app/WikiSpot/app/src/main/res/layout/file_view.xml +++ b/app/WikiSpot/app/src/main/res/layout/file_view.xml @@ -25,6 +25,7 @@ android:layout_marginTop="36dp" android:textSize="24sp" android:textStyle="bold" + android:textColor="?attr/generalTextColor" card_view:layout_constraintStart_toStartOf="parent" card_view:layout_constraintTop_toTopOf="parent" tools:text="Filename" /> diff --git a/app/WikiSpot/app/src/main/res/layout/fragment_chat.xml b/app/WikiSpot/app/src/main/res/layout/fragment_chat.xml index bbda3db..2ea7818 100644 --- a/app/WikiSpot/app/src/main/res/layout/fragment_chat.xml +++ b/app/WikiSpot/app/src/main/res/layout/fragment_chat.xml @@ -38,6 +38,7 @@ android:layout_marginEnd="5dp" android:ems="10" android:inputType="textPersonName" + android:textColor="?attr/generalTextColor" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/sendMessageBtn" app:layout_constraintStart_toStartOf="parent" diff --git a/app/WikiSpot/app/src/main/res/layout/fragment_home.xml b/app/WikiSpot/app/src/main/res/layout/fragment_home.xml index b4cda4e..8d218f5 100644 --- a/app/WikiSpot/app/src/main/res/layout/fragment_home.xml +++ b/app/WikiSpot/app/src/main/res/layout/fragment_home.xml @@ -21,7 +21,7 @@ android:background="@drawable/text_background_gradient" android:padding="5dp" android:text="@string/home" - android:textColor="@color/white" + android:textColor="?attr/textOnTextBgColor" android:textSize="28sp" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/WikiSpot/app/src/main/res/layout/fragment_info.xml b/app/WikiSpot/app/src/main/res/layout/fragment_info.xml index 799b086..ef51161 100644 --- a/app/WikiSpot/app/src/main/res/layout/fragment_info.xml +++ b/app/WikiSpot/app/src/main/res/layout/fragment_info.xml @@ -25,7 +25,7 @@ android:background="@drawable/text_background_gradient" android:padding="5dp" android:text="" - android:textColor="#fff" + android:textColor="?attr/textOnTextBgColor" android:textSize="24sp" android:textStyle="bold" app:layout_constraintEnd_toEndOf="parent" @@ -51,6 +51,8 @@ android:layout_marginTop="32dp" android:text="" android:textAlignment="center" + android:textSize="18sp" + android:textColor="?attr/generalTextColor" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" @@ -75,7 +77,7 @@ android:padding="4dp" android:text="@string/files" android:textAlignment="center" - android:textColor="#FFFFFF" + android:textColor="?attr/textOnTextBgColor" android:textSize="24sp" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/WikiSpot/app/src/main/res/layout/fragment_settings.xml b/app/WikiSpot/app/src/main/res/layout/fragment_settings.xml index c96366c..33af92d 100644 --- a/app/WikiSpot/app/src/main/res/layout/fragment_settings.xml +++ b/app/WikiSpot/app/src/main/res/layout/fragment_settings.xml @@ -25,7 +25,7 @@ android:text="@string/dark_theme" android:background="@drawable/text_background_gradient" android:padding="5dp" - android:textColor="#FFFFFF" + android:textColor="?attr/textOnTextBgColor" android:textSize="24sp" android:textStyle="bold" app:layout_constraintStart_toStartOf="parent" diff --git a/app/WikiSpot/app/src/main/res/layout/labeled_value_item.xml b/app/WikiSpot/app/src/main/res/layout/labeled_value_item.xml index 04bb739..7194041 100644 --- a/app/WikiSpot/app/src/main/res/layout/labeled_value_item.xml +++ b/app/WikiSpot/app/src/main/res/layout/labeled_value_item.xml @@ -21,8 +21,8 @@ android:layout_marginStart="8dp" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" - android:text="TextView" android:textSize="40sp" + android:textColor="?attr/generalTextColor" card_view:layout_constraintBottom_toBottomOf="parent" card_view:layout_constraintStart_toStartOf="parent" card_view:layout_constraintTop_toTopOf="parent" /> @@ -34,8 +34,8 @@ android:layout_marginTop="16dp" android:layout_marginEnd="32dp" android:layout_marginBottom="16dp" - android:text="TextView" android:textSize="40sp" + android:textColor="?attr/generalTextColor" card_view:layout_constraintBottom_toBottomOf="parent" card_view:layout_constraintEnd_toEndOf="parent" card_view:layout_constraintTop_toTopOf="parent" /> diff --git a/app/WikiSpot/app/src/main/res/layout/message.xml b/app/WikiSpot/app/src/main/res/layout/message.xml index ca7d3c8..a9bacb9 100644 --- a/app/WikiSpot/app/src/main/res/layout/message.xml +++ b/app/WikiSpot/app/src/main/res/layout/message.xml @@ -23,6 +23,7 @@ android:layout_margin="2dp" android:textSize="12sp" android:textStyle="bold" + android:textColor="?attr/generalTextColor" card_view:layout_constraintEnd_toEndOf="parent" card_view:layout_constraintHorizontal_bias="0.5" card_view:layout_constraintStart_toStartOf="parent" @@ -37,6 +38,7 @@ android:textAlignment="textStart" android:textSize="18sp" android:textStyle="bold" + android:textColor="?attr/generalTextColor" card_view:layout_constraintBottom_toBottomOf="parent" card_view:layout_constraintEnd_toEndOf="parent" card_view:layout_constraintHorizontal_bias="0.5" diff --git a/app/WikiSpot/app/src/main/res/values-es-rES/strings.xml b/app/WikiSpot/app/src/main/res/values-es-rES/strings.xml new file mode 100644 index 0000000..ec9be09 --- /dev/null +++ b/app/WikiSpot/app/src/main/res/values-es-rES/strings.xml @@ -0,0 +1,11 @@ + + + WikiSpot + Chat + Explorar + Casa + Mapa + Ajustes + Archivos + Tema oscuro + \ No newline at end of file diff --git a/app/WikiSpot/app/src/main/res/values-fr-rFR/strings.xml b/app/WikiSpot/app/src/main/res/values-fr-rFR/strings.xml new file mode 100644 index 0000000..cc5c355 --- /dev/null +++ b/app/WikiSpot/app/src/main/res/values-fr-rFR/strings.xml @@ -0,0 +1,11 @@ + + + WikiSpot + Thème sombre + Des dossiers + Paramètres + Carte + Domicile + Explorer + Discuter + \ No newline at end of file diff --git a/app/WikiSpot/app/src/main/res/values-zh-rCN/strings.xml b/app/WikiSpot/app/src/main/res/values-zh-rCN/strings.xml new file mode 100644 index 0000000..99ecc80 --- /dev/null +++ b/app/WikiSpot/app/src/main/res/values-zh-rCN/strings.xml @@ -0,0 +1,11 @@ + + + WikiSpot + 家 + 地图 + 探索 + 聊天 + 设定值 + 档案文件 + 黑暗主题 + \ No newline at end of file diff --git a/app/WikiSpot/app/src/main/res/values/attrs.xml b/app/WikiSpot/app/src/main/res/values/attrs.xml index f3f366c..8484a19 100644 --- a/app/WikiSpot/app/src/main/res/values/attrs.xml +++ b/app/WikiSpot/app/src/main/res/values/attrs.xml @@ -1,6 +1,12 @@ + + + + + + @@ -32,6 +38,10 @@ + + + + diff --git a/app/WikiSpot/app/src/main/res/values/colors.xml b/app/WikiSpot/app/src/main/res/values/colors.xml index 8173213..0847b5a 100644 --- a/app/WikiSpot/app/src/main/res/values/colors.xml +++ b/app/WikiSpot/app/src/main/res/values/colors.xml @@ -12,6 +12,10 @@ #F48FB1 @color/black + #fff + #89000000 + #89000000 + #ECD21A1A #320747 #33C4BCC9 @@ -46,6 +50,10 @@ #A7D2FF #96E7FF + #C4FFA5 + #D1FBA0 + #F6FEBA + #B078F4 #5100B3 @@ -55,6 +63,10 @@ #FF03DAC5 @color/black + #aaa + #96FFFFFF + #AAFFFFFF + #FFB571 #320747 #33222222 @@ -89,4 +101,8 @@ #69829D #54818E + #729360 + #809A62 + #8F936C + \ No newline at end of file diff --git a/app/WikiSpot/app/src/main/res/values/themes.xml b/app/WikiSpot/app/src/main/res/values/themes.xml index 78ffe00..c5133c6 100644 --- a/app/WikiSpot/app/src/main/res/values/themes.xml +++ b/app/WikiSpot/app/src/main/res/values/themes.xml @@ -12,6 +12,11 @@ @color/secondaryVariant @color/onSecondary + + @color/textOnTextBgColor + @color/generalIconsColor + @color/generalTextColor + @color/textBackgroundGradientStartColor @@ -43,6 +48,10 @@ @color/infoFragmentGradientCenterColor @color/infoFragmentGradientEndColor + @color/contrastingGradientStartColor + @color/contrastingGradientCenterColor + @color/contrastingGradientEndColor + @color/bottomNavBarCheckedItemColor @color/bottomNavBarRippleColor @@ -73,6 +82,11 @@ @color/secondaryVariantDark @color/onSecondaryDark + + @color/textOnTextBgColorDark + @color/generalIconsColorDark + @color/generalTextColorDark + @color/textBackgroundGradientStartColorDark @@ -104,6 +118,10 @@ @color/infoFragmentGradientCenterColorDark @color/infoFragmentGradientEndColorDark + @color/contrastingGradientStartColorDark + @color/contrastingGradientCenterColorDark + @color/contrastingGradientEndColorDark + @color/bottomNavBarCheckedItemColorDark @color/bottomNavBarRippleColorDark