Skip to content

DROID-3128 Chats | Fix | Enable space-level chat in specified Space ID #1874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
uburoiubu merged 3 commits into from
Dec 6, 2024
Merged

DROID-3128 Chats | Fix | Enable space-level chat in specified Space ID #1874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1a6201
DROID-3128 fix
uburoiubu Dec 5, 2024
9d8782c
DROID-3128 fix
uburoiubu Dec 5, 2024
bc7d30d
Merge branch 'main' into droid-3128-enable-chat-in-specified-space-id…
uburoiubu Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions app/src/main/java/com/anytypeio/anytype/app/DefaultFeatureToggles.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,5 @@ class DefaultFeatureToggles @Inject constructor(
override val isSpaceLevelChatWidgetEnabled: Boolean
get() = false

override val isNewSpaceHomeEnabled: Boolean
get() = true
override val isNewSpaceHomeEnabled: Boolean = buildProvider.isDebug()
}
10 changes: 9 additions & 1 deletion app/src/main/java/com/anytypeio/anytype/ui/home/HomeScreenFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ class HomeScreenFragment : BaseComposeFragment(),
surface = colorResource(id = R.color.background_secondary)
)
) {
if (featureToggles.isNewSpaceHomeEnabled) {
if (featureToggles.isNewSpaceHomeEnabled || space == SPACE_WITH_SPACE_LEVEL_CHAT) {
val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = false)
var showGlobalSearchBottomSheet by remember { mutableStateOf(false) }

Expand Down Expand Up @@ -564,6 +564,9 @@ class HomeScreenFragment : BaseComposeFragment(),
}

override fun onApplyWindowRootInsets(view: View) {
if (featureToggles.isNewSpaceHomeEnabled || space != SPACE_WITH_SPACE_LEVEL_CHAT) {
super.onApplyWindowRootInsets(view)
}
// Do not apply window insets on fragment container.
}

Expand All @@ -572,6 +575,11 @@ class HomeScreenFragment : BaseComposeFragment(),
const val DEEP_LINK_KEY = "arg.home-screen.deep-link"
const val SPACE_ID_KEY = "arg.home-screen.space-id"

/**
* Temporary space for beta-testing space-level chat
*/
const val SPACE_WITH_SPACE_LEVEL_CHAT = "bafyreiezhzb4ggnhjwejmh67pd5grilk6jn3jt7y2rnfpbkjwekilreola.1t123w9f2lgn5"

fun args(
space: Id,
deeplink: String? = null
Expand Down
2 changes: 1 addition & 1 deletion feature-discussions/src/main/res/drawable/ic_send_message.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
android:fillColor="@color/glyph_button"/>
<path
android:pathData="M10.259,21.769C9.815,21.34 10.02,20.857 10.359,20.253L12.118,17.088C12.347,16.692 12.524,16.549 12.905,16.54L23.024,16.171C23.143,16.166 23.21,16.093 23.21,16C23.205,15.913 23.143,15.835 23.024,15.83L12.905,15.498C12.509,15.484 12.328,15.328 12.118,14.941L10.325,11.697C10.006,11.122 9.82,10.656 10.259,10.232C10.607,9.896 11.16,9.96 11.713,10.2L23.057,15.088C23.362,15.217 23.605,15.36 23.767,15.517C24.077,15.816 24.077,16.185 23.767,16.484C23.605,16.641 23.362,16.784 23.057,16.913L11.775,21.778C11.141,22.05 10.602,22.101 10.259,21.769Z"
android:fillColor="#ffffff"/>
android:fillColor="@color/text_label_inversion"/>
</vector>
Loading