From 9cd547cf1030e8c2595e5748bc5b6f8b3f8be63a Mon Sep 17 00:00:00 2001 From: ThomasSession Date: Thu, 15 Aug 2024 16:34:21 +1000 Subject: [PATCH] Clean up --- .../main/res/values-notnight-v21/colors.xml | 31 --------- app/src/main/res/values/arrays.xml | 66 ------------------- app/src/main/res/values/attrs.xml | 2 - app/src/main/res/values/colors.xml | 44 ------------- app/src/main/res/values/dimens.xml | 31 --------- app/src/main/res/values/ids.xml | 3 - app/src/main/res/values/integers.xml | 2 - app/src/main/res/values/styles.xml | 34 ---------- app/src/main/res/values/text_styles.xml | 6 -- app/src/main/res/values/themes.xml | 8 --- libsession/src/main/res/values/arrays.xml | 47 ------------- libsession/src/main/res/values/colors.xml | 16 ----- libsession/src/main/res/values/dimens.xml | 27 -------- libsession/src/main/res/values/ids.xml | 3 - libsession/src/main/res/values/integers.xml | 1 - .../src/main/res/values/text_styles.xml | 6 -- 16 files changed, 327 deletions(-) diff --git a/app/src/main/res/values-notnight-v21/colors.xml b/app/src/main/res/values-notnight-v21/colors.xml index ef91e51099..a7c8d9b163 100644 --- a/app/src/main/res/values-notnight-v21/colors.xml +++ b/app/src/main/res/values-notnight-v21/colors.xml @@ -1,52 +1,21 @@ - #ffffff - #fcfcfc #fcfcfc #333132 - #0A000000 - #8000E97B - @color/core_black - @color/core_white - - @color/core_grey_60 - @color/core_grey_75 @color/transparent_black_70 @color/transparent_white_87 @color/core_white - @color/core_grey_05 - @color/core_grey_02 - @color/core_white - @color/signal_background_secondary - @color/core_grey_90 @color/core_grey_25 - @color/core_grey_65 - - @color/transparent_black - @color/transparent_black_40 - @color/core_grey_75 - @color/core_grey_45 - @color/core_grey_60 - @color/core_black - @color/core_grey_45 - - @color/transparent_black_15 - @color/core_white - @color/transparent_white_20 - - @color/core_grey_05 @color/core_grey_25 - @color/core_grey_15 - \ No newline at end of file diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 8d0d714e49..4cc6ac015f 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -119,46 +119,6 @@ vi - - @color/accent_green - @color/accent_blue - @color/accent_yellow - @color/accent_pink - @color/accent_purple - @color/accent_orange - @color/accent_red - - - - @string/preferences__fast - @string/preferences__normal - @string/preferences__slow - - - - 300,300 - 500,2000 - 3000,3000 - - - - @string/preferences__never - @string/preferences__one_time - @string/preferences__two_times - @string/preferences__three_times - @string/preferences__five_times - @string/preferences__ten_times - - - - 0 - 1 - 2 - 3 - 5 - 10 - - default custom @@ -185,21 +145,6 @@ - - 0 - 5 - 10 - 30 - 60 - 300 - 1800 - 3600 - 21600 - 43200 - 86400 - 604800 - - #ffffff #ff0000 @@ -212,17 +157,6 @@ #000000 - - @string/arrays__default - @string/arrays__high - @string/arrays__max - - - - 0 - 1 - 2 - @string/notify_type_all @string/notify_type_mentions diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 4325748b8f..c0ce8bb6a8 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -149,8 +149,6 @@ - - diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index ff73134643..660c5cff0c 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,26 +1,17 @@ - #D8D8D8 #353535 #161616 #36383C - #323232 - #101011 - @color/unimportant_button_background #333132 - #0AFFFFFF #1B1B1B #141414 - #80FFFFFF - #212121 #FFCE3A - #0DFFFFFF #DD353535 #FFFFFF #D8D8D8 #171717 - #171717 @color/accent_green @@ -36,9 +27,7 @@ #ffffffff #ff000000 - #ffe0e0e0 #ffababab - #ffcccccc #ffbbbbbb #ff808080 #ff595959 @@ -46,13 +35,11 @@ #0f000000 #26000000 #30000000 - #40000000 #70000000 #dfffffff #90000000 #26ffffff - #33ffffff #30ffffff #40ffffff #aaffffff @@ -61,9 +48,7 @@ @color/navigation_bar @color/navigation_bar @color/gray65 - #22000000 - #ffffffff #ff333333 #00FFFFFF @@ -73,53 +58,24 @@ @color/transparent_black_90 - #121212 - #171717 - - @color/core_white @color/transparent_black_15 - @color/core_grey_75 - - @color/core_grey_35 - @color/core_grey_15 @color/transparent_black_70 #df5e5e5e @color/core_grey_95 - @color/core_grey_75 - @color/core_grey_90 - @color/core_grey_75 - @color/core_grey_65 - @color/core_grey_05 @color/core_grey_60 - @color/core_grey_25 ?colorPrimary - - @color/transparent - @color/transparent_white_40 - - @color/core_white - @color/core_grey_25 @color/core_grey_25 - @color/core_white - @color/core_grey_15 - - @color/transparent_black_15 - @color/core_white - @color/transparent_white_20 - - @color/core_grey_75 @color/core_grey_45 - @color/core_grey_45 #31F196 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index f43d643b9e..3ec6cd1990 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -8,7 +8,6 @@ 17sp 20sp 26sp - 50sp 60dp @@ -23,17 +22,12 @@ 80dp 14dp 1dp - 60dp - 72dp 36dp 8dp - 224dp 10dp - 250dp 64dp 8dp 11dp - 4dp 8dp 8dp 56dp @@ -53,14 +47,12 @@ 56dp 40dp - 32sp 50dp 220dp 110dp 170dp 48dp 16sp - 12sp 64dp 210dp @@ -69,25 +61,16 @@ 140dp 139dp 69dp - 210dp - 104dp - 175dp - 104dp 69dp 18dp 4dp 2dp 1.5dp - @dimen/medium_spacing - @dimen/medium_spacing 24dp 24dp 210dp 150dp - 240dp - 100dp - 320dp 175dp 85dp @@ -97,14 +80,7 @@ 120dp - 4dp - 40dp - 8dp - 1dp - - 2dp - 16dp 3 @@ -125,12 +101,9 @@ 14dp - -96dp - 24dp 16dp 56dp - 120dp 18dp @@ -144,12 +117,8 @@ 0dp 320dp - 44dp - - 390dp 40dp 200dp - 34dp 24dp diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml index cb9392f697..045e125f3d 100644 --- a/app/src/main/res/values/ids.xml +++ b/app/src/main/res/values/ids.xml @@ -1,6 +1,3 @@ - - - diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml index c61cc3c843..e4df0e1685 100644 --- a/app/src/main/res/values/integers.xml +++ b/app/src/main/res/values/integers.xml @@ -1,7 +1,5 @@ - 300 - 200 100 150 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index df6c163ea0..a01e2b69ab 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -29,10 +29,6 @@ ?android:textColorPrimary - - - - - - - - - - @@ -229,14 +207,6 @@ clear out android:textOn and android:textOff, to avoid the default text label behavior of the ToggleButton class.) --> - - @@ -251,10 +221,6 @@ ?attr/selectableItemBackground - - diff --git a/app/src/main/res/values/text_styles.xml b/app/src/main/res/values/text_styles.xml index 5639c60147..54bd3c0f38 100644 --- a/app/src/main/res/values/text_styles.xml +++ b/app/src/main/res/values/text_styles.xml @@ -22,10 +22,4 @@ 0.03 - - - \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 23b7b5f5db..37f0e517ac 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -65,10 +65,6 @@ - - - - - \ No newline at end of file