Commit 9cbe434d authored by Yusuke Iwaki's avatar Yusuke Iwaki

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

parents 039cbe39 ff0ba45f
...@@ -2,37 +2,32 @@ ...@@ -2,37 +2,32 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout 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_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.support.design.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent">
>
<android.support.v7.widget.Toolbar <android.support.design.widget.AppBarLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
app:title="@string/app_name"
/>
</android.support.design.widget.AppBarLayout>
<FrameLayout <android.support.v7.widget.Toolbar
android:id="@+id/activity_main_container" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="match_parent" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
android:background="@color/white" app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
app:layout_behavior="@string/appbar_scrolling_view_behavior" app:title="@string/app_name" />
></FrameLayout> </android.support.design.widget.AppBarLayout>
<FrameLayout
android:id="@+id/activity_main_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</android.support.design.widget.CoordinatorLayout> </android.support.design.widget.CoordinatorLayout>
</LinearLayout> </LinearLayout>
\ No newline at end of file
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal"> 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> </LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?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/sliding_pane"
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:id="@+id/sliding_pane"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
>
<include layout="@layout/sidebar"/>
<android.support.design.widget.CoordinatorLayout <include layout="@layout/sidebar" />
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<android.support.design.widget.AppBarLayout <android.support.design.widget.CoordinatorLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent">
>
<android.support.v7.widget.Toolbar <android.support.design.widget.AppBarLayout
android:id="@+id/activity_main_toolbar" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
app:title="@string/app_name"
/>
</android.support.design.widget.AppBarLayout>
<FrameLayout <android.support.v7.widget.Toolbar
android:id="@+id/activity_main_container" android:id="@+id/activity_main_toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:background="@color/white" android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
android:clickable="true" app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
app:layout_behavior="@string/appbar_scrolling_view_behavior" app:title="@string/app_name" />
></FrameLayout> </android.support.design.widget.AppBarLayout>
<FrameLayout
android:id="@+id/activity_main_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:clickable="true"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</android.support.design.widget.CoordinatorLayout> </android.support.design.widget.CoordinatorLayout>
</android.support.v4.widget.SlidingPaneLayout> </android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?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:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:minWidth="288dp" 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.support.design.widget.TextInputEditText <android.support.design.widget.TextInputLayout
android:id="@+id/editor_email" android:id="@+id/text_input_email"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:hint="email address"
android:imeOptions="actionNext"
android:inputType="textWebEmailAddress"
android:singleLine="true"
/>
</android.support.design.widget.TextInputLayout>
<Space <android.support.design.widget.TextInputEditText
android:layout_width="wrap_content" android:id="@+id/editor_email"
android:layout_height="@dimen/margin_8" android:layout_width="match_parent"
/> android:layout_height="wrap_content"
android:hint="@string/dialog_user_registration_email"
android:imeOptions="actionNext"
android:inputType="textWebEmailAddress"
android:singleLine="true" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout <Space
android:id="@+id/text_input_username" android:layout_width="wrap_content"
android:layout_width="match_parent" android:layout_height="@dimen/margin_8" />
android:layout_height="wrap_content"
>
<android.support.design.widget.TextInputEditText <android.support.design.widget.TextInputLayout
android:id="@+id/editor_username" android:id="@+id/text_input_username"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:hint="username"
android:imeOptions="actionNext"
android:inputType="textWebEmailAddress"
android:singleLine="true"
/>
</android.support.design.widget.TextInputLayout>
<Space <android.support.design.widget.TextInputEditText
android:layout_width="wrap_content" android:id="@+id/editor_username"
android:layout_height="@dimen/margin_8" android:layout_width="match_parent"
/> android:layout_height="wrap_content"
android:hint="@string/dialog_user_registration_username"
android:imeOptions="actionNext"
android:inputType="textWebEmailAddress"
android:singleLine="true" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout <Space
android:id="@+id/text_input_passwd" android:layout_width="wrap_content"
android:layout_width="match_parent" android:layout_height="@dimen/margin_8" />
android:layout_height="wrap_content"
app:passwordToggleEnabled="true"
>
<android.support.design.widget.TextInputEditText <android.support.design.widget.TextInputLayout
android:id="@+id/editor_passwd" android:id="@+id/text_input_passwd"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="password" app:passwordToggleEnabled="true">
android:imeOptions="actionNext"
android:inputType="textWebPassword" <android.support.design.widget.TextInputEditText
android:singleLine="true" android:id="@+id/editor_passwd"
/> android:layout_width="match_parent"
</android.support.design.widget.TextInputLayout> android:layout_height="wrap_content"
android:hint="@string/dialog_user_registration_password"
android:imeOptions="actionNext"
android:inputType="textWebPassword"
android:singleLine="true" />
</android.support.design.widget.TextInputLayout>
<Space <Space
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/margin_16" android:layout_height="@dimen/margin_16" />
/>
<android.support.design.widget.FloatingActionButton <android.support.design.widget.FloatingActionButton
android:id="@+id/btn_register_user" android:id="@+id/btn_register_user"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end|bottom" android:layout_gravity="end|bottom"
app:elevation="2dp" app:elevation="2dp"
app:fabSize="mini" app:fabSize="mini"
app:srcCompat="@drawable/ic_arrow_forward_white_24dp" app:srcCompat="@drawable/ic_arrow_forward_white_24dp" />
/>
<chat.rocket.android.widget.WaitingView <chat.rocket.android.widget.WaitingView
android:id="@+id/waiting" android:id="@+id/waiting"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:dotCount="5" android:layout_gravity="center"
app:dotSize="12dp" app:dotCount="5"
android:layout_gravity="center" app:dotSize="12dp" />
/>
</LinearLayout> </LinearLayout>
\ No newline at end of file
...@@ -3,45 +3,45 @@ ...@@ -3,45 +3,45 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
>
<FrameLayout
android:id="@+id/room_user_titlebar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="match_parent"
android:paddingStart="@dimen/margin_16" android:orientation="vertical">
android:paddingRight="@dimen/margin_16"
> <FrameLayout
<TextView android:id="@+id/room_user_titlebar"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="?attr/actionBarSize"
android:text="@string/users_of_room_title" android:paddingRight="@dimen/margin_16"
android:textAppearance="@style/TextAppearance.AppCompat.Title" android:paddingStart="@dimen/margin_16">
android:layout_gravity="start|center_vertical"/>
<TextView <TextView
android:id="@+id/room_user_count" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_gravity="start|center_vertical"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:text="@string/users_of_room_title"
android:layout_gravity="end|center_vertical"/> android:textAppearance="@style/TextAppearance.AppCompat.Title" />
</FrameLayout>
<TextView
<android.support.v7.widget.RecyclerView android:id="@+id/room_user_count"
android:id="@+id/recyclerview" android:layout_width="wrap_content"
android:orientation="vertical" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_gravity="end|center_vertical"
android:layout_height="match_parent"/> android:textAppearance="@style/TextAppearance.AppCompat.Small" />
</FrameLayout>
</LinearLayout>
<android.support.v7.widget.RecyclerView
<chat.rocket.android.widget.WaitingView android:id="@+id/recyclerview"
android:id="@+id/waiting" android:layout_width="match_parent"
android:layout_width="wrap_content" android:layout_height="match_parent"
android:layout_height="wrap_content" android:orientation="vertical" />
android:layout_gravity="center"
/> </LinearLayout>
<chat.rocket.android.widget.WaitingView
android:id="@+id/waiting"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center" />
</FrameLayout> </FrameLayout>
\ No newline at end of file
...@@ -2,26 +2,26 @@ ...@@ -2,26 +2,26 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"
android:minWidth="288dp"
android:padding="@dimen/margin_24"
android:gravity="center" 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" />
<chat.rocket.android.widget.WaitingView
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<ImageView <TextView
android:layout_width="80dp" android:id="@+id/txt_caption"
android:layout_height="80dp" android:layout_width="wrap_content"
android:layout_marginBottom="@dimen/margin_24" android:layout_height="wrap_content"
android:scaleType="fitCenter" android:layout_marginTop="@dimen/margin_16"
android:src="@mipmap/ic_launcher"/> android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
<chat.rocket.android.widget.WaitingView
android:layout_width="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"/>
</LinearLayout> </LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?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:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="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:padding="@dimen/margin_16"
android:gravity="center"> android:theme="@style/Theme.AppCompat.Light">
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Welcome to Rocket.Chat.Android\nSelect a channel from the drawer." android:layout_marginBottom="@dimen/margin_16"
android:textSize="14sp"
android:gravity="center" android:gravity="center"
android:layout_marginBottom="@dimen/margin_16"/> android:text="@string/fragment_home_welcome_message"
android:textSize="14sp" />
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@mipmap/ic_launcher"/> android:src="@mipmap/ic_launcher" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
...@@ -3,57 +3,50 @@ ...@@ -3,57 +3,50 @@
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_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/colorPrimaryDark" android:background="?attr/colorPrimaryDark">
>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:minWidth="288dp"
android:orientation="horizontal"
android:padding="@dimen/margin_24"
>
<LinearLayout <LinearLayout
android:layout_width="0px" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_gravity="center"
android:orientation="vertical" android:background="@color/white"
> android:minWidth="288dp"
android:orientation="horizontal"
android:padding="@dimen/margin_24">
<TextView <LinearLayout
android:layout_width="match_parent" android:layout_width="0px"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="hostname" android:layout_weight="1"
android:textAppearance="@style/TextAppearance.AppCompat.Caption" android:orientation="vertical">
/>
<EditText <TextView
android:id="@+id/editor_hostname" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:text="@string/fragment_input_hostname_hostname"
android:hint="demo.rocket.chat" android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
android:imeOptions="actionGo"
android:inputType="textWebEditText"
android:singleLine="true"
/>
</LinearLayout>
<Space <EditText
android:layout_width="@dimen/margin_8" android:id="@+id/editor_hostname"
android:layout_height="wrap_content" android:layout_width="match_parent"
/> android:layout_height="wrap_content"
android:hint="@string/fragment_input_hostname_server_hint"
android:imeOptions="actionGo"
android:inputType="textWebEditText"
android:singleLine="true" />
</LinearLayout>
<android.support.design.widget.FloatingActionButton <Space
android:id="@+id/btn_connect" android:layout_width="@dimen/margin_8"
android:layout_width="wrap_content" android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:layout_gravity="end|bottom" <android.support.design.widget.FloatingActionButton
app:elevation="2dp" android:id="@+id/btn_connect"
app:fabSize="mini" android:layout_width="wrap_content"
app:srcCompat="@drawable/ic_arrow_forward_white_24dp" android:layout_height="wrap_content"
/> android:layout_gravity="end|bottom"
</LinearLayout> app:elevation="2dp"
app:fabSize="mini"
app:srcCompat="@drawable/ic_arrow_forward_white_24dp" />
</LinearLayout>
</FrameLayout> </FrameLayout>
\ No newline at end of file
...@@ -3,114 +3,102 @@ ...@@ -3,114 +3,102 @@
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_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/colorPrimaryDark" android:background="?attr/colorPrimaryDark">
>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:minWidth="288dp"
android:orientation="vertical"
android:padding="@dimen/margin_24"
>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:layout_gravity="center"
> android:background="@color/white"
<chat.rocket.android.widget.FontAwesomeButton android:minWidth="288dp"
android:id="@+id/btn_login_with_twitter" android:orientation="vertical"
android:layout_width="48dp" android:padding="@dimen/margin_24">
android:layout_height="48dp"
android:text="@string/fa_twitter"
android:textSize="16dp"
android:layout_marginEnd="@dimen/margin_8"
android:enabled="false"
/>
<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"
/>
</LinearLayout>
<android.support.design.widget.TextInputLayout <LinearLayout
android:id="@+id/text_input_username" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:orientation="horizontal">
>
<android.support.design.widget.TextInputEditText <chat.rocket.android.widget.FontAwesomeButton
android:id="@+id/editor_username" android:id="@+id/btn_login_with_twitter"
android:layout_width="match_parent" android:layout_width="48dp"
android:layout_height="wrap_content" android:layout_height="48dp"
android:hint="username or email" android:layout_marginEnd="@dimen/margin_8"
android:imeOptions="actionNext" android:enabled="false"
android:inputType="textWebEmailAddress" android:text="@string/fa_twitter"
android:singleLine="true" android:textSize="16dp" />
/>
</android.support.design.widget.TextInputLayout>
<Space <chat.rocket.android.widget.FontAwesomeButton
android:layout_width="wrap_content" android:id="@+id/btn_login_with_github"
android:layout_height="@dimen/margin_8" android:layout_width="48dp"
/> android:layout_height="48dp"
android:layout_marginEnd="@dimen/margin_8"
android:text="@string/fa_github"
android:textSize="16dp" />
</LinearLayout>
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:id="@+id/text_input_passwd" android:id="@+id/text_input_username"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
app:passwordToggleEnabled="true"
>
<android.support.design.widget.TextInputEditText <android.support.design.widget.TextInputEditText
android:id="@+id/editor_passwd" android:id="@+id/editor_username"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="password" android:hint="@string/fragment_login_username_or_email"
android:imeOptions="actionNext" android:imeOptions="actionNext"
android:inputType="textWebPassword" android:inputType="textWebEmailAddress"
android:singleLine="true" android:singleLine="true" />
/> </android.support.design.widget.TextInputLayout>
</android.support.design.widget.TextInputLayout>
<Space <Space
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/margin_16" android:layout_height="@dimen/margin_8" />
/>
<FrameLayout <android.support.design.widget.TextInputLayout
android:layout_width="match_parent" android:id="@+id/text_input_passwd"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:orientation="horizontal" android:layout_height="wrap_content"
> 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="@string/fragment_login_password"
android:imeOptions="actionNext"
android:inputType="textWebPassword"
android:singleLine="true" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.FloatingActionButton <Space
android:id="@+id/btn_user_registration" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="@dimen/margin_16" />
android:layout_height="wrap_content"
android:layout_gravity="start|bottom"
app:elevation="2dp"
app:fabSize="mini"
app:backgroundTint="@color/white"
app:srcCompat="@drawable/ic_user_registration_blue_24dp"
/>
<android.support.design.widget.FloatingActionButton <FrameLayout
android:id="@+id/btn_login_with_email" android:layout_width="match_parent"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:orientation="horizontal">
android:layout_gravity="end|bottom"
app:elevation="2dp" <android.support.design.widget.FloatingActionButton
app:fabSize="normal" android:id="@+id/btn_user_registration"
app:srcCompat="@drawable/ic_arrow_forward_white_24dp" android:layout_width="wrap_content"
/> android:layout_height="wrap_content"
</FrameLayout> android:layout_gravity="start|bottom"
</LinearLayout> app:backgroundTint="@color/white"
app:elevation="2dp"
app:fabSize="mini"
app:srcCompat="@drawable/ic_user_registration_blue_24dp" />
<android.support.design.widget.FloatingActionButton
android:id="@+id/btn_login_with_email"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|bottom"
app:elevation="2dp"
app:fabSize="normal"
app:srcCompat="@drawable/ic_arrow_forward_white_24dp" />
</FrameLayout>
</LinearLayout>
</FrameLayout> </FrameLayout>
\ No newline at end of file
...@@ -3,70 +3,63 @@ ...@@ -3,70 +3,63 @@
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_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/colorPrimaryDark" android:background="?attr/colorPrimaryDark">
>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/white"
android:minWidth="288dp"
android:orientation="vertical"
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..."
/>
<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"
/>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:background="@color/white"
android:minWidth="288dp"
android:orientation="vertical" android:orientation="vertical"
> android:padding="@dimen/margin_24">
<android.support.design.widget.FloatingActionButton
android:id="@+id/btn_retry_login"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_8"
app:elevation="2dp"
app:fabSize="normal"
app:srcCompat="@drawable/ic_arrow_forward_white_24dp"
/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:text="@string/fragment_retry_login_error_title"
android:text="RETRY" android:textAppearance="@style/TextAppearance.AppCompat.Title" />
/>
</LinearLayout> <TextView
android:id="@+id/txt_error_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_8"
android:layout_marginTop="@dimen/margin_8"
android:textAppearance="@style/Base.TextAppearance.AppCompat.Body1" />
<chat.rocket.android.widget.WaitingView <LinearLayout
android:id="@+id/waiting" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_gravity="center"
android:layout_marginTop="@dimen/margin_16" android:gravity="center"
app:dotCount="5" android:orientation="vertical">
app:dotSize="12dp"
android:layout_gravity="center" <android.support.design.widget.FloatingActionButton
/> android:id="@+id/btn_retry_login"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_8"
app:elevation="2dp"
app:fabSize="normal"
app:srcCompat="@drawable/ic_arrow_forward_white_24dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/fragment_retry_login_retry_title"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
</LinearLayout> </LinearLayout>
<chat.rocket.android.widget.WaitingView
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" />
</LinearLayout>
</FrameLayout> </FrameLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.DrawerLayout <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/drawer_layout" android:id="@+id/drawer_layout"
android:layout_width="match_parent" 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 <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="end" android:layout_gravity="end"
android:clickable="true" android:clickable="true"
android:theme="@style/AppTheme.Dark" android:theme="@style/AppTheme.Dark">
>
<include layout="@layout/room_side_menu"/> <include layout="@layout/room_side_menu" />
</FrameLayout> </FrameLayout>
</android.support.v4.widget.DrawerLayout> </android.support.v4.widget.DrawerLayout>
\ No newline at end of file
...@@ -3,26 +3,25 @@ ...@@ -3,26 +3,25 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/colorPrimaryDark" android:background="?attr/colorPrimaryDark"
android:theme="@style/AppTheme.Dark" android:theme="@style/AppTheme.Dark">
>
<LinearLayout <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="center"
android:gravity="center"
>
<chat.rocket.android.widget.WaitingView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
/> android:layout_gravity="center"
<TextView android:gravity="center"
android:id="@+id/txt_caption" android:orientation="vertical">
android:layout_width="wrap_content"
android:layout_height="wrap_content" <chat.rocket.android.widget.WaitingView
android:textAppearance="@style/TextAppearance.AppCompat.Caption" android:layout_width="wrap_content"
android:layout_marginTop="@dimen/margin_32"/> android:layout_height="wrap_content" />
</LinearLayout>
<TextView
android:id="@+id/txt_caption"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_32"
android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
</LinearLayout>
</FrameLayout> </FrameLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?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" xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" 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"
>
<ImageView
android:id="@+id/user_avatar"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_margin="8dp"
tools:src="@drawable/ic_default_avatar"
/>
<LinearLayout <LinearLayout
android:layout_width="0px" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:orientation="horizontal">
android:orientation="vertical"
android:layout_marginEnd="8dp"> <ImageView
<LinearLayout android:id="@+id/user_avatar"
android:id="@+id/user_and_timestamp_container" android:layout_width="32dp"
android:layout_width="match_parent" android:layout_height="32dp"
android:layout_height="wrap_content" android:layout_margin="8dp"
android:orientation="horizontal"> tools:src="@drawable/ic_default_avatar" />
<TextView
android:id="@+id/username" <LinearLayout
android:layout_width="wrap_content" android:layout_width="0px"
android:layout_height="wrap_content"
android:textStyle="bold"
tools:text="John Doe"/>
<Space
android:layout_width="@dimen/margin_8"
android:layout_height="wrap_content"
/>
<TextView
android:id="@+id/timestamp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:enabled="false" android:layout_marginEnd="8dp"
tools:text="12:34"/> android:layout_weight="1"
</LinearLayout> android:orientation="vertical">
<chat.rocket.android.widget.message.RocketChatMessageLayout
android:id="@+id/message_body" <LinearLayout
android:layout_width="match_parent" android:id="@+id/user_and_timestamp_container"
android:layout_height="wrap_content"/> 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" />
<Space
android:layout_width="@dimen/margin_8"
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" />
</LinearLayout>
<chat.rocket.android.widget.message.RocketChatMessageLayout
android:id="@+id/message_body"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Space <Space xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/space" android:id="@+id/space"
android:layout_width="match_parent" 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
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:theme="@style/AppTheme" android:orientation="vertical"
> android:theme="@style/AppTheme">
<chat.rocket.android.widget.WaitingView <chat.rocket.android.widget.WaitingView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_margin="@dimen/margin_8" android:layout_margin="@dimen/margin_8" />
/>
</FrameLayout> </FrameLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/newday_container" android:id="@+id/newday_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:layout_margin="16dp" android:layout_margin="16dp"
> android:gravity="center_vertical"
android:orientation="horizontal">
<View <View
android:layout_width="0px" android:layout_width="0px"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@color/newday_color"/> android:background="@color/newday_color" />
<TextView <TextView
android:id="@+id/newday_text" android:id="@+id/newday_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/newday_color" android:layout_marginLeft="16dp"
android:textSize="8sp" android:layout_marginRight="16dp"
android:textStyle="bold" android:textColor="@color/newday_color"
android:layout_marginLeft="16dp" android:textSize="8sp"
android:layout_marginRight="16dp" android:textStyle="bold"
tools:text="2016/01/23"/> tools:text="2016/01/23" />
<View <View
android:layout_width="0px" android:layout_width="0px"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@color/newday_color"/> android:background="@color/newday_color" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:theme="@style/AppTheme" android:orientation="vertical"
> android:theme="@style/AppTheme">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_16" android:layout_gravity="center"
android:text="@string/start_of_conversation" android:layout_margin="@dimen/margin_16"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:text="@string/start_of_conversation"
android:layout_gravity="center" android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
/>
</FrameLayout> </FrameLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?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:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/listPreferredItemHeightSmall" android:layout_height="?attr/listPreferredItemHeightSmall"
android:gravity="center_vertical"> android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView <ImageView
android:id="@+id/room_user_status" android:id="@+id/room_user_status"
android:layout_width="8dp" android:layout_width="8dp"
android:layout_height="8dp" android:layout_height="8dp"
android:layout_margin="@dimen/margin_8"/> android:layout_margin="@dimen/margin_8" />
<ImageView <ImageView
android:id="@+id/room_user_avatar" android:id="@+id/room_user_avatar"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" /> android:layout_height="24dp" />
<TextView <TextView
android:id="@+id/room_user_name" android:id="@+id/room_user_name"
android:layout_width="0px" android:layout_width="0px"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/margin_8" android:layout_marginLeft="@dimen/margin_8"
android:layout_marginRight="@dimen/margin_8" android:layout_marginRight="@dimen/margin_8"
android:layout_weight="1" android:layout_weight="1"
android:textAppearance="@style/TextAppearance.AppCompat.Small" /> android:textAppearance="@style/TextAppearance.AppCompat.Small" />
</LinearLayout> </LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/room_side_menu" android:id="@+id/room_side_menu"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"
android:layout_gravity="end" android:layout_gravity="end"
> android:orientation="vertical">
<chat.rocket.android.widget.FontAwesomeButton <chat.rocket.android.widget.FontAwesomeButton
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:textSize="24dp" android:enabled="false"
android:text="@string/fa_search" android:text="@string/fa_search"
android:enabled="false" android:textSize="24dp" />
/>
<chat.rocket.android.widget.FontAwesomeButton <chat.rocket.android.widget.FontAwesomeButton
android:id="@+id/btn_users" android:id="@+id/btn_users"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:textSize="24dp" android:text="@string/fa_users"
android:text="@string/fa_users" android:textSize="24dp" />
/>
<chat.rocket.android.widget.FontAwesomeButton <chat.rocket.android.widget.FontAwesomeButton
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:textSize="24dp" android:enabled="false"
android:text="@string/fa_at" android:text="@string/fa_at"
android:enabled="false" android:textSize="24dp" />
/>
</LinearLayout> </LinearLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?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" 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_width="280dp"
android:layout_height="match_parent" 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.support.v4.widget.NestedScrollView
android:layout_height="match_parent" android:layout_width="96dp"
android:layout_gravity="start" android:layout_height="match_parent"
android:background="?attr/colorPrimaryDark" android:layout_gravity="start"
> android:background="?attr/colorPrimaryDark">
<LinearLayout
android:layout_width="match_parent" <LinearLayout
android:layout_height="wrap_content" android:layout_width="match_parent"
android:orientation="vertical" android:layout_height="wrap_content"
> 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" />
<ImageButton <chat.rocket.android.widget.FontAwesomeButton
android:layout_width="80dp" style="@style/Base.Widget.AppCompat.Button.Borderless"
android:layout_height="80dp" android:layout_width="80dp"
android:layout_margin="@dimen/margin_8" android:layout_height="80dp"
android:src="@mipmap/ic_launcher" android:layout_margin="@dimen/margin_8"
style="@style/Base.Widget.AppCompat.Button.Borderless" android:text="@string/fa_plus" />
/> </LinearLayout>
<chat.rocket.android.widget.FontAwesomeButton </android.support.v4.widget.NestedScrollView>
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"
/>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
<FrameLayout <FrameLayout
android:id="@+id/sidebar_fragment_container" android:id="@+id/sidebar_fragment_container"
android:layout_width="280dp" android:layout_width="280dp"
android:layout_height="match_parent" android:layout_height="match_parent" />
/>
</android.support.v4.widget.SlidingPaneLayout> </android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<WebView <WebView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/webview" android:id="@+id/webview"
android:layout_width="match_parent" 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
...@@ -8,10 +8,21 @@ ...@@ -8,10 +8,21 @@
<string name="user_status_invisible">Invisible</string> <string name="user_status_invisible">Invisible</string>
<string name="fragment_sidebar_main_logout_title">Logout</string> <string name="fragment_sidebar_main_logout_title">Logout</string>
<string name="start_of_conversation">Start of conversation</string> <string name="start_of_conversation">Start of conversation</string>
<string name="users_of_room_title">Members List</string> <string name="users_of_room_title">Members List</string>
<string name="fmt_room_user_count">Total: %,d users</string> <string name="fmt_room_user_count">Total: %,d users</string>
<string name="sending">Sending...</string> <string name="sending">Sending...</string>
<string name="resend">Resend</string> <string name="resend">Resend</string>
<string name="discard">Discard</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> </resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment