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 15f6db9ceae5a4936e93b89ac9a05c0a3da6fa34..0000000000000000000000000000000000000000 --- 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 55e116eb7362fbfcbd1b41e04cccab08223054e5..a8c9132fc816abff3f1646b1afe3624557bb81cf 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 34d5ae3e65e0e664cc790002b72e0b3e750452c2..6f977b1ad4721d48cf386533b9fe721b3a81c439 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 8099aca550f2ab9575ade50772c0d3a90368590e..299b7d1c3737698f2fa0add3cd7bad4b4850299f 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 4c126f3841dca0f47796703b25463523f3d6dcc7..76c08353af44e9dd2d99d2a18d0b402eba40f62b 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 5b2d9293f59027c69d3135d9127d496fc25a5e22..2ad2082c5eaafed787406897fc586756438a5f89 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 feb87ad8385eb16dd5e46e49f612387221bfac78..87990da014a872cedad2cf3bb57488eda395a980 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 70a06e083f3a0b74075fb77d305e2ce260a7558d..5381b4bcd675e274a760cc5d7ff3b56f2cf0000d 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 aa0f4201c7fd2eec09676fceb49d484c9895e557..37c5053d211d0099b513ac8ed2b2ef564a383c04 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>