From 338d8405c0061dd1edd1cc6048415d13b6850795 Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Thu, 22 Dec 2022 18:00:31 -0300
Subject: [PATCH] Bump version number

---
 .../main/res/layout/item_settings_button.xml  | 46 +++++++++++++++++++
 .../{color_picker.xml => color_palettes.xml}  |  3 +-
 mastodon/src/main/res/values/colors.xml       | 20 ++++++++
 mastodon/src/main/res/values/palettes.xml     | 30 ++++++++++++
 mastodon/src/main/res/values/strings_sk.xml   |  1 +
 5 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 mastodon/src/main/res/layout/item_settings_button.xml
 rename mastodon/src/main/res/menu/{color_picker.xml => color_palettes.xml} (79%)

diff --git a/mastodon/src/main/res/layout/item_settings_button.xml b/mastodon/src/main/res/layout/item_settings_button.xml
new file mode 100644
index 000000000..ea16648d8
--- /dev/null
+++ b/mastodon/src/main/res/layout/item_settings_button.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal"
+    android:layout_width="match_parent"
+    android:layout_height="48dp"
+    android:paddingHorizontal="16dp"
+    android:gravity="center_vertical"
+    android:layoutDirection="locale">
+
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginEnd="32dp"
+        android:importantForAccessibility="no"
+        android:tint="?android:textColorPrimary"
+        tools:src="@drawable/ic_fluent_color_24_regular"/>
+
+
+    <TextView
+        android:id="@+id/text"
+        android:layout_height="wrap_content"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_marginEnd="8dp"
+        android:gravity="center_vertical"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="16sp" />
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="wrap_content"
+        android:layout_height="32dp"
+        android:background="@drawable/bg_inline_button"
+        android:elevation="0dp"
+        android:ellipsize="middle"
+        android:fontFamily="sans-serif-medium"
+        android:singleLine="true"
+        android:stateListAnimator="@null"
+        android:textColor="?android:textColorPrimary"
+        android:textSize="16sp"
+        tools:text="@string/sk_color_palette_pink" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/mastodon/src/main/res/menu/color_picker.xml b/mastodon/src/main/res/menu/color_palettes.xml
similarity index 79%
rename from mastodon/src/main/res/menu/color_picker.xml
rename to mastodon/src/main/res/menu/color_palettes.xml
index 72d7c47a7..aff209973 100644
--- a/mastodon/src/main/res/menu/color_picker.xml
+++ b/mastodon/src/main/res/menu/color_palettes.xml
@@ -5,7 +5,8 @@
     <item android:id="@+id/pink_color" android:title="@string/sk_color_palette_pink"/>
     <item android:id="@+id/green_color" android:title="@string/sk_color_palette_green"/>
     <item android:id="@+id/blue_color" android:title="@string/sk_color_palette_blue"/>
-    <item android:id="@+id/orange_color" android:title="@string/sk_color_palette_brown"/>
+    <item android:id="@+id/brown_color" android:title="@string/sk_color_palette_brown"/>
     <item android:id="@+id/yellow_color" android:title="@string/sk_color_palette_yellow"/>
     <item android:id="@+id/red_color" android:title="@string/sk_color_palette_red"/>
+    <item android:id="@+id/nord_color" android:title="@string/sk_color_palette_nord"/>
 </menu>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/colors.xml b/mastodon/src/main/res/values/colors.xml
index 7ab2c2da9..434708c36 100644
--- a/mastodon/src/main/res/values/colors.xml
+++ b/mastodon/src/main/res/values/colors.xml
@@ -292,4 +292,24 @@
 	<color name="red_gray_50t">#ffede6ca</color>
 	<color name="red_gray_50">#ffede6</color>
 	<color name="red_gray_25">#f7f8fa</color>
+
+	<color name="nord_primary_25">#fafaff</color>
+	<color name="nord_primary_50">#eff0ff</color>
+	<color name="nord_primary_100">#dfe1f2</color>
+	<color name="nord_primary_200">#c3c6d6</color>
+	<color name="nord_primary_300">#a8aaba</color>
+	<color name="nord_primary_400">#8f909f</color>
+	<color name="nord_primary_500">#727584</color>
+	<color name="nord_primary_600">#5b5e6c</color>
+	<color name="nord_primary_700">#434654</color>
+	<color name="nord_primary_800">#2d303d</color>
+	<color name="nord_primary_900">#181b27</color>
+
+	<color name="nord_gray_400">#aaaab4</color>
+	<color name="nord_gray_300">#c5c6d0</color>
+	<color name="nord_gray_200">#e2e2ec</color>
+	<color name="nord_gray_100">#eff0ff</color>
+	<color name="nord_gray_50t">#f0f0faca</color>
+	<color name="nord_gray_50">#f0f0fa</color>
+	<color name="nord_gray_25">#f7f8fa</color>
 </resources>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/palettes.xml b/mastodon/src/main/res/values/palettes.xml
index 4c4c9caf7..8f5baab75 100644
--- a/mastodon/src/main/res/values/palettes.xml
+++ b/mastodon/src/main/res/values/palettes.xml
@@ -232,4 +232,34 @@
 		<item name="colorGray50">@color/red_gray_50</item>
 		<item name="colorGray25">@color/red_gray_25</item>
 	</style>
+
+	<style name="ColorPalette.Blueish">
+		<item name="colorPrimary25">@color/nord_primary_25</item>
+		<item name="colorPrimary50">@color/nord_primary_50</item>
+		<item name="colorPrimary100">@color/nord_primary_100</item>
+		<item name="colorPrimary200">@color/nord_primary_200</item>
+		<item name="colorPrimary300">@color/nord_primary_300</item>
+		<item name="colorPrimary400">@color/nord_primary_400</item>
+		<item name="colorPrimary500">@color/nord_primary_500</item>
+		<item name="colorPrimary600">@color/nord_primary_600</item>
+		<item name="colorPrimary700">@color/nord_primary_700</item>
+		<item name="colorPrimary800">@color/nord_primary_800</item>
+		<item name="colorPrimary900">@color/nord_primary_900</item>
+
+		<item name="colorGray900">@color/brownish_gray_900</item>
+		<item name="colorGray800t">@color/brownish_gray_800t</item>
+		<item name="colorGray800">@color/brownish_gray_800</item>
+		<item name="colorGray700">@color/brownish_gray_700</item>
+		<item name="colorGray600">@color/brownish_gray_600</item>
+		<item name="colorGray500">@color/brownish_gray_500</item>
+
+		<item name="colorGray400">@color/nord_gray_400</item>
+		<item name="colorGray300">@color/nord_gray_300</item>
+		<item name="colorGray200">@color/nord_gray_200</item>
+		<item name="colorGray100">@color/nord_gray_100</item>
+		<item name="colorGray50t">@color/nord_gray_50t</item>
+		<item name="colorGray50">@color/nord_gray_50</item>
+		<item name="colorGray25">@color/nord_gray_25</item>
+	</style>
+
 </resources>
\ No newline at end of file
diff --git a/mastodon/src/main/res/values/strings_sk.xml b/mastodon/src/main/res/values/strings_sk.xml
index 496b4d7df..0f700d6f1 100644
--- a/mastodon/src/main/res/values/strings_sk.xml
+++ b/mastodon/src/main/res/values/strings_sk.xml
@@ -49,6 +49,7 @@
     <string name="sk_color_palette_brown">Brown</string>
     <string name="sk_color_palette_red">Red</string>
     <string name="sk_color_palette_yellow">Yellow</string>
+    <string name="sk_color_palette_nord">Nord</string>
     <string name="sk_poll_allow_multiple">Allow multiple choices</string>
     <string name="sk_translate_post">Translate</string>
     <string name="sk_translate_show_original">Show original</string>