Merge remote-tracking branch 'origin/develop' into develop

app/src/main/res/layout-w720dp/activity_main.xml

@@ -2,28 +2,24 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
+    android:layout_height="match_parent">
 
-  <include layout="@layout/sidebar"/>
+    <include layout="@layout/sidebar" />
 
     <android.support.design.widget.CoordinatorLayout
         android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      >
+        android:layout_height="match_parent">
 
         <android.support.design.widget.AppBarLayout
             android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
+            android:layout_height="wrap_content">
 
             <android.support.v7.widget.Toolbar
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
                 app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-          app:title="@string/app_name"
-          />
+                app:title="@string/app_name" />
         </android.support.design.widget.AppBarLayout>
 
         <FrameLayout
@@ -31,8 +27,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@color/white"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        ></FrameLayout>
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
     </android.support.design.widget.CoordinatorLayout>
 </LinearLayout>
\ No newline at end of file

app/src/main/res/layout-w720dp/fragment_room.xml

@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="horizontal">
 
-  <include layout="@layout/fragment_room_main"/>
+    <include layout="@layout/fragment_room_main" />
 
-  <include layout="@layout/room_side_menu"/>
+    <include layout="@layout/room_side_menu" />
 </LinearLayout>
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.SlidingPaneLayout
-    android:id="@+id/sliding_pane"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/sliding_pane"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
+    android:layout_height="match_parent">
 
-  <include layout="@layout/sidebar"/>
+    <include layout="@layout/sidebar" />
 
     <android.support.design.widget.CoordinatorLayout
         android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      >
+        android:layout_height="match_parent">
 
         <android.support.design.widget.AppBarLayout
             android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
+            android:layout_height="wrap_content">
 
             <android.support.v7.widget.Toolbar
                 android:id="@+id/activity_main_toolbar"
@@ -25,8 +21,7 @@
                 android:layout_height="wrap_content"
                 android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
                 app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
-          app:title="@string/app_name"
-          />
+                app:title="@string/app_name" />
         </android.support.design.widget.AppBarLayout>
 
         <FrameLayout
@@ -35,8 +30,7 @@
             android:layout_height="match_parent"
             android:background="@color/white"
             android:clickable="true"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        ></FrameLayout>
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
     </android.support.design.widget.CoordinatorLayout>
 </android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:minWidth="288dp"
-    android:padding="@dimen/margin_24"
-    >
+    android:orientation="vertical"
+    android:padding="@dimen/margin_24">
 
     <android.support.design.widget.TextInputLayout
         android:id="@+id/text_input_email"
         android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      >
+        android:layout_height="wrap_content">
 
         <android.support.design.widget.TextInputEditText
             android:id="@+id/editor_email"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-        android:hint="email address"
+            android:hint="@string/dialog_user_registration_email"
             android:imeOptions="actionNext"
             android:inputType="textWebEmailAddress"
-        android:singleLine="true"
-        />
+            android:singleLine="true" />
     </android.support.design.widget.TextInputLayout>
 
     <Space
         android:layout_width="wrap_content"
-      android:layout_height="@dimen/margin_8"
-      />
+        android:layout_height="@dimen/margin_8" />
 
     <android.support.design.widget.TextInputLayout
         android:id="@+id/text_input_username"
         android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      >
+        android:layout_height="wrap_content">
 
         <android.support.design.widget.TextInputEditText
             android:id="@+id/editor_username"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-        android:hint="username"
+            android:hint="@string/dialog_user_registration_username"
             android:imeOptions="actionNext"
             android:inputType="textWebEmailAddress"
-        android:singleLine="true"
-        />
+            android:singleLine="true" />
     </android.support.design.widget.TextInputLayout>
 
     <Space
         android:layout_width="wrap_content"
-      android:layout_height="@dimen/margin_8"
-      />
+        android:layout_height="@dimen/margin_8" />
 
     <android.support.design.widget.TextInputLayout
         android:id="@+id/text_input_passwd"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-      app:passwordToggleEnabled="true"
-      >
+        app:passwordToggleEnabled="true">
 
         <android.support.design.widget.TextInputEditText
             android:id="@+id/editor_passwd"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-        android:hint="password"
+            android:hint="@string/dialog_user_registration_password"
             android:imeOptions="actionNext"
             android:inputType="textWebPassword"
-        android:singleLine="true"
-        />
+            android:singleLine="true" />
     </android.support.design.widget.TextInputLayout>
 
     <Space
         android:layout_width="wrap_content"
-      android:layout_height="@dimen/margin_16"
-      />
+        android:layout_height="@dimen/margin_16" />
 
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/btn_register_user"
@@ -82,16 +72,14 @@
         android:layout_gravity="end|bottom"
         app:elevation="2dp"
         app:fabSize="mini"
-      app:srcCompat="@drawable/ic_arrow_forward_white_24dp"
-      />
+        app:srcCompat="@drawable/ic_arrow_forward_white_24dp" />
 
     <chat.rocket.android.widget.WaitingView
         android:id="@+id/waiting"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-      app:dotCount="5"
-      app:dotSize="12dp"
         android:layout_gravity="center"
-      />
+        app:dotCount="5"
+        app:dotSize="12dp" />
 
 </LinearLayout>
\ No newline at end of file

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

@@ -6,34 +6,35 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-      android:orientation="vertical"
-      >
+        android:orientation="vertical">
+
         <FrameLayout
             android:id="@+id/room_user_titlebar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-        android:paddingStart="@dimen/margin_16"
             android:paddingRight="@dimen/margin_16"
-        >
+            android:paddingStart="@dimen/margin_16">
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_gravity="start|center_vertical"
                 android:text="@string/users_of_room_title"
-          android:textAppearance="@style/TextAppearance.AppCompat.Title"
-          android:layout_gravity="start|center_vertical"/>
+                android:textAppearance="@style/TextAppearance.AppCompat.Title" />
+
             <TextView
                 android:id="@+id/room_user_count"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-          android:textAppearance="@style/TextAppearance.AppCompat.Small"
-          android:layout_gravity="end|center_vertical"/>
+                android:layout_gravity="end|center_vertical"
+                android:textAppearance="@style/TextAppearance.AppCompat.Small" />
         </FrameLayout>
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/recyclerview"
-        android:orientation="vertical"
             android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+            android:layout_height="match_parent"
+            android:orientation="vertical" />
 
     </LinearLayout>
 
@@ -41,7 +42,6 @@
         android:id="@+id/waiting"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-      android:layout_gravity="center"
-      />
+        android:layout_gravity="center" />
 
 </FrameLayout>
\ No newline at end of file

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

@@ -2,26 +2,26 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:minWidth="288dp"
-    android:padding="@dimen/margin_24"
     android:gravity="center"
-    >
+    android:minWidth="288dp"
+    android:orientation="vertical"
+    android:padding="@dimen/margin_24">
 
     <ImageView
         android:layout_width="80dp"
         android:layout_height="80dp"
         android:layout_marginBottom="@dimen/margin_24"
         android:scaleType="fitCenter"
-      android:src="@mipmap/ic_launcher"/>
+        android:src="@mipmap/ic_launcher" />
+
     <chat.rocket.android.widget.WaitingView
         android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      />
+        android:layout_height="wrap_content" />
+
     <TextView
         android:id="@+id/txt_caption"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-      android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-      android:layout_marginTop="@dimen/margin_16"/>
+        android:layout_marginTop="@dimen/margin_16"
+        android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
 </LinearLayout>
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:theme="@style/Theme.AppCompat.Light"
+    android:gravity="center"
+    android:orientation="vertical"
     android:padding="@dimen/margin_16"
-    android:gravity="center">
+    android:theme="@style/Theme.AppCompat.Light">
+
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Welcome to Rocket.Chat.Android\nSelect a channel from the drawer."
-        android:textSize="14sp"
+        android:layout_marginBottom="@dimen/margin_16"
         android:gravity="center"
-        android:layout_marginBottom="@dimen/margin_16"/>
+        android:text="@string/fragment_home_welcome_message"
+        android:textSize="14sp" />
 
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@mipmap/ic_launcher"/>
+        android:src="@mipmap/ic_launcher" />
 </LinearLayout>
\ No newline at end of file

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

@@ -3,8 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorPrimaryDark"
-    >
+    android:background="?attr/colorPrimaryDark">
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -13,38 +12,33 @@
         android:background="@color/white"
         android:minWidth="288dp"
         android:orientation="horizontal"
-      android:padding="@dimen/margin_24"
-      >
+        android:padding="@dimen/margin_24">
 
         <LinearLayout
             android:layout_width="0px"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-        android:orientation="vertical"
-        >
+            android:orientation="vertical">
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-          android:text="hostname"
-          android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-          />
+                android:text="@string/fragment_input_hostname_hostname"
+                android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
 
             <EditText
                 android:id="@+id/editor_hostname"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-          android:hint="demo.rocket.chat"
+                android:hint="@string/fragment_input_hostname_server_hint"
                 android:imeOptions="actionGo"
                 android:inputType="textWebEditText"
-          android:singleLine="true"
-          />
+                android:singleLine="true" />
         </LinearLayout>
 
         <Space
             android:layout_width="@dimen/margin_8"
-        android:layout_height="wrap_content"
-        />
+            android:layout_height="wrap_content" />
 
         <android.support.design.widget.FloatingActionButton
             android:id="@+id/btn_connect"
@@ -53,7 +47,6 @@
             android:layout_gravity="end|bottom"
             app:elevation="2dp"
             app:fabSize="mini"
-        app:srcCompat="@drawable/ic_arrow_forward_white_24dp"
-        />
+            app:srcCompat="@drawable/ic_arrow_forward_white_24dp" />
     </LinearLayout>
 </FrameLayout>
\ No newline at end of file

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

@@ -3,8 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorPrimaryDark"
-    >
+    android:background="?attr/colorPrimaryDark">
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -13,94 +12,84 @@
         android:background="@color/white"
         android:minWidth="288dp"
         android:orientation="vertical"
-      android:padding="@dimen/margin_24"
-      >
+        android:padding="@dimen/margin_24">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        >
+            android:orientation="horizontal">
+
             <chat.rocket.android.widget.FontAwesomeButton
                 android:id="@+id/btn_login_with_twitter"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
-          android:text="@string/fa_twitter"
-          android:textSize="16dp"
                 android:layout_marginEnd="@dimen/margin_8"
                 android:enabled="false"
-          />
+                android:text="@string/fa_twitter"
+                android:textSize="16dp" />
+
             <chat.rocket.android.widget.FontAwesomeButton
                 android:id="@+id/btn_login_with_github"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
-          android:text="@string/fa_github"
-          android:textSize="16dp"
                 android:layout_marginEnd="@dimen/margin_8"
-          />
+                android:text="@string/fa_github"
+                android:textSize="16dp" />
         </LinearLayout>
 
         <android.support.design.widget.TextInputLayout
             android:id="@+id/text_input_username"
             android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
+            android:layout_height="wrap_content">
 
             <android.support.design.widget.TextInputEditText
                 android:id="@+id/editor_username"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-          android:hint="username or email"
+                android:hint="@string/fragment_login_username_or_email"
                 android:imeOptions="actionNext"
                 android:inputType="textWebEmailAddress"
-          android:singleLine="true"
-          />
+                android:singleLine="true" />
         </android.support.design.widget.TextInputLayout>
 
         <Space
             android:layout_width="wrap_content"
-        android:layout_height="@dimen/margin_8"
-        />
+            android:layout_height="@dimen/margin_8" />
 
         <android.support.design.widget.TextInputLayout
             android:id="@+id/text_input_passwd"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-        app:passwordToggleEnabled="true"
-        >
+            app:passwordToggleEnabled="true">
 
             <android.support.design.widget.TextInputEditText
                 android:id="@+id/editor_passwd"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-          android:hint="password"
+                android:hint="@string/fragment_login_password"
                 android:imeOptions="actionNext"
                 android:inputType="textWebPassword"
-          android:singleLine="true"
-          />
+                android:singleLine="true" />
         </android.support.design.widget.TextInputLayout>
 
         <Space
             android:layout_width="wrap_content"
-        android:layout_height="@dimen/margin_16"
-        />
+            android:layout_height="@dimen/margin_16" />
 
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        >
+            android:orientation="horizontal">
 
             <android.support.design.widget.FloatingActionButton
                 android:id="@+id/btn_user_registration"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="start|bottom"
+                app:backgroundTint="@color/white"
                 app:elevation="2dp"
                 app:fabSize="mini"
-          app:backgroundTint="@color/white"
-          app:srcCompat="@drawable/ic_user_registration_blue_24dp"
-          />
+                app:srcCompat="@drawable/ic_user_registration_blue_24dp" />
 
             <android.support.design.widget.FloatingActionButton
                 android:id="@+id/btn_login_with_email"
@@ -109,8 +98,7 @@
                 android:layout_gravity="end|bottom"
                 app:elevation="2dp"
                 app:fabSize="normal"
-          app:srcCompat="@drawable/ic_arrow_forward_white_24dp"
-          />
+                app:srcCompat="@drawable/ic_arrow_forward_white_24dp" />
         </FrameLayout>
     </LinearLayout>
 </FrameLayout>
\ No newline at end of file

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

@@ -3,8 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorPrimaryDark"
-    >
+    android:background="?attr/colorPrimaryDark">
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -13,32 +12,29 @@
         android:background="@color/white"
         android:minWidth="288dp"
         android:orientation="vertical"
-      android:padding="@dimen/margin_24"
-      >
+        android:padding="@dimen/margin_24">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.AppCompat.Title"
-        android:text="Oops..."
-        />
+            android:text="@string/fragment_retry_login_error_title"
+            android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
         <TextView
             android:id="@+id/txt_error_description"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-        android:textAppearance="@style/Base.TextAppearance.AppCompat.Body1"
-        android:layout_marginTop="@dimen/margin_8"
             android:layout_marginBottom="@dimen/margin_8"
-        />
+            android:layout_marginTop="@dimen/margin_8"
+            android:textAppearance="@style/Base.TextAppearance.AppCompat.Body1" />
 
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:gravity="center"
-        android:orientation="vertical"
-        >
+            android:orientation="vertical">
+
             <android.support.design.widget.FloatingActionButton
                 android:id="@+id/btn_retry_login"
                 android:layout_width="wrap_content"
@@ -46,15 +42,13 @@
                 android:layout_margin="@dimen/margin_8"
                 app:elevation="2dp"
                 app:fabSize="normal"
-          app:srcCompat="@drawable/ic_arrow_forward_white_24dp"
-          />
+                app:srcCompat="@drawable/ic_arrow_forward_white_24dp" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-          android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-          android:text="RETRY"
-          />
+                android:text="@string/fragment_retry_login_retry_title"
+                android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
 
         </LinearLayout>
 
@@ -62,11 +56,10 @@
             android:id="@+id/waiting"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center"
             android:layout_marginTop="@dimen/margin_16"
             app:dotCount="5"
-        app:dotSize="12dp"
-        android:layout_gravity="center"
-        />
+            app:dotSize="12dp" />
 
     </LinearLayout>
 </FrameLayout>
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
+    android:layout_height="match_parent">
 
-  <include layout="@layout/fragment_room_main"/>
+    <include layout="@layout/fragment_room_main" />
 
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="end"
         android:clickable="true"
-      android:theme="@style/AppTheme.Dark"
-      >
-    <include layout="@layout/room_side_menu"/>
+        android:theme="@style/AppTheme.Dark">
+
+        <include layout="@layout/room_side_menu" />
     </FrameLayout>
 </android.support.v4.widget.DrawerLayout>
\ No newline at end of file

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

@@ -3,26 +3,25 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?attr/colorPrimaryDark"
-    android:theme="@style/AppTheme.Dark"
-    >
+    android:theme="@style/AppTheme.Dark">
 
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-      android:orientation="vertical"
         android:layout_gravity="center"
         android:gravity="center"
-      >
+        android:orientation="vertical">
+
         <chat.rocket.android.widget.WaitingView
             android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        />
+            android:layout_height="wrap_content" />
+
         <TextView
             android:id="@+id/txt_caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-        android:layout_marginTop="@dimen/margin_32"/>
+            android:layout_marginTop="@dimen/margin_32"
+            android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
     </LinearLayout>
 
 </FrameLayout>
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:theme="@style/AppTheme"
-    >
+    android:orientation="vertical"
+    android:theme="@style/AppTheme">
 
-  <include layout="@layout/list_item_message_newday"/>
+    <include layout="@layout/list_item_message_newday" />
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-      android:orientation="horizontal"
-      >
+        android:orientation="horizontal">
 
         <ImageView
             android:id="@+id/user_avatar"
             android:layout_width="32dp"
             android:layout_height="32dp"
             android:layout_margin="8dp"
-        tools:src="@drawable/ic_default_avatar"
-        />
+            tools:src="@drawable/ic_default_avatar" />
+
         <LinearLayout
             android:layout_width="0px"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
             android:layout_weight="1"
-        android:orientation="vertical"
-        android:layout_marginEnd="8dp">
+            android:orientation="vertical">
+
             <LinearLayout
                 android:id="@+id/user_and_timestamp_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
+
                 <TextView
                     android:id="@+id/username"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textStyle="bold"
-            tools:text="John Doe"/>
+                    tools:text="John Doe" />
+
                 <Space
                     android:layout_width="@dimen/margin_8"
-            android:layout_height="wrap_content"
-            />
+                    android:layout_height="wrap_content" />
+
                 <TextView
                     android:id="@+id/timestamp"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:enabled="false"
-            tools:text="12:34"/>
+                    tools:text="12:34" />
             </LinearLayout>
+
             <chat.rocket.android.widget.message.RocketChatMessageLayout
                 android:id="@+id/message_body"
                 android:layout_width="match_parent"
-          android:layout_height="wrap_content"/>
+                android:layout_height="wrap_content" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
-<Space
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<Space xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/space"
     android:layout_width="match_parent"
-    android:layout_height="88dp"
-    />
+    android:layout_height="88dp" />
\ No newline at end of file
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:theme="@style/AppTheme"
-    >
+    android:orientation="vertical"
+    android:theme="@style/AppTheme">
 
     <chat.rocket.android.widget.WaitingView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-      android:layout_margin="@dimen/margin_8"
-      />
+        android:layout_margin="@dimen/margin_8" />
 
 </FrameLayout>
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/newday_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
     android:layout_margin="16dp"
-    >
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
 
     <View
         android:layout_width="0px"
         android:layout_height="1dp"
         android:layout_weight="1"
-      android:background="@color/newday_color"/>
+        android:background="@color/newday_color" />
 
     <TextView
         android:id="@+id/newday_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
         android:textColor="@color/newday_color"
         android:textSize="8sp"
         android:textStyle="bold"
-      android:layout_marginLeft="16dp"
-      android:layout_marginRight="16dp"
-      tools:text="2016/01/23"/>
+        tools:text="2016/01/23" />
 
     <View
         android:layout_width="0px"
         android:layout_height="1dp"
         android:layout_weight="1"
-      android:background="@color/newday_color"/>
+        android:background="@color/newday_color" />
 
 </LinearLayout>
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:theme="@style/AppTheme"
-    >
+    android:orientation="vertical"
+    android:theme="@style/AppTheme">
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="center"
         android:layout_margin="@dimen/margin_16"
         android:text="@string/start_of_conversation"
-      android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-      android:layout_gravity="center"
-      />
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
 
 </FrameLayout>
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="?attr/listPreferredItemHeightSmall"
-    android:gravity="center_vertical">
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
 
     <ImageView
         android:id="@+id/room_user_status"
         android:layout_width="8dp"
         android:layout_height="8dp"
-      android:layout_margin="@dimen/margin_8"/>
+        android:layout_margin="@dimen/margin_8" />
 
     <ImageView
         android:id="@+id/room_user_avatar"

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

 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/room_side_menu"
     android:layout_width="48dp"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     android:layout_gravity="end"
-    >
+    android:orientation="vertical">
 
     <chat.rocket.android.widget.FontAwesomeButton
         android:layout_width="48dp"
         android:layout_height="48dp"
-      android:textSize="24dp"
-      android:text="@string/fa_search"
         android:enabled="false"
-      />
+        android:text="@string/fa_search"
+        android:textSize="24dp" />
+
     <chat.rocket.android.widget.FontAwesomeButton
         android:id="@+id/btn_users"
         android:layout_width="48dp"
         android:layout_height="48dp"
-      android:textSize="24dp"
         android:text="@string/fa_users"
-      />
+        android:textSize="24dp" />
+
     <chat.rocket.android.widget.FontAwesomeButton
         android:layout_width="48dp"
         android:layout_height="48dp"
-      android:textSize="24dp"
-      android:text="@string/fa_at"
         android:enabled="false"
-      />
+        android:text="@string/fa_at"
+        android:textSize="24dp" />
 
 </LinearLayout>
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.SlidingPaneLayout
+<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/sub_sliding_pane"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_gravity="start"
     android:layout_width="280dp"
     android:layout_height="match_parent"
-    android:theme="@style/AppTheme.Dark"
-    >
+    android:layout_gravity="start"
+    android:theme="@style/AppTheme.Dark">
+
     <android.support.v4.widget.NestedScrollView
         android:layout_width="96dp"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-      android:background="?attr/colorPrimaryDark"
-      >
+        android:background="?attr/colorPrimaryDark">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-        android:orientation="vertical"
-        >
+            android:orientation="vertical">
 
             <ImageButton
+                style="@style/Base.Widget.AppCompat.Button.Borderless"
                 android:layout_width="80dp"
                 android:layout_height="80dp"
                 android:layout_margin="@dimen/margin_8"
-          android:src="@mipmap/ic_launcher"
-          style="@style/Base.Widget.AppCompat.Button.Borderless"
-          />
+                android:src="@mipmap/ic_launcher" />
+
             <chat.rocket.android.widget.FontAwesomeButton
+                style="@style/Base.Widget.AppCompat.Button.Borderless"
                 android:layout_width="80dp"
                 android:layout_height="80dp"
                 android:layout_margin="@dimen/margin_8"
-          android:text="@string/fa_plus"
-          style="@style/Base.Widget.AppCompat.Button.Borderless"
-          />
+                android:text="@string/fa_plus" />
         </LinearLayout>
     </android.support.v4.widget.NestedScrollView>
 
     <FrameLayout
         android:id="@+id/sidebar_fragment_container"
         android:layout_width="280dp"
-      android:layout_height="match_parent"
-      />
+        android:layout_height="match_parent" />
 
 </android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
-<WebView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<WebView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/webview"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    />
+    android:layout_height="match_parent" />
\ No newline at end of file
\ No newline at end of file

app/src/main/res/values/strings.xml

@@ -14,4 +14,15 @@
     <string name="sending">Sending...</string>
     <string name="resend">Resend</string>
     <string name="discard">Discard</string>
+
+    <string name="dialog_user_registration_email">Email</string>
+    <string name="dialog_user_registration_username">Username</string>
+    <string name="dialog_user_registration_password">Password</string>
+    <string name="fragment_home_welcome_message">Welcome to Rocket.Chat.Android\nSelect a channel from the drawer.</string>
+    <string name="fragment_input_hostname_hostname">Hostname</string>
+    <string name="fragment_input_hostname_server_hint">demo.rocket.chat</string>
+    <string name="fragment_login_username_or_email">Username or email</string>
+    <string name="fragment_login_password">Password</string>
+    <string name="fragment_retry_login_retry_title">RETRY</string>
+    <string name="fragment_retry_login_error_title">Oops…</string>
 </resources>