gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 20:19:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #461 and #457

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-02-14 03:36:00 +01:00
parent ac91b2b5b6
commit 68c45f6831
5 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -114,7 +114,7 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.0.2' implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'com.google.android.material:material:1.0.0' implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
implementation 'com.github.vanniktech.Emoji:emoji-twitter:182e1ff4f4' implementation 'com.github.vanniktech:Emoji:746caa4623'
implementation 'org.michaelevans.colorart:library:0.0.3' implementation 'org.michaelevans.colorart:library:0.0.3'
implementation "android.arch.work:work-runtime:${workVersion}" implementation "android.arch.work:work-runtime:${workVersion}"
implementation "android.arch.work:work-rxjava2:${workVersion}" implementation "android.arch.work:work-rxjava2:${workVersion}"

6
app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
View File

@ -463,8 +463,10 @@ public class ChatController extends BaseController implements MessagesListAdapte
emojiPopup = EmojiPopup.Builder.fromRootView(view).setOnEmojiPopupShownListener(new OnEmojiPopupShownListener() { emojiPopup = EmojiPopup.Builder.fromRootView(view).setOnEmojiPopupShownListener(new OnEmojiPopupShownListener() {
@Override @Override
public void onEmojiPopupShown() { public void onEmojiPopupShown() {
smileyButton.setColorFilter(getResources().getColor(R.color.colorPrimary), if (getResources() != null) {
PorterDuff.Mode.SRC_IN); smileyButton.setColorFilter(getResources().getColor(R.color.colorPrimary),
PorterDuff.Mode.SRC_IN);
}
} }
}).setOnEmojiPopupDismissListener(new OnEmojiPopupDismissListener() { }).setOnEmojiPopupDismissListener(new OnEmojiPopupDismissListener() {
@Override @Override

13
app/src/main/java/com/nextcloud/talk/controllers/base/BaseController.java
View File

@ -18,11 +18,13 @@
*/ */
package com.nextcloud.talk.controllers.base; package com.nextcloud.talk.controllers.base;
import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.inputmethod.InputMethodManager;
import com.bluelinelabs.conductor.Controller; import com.bluelinelabs.conductor.Controller;
import com.nextcloud.talk.application.NextcloudTalkApplication; import com.nextcloud.talk.application.NextcloudTalkApplication;
import com.nextcloud.talk.controllers.AccountVerificationController; import com.nextcloud.talk.controllers.AccountVerificationController;
@ -47,6 +49,8 @@ public abstract class BaseController extends ButterKnifeController {
private static final String TAG = "BaseController"; private static final String TAG = "BaseController";
@Inject @Inject
AppPreferences appPreferences; AppPreferences appPreferences;
@Inject
Context context;
protected BaseController() { protected BaseController() {
cleanTempCertPreference(); cleanTempCertPreference();
@ -109,6 +113,15 @@ public abstract class BaseController extends ButterKnifeController {
super.onAttach(view); super.onAttach(view);
} }
@Override
protected void onDetach(@NonNull View view) {
super.onDetach(view);
InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
if (imm != null) {
imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
}
}
protected void setTitle() { protected void setTitle() {
Controller parentController = getParentController(); Controller parentController = getParentController();
while (parentController != null) { while (parentController != null) {

13
app/src/main/res/layout/emoji_view.xml
View File

@ -23,22 +23,21 @@
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<androidx.viewpager.widget.ViewPager <androidx.viewpager.widget.ViewPager
android:id="@+id/emojis_pager" android:id="@+id/emojiViewPager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_above="@+id/emoji_divider" /> android:layout_above="@+id/emojiViewDivider" />
<View <View
android:id="@+id/emoji_divider" android:id="@+id/emojiViewDivider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_above="@id/emojis_tab"/> android:layout_above="@id/emojiViewTab"/>
<LinearLayout <LinearLayout
android:id="@+id/emojis_tab" android:id="@+id/emojiViewTab"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="36dp" android:layout_height="36dp"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:orientation="horizontal" /> android:orientation="horizontal" />
</RelativeLayout>
</RelativeLayout>

2
app/src/main/res/layout/view_message_input.xml
View File

@ -40,7 +40,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:imeOptions="actionDone|flagNoFullscreen" android:imeOptions="actionDone"
android:layout_toStartOf="@id/sendButtonSpace" android:layout_toStartOf="@id/sendButtonSpace"
android:inputType="textAutoCorrect|textMultiLine|textCapSentences"/> android:inputType="textAutoCorrect|textMultiLine|textCapSentences"/>