Merge branch 'develop' into userstatus-on-toolbar

app/src/main/java/chat/rocket/android/activity/MainActivity.java

@@ -85,6 +85,25 @@ public class MainActivity extends AbstractAuthedActivity implements MainContract
         pane.openPane();
       }
     });
+
+    //ref: ActionBarDrawerToggle#setProgress
+    pane.setPanelSlideListener(new SlidingPaneLayout.PanelSlideListener() {
+      @Override
+      public void onPanelSlide(View panel, float slideOffset) {
+        drawerArrowDrawable.setProgress(slideOffset);
+      }
+
+      @Override
+      public void onPanelOpened(View panel) {
+        drawerArrowDrawable.setVerticalMirror(true);
+      }
+
+      @Override
+      public void onPanelClosed(View panel) {
+        drawerArrowDrawable.setVerticalMirror(false);
+        closeUserActionContainer();
+      }
+    });
   }
 
   private boolean closeSidebarIfNeeded() {
@@ -137,6 +156,14 @@ public class MainActivity extends AbstractAuthedActivity implements MainContract
         .commit();
   }
 
+  private void closeUserActionContainer() {
+    SidebarMainFragment sidebarFragment = (SidebarMainFragment) getSupportFragmentManager()
+            .findFragmentById(R.id.sidebar_fragment_container);
+    if (sidebarFragment != null) {
+      sidebarFragment.closeUserActionContainer();
+    }
+  }
+
   @Override
   protected void onRoomIdUpdated() {
     super.onRoomIdUpdated();

app/src/main/java/chat/rocket/android/fragment/server_config/TwoStepAuthFragment.java

@@ -89,11 +89,11 @@ public class TwoStepAuthFragment extends AbstractServerConfigFragment
   protected void onSetupView() {
     waitingView = rootView.findViewById(R.id.waiting);
 
-    final TextView twoStepCodeTextView = (TextView) rootView.findViewById(R.id.two_step_code);
+    final TextView twoStepCodeTextView = rootView.findViewById(R.id.two_step_code);
+
+    twoStepCodeTextView.requestFocus();
 
     submitButton = rootView.findViewById(R.id.btn_two_step_login);
-    submitButton.setOnClickListener(view -> {
-      presenter.onCode(twoStepCodeTextView.getText().toString());
-    });
+    submitButton.setOnClickListener(v -> presenter.onCode(twoStepCodeTextView.getText().toString()));
   }
 }

app/src/main/java/chat/rocket/android/fragment/sidebar/SidebarMainFragment.java

@@ -166,12 +166,16 @@ public class SidebarMainFragment extends AbstractFragment implements SidebarMain
     RxCompoundButton.checkedChanges(toggleUserAction)
         .compose(bindToLifecycle())
         .subscribe(
-            aBoolean -> rootView.findViewById(R.id.user_action_outer_container)
-                .setVisibility(aBoolean ? View.VISIBLE : View.GONE),
+            this::showUserActionContainer,
             Logger::report
         );
   }
 
+  private void showUserActionContainer(boolean show) {
+    rootView.findViewById(R.id.user_action_outer_container)
+            .setVisibility(show ? View.VISIBLE : View.GONE);
+  }
+
   @Override
   public void showScreen() {
     rootView.setVisibility(View.VISIBLE);
@@ -256,7 +260,7 @@ public class SidebarMainFragment extends AbstractFragment implements SidebarMain
     });
   }
 
-  private void closeUserActionContainer() {
+  public void closeUserActionContainer() {
     final CompoundButton toggleUserAction = rootView.findViewById(R.id.toggle_user_action);
     if (toggleUserAction != null && toggleUserAction.isChecked()) {
       toggleUserAction.setChecked(false);

app/src/main/java/chat/rocket/android/layouthelper/chatroom/MessageListAdapter.java

@@ -32,6 +32,7 @@ public class MessageListAdapter extends ExtModelListAdapter<Message, PairedMessa
   public MessageListAdapter(Context context, String hostname) {
     super(context);
     this.hostname = hostname;
+    this.hasNext = true;
   }
 
   public void setAbsoluteUrl(AbsoluteUrl absoluteUrl) {

app/src/main/res/layout/list_item_normal_message.xml

@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
+    android:background="@android:color/white"
     android:theme="@style/AppTheme">
 
     <include layout="@layout/list_item_message_newday" />
@@ -63,6 +64,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:enabled="false"
+                    android:textColor="@color/color_timestamp"
                     tools:text="12:34" />
 
                 <View

app/src/main/res/layout/list_item_system_message.xml

@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
+    android:background="@android:color/white"
     android:theme="@style/AppTheme">
 
     <include layout="@layout/list_item_message_newday" />
@@ -50,6 +51,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:enabled="false"
+                    android:textColor="@color/color_timestamp"
                     tools:text="12:34" />
 
                 <View

rocket-chat-android-widgets/src/main/res/layout/message_inline_embed_url.xml

@@ -36,6 +36,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
                 android:layout_marginBottom="2dp"
+                android:textColor="@color/color_embed_hostname"
                 android:enabled="false" />
 
         <TextView

rocket-chat-android-widgets/src/main/res/values/colors.xml

@@ -4,6 +4,9 @@
   <color name="color_shadow">#FFE6E6E7</color>
   <color name="color_icon_composer">#FFA8A8A8</color>
 
+  <color name="color_timestamp">#FFA8A8A8</color>
+  <color name="color_embed_hostname">@color/color_timestamp</color>
+  
   <!-- User status colors-->
   <color name="color_user_status_online">#FF4CAF50</color> <!-- Green 500 -->
   <color name="color_user_status_busy">#FFF44336</color> <!-- Red 500-->