commit 7307cd5410db3244af689dbb4cb25e1b1f9f84d2
author Adrien Béraud <adrien.beraud@savoirfairelinux.com> Mon Apr 13 23:29:11 2020 -0400
committer Adrien Béraud <adrien.beraud@savoirfairelinux.com> Mon Apr 13 23:29:11 2020 -0400
tree 190677f178409c7e1c6192c6a38359863f5cf8da
parent c9382aea4b822beb102081a9b34b0e63d4afc4bb

move to ViewBinding

Change-Id: I1ef0835bf585654989b29879c0e2ff0eefd721c3

ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java

diff --git a/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java
index 3c86847..b6bf0e0 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.java
@@ -75,7 +75,6 @@
 import java.util.List;
 import java.util.Map;
 
-import butterknife.OnEditorAction;
 import cx.ring.BuildConfig;
 import cx.ring.R;
 import cx.ring.adapters.ConversationAdapter;
@@ -89,7 +88,6 @@
 import cx.ring.conversation.ConversationPresenter;
 import cx.ring.conversation.ConversationView;
 import cx.ring.databinding.FragConversationBinding;
-import cx.ring.dependencyinjection.JamiInjectionComponent;
 import cx.ring.interfaces.Colorable;
 import cx.ring.model.Account;
 import cx.ring.model.CallContact;
@@ -197,16 +195,6 @@
         }
     }
 
-    @Override
-    public int getLayout() {
-        return R.layout.frag_conversation;
-    }
-
-    @Override
-    public void injectFragment(JamiInjectionComponent component) {
-        component.inject(this);
-    }
-
     private static void setBottomPadding(@NonNull View view, int padding) {
         view.setPadding(
                 view.getPaddingLeft(),
@@ -227,7 +215,7 @@
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        injectFragment(((JamiApplication) getActivity().getApplication()).getRingInjectionComponent());
+        ((JamiApplication) getActivity().getApplication()).getInjectionComponent().inject(this);
         Resources res = getResources();
         marginPx = res.getDimensionPixelSize(R.dimen.conversation_message_input_margin);
         mapWidth = res.getDimensionPixelSize(R.dimen.location_sharing_minmap_width);
@@ -340,6 +328,8 @@
         if (animator != null)
             animator.setSupportsChangeAnimations(false);
         binding.histList.setAdapter(mAdapter);
+
+
     }
 
     @Override
@@ -741,7 +731,6 @@
         }
     }
 
-    @OnEditorAction(R.id.msg_input_txt)
     boolean actionSendMsgText(int actionId) {
         switch (actionId) {
             case EditorInfo.IME_ACTION_SEND: