Merge branch 'release/v1.0.22' into develop

app/src/main/java/org/futo/circles/feature/ignored/IgnoredUsersViewModel.kt

@@ -24,7 +24,8 @@ class IgnoredUsersViewModel @Inject constructor(
 
     fun unIgnoreUser(userId: String) {
         launchBg {
-            unIgnoreUserLiveData.postValue(userOptionsDataSource.unIgnoreSender(userId))
+            val result = userOptionsDataSource.unIgnoreSender(userId)
+            unIgnoreUserLiveData.postValue(result)
         }
     }
 

app/src/main/java/org/futo/circles/feature/timeline/TimelineViewModel.kt

@@ -16,13 +16,13 @@ import org.futo.circles.core.feature.timeline.data_source.AccessLevelDataSource
 import org.futo.circles.core.feature.timeline.data_source.BaseTimelineDataSource
 import org.futo.circles.core.feature.timeline.post.PostOptionsDataSource
 import org.futo.circles.core.feature.timeline.post.SendMessageDataSource
+import org.futo.circles.core.feature.user.UserOptionsDataSource
 import org.futo.circles.core.model.CircleRoomTypeArg
 import org.futo.circles.core.model.CreatePollContent
 import org.futo.circles.core.model.PostContent
 import org.futo.circles.core.model.ShareableContent
 import org.futo.circles.core.provider.MatrixSessionProvider
 import org.futo.circles.core.utils.getTimelineRoomIdOrThrow
-import org.futo.circles.core.feature.user.UserOptionsDataSource
 import org.futo.circles.feature.timeline.data_source.ReadMessageDataSource
 import org.futo.circles.model.CreatePostContent
 import org.futo.circles.model.MediaPostContent
@@ -71,7 +71,8 @@ class TimelineViewModel @Inject constructor(
 
     fun ignoreSender(senderId: String) {
         launchBg {
-            ignoreUserLiveData.postValue(userOptionsDataSource.ignoreSender(senderId))
+            val result = userOptionsDataSource.ignoreSender(senderId)
+            ignoreUserLiveData.postValue(result)
         }
     }
 

app/src/main/java/org/futo/circles/view/PreviewPostView.kt

@@ -282,7 +282,7 @@ class PreviewPostView(
         addMenuItem(binding.lMainMenu, org.futo.circles.core.R.drawable.ic_mention) {
             insertMentionMark()
         }
-        addMenuItem(binding.lMainMenu, R.drawable.ic_link) {
+        addMenuItem(binding.lMainMenu, org.futo.circles.core.R.drawable.ic_link) {
             listener?.onAddLinkClicked()
         }
         addMenuItem(binding.lMainMenu, R.drawable.ic_text) {

app/src/main/res/values/dimens.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="divider_height">1dp</dimen>
-    <dimen name="reply_post_item_margin">24dp</dimen>
-    <dimen name="post_text_side_margin">24dp</dimen>
-    <dimen name="circle_icon_size">100dp</dimen>
     <dimen name="profile_avatar_size">50dp</dimen>
-
-    <dimen name="rich_text_composer_corner_radius_expanded">14dp</dimen>
-    <dimen name="rich_text_composer_menu_item_size">44dp</dimen>
 </resources>
\ No newline at end of file

app/src/main/res/values/strings.xml

@@ -9,7 +9,6 @@
     <string name="my_people">My People</string>
     <string name="my_circles">My Circles</string>
     <string name="share">Share</string>
-    <string name="follow">Follow</string>
     <string name="fix">Fix</string>
     <string name="followers">Followers</string>
     <string name="known_users">Known users</string>
@@ -194,7 +193,7 @@
     <string name="help">Help</string>
     <string name="optional_request_message">Optional: Request message</string>
     <string name="media_storage">Media storage</string>
-    <string name="media_usage_format">%s of %s used</string>
+    <string name="media_usage_format">%1$s of %2$s used</string>
     <string name="group_invites_notification_format">Show %d Group invitations</string>
     <string name="circle_invites_notification_format">Show %d Circle invitations</string>
     <string name="show_connection_invites_format">Show %d connection invites</string>
@@ -214,7 +213,6 @@
     <string name="rich_text_editor_quote">Toggle quote</string>
     <string name="rich_text_editor_code_block">Toggle code block</string>
     <string name="general">General</string>
-    <string name="invite_to_connect">Invite to connect</string>
     <string name="empty_media_storage_info">0 MB used</string>
 
     <string-array name="debug_domains">

auth/src/main/res/values/dimen.xml

-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="reply_post_item_margin">24dp</dimen>
-    <dimen name="post_text_side_margin">24dp</dimen>
-    <dimen name="group_icon_size">120dp</dimen>
-    <dimen name="circle_icon_size">100dp</dimen>
-    <dimen name="profile_avatar_size">50dp</dimen>
-</resources>
\ No newline at end of file

core/src/main/java/org/futo/circles/core/feature/picker/gallery/rooms/PickGalleryFragment.kt

@@ -36,6 +36,6 @@ class PickGalleryFragment : Fragment(R.layout.fragment_pick_gallery) {
     }
 
     private fun setupObservers() {
-        viewModel.galleriesLiveData?.observeData(this) { listAdapter.submitList(it) }
+        viewModel.galleriesLiveData.observeData(this) { listAdapter.submitList(it) }
     }
 }
\ No newline at end of file

core/src/main/res/values/dimen.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
     <dimen name="divider_height">1dp</dimen>
+    <dimen name="reply_post_item_margin">24dp</dimen>
+    <dimen name="post_text_side_margin">24dp</dimen>
+    <dimen name="circle_icon_size">100dp</dimen>
     <dimen name="group_icon_size">120dp</dimen>
-
 </resources>
\ No newline at end of file

core/src/main/res/values/strings.xml

@@ -166,4 +166,6 @@
     <string name="invites_you_to_connect">invites you to connect</string>
     <string name="invites">Invites</string>
     <string name="requests">Requests</string>
+    <string name="invite_to_connect">Invite to connect</string>
+    <string name="follow">Follow</string>
 </resources>
\ No newline at end of file