mirror of
https://github.com/nextcloud/talk-android
synced 2025-07-04 19:39:47 +01:00
Mostly fix layout issue
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
parent
ceb5ae7e25
commit
da273a43fc
@ -75,7 +75,6 @@ import com.nextcloud.talk.models.json.rooms.RoomOverall;
|
|||||||
import com.nextcloud.talk.models.json.rooms.RoomsOverall;
|
import com.nextcloud.talk.models.json.rooms.RoomsOverall;
|
||||||
import com.nextcloud.talk.presenters.MentionAutocompletePresenter;
|
import com.nextcloud.talk.presenters.MentionAutocompletePresenter;
|
||||||
import com.nextcloud.talk.utils.ApiUtils;
|
import com.nextcloud.talk.utils.ApiUtils;
|
||||||
import com.nextcloud.talk.utils.KeyboardUtils;
|
|
||||||
import com.nextcloud.talk.utils.bundle.BundleKeys;
|
import com.nextcloud.talk.utils.bundle.BundleKeys;
|
||||||
import com.nextcloud.talk.utils.database.user.UserUtils;
|
import com.nextcloud.talk.utils.database.user.UserUtils;
|
||||||
import com.nextcloud.talk.utils.glide.GlideApp;
|
import com.nextcloud.talk.utils.glide.GlideApp;
|
||||||
@ -417,10 +416,6 @@ public class ChatController extends BaseController implements MessagesListAdapte
|
|||||||
if (mentionAutocomplete != null && mentionAutocomplete.isPopupShowing()) {
|
if (mentionAutocomplete != null && mentionAutocomplete.isPopupShowing()) {
|
||||||
mentionAutocomplete.dismissPopup();
|
mentionAutocomplete.dismissPopup();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (getActivity() != null) {
|
|
||||||
new KeyboardUtils(getActivity(), getView());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -5,7 +5,6 @@
|
|||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:fitsSystemWindows="true"
|
|
||||||
tools:context=".activities.MainActivity">
|
tools:context=".activities.MainActivity">
|
||||||
|
|
||||||
<android.support.design.widget.AppBarLayout
|
<android.support.design.widget.AppBarLayout
|
||||||
|
@ -19,51 +19,16 @@
|
|||||||
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<RelativeLayout
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:layout_alignParentBottom="true"
|
|
||||||
android:id="@+id/inputLinearLayout">
|
|
||||||
|
|
||||||
<View
|
|
||||||
android:id="@+id/separator"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="1dp"
|
|
||||||
android:layout_marginLeft="16dp"
|
|
||||||
android:layout_marginRight="16dp"
|
|
||||||
android:background="@color/nc_light_grey"/>
|
|
||||||
|
|
||||||
<com.stfalcon.chatkit.messages.MessageInput
|
|
||||||
android:id="@+id/messageInputView"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:maxLength="1000"
|
|
||||||
app:inputButtonDefaultBgColor="@color/colorPrimary"
|
|
||||||
app:inputButtonDefaultBgPressedColor="@color/colorPrimaryDark"
|
|
||||||
app:inputButtonHeight="30dp"
|
|
||||||
app:inputButtonMargin="16dp"
|
|
||||||
app:inputButtonWidth="30dp"
|
|
||||||
app:inputHint="@string/nc_hint_enter_a_message"
|
|
||||||
app:inputTextColor="@color/black"
|
|
||||||
app:inputTextSize="16sp"/>
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
<com.stfalcon.chatkit.messages.MessagesList
|
<com.stfalcon.chatkit.messages.MessagesList
|
||||||
android:id="@+id/messagesListView"
|
android:id="@+id/messagesListView"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_above="@id/inputLinearLayout"
|
android:layout_above="@+id/messageInputView"
|
||||||
app:incomingDefaultBubbleColor="@color/white_two"
|
app:incomingDefaultBubbleColor="@color/white_two"
|
||||||
app:incomingDefaultBubblePressedColor="@color/white_two"
|
app:incomingDefaultBubblePressedColor="@color/white_two"
|
||||||
app:incomingDefaultBubbleSelectedColor="@color/colorPrimaryDark"
|
app:incomingDefaultBubbleSelectedColor="@color/colorPrimaryDark"
|
||||||
@ -83,19 +48,39 @@
|
|||||||
|
|
||||||
<com.webianks.library.PopupBubble
|
<com.webianks.library.PopupBubble
|
||||||
android:id="@+id/popupBubbleView"
|
android:id="@+id/popupBubbleView"
|
||||||
|
android:layout_margin="16dp"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="top|center_horizontal"
|
android:layout_above="@+id/separator"
|
||||||
android:layout_margin="16dp"
|
android:layout_centerHorizontal="true"
|
||||||
android:paddingEnd="8dp"
|
android:paddingEnd="8dp"
|
||||||
app:pb_backgroundColor="@color/colorPrimary"
|
app:pb_backgroundColor="@color/colorPrimary"
|
||||||
app:pb_icon="@drawable/ic_baseline_arrow_downward_24px"
|
app:pb_icon="@drawable/ic_baseline_arrow_downward_24px"
|
||||||
app:pb_text="@string/nc_new_messages"
|
app:pb_text="@string/nc_new_messages"
|
||||||
android:layout_above="@id/inputLinearLayout"
|
|
||||||
android:layout_centerHorizontal="true"
|
|
||||||
app:pb_textColor="@color/white"/>
|
app:pb_textColor="@color/white"/>
|
||||||
|
|
||||||
|
<View
|
||||||
|
android:id="@+id/separator"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="1dp"
|
||||||
|
android:layout_above="@+id/messageInputView"
|
||||||
|
android:layout_marginLeft="16dp"
|
||||||
|
android:layout_marginRight="16dp"
|
||||||
|
android:background="@color/nc_light_grey"/>
|
||||||
|
|
||||||
|
<com.stfalcon.chatkit.messages.MessageInput
|
||||||
|
android:id="@+id/messageInputView"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentBottom="true"
|
||||||
|
android:maxLength="1000"
|
||||||
|
app:inputButtonDefaultBgColor="@color/colorPrimary"
|
||||||
|
app:inputButtonDefaultBgPressedColor="@color/colorPrimaryDark"
|
||||||
|
app:inputButtonHeight="30dp"
|
||||||
|
app:inputButtonMargin="16dp"
|
||||||
|
app:inputButtonWidth="30dp"
|
||||||
|
app:inputHint="@string/nc_hint_enter_a_message"
|
||||||
|
app:inputTextColor="@color/black"
|
||||||
|
app:inputTextSize="16sp"/>
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
|
|
||||||
</android.support.design.widget.CoordinatorLayout>
|
|
||||||
|
Loading…
Reference in New Issue
Block a user