From bed643c9f5d6b59775d47a4fd0452ad4ddfaec46 Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Tue, 18 Jul 2023 16:04:20 +0300
Subject: [PATCH] Fix res linking
---
app/src/main/res/values-night/colors.xml | 5 -----
app/src/main/res/values/colors.xml | 1 -
app/src/main/res/values/strings.xml | 3 ---
{app => auth}/src/main/res/drawable/ic_fingerprint.xml | 0
{app => auth}/src/main/res/drawable/ic_key.xml | 0
auth/src/main/res/values/strings.xml | 3 +++
build.gradle | 2 +-
{app => core}/src/main/res/drawable/ic_create.xml | 0
core/src/main/res/values-night/{colors.xml => color.xml} | 1 +
core/src/main/res/values/color.xml | 1 +
core/src/main/res/values/strings.xml | 1 +
gallery/src/main/res/values/strings.xml | 1 -
12 files changed, 7 insertions(+), 11 deletions(-)
delete mode 100644 app/src/main/res/values-night/colors.xml
rename {app => auth}/src/main/res/drawable/ic_fingerprint.xml (100%)
rename {app => auth}/src/main/res/drawable/ic_key.xml (100%)
rename {app => core}/src/main/res/drawable/ic_create.xml (100%)
rename core/src/main/res/values-night/{colors.xml => color.xml} (76%)
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
deleted file mode 100644
index 15f6db9ce..000000000
--- a/app/src/main/res/values-night/colors.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <color name="list_item_icon_color">@color/menu_icon_color</color>
-
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 55e116eb7..a8c9132fc 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -17,7 +17,6 @@
<color name="pink">#FF2D55</color>
<color name="gray">#8E8E93</color>
<color name="close_background">#80000000</color>
- <color name="list_item_icon_color">@color/black</color>
<color name="highlight_color">#4D0E7AFE</color>
<color name="chip_selected_color">#800E7AFE</color>
<color name="launcher_background_color">#00008b</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 34d5ae3e6..6f977b1ad 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -133,11 +133,8 @@
<string name="requested_to_join">Requested to join</string>
<string name="select_circles_in_which_you_want_to_follow_this_timeline">Select circles in which you want to follow this timeline</string>
<string name="accept_invite">Accept invite</string>
- <string name="edit_profile">Edit Profile</string>
<string name="login_sessions">Login sessions</string>
<string name="settings">Settings</string>
- <string name="user_id">User ID</string>
- <string name="verify">Verify</string>
<string name="save_to_device">Save to device</string>
<string name="save_to_gallery">Save to gallery</string>
<string name="unignore">Unignore</string>
diff --git a/app/src/main/res/drawable/ic_fingerprint.xml b/auth/src/main/res/drawable/ic_fingerprint.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_fingerprint.xml
rename to auth/src/main/res/drawable/ic_fingerprint.xml
diff --git a/app/src/main/res/drawable/ic_key.xml b/auth/src/main/res/drawable/ic_key.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_key.xml
rename to auth/src/main/res/drawable/ic_key.xml
diff --git a/auth/src/main/res/values/strings.xml b/auth/src/main/res/values/strings.xml
index 8099aca55..299b7d1c3 100644
--- a/auth/src/main/res/values/strings.xml
+++ b/auth/src/main/res/values/strings.xml
@@ -121,6 +121,9 @@
<string name="verify_session">Verify session</string>
<string name="scan_qr_code">Scan QR code</string>
<string name="profile_updated">Profile updated</string>
+ <string name="edit_profile">Edit Profile</string>
+ <string name="user_id">User ID</string>
+ <string name="verify">Verify</string>
<plurals name="days">
<item quantity="one">%1$d day</item>
diff --git a/build.gradle b/build.gradle
index 4c126f384..76c08353a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
minSdkVersion = 24
sdkVersion = 33
androidx_nav_version = "2.5.3"
- modules_version = "1.0.4"
+ modules_version = "1.0.5"
modules_gitlab_projectId = "13"
}
repositories {
diff --git a/app/src/main/res/drawable/ic_create.xml b/core/src/main/res/drawable/ic_create.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_create.xml
rename to core/src/main/res/drawable/ic_create.xml
diff --git a/core/src/main/res/values-night/colors.xml b/core/src/main/res/values-night/color.xml
similarity index 76%
rename from core/src/main/res/values-night/colors.xml
rename to core/src/main/res/values-night/color.xml
index 5b2d9293f..2ad2082c5 100644
--- a/core/src/main/res/values-night/colors.xml
+++ b/core/src/main/res/values-night/color.xml
@@ -3,4 +3,5 @@
<color name="divider_color">#333333</color>
<color name="menu_icon_color">#ABABAB</color>
<color name="post_card_background_color">#2D2D2D</color>
+ <color name="list_item_icon_color">@color/menu_icon_color</color>
</resources>
\ No newline at end of file
diff --git a/core/src/main/res/values/color.xml b/core/src/main/res/values/color.xml
index feb87ad83..87990da01 100644
--- a/core/src/main/res/values/color.xml
+++ b/core/src/main/res/values/color.xml
@@ -13,5 +13,6 @@
<color name="menu_icon_color">#99000000</color>
<color name="post_card_background_color">@color/white</color>
<color name="gray">#8E8E93</color>
+ <color name="list_item_icon_color">@color/black</color>
</resources>
\ No newline at end of file
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 70a06e083..5381b4bcd 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -55,5 +55,6 @@
<string name="remove">Remove</string>
<string name="choose_gallery">Choose gallery</string>
<string name="pick_media">Pick media</string>
+ <string name="change_icon">Change icon</string>
</resources>
\ No newline at end of file
diff --git a/gallery/src/main/res/values/strings.xml b/gallery/src/main/res/values/strings.xml
index aa0f4201c..37c5053d2 100644
--- a/gallery/src/main/res/values/strings.xml
+++ b/gallery/src/main/res/values/strings.xml
@@ -18,7 +18,6 @@
<string name="backup_device_folders">Backup device folders</string>
<string name="backup_folders_hint">Choose folders to backup and view in your Gallery:</string>
<string name="configure_gallery">Configure gallery</string>
- <string name="change_icon">Change icon</string>
<string name="gallery_name">Gallery name</string>
<string name="gallery_encryption_warning">NOTE: Gallery name and cover image are not encrypted</string>
<string name="create_new_gallery">Create new gallery</string>
--
GitLab