From 2721224ac650ecfa72cf2837f77111b4937f3a8f Mon Sep 17 00:00:00 2001 From: Hussein El Feky Date: Mon, 20 May 2019 01:01:37 +0200 Subject: [PATCH 1/3] Fixed bottom sheet issues --- .../ui/DirectorySortingBottomSheetFragment.kt | 16 +- .../servers/ui/ServersBottomSheetFragment.kt | 14 ++ .../SortingAndGroupingBottomSheetFragment.kt | 11 ++ ...ottom_sheet_fragment_directory_sorting.xml | 173 ++++++++++-------- .../layout/bottom_sheet_fragment_sort_by.xml | 166 +++++++++-------- 5 files changed, 218 insertions(+), 162 deletions(-) diff --git a/app/src/main/java/chat/rocket/android/directory/ui/DirectorySortingBottomSheetFragment.kt b/app/src/main/java/chat/rocket/android/directory/ui/DirectorySortingBottomSheetFragment.kt index 31ca732f3a..4290ac18c4 100644 --- a/app/src/main/java/chat/rocket/android/directory/ui/DirectorySortingBottomSheetFragment.kt +++ b/app/src/main/java/chat/rocket/android/directory/ui/DirectorySortingBottomSheetFragment.kt @@ -1,7 +1,6 @@ package chat.rocket.android.directory.ui import DrawableHelper -import android.content.DialogInterface import android.graphics.drawable.Drawable import android.os.Bundle import android.view.LayoutInflater @@ -10,6 +9,8 @@ import android.view.ViewGroup import android.widget.TextView import androidx.fragment.app.FragmentManager import chat.rocket.android.R +import com.google.android.material.bottomsheet.BottomSheetBehavior +import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialogFragment import kotlinx.android.synthetic.main.bottom_sheet_fragment_directory_sorting.* @@ -67,10 +68,6 @@ class DirectorySortingBottomSheetFragment : BottomSheetDialogFragment() { setupListeners() } - override fun onCancel(dialog: DialogInterface?) { - super.onCancel(dialog) - } - private fun setupView() { if (isSortByChannels) { checkSelection(text_channels, hashtagDrawable) @@ -82,6 +79,15 @@ class DirectorySortingBottomSheetFragment : BottomSheetDialogFragment() { } private fun setupListeners() { + dialog.setOnShowListener { dialog -> + val bottomSheet = (dialog as BottomSheetDialog).findViewById( + com.google.android.material.R.id.design_bottom_sheet + ) + bottomSheet?.let { + BottomSheetBehavior.from(bottomSheet).peekHeight = bottomSheet.height + } + } + text_channels.setOnClickListener { checkSelection(text_channels, hashtagDrawable) uncheckSelection(text_users, userDrawable) diff --git a/app/src/main/java/chat/rocket/android/servers/ui/ServersBottomSheetFragment.kt b/app/src/main/java/chat/rocket/android/servers/ui/ServersBottomSheetFragment.kt index 717a113e04..e3631d5633 100644 --- a/app/src/main/java/chat/rocket/android/servers/ui/ServersBottomSheetFragment.kt +++ b/app/src/main/java/chat/rocket/android/servers/ui/ServersBottomSheetFragment.kt @@ -12,6 +12,8 @@ import chat.rocket.android.servers.adapter.ServersAdapter import chat.rocket.android.servers.presentation.ServersPresenter import chat.rocket.android.servers.presentation.ServersView import chat.rocket.android.util.extensions.showToast +import com.google.android.material.bottomsheet.BottomSheetBehavior +import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialogFragment import dagger.android.support.AndroidSupportInjection import kotlinx.android.synthetic.main.bottom_sheet_fragment_servers.* @@ -38,6 +40,18 @@ class ServersBottomSheetFragment : BottomSheetDialogFragment(), ServersView { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) presenter.getAllServers() + setupListeners() + } + + private fun setupListeners() { + dialog.setOnShowListener { dialog -> + val bottomSheet = (dialog as BottomSheetDialog).findViewById( + com.google.android.material.R.id.design_bottom_sheet + ) + bottomSheet?.let { + BottomSheetBehavior.from(bottomSheet).peekHeight = bottomSheet.height + } + } } override fun showServerList(serverList: List, currentServerUrl: String) { diff --git a/app/src/main/java/chat/rocket/android/sortingandgrouping/ui/SortingAndGroupingBottomSheetFragment.kt b/app/src/main/java/chat/rocket/android/sortingandgrouping/ui/SortingAndGroupingBottomSheetFragment.kt index 4ab319310f..ca62af7f67 100644 --- a/app/src/main/java/chat/rocket/android/sortingandgrouping/ui/SortingAndGroupingBottomSheetFragment.kt +++ b/app/src/main/java/chat/rocket/android/sortingandgrouping/ui/SortingAndGroupingBottomSheetFragment.kt @@ -13,6 +13,8 @@ import chat.rocket.android.chatrooms.ui.ChatRoomsFragment import chat.rocket.android.chatrooms.ui.TAG_CHAT_ROOMS_FRAGMENT import chat.rocket.android.sortingandgrouping.presentation.SortingAndGroupingPresenter import chat.rocket.android.sortingandgrouping.presentation.SortingAndGroupingView +import com.google.android.material.bottomsheet.BottomSheetBehavior +import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialogFragment import dagger.android.support.AndroidSupportInjection import kotlinx.android.synthetic.main.bottom_sheet_fragment_sort_by.* @@ -89,6 +91,15 @@ class SortingAndGroupingBottomSheetFragment : BottomSheetDialogFragment(), Sorti } private fun setupListeners() { + dialog.setOnShowListener { dialog -> + val bottomSheet = (dialog as BottomSheetDialog).findViewById( + com.google.android.material.R.id.design_bottom_sheet + ) + bottomSheet?.let { + BottomSheetBehavior.from(bottomSheet).peekHeight = bottomSheet.height + } + } + text_name.setOnClickListener { changeSortByTitle(getString(R.string.msg_sort_by_name)) checkSelection(text_name, filterDrawable) diff --git a/app/src/main/res/layout/bottom_sheet_fragment_directory_sorting.xml b/app/src/main/res/layout/bottom_sheet_fragment_directory_sorting.xml index 215b7cd1b3..4594abaf50 100644 --- a/app/src/main/res/layout/bottom_sheet_fragment_directory_sorting.xml +++ b/app/src/main/res/layout/bottom_sheet_fragment_directory_sorting.xml @@ -1,9 +1,10 @@ - + android:textStyle="normal" /> + android:background="#1F000000" /> - + android:layout_height="wrap_content"> - + - + - + - + - + + + + + + + + + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/bottom_sheet_fragment_sort_by.xml b/app/src/main/res/layout/bottom_sheet_fragment_sort_by.xml index 409ab42ae1..5a78302659 100644 --- a/app/src/main/res/layout/bottom_sheet_fragment_sort_by.xml +++ b/app/src/main/res/layout/bottom_sheet_fragment_sort_by.xml @@ -24,86 +24,100 @@ android:layout_marginTop="16dp" android:background="#1F000000" /> - + android:layout_height="wrap_content"> - + - + - + - + + + + + + + + + + + - \ No newline at end of file From 6ae2df1af8c6f5ee84cd9e93fcfd6038d139dc26 Mon Sep 17 00:00:00 2001 From: Hussein El Feky Date: Mon, 20 May 2019 01:03:07 +0200 Subject: [PATCH 2/3] Fixed hardcoded string --- .../java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt index b6fc0b55d3..896b8d66d6 100644 --- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt +++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt @@ -548,7 +548,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR if (newMessageCount <= 99) { text_count.text = newMessageCount.toString() } else { - text_count.text = "99+" + text_count.text = getString(R.string.msg_more_than_ninety_nine_unread_messages) } text_count.isVisible = true } else if (!button_fab.isVisible) { From 1af7fe631a54004a27752fb4ca718e1ffc2c7e26 Mon Sep 17 00:00:00 2001 From: Hussein El Feky Date: Mon, 20 May 2019 01:06:16 +0200 Subject: [PATCH 3/3] Corrected translations --- app/src/main/res/values-ar/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 9bb98f3961..37f2ee000f 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -103,10 +103,10 @@ نشر بواسطة تم تحديث الملف الشخصي بنجاح اسم المستخدم - اسم المستخدم أو عنوان بريد + اسم المستخدم أو عنوان البريد كلمة السر الاسم - عنوان بريد + عنوان البريد رابط الشخصية استمرار باستخدام حساب التواصل الاجتماعي مستخدم جديد؟ %1$s