Skip to content

A
AloqaIM-Android
Commit 51a1d9ba authored by Tiago Cunha's avatar Tiago Cunha
Browse files
Options

Exported strings 

Clean up the view a bit
parent f791fce4
Show whitespace changes
Inline Side-by-side
Showing with 229 additions and 297 deletions
app/src/main/res/drawable/userstatus_away.xml
View file @ 51a1d9ba
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval"> android:shape="oval">
<solid android:color="@color/userstatus_away"/> <solid android:color="@color/userstatus_away" />
<stroke <stroke
android:color="@color/userstatus_away_outline" android:width="1dp"
android:width="1dp"/> android:color="@color/userstatus_away_outline" />
<size
android:width="16dp"
android:height="16dp" />
</shape> </shape>
app/src/main/res/drawable/userstatus_busy.xml
View file @ 51a1d9ba
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval"> android:shape="oval">
<solid android:color="@color/userstatus_busy"/> <solid android:color="@color/userstatus_busy" />
<stroke <stroke
android:color="@color/userstatus_busy_outline" android:width="1dp"
android:width="1dp"/> android:color="@color/userstatus_busy_outline" />
<size
android:width="16dp"
android:height="16dp" />
</shape> </shape>
app/src/main/res/drawable/userstatus_offline.xml
View file @ 51a1d9ba
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval"> android:shape="oval">
<solid android:color="@color/userstatus_offline"/> <solid android:color="@color/userstatus_offline" />
<stroke <stroke
android:color="@color/userstatus_offline_outline" android:width="1dp"
android:width="1dp"/> android:color="@color/userstatus_offline_outline" />
<size
android:width="16dp"
android:height="16dp" />
</shape> </shape>
app/src/main/res/drawable/userstatus_online.xml
View file @ 51a1d9ba
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval"> android:shape="oval">
<solid android:color="@color/userstatus_online"/> <solid android:color="@color/userstatus_online" />
<stroke <stroke
android:color="@color/userstatus_online_outline" android:width="1dp"
android:width="1dp"/> android:color="@color/userstatus_online_outline" />
<size
android:width="16dp"
android:height="16dp" />
</shape> </shape>
app/src/main/res/layout/fragment_sidebar_main.xml
View file @ 51a1d9ba
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout <RelativeLayout 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"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools" android:theme="@style/AppTheme.Dark">
android:theme="@style/AppTheme.Dark"
>
<LinearLayout <LinearLayout
android:id="@+id/user_info_container" android:id="@+id/user_info_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:background="?attr/colorPrimaryDark" android:background="?attr/colorPrimaryDark"
android:elevation="2dp"
android:foreground="?attr/selectableItemBackground" android:foreground="?attr/selectableItemBackground"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="@dimen/margin_16" android:padding="@dimen/margin_16">
android:layout_alignParentTop="true"
android:elevation="2dp"
>
<ImageView <ImageView
android:id="@+id/current_user_status" android:id="@+id/current_user_status"
android:layout_width="8dp" android:layout_width="8dp"
android:layout_height="8dp" android:layout_height="8dp"
android:src="@drawable/userstatus_online" android:src="@drawable/userstatus_online" />
/>
<Space <Space
android:layout_width="@dimen/margin_8" android:layout_width="@dimen/margin_8"
android:layout_height="wrap_content" android:layout_height="wrap_content" />
/>
<ImageView <ImageView
android:id="@+id/current_user_avatar" android:id="@+id/current_user_avatar"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp" />
/>
<FrameLayout <TextView
android:id="@+id/current_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_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"
>
<TextView
android:id="@+id/current_user_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="John Doe"
android:textSize="14sp" android:textSize="14sp"
/> tools:text="John Doe" />
</FrameLayout>
<chat.rocket.android.widget.DownUpToggleView <chat.rocket.android.widget.DownUpToggleView
android:id="@+id/toggle_user_action" android:id="@+id/toggle_user_action"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content" />
/>
</LinearLayout> </LinearLayout>
<android.support.v4.widget.NestedScrollView <android.support.v4.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/user_info_container"
android:background="?attr/colorPrimary"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
> android:layout_below="@+id/user_info_container"
android:background="?attr/colorPrimary">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="?attr/listPreferredItemPaddingLeft"
android:orientation="vertical" android:orientation="vertical"
> android:paddingStart="?attr/listPreferredItemPaddingLeft">
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_8" android:layout_marginTop="@dimen/margin_8">
>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="CHANNELS"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:textStyle="bold"
android:alpha="0.62"
android:layout_gravity="start|center_vertical" android:layout_gravity="start|center_vertical"
/> android:alpha="0.62"
android:text="@string/fragment_sidebar_main_channels_title"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:textStyle="bold" />
<chat.rocket.android.widget.FontAwesomeButton <chat.rocket.android.widget.FontAwesomeButton
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:text="@string/fa_plus"
android:textSize="12dp"
android:layout_gravity="end|center_vertical" android:layout_gravity="end|center_vertical"
style="@style/Widget.AppCompat.Button.Borderless" android:text="@string/fa_plus"
/> android:textSize="12dp" />
</FrameLayout> </FrameLayout>
...@@ -108,33 +91,30 @@ ...@@ -108,33 +91,30 @@
android:id="@+id/channels_container" android:id="@+id/channels_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginEnd="?attr/listPreferredItemPaddingRight" android:layout_marginEnd="?attr/listPreferredItemPaddingRight"
/> android:orientation="vertical" />
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_8" android:layout_marginTop="@dimen/margin_8">
>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="DIRECT MESSAGES"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:textStyle="bold"
android:alpha="0.62"
android:layout_gravity="start|center_vertical" android:layout_gravity="start|center_vertical"
/> android:alpha="0.62"
android:text="@string/fragment_sidebar_main_direct_messages_title"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:textStyle="bold" />
<chat.rocket.android.widget.FontAwesomeButton <chat.rocket.android.widget.FontAwesomeButton
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:text="@string/fa_plus"
android:textSize="12dp"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_gravity="end|center_vertical" android:layout_gravity="end|center_vertical"
/> android:text="@string/fa_plus"
android:textSize="12dp" />
</FrameLayout> </FrameLayout>
...@@ -142,9 +122,8 @@ ...@@ -142,9 +122,8 @@
android:id="@+id/direct_messages_container" android:id="@+id/direct_messages_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginEnd="?attr/listPreferredItemPaddingRight" android:layout_marginEnd="?attr/listPreferredItemPaddingRight"
/> android:orientation="vertical" />
</LinearLayout> </LinearLayout>
</android.support.v4.widget.NestedScrollView> </android.support.v4.widget.NestedScrollView>
...@@ -153,146 +132,81 @@ ...@@ -153,146 +132,81 @@
android:id="@+id/user_action_outer_container" android:id="@+id/user_action_outer_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/user_info_container"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_below="@+id/user_info_container"
android:background="?attr/colorPrimaryDark" android:background="?attr/colorPrimaryDark"
android:elevation="2dp" android:elevation="2dp"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible" tools:visibility="visible">
>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical">
>
<LinearLayout <TextView
android:id="@+id/btn_status_online" android:id="@+id/btn_status_online"
android:orientation="horizontal"
style="@style/sidebar_list_item" style="@style/sidebar_list_item"
> android:layout_marginLeft="16dp"
<FrameLayout android:drawableLeft="@drawable/userstatus_online"
android:layout_width="48dp" android:drawablePadding="16dp"
android:layout_height="match_parent" android:text="@string/user_status_online"
> android:textAppearance="?attr/textAppearanceListItemSmall" />
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:src="@drawable/userstatus_online"
android:layout_gravity="center"
/>
</FrameLayout>
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Online"
android:textAppearance="?attr/textAppearanceListItemSmall"
/>
</LinearLayout>
<LinearLayout
android:id="@+id/btn_status_away" android:id="@+id/btn_status_away"
android:orientation="horizontal"
style="@style/sidebar_list_item" style="@style/sidebar_list_item"
> android:layout_marginLeft="16dp"
<FrameLayout android:drawableLeft="@drawable/userstatus_away"
android:layout_width="48dp" android:drawablePadding="16dp"
android:layout_height="match_parent" android:text="@string/user_status_away"
> android:textAppearance="?attr/textAppearanceListItemSmall" />
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:src="@drawable/userstatus_away"
android:layout_gravity="center"
/>
</FrameLayout>
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Away"
android:textAppearance="?attr/textAppearanceListItemSmall"
/>
</LinearLayout>
<LinearLayout
android:id="@+id/btn_status_busy" android:id="@+id/btn_status_busy"
android:orientation="horizontal"
style="@style/sidebar_list_item" style="@style/sidebar_list_item"
> android:layout_marginLeft="16dp"
<FrameLayout android:drawableLeft="@drawable/userstatus_busy"
android:layout_width="48dp" android:drawablePadding="16dp"
android:layout_height="match_parent" android:text="@string/user_status_busy"
> android:textAppearance="?attr/textAppearanceListItemSmall" />
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:src="@drawable/userstatus_busy"
android:layout_gravity="center"
/>
</FrameLayout>
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Busy"
android:textAppearance="?attr/textAppearanceListItemSmall"
/>
</LinearLayout>
<LinearLayout
android:id="@+id/btn_status_invisible" android:id="@+id/btn_status_invisible"
android:orientation="horizontal"
style="@style/sidebar_list_item" style="@style/sidebar_list_item"
> android:layout_marginLeft="16dp"
<FrameLayout android:drawableLeft="@drawable/userstatus_offline"
android:layout_width="48dp" android:drawablePadding="16dp"
android:layout_height="match_parent" android:text="@string/user_status_invisible"
> android:textAppearance="?attr/textAppearanceListItemSmall" />
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:src="@drawable/userstatus_offline"
android:layout_gravity="center"
/>
</FrameLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Invisible"
android:textAppearance="?attr/textAppearanceListItemSmall"
/>
</LinearLayout>
<chat.rocket.android.widget.DividerView <chat.rocket.android.widget.DividerView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content" />
<LinearLayout <LinearLayout
android:id="@+id/btn_logout" android:id="@+id/btn_logout"
android:orientation="horizontal"
style="@style/sidebar_list_item" style="@style/sidebar_list_item"
> android:orientation="horizontal">
<FrameLayout <FrameLayout
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="match_parent" android:layout_height="match_parent">
>
<chat.rocket.android.widget.FontAwesomeTextView <chat.rocket.android.widget.FontAwesomeTextView
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:textSize="14dp"
android:text="@string/fa_sign_out"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" android:gravity="center"
/> android:text="@string/fa_sign_out"
android:textSize="14dp" />
</FrameLayout> </FrameLayout>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Logout" android:text="@string/fragment_sidebar_main_logout_title"
android:textAppearance="?attr/textAppearanceListItemSmall" android:textAppearance="?attr/textAppearanceListItemSmall" />
/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</android.support.v4.widget.NestedScrollView> </android.support.v4.widget.NestedScrollView>
......
app/src/main/res/layout/simple_screen.xml
View file @ 51a1d9ba
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/content" android:id="@+id/content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
>
</FrameLayout> </FrameLayout>
\ No newline at end of file
app/src/main/res/values/strings.xml
View file @ 51a1d9ba
<resources> <resources>
<string name="app_name">Rocket.Chat.Android</string> <string name="app_name">Rocket.Chat.Android</string>
<string name="fragment_sidebar_main_channels_title">CHANNELS</string>
<string name="fragment_sidebar_main_direct_messages_title">DIRECT MESSAGES</string>
<string name="user_status_online">Online</string>
<string name="user_status_away">Away</string>
<string name="user_status_busy">Busy</string>
<string name="user_status_invisible">Invisible</string>
<string name="fragment_sidebar_main_logout_title">Logout</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

Technounit-GROUP 2023