Skip to content

Commit 11b4ea5

Browse files
ericdecaniniericdecanini
authored
Merge pull request #6801 from vector-im/feature/eric/new-chat-bottom-sheet
New App Layout: Adds New Chat Bottom Sheet
2 parents a251002 + 90ab40d commit 11b4ea5

File tree

9 files changed

+156
-1
lines changed

9 files changed

+156
-1
lines changed

‎changelog.d/6801.wip

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Adds new chat bottom sheet as the click action of the main FAB in the new app layout

‎vector/src/main/java/im/vector/app/core/di/FragmentModule.kt

+6
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ import im.vector.app.features.home.room.detail.TimelineFragment
6363
import im.vector.app.features.home.room.detail.search.SearchFragment
6464
import im.vector.app.features.home.room.list.RoomListFragment
6565
import im.vector.app.features.home.room.list.home.HomeRoomListFragment
66+
import im.vector.app.features.home.room.list.home.NewChatBottomSheet
6667
import im.vector.app.features.home.room.threads.list.views.ThreadListFragment
6768
import im.vector.app.features.location.LocationSharingFragment
6869
import im.vector.app.features.location.preview.LocationPreviewFragment
@@ -191,6 +192,11 @@ interface FragmentModule {
191192
@FragmentKey(RoomListFragment::class)
192193
fun bindRoomListFragment(fragment: RoomListFragment): Fragment
193194

195+
@Binds
196+
@IntoMap
197+
@FragmentKey(NewChatBottomSheet::class)
198+
fun bindNewChatBottomSheetFragment(fragment: NewChatBottomSheet): Fragment
199+
194200
@Binds
195201
@IntoMap
196202
@FragmentKey(LocalePickerFragment::class)

‎vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt

+3-1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ class HomeRoomListFragment @Inject constructor(
7474

7575
private lateinit var stateRestorer: LayoutManagerStateRestorer
7676

77+
private val newChatBottomSheet = NewChatBottomSheet()
78+
7779
override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentRoomListBinding {
7880
return FragmentRoomListBinding.inflate(inflater, container, false)
7981
}
@@ -166,7 +168,7 @@ class HomeRoomListFragment @Inject constructor(
166168
showFABs()
167169

168170
views.newLayoutCreateChatButton.setOnClickListener {
169-
// Click action for create chat modal goes here (Issue #6717)
171+
newChatBottomSheet.show(requireActivity().supportFragmentManager, NewChatBottomSheet.TAG)
170172
}
171173

172174
views.newLayoutOpenSpacesButton.setOnClickListener {

‎vector/src/main/java/im/vector/app/features/home/room/list/home/NewChatBottomSheet.kt

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/*
2+
* Copyright (c) 2022 New Vector Ltd
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package im.vector.app.features.home.room.list.home
18+
19+
import android.os.Bundle
20+
import android.view.LayoutInflater
21+
import android.view.View
22+
import android.view.ViewGroup
23+
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
24+
import dagger.hilt.android.AndroidEntryPoint
25+
import im.vector.app.databinding.FragmentNewChatBottomSheetBinding
26+
import im.vector.app.features.navigation.Navigator
27+
import javax.inject.Inject
28+
29+
@AndroidEntryPoint
30+
class NewChatBottomSheet @Inject constructor() : BottomSheetDialogFragment() {
31+
32+
@Inject lateinit var navigator: Navigator
33+
34+
private lateinit var binding: FragmentNewChatBottomSheetBinding
35+
36+
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
37+
binding = FragmentNewChatBottomSheetBinding.inflate(inflater, container, false)
38+
initFABs()
39+
return binding.root
40+
}
41+
42+
private fun initFABs() {
43+
binding.startChat.setOnClickListener {
44+
navigator.openCreateDirectRoom(requireActivity())
45+
}
46+
47+
binding.createRoom.setOnClickListener {
48+
navigator.openCreateRoom(requireActivity())
49+
}
50+
51+
binding.exploreRooms.setOnClickListener {
52+
navigator.openRoomDirectory(requireContext())
53+
}
54+
}
55+
56+
companion object {
57+
const val TAG = "NewChatBottomSheet"
58+
}
59+
}

‎vector/src/main/res/drawable/ic_chat.xml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:pathData="M12.283,21.44C17.649,21.44 22,17.088 22,11.719C22,6.351 17.649,1.999 12.283,1.999C6.916,1.999 2.566,6.351 2.566,11.719C2.566,13.223 2.907,14.648 3.517,15.918L2.045,20.705C1.808,21.474 2.531,22.194 3.299,21.953L8.046,20.47C9.326,21.091 10.764,21.44 12.283,21.44Z"
8+
android:fillColor="#737D8C"
9+
android:fillType="evenOdd"/>
10+
</vector>

‎vector/src/main/res/drawable/ic_room_add.xml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:pathData="M17.048,4.105C17.107,3.556 16.708,3.064 16.159,3.006C15.61,2.948 15.118,3.346 15.059,3.895L14.668,7.602H9.613L9.983,4.105C10.041,3.556 9.642,3.064 9.093,3.006C8.544,2.948 8.052,3.346 7.994,3.895L7.602,7.602H4.834C4.281,7.602 3.834,8.05 3.834,8.602C3.834,9.154 4.281,9.602 4.834,9.602H7.39L6.872,14.505H4C3.448,14.505 3,14.953 3,15.505C3,16.058 3.448,16.506 4,16.506H6.661L6.331,19.622C6.273,20.171 6.671,20.663 7.221,20.721C7.77,20.779 8.262,20.381 8.32,19.832L8.589,17.288C8.319,16.818 8.165,16.274 8.165,15.693C8.165,14.871 8.474,14.122 8.984,13.555L9.401,9.602H12.959C13.538,8.776 14.497,8.235 15.583,8.235C16.669,8.235 17.628,8.776 18.207,9.602H19.379C19.931,9.602 20.379,9.154 20.379,8.602C20.379,8.05 19.931,7.602 19.379,7.602H16.679L17.048,4.105ZM15.583,10.382C16.135,10.382 16.583,10.83 16.583,11.382V14.693H19.852C20.404,14.693 20.852,15.141 20.852,15.693C20.852,16.246 20.404,16.694 19.852,16.694H16.583V20.004C16.583,20.557 16.135,21.004 15.583,21.004C15.031,21.004 14.583,20.557 14.583,20.004V16.694H11.313C10.76,16.694 10.313,16.246 10.313,15.693C10.313,15.141 10.76,14.693 11.313,14.693H14.583V11.382C14.583,10.83 15.031,10.382 15.583,10.382Z"
8+
android:fillColor="#737D8C"
9+
android:fillType="evenOdd"/>
10+
</vector>

‎vector/src/main/res/drawable/ic_room_explore.xml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:pathData="M16.647,3.006C17.196,3.065 17.593,3.558 17.533,4.108L17.147,7.684H19.998C20.55,7.684 20.998,8.132 20.998,8.684C20.998,9.236 20.55,9.684 19.998,9.684H16.931L16.8,10.891C16.058,10.967 15.356,11.181 14.722,11.508L14.919,9.684H9.582L9.039,14.708H11.898C11.67,15.332 11.545,16.006 11.544,16.708H8.822L8.455,20.111C8.395,20.66 7.902,21.057 7.353,20.997C6.804,20.938 6.407,20.445 6.466,19.896L6.811,16.708H3.999C3.447,16.708 2.999,16.26 2.999,15.708C2.999,15.156 3.447,14.708 3.999,14.708H7.027L7.57,9.684H4.864C4.312,9.684 3.864,9.236 3.864,8.684C3.864,8.132 4.312,7.684 4.864,7.684H7.786L8.196,3.893C8.255,3.344 8.748,2.947 9.298,3.006C9.847,3.065 10.244,3.558 10.184,4.108L9.798,7.684H15.135L15.545,3.893C15.604,3.344 16.097,2.947 16.647,3.006Z"
8+
android:fillColor="#737D8C"
9+
android:fillType="evenOdd"/>
10+
<path
11+
android:pathData="M19.003,16.765C19.003,17.817 18.151,18.669 17.1,18.669C16.048,18.669 15.196,17.817 15.196,16.765C15.196,15.714 16.048,14.862 17.1,14.862C18.151,14.862 19.003,15.714 19.003,16.765ZM20.332,18.698C20.67,18.133 20.865,17.472 20.865,16.765C20.865,14.686 19.179,13 17.1,13C15.02,13 13.334,14.686 13.334,16.765C13.334,18.845 15.02,20.531 17.1,20.531C17.806,20.531 18.467,20.336 19.032,19.998C19.062,20.038 19.094,20.077 19.131,20.114L20.745,21.727C21.108,22.091 21.698,22.091 22.061,21.727C22.425,21.364 22.425,20.774 22.061,20.411L20.448,18.797C20.411,18.76 20.372,18.728 20.332,18.698Z"
12+
android:fillColor="#737D8C"
13+
android:fillType="evenOdd"/>
14+
</vector>

‎vector/src/main/res/layout/fragment_new_chat_bottom_sheet.xml

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
android:layout_width="match_parent"
5+
android:layout_height="wrap_content"
6+
android:orientation="vertical">
7+
8+
<TextView
9+
android:id="@+id/start_chat"
10+
style="@style/Widget.Vector.TextView.Body"
11+
android:layout_width="match_parent"
12+
android:layout_height="wrap_content"
13+
android:background="?selectableItemBackground"
14+
android:drawablePadding="16dp"
15+
android:paddingHorizontal="16dp"
16+
android:paddingVertical="16dp"
17+
android:text="@string/start_chat"
18+
android:textColor="?vctr_content_primary"
19+
android:textSize="16sp"
20+
app:drawableStartCompat="@drawable/ic_chat" />
21+
22+
<TextView
23+
android:id="@+id/create_room"
24+
style="@style/Widget.Vector.TextView.Body"
25+
android:layout_width="match_parent"
26+
android:layout_height="wrap_content"
27+
android:background="?selectableItemBackground"
28+
android:drawablePadding="16dp"
29+
android:paddingHorizontal="16dp"
30+
android:paddingVertical="16dp"
31+
android:text="@string/create_room"
32+
android:textColor="?vctr_content_primary"
33+
android:textSize="16sp"
34+
app:drawableStartCompat="@drawable/ic_room_add" />
35+
36+
<TextView
37+
android:id="@+id/explore_rooms"
38+
style="@style/Widget.Vector.TextView.Body"
39+
android:layout_width="match_parent"
40+
android:layout_height="wrap_content"
41+
android:background="?selectableItemBackground"
42+
android:drawablePadding="16dp"
43+
android:paddingHorizontal="16dp"
44+
android:paddingVertical="16dp"
45+
android:text="@string/explore_rooms"
46+
android:textColor="?vctr_content_primary"
47+
android:textSize="16sp"
48+
app:drawableStartCompat="@drawable/ic_room_explore" />
49+
50+
</LinearLayout>

‎vector/src/main/res/values/strings.xml

+3
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,10 @@
137137

138138
<!-- Home Screen -->
139139
<string name="all_chats">All Chats</string>
140+
<string name="start_chat">Start Chat</string>
141+
<string name="create_room">Create Room</string>
140142
<string name="change_space">Change Space</string>
143+
<string name="explore_rooms">Explore Rooms</string>
141144

142145
<!-- Last seen time -->
143146

0 commit comments

Comments
 (0)