From d93cb63e0a666fbe44d72dce6e4a20fa677037b3 Mon Sep 17 00:00:00 2001 From: fmodf Date: Wed, 3 Jul 2024 17:25:18 +0200 Subject: [PATCH] wip --- .../{primary => elements}/Contents.json | 0 .../active.colorset}/Contents.json | 0 .../passive.colorset}/Contents.json | 0 .../{secondary => shape}/Contents.json | 0 .../black.colorset}/Contents.json | 0 .../separator.colorset/Contents.json | 0 .../white.colorset/Contents.json | 0 .../material/text/main.colorset/Contents.json | 6 +++--- .../material/text/sub.colorset/Contents.json | 4 ++-- .../white.colorset}/Contents.json | 0 .../Assets/Colors.xcassets/old/Contents.json | 9 +++++++++ .../old/background/Contents.json | 9 +++++++++ .../Colors.xcassets/old/primary/Contents.json | 9 +++++++++ .../primary/c100.colorset/Contents.json | 0 .../primary/c200.colorset/Contents.json | 0 .../primary/c400.colorset/Contents.json | 0 .../primary/c50.colorset}/Contents.json | 6 +++--- .../primary/c500main.colorset/Contents.json | 0 .../old/secondary/Contents.json | 9 +++++++++ .../secondary/c100.colorset/Contents.json | 0 .../secondary/c200.colorset/Contents.json | 0 .../secondary/c300.colorset/Contents.json | 0 .../secondary/c400.colorset/Contents.json | 0 .../secondary/c50.colorset/Contents.json | 0 .../secondary/c500main.colorset/Contents.json | 0 .../secondary/c600.colorset/Contents.json | 0 .../secondary/c700.colorset/Contents.json | 0 .../secondary/c800.colorset/Contents.json | 0 .../secondary/c900.colorset/Contents.json | 0 .../Colors.xcassets/old/text/Contents.json | 9 +++++++++ .../old/text/main.colorset/Contents.json | 20 +++++++++++++++++++ .../text/sub.colorset}/Contents.json | 4 ++-- 32 files changed, 75 insertions(+), 10 deletions(-) rename ConversationsClassic/Resources/Assets/Colors.xcassets/material/{primary => elements}/Contents.json (100%) rename ConversationsClassic/Resources/Assets/Colors.xcassets/material/{primary/c800.colorset => elements/active.colorset}/Contents.json (100%) rename ConversationsClassic/Resources/Assets/Colors.xcassets/material/{primary/c300.colorset => elements/passive.colorset}/Contents.json (100%) rename ConversationsClassic/Resources/Assets/Colors.xcassets/material/{secondary => shape}/Contents.json (100%) rename ConversationsClassic/Resources/Assets/Colors.xcassets/material/{primary/c700.colorset => shape/black.colorset}/Contents.json (100%) rename ConversationsClassic/Resources/Assets/Colors.xcassets/material/{background => shape}/separator.colorset/Contents.json (100%) rename ConversationsClassic/Resources/Assets/Colors.xcassets/material/{background => shape}/white.colorset/Contents.json (100%) rename ConversationsClassic/Resources/Assets/Colors.xcassets/material/{primary/c50.colorset => text/white.colorset}/Contents.json (100%) create mode 100644 ConversationsClassic/Resources/Assets/Colors.xcassets/old/Contents.json create mode 100644 ConversationsClassic/Resources/Assets/Colors.xcassets/old/background/Contents.json create mode 100644 ConversationsClassic/Resources/Assets/Colors.xcassets/old/primary/Contents.json rename ConversationsClassic/Resources/Assets/Colors.xcassets/{material => old}/primary/c100.colorset/Contents.json (100%) rename ConversationsClassic/Resources/Assets/Colors.xcassets/{material => old}/primary/c200.colorset/Contents.json (100%) rename ConversationsClassic/Resources/Assets/Colors.xcassets/{material => old}/primary/c400.colorset/Contents.json (100%) rename ConversationsClassic/Resources/Assets/Colors.xcassets/{material/primary/c900.colorset => old/primary/c50.colorset}/Contents.json (75%) rename ConversationsClassic/Resources/Assets/Colors.xcassets/{material => old}/primary/c500main.colorset/Contents.json (100%) create mode 100644 ConversationsClassic/Resources/Assets/Colors.xcassets/old/secondary/Contents.json rename ConversationsClassic/Resources/Assets/Colors.xcassets/{material => old}/secondary/c100.colorset/Contents.json (100%) rename ConversationsClassic/Resources/Assets/Colors.xcassets/{material => old}/secondary/c200.colorset/Contents.json (100%) rename ConversationsClassic/Resources/Assets/Colors.xcassets/{material => old}/secondary/c300.colorset/Contents.json (100%) rename ConversationsClassic/Resources/Assets/Colors.xcassets/{material => old}/secondary/c400.colorset/Contents.json (100%) rename ConversationsClassic/Resources/Assets/Colors.xcassets/{material => old}/secondary/c50.colorset/Contents.json (100%) rename ConversationsClassic/Resources/Assets/Colors.xcassets/{material => old}/secondary/c500main.colorset/Contents.json (100%) rename ConversationsClassic/Resources/Assets/Colors.xcassets/{material => old}/secondary/c600.colorset/Contents.json (100%) rename ConversationsClassic/Resources/Assets/Colors.xcassets/{material => old}/secondary/c700.colorset/Contents.json (100%) rename ConversationsClassic/Resources/Assets/Colors.xcassets/{material => old}/secondary/c800.colorset/Contents.json (100%) rename ConversationsClassic/Resources/Assets/Colors.xcassets/{material => old}/secondary/c900.colorset/Contents.json (100%) create mode 100644 ConversationsClassic/Resources/Assets/Colors.xcassets/old/text/Contents.json create mode 100644 ConversationsClassic/Resources/Assets/Colors.xcassets/old/text/main.colorset/Contents.json rename ConversationsClassic/Resources/Assets/Colors.xcassets/{material/primary/c600.colorset => old/text/sub.colorset}/Contents.json (83%) diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/primary/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/material/elements/Contents.json similarity index 100% rename from ConversationsClassic/Resources/Assets/Colors.xcassets/material/primary/Contents.json rename to ConversationsClassic/Resources/Assets/Colors.xcassets/material/elements/Contents.json diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/primary/c800.colorset/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/material/elements/active.colorset/Contents.json similarity index 100% rename from ConversationsClassic/Resources/Assets/Colors.xcassets/material/primary/c800.colorset/Contents.json rename to ConversationsClassic/Resources/Assets/Colors.xcassets/material/elements/active.colorset/Contents.json diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/primary/c300.colorset/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/material/elements/passive.colorset/Contents.json similarity index 100% rename from ConversationsClassic/Resources/Assets/Colors.xcassets/material/primary/c300.colorset/Contents.json rename to ConversationsClassic/Resources/Assets/Colors.xcassets/material/elements/passive.colorset/Contents.json diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/secondary/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/material/shape/Contents.json similarity index 100% rename from ConversationsClassic/Resources/Assets/Colors.xcassets/material/secondary/Contents.json rename to ConversationsClassic/Resources/Assets/Colors.xcassets/material/shape/Contents.json diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/primary/c700.colorset/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/material/shape/black.colorset/Contents.json similarity index 100% rename from ConversationsClassic/Resources/Assets/Colors.xcassets/material/primary/c700.colorset/Contents.json rename to ConversationsClassic/Resources/Assets/Colors.xcassets/material/shape/black.colorset/Contents.json diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/background/separator.colorset/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/material/shape/separator.colorset/Contents.json similarity index 100% rename from ConversationsClassic/Resources/Assets/Colors.xcassets/material/background/separator.colorset/Contents.json rename to ConversationsClassic/Resources/Assets/Colors.xcassets/material/shape/separator.colorset/Contents.json diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/background/white.colorset/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/material/shape/white.colorset/Contents.json similarity index 100% rename from ConversationsClassic/Resources/Assets/Colors.xcassets/material/background/white.colorset/Contents.json rename to ConversationsClassic/Resources/Assets/Colors.xcassets/material/shape/white.colorset/Contents.json diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/text/main.colorset/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/material/text/main.colorset/Contents.json index 9c8eb66..dfe1a2d 100644 --- a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/text/main.colorset/Contents.json +++ b/ConversationsClassic/Resources/Assets/Colors.xcassets/material/text/main.colorset/Contents.json @@ -5,9 +5,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0x2D", - "green" : "0x2D", - "red" : "0x2D" + "blue" : "0x36", + "green" : "0x31", + "red" : "0x2A" } }, "idiom" : "universal" diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/text/sub.colorset/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/material/text/sub.colorset/Contents.json index 2e42b95..4db6d18 100644 --- a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/text/sub.colorset/Contents.json +++ b/ConversationsClassic/Resources/Assets/Colors.xcassets/material/text/sub.colorset/Contents.json @@ -6,8 +6,8 @@ "components" : { "alpha" : "1.000", "blue" : "0x78", - "green" : "0x78", - "red" : "0x78" + "green" : "0x6D", + "red" : "0x5A" } }, "idiom" : "universal" diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/primary/c50.colorset/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/material/text/white.colorset/Contents.json similarity index 100% rename from ConversationsClassic/Resources/Assets/Colors.xcassets/material/primary/c50.colorset/Contents.json rename to ConversationsClassic/Resources/Assets/Colors.xcassets/material/text/white.colorset/Contents.json diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/old/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/Contents.json new file mode 100644 index 0000000..6e96565 --- /dev/null +++ b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/Contents.json @@ -0,0 +1,9 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "provides-namespace" : true + } +} diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/old/background/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/background/Contents.json new file mode 100644 index 0000000..6e96565 --- /dev/null +++ b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/background/Contents.json @@ -0,0 +1,9 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "provides-namespace" : true + } +} diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/old/primary/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/primary/Contents.json new file mode 100644 index 0000000..6e96565 --- /dev/null +++ b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/primary/Contents.json @@ -0,0 +1,9 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "provides-namespace" : true + } +} diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/primary/c100.colorset/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/primary/c100.colorset/Contents.json similarity index 100% rename from ConversationsClassic/Resources/Assets/Colors.xcassets/material/primary/c100.colorset/Contents.json rename to ConversationsClassic/Resources/Assets/Colors.xcassets/old/primary/c100.colorset/Contents.json diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/primary/c200.colorset/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/primary/c200.colorset/Contents.json similarity index 100% rename from ConversationsClassic/Resources/Assets/Colors.xcassets/material/primary/c200.colorset/Contents.json rename to ConversationsClassic/Resources/Assets/Colors.xcassets/old/primary/c200.colorset/Contents.json diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/primary/c400.colorset/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/primary/c400.colorset/Contents.json similarity index 100% rename from ConversationsClassic/Resources/Assets/Colors.xcassets/material/primary/c400.colorset/Contents.json rename to ConversationsClassic/Resources/Assets/Colors.xcassets/old/primary/c400.colorset/Contents.json diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/primary/c900.colorset/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/primary/c50.colorset/Contents.json similarity index 75% rename from ConversationsClassic/Resources/Assets/Colors.xcassets/material/primary/c900.colorset/Contents.json rename to ConversationsClassic/Resources/Assets/Colors.xcassets/old/primary/c50.colorset/Contents.json index dfe1a2d..a61d481 100644 --- a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/primary/c900.colorset/Contents.json +++ b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/primary/c50.colorset/Contents.json @@ -5,9 +5,9 @@ "color-space" : "srgb", "components" : { "alpha" : "1.000", - "blue" : "0x36", - "green" : "0x31", - "red" : "0x2A" + "blue" : "0xFF", + "green" : "0xFF", + "red" : "0xFE" } }, "idiom" : "universal" diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/primary/c500main.colorset/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/primary/c500main.colorset/Contents.json similarity index 100% rename from ConversationsClassic/Resources/Assets/Colors.xcassets/material/primary/c500main.colorset/Contents.json rename to ConversationsClassic/Resources/Assets/Colors.xcassets/old/primary/c500main.colorset/Contents.json diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/old/secondary/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/secondary/Contents.json new file mode 100644 index 0000000..6e96565 --- /dev/null +++ b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/secondary/Contents.json @@ -0,0 +1,9 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "provides-namespace" : true + } +} diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/secondary/c100.colorset/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/secondary/c100.colorset/Contents.json similarity index 100% rename from ConversationsClassic/Resources/Assets/Colors.xcassets/material/secondary/c100.colorset/Contents.json rename to ConversationsClassic/Resources/Assets/Colors.xcassets/old/secondary/c100.colorset/Contents.json diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/secondary/c200.colorset/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/secondary/c200.colorset/Contents.json similarity index 100% rename from ConversationsClassic/Resources/Assets/Colors.xcassets/material/secondary/c200.colorset/Contents.json rename to ConversationsClassic/Resources/Assets/Colors.xcassets/old/secondary/c200.colorset/Contents.json diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/secondary/c300.colorset/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/secondary/c300.colorset/Contents.json similarity index 100% rename from ConversationsClassic/Resources/Assets/Colors.xcassets/material/secondary/c300.colorset/Contents.json rename to ConversationsClassic/Resources/Assets/Colors.xcassets/old/secondary/c300.colorset/Contents.json diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/secondary/c400.colorset/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/secondary/c400.colorset/Contents.json similarity index 100% rename from ConversationsClassic/Resources/Assets/Colors.xcassets/material/secondary/c400.colorset/Contents.json rename to ConversationsClassic/Resources/Assets/Colors.xcassets/old/secondary/c400.colorset/Contents.json diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/secondary/c50.colorset/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/secondary/c50.colorset/Contents.json similarity index 100% rename from ConversationsClassic/Resources/Assets/Colors.xcassets/material/secondary/c50.colorset/Contents.json rename to ConversationsClassic/Resources/Assets/Colors.xcassets/old/secondary/c50.colorset/Contents.json diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/secondary/c500main.colorset/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/secondary/c500main.colorset/Contents.json similarity index 100% rename from ConversationsClassic/Resources/Assets/Colors.xcassets/material/secondary/c500main.colorset/Contents.json rename to ConversationsClassic/Resources/Assets/Colors.xcassets/old/secondary/c500main.colorset/Contents.json diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/secondary/c600.colorset/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/secondary/c600.colorset/Contents.json similarity index 100% rename from ConversationsClassic/Resources/Assets/Colors.xcassets/material/secondary/c600.colorset/Contents.json rename to ConversationsClassic/Resources/Assets/Colors.xcassets/old/secondary/c600.colorset/Contents.json diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/secondary/c700.colorset/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/secondary/c700.colorset/Contents.json similarity index 100% rename from ConversationsClassic/Resources/Assets/Colors.xcassets/material/secondary/c700.colorset/Contents.json rename to ConversationsClassic/Resources/Assets/Colors.xcassets/old/secondary/c700.colorset/Contents.json diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/secondary/c800.colorset/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/secondary/c800.colorset/Contents.json similarity index 100% rename from ConversationsClassic/Resources/Assets/Colors.xcassets/material/secondary/c800.colorset/Contents.json rename to ConversationsClassic/Resources/Assets/Colors.xcassets/old/secondary/c800.colorset/Contents.json diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/secondary/c900.colorset/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/secondary/c900.colorset/Contents.json similarity index 100% rename from ConversationsClassic/Resources/Assets/Colors.xcassets/material/secondary/c900.colorset/Contents.json rename to ConversationsClassic/Resources/Assets/Colors.xcassets/old/secondary/c900.colorset/Contents.json diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/old/text/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/text/Contents.json new file mode 100644 index 0000000..6e96565 --- /dev/null +++ b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/text/Contents.json @@ -0,0 +1,9 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "provides-namespace" : true + } +} diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/old/text/main.colorset/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/text/main.colorset/Contents.json new file mode 100644 index 0000000..9c8eb66 --- /dev/null +++ b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/text/main.colorset/Contents.json @@ -0,0 +1,20 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x2D", + "green" : "0x2D", + "red" : "0x2D" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/primary/c600.colorset/Contents.json b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/text/sub.colorset/Contents.json similarity index 83% rename from ConversationsClassic/Resources/Assets/Colors.xcassets/material/primary/c600.colorset/Contents.json rename to ConversationsClassic/Resources/Assets/Colors.xcassets/old/text/sub.colorset/Contents.json index 4db6d18..2e42b95 100644 --- a/ConversationsClassic/Resources/Assets/Colors.xcassets/material/primary/c600.colorset/Contents.json +++ b/ConversationsClassic/Resources/Assets/Colors.xcassets/old/text/sub.colorset/Contents.json @@ -6,8 +6,8 @@ "components" : { "alpha" : "1.000", "blue" : "0x78", - "green" : "0x6D", - "red" : "0x5A" + "green" : "0x78", + "red" : "0x78" } }, "idiom" : "universal"