group member name tags, group convo iconography, tweaks

This commit is contained in:
Jake McGinty
2014-02-15 04:21:56 -08:00
parent b2fdd74a1c
commit 8e3aa94a05
25 changed files with 150 additions and 183 deletions

View File

@@ -1,104 +1,97 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:layout_marginBottom="20dp">
android:layout_marginBottom="20dp"
android:gravity="center_vertical">
<LinearLayout
android:id="@+id/group_details_layout"
<LinearLayout android:id="@+id/group_details_layout"
android:layout_width="fill_parent"
android:layout_height="106dp"
android:orientation="horizontal"
android:gravity="center_vertical"
android:paddingLeft="14dp"
android:paddingRight="18dp"
android:paddingTop="14dp">
android:paddingTop="14dp"
android:orientation="horizontal"
android:gravity="center_vertical">
<ImageView
android:id="@+id/avatar"
<ImageView android:id="@+id/avatar"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginRight="10dp"
android:background="@drawable/thin_border"
android:src="@drawable/icon"/>
<EditText
android:id="@+id/group_name"
<EditText android:id="@+id/group_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:padding="10dp"
android:hint="@string/GroupCreateActivity_group_name_hint"
android:layout_gravity="center_vertical" />
android:lines="1"
android:inputType="textAutoCorrect"
android:hint="@string/GroupCreateActivity_group_name_hint" />
</LinearLayout>
<LinearLayout
android:id="@+id/creating_group_layout"
android:visibility="gone"
<LinearLayout android:id="@+id/creating_group_layout"
android:layout_width="fill_parent"
android:layout_height="106dp"
android:orientation="horizontal"
android:gravity="center_vertical"
android:paddingLeft="18dp"
android:paddingRight="18dp"
android:paddingTop="18dp">
android:paddingTop="18dp"
android:orientation="horizontal"
android:gravity="center_vertical"
android:visibility="gone">
<ProgressBar
android:id="@+id/creating_progress_bar"
<ProgressBar android:id="@+id/creating_progress_bar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10dp"
android:indeterminate="true"
style="@android:style/Widget.ProgressBar" />
style="@android:style/Widget.ProgressBar"
android:indeterminate="true" />
<TextView
android:id="@+id/creating_group_text"
<TextView android:id="@+id/creating_group_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:padding="10dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_gravity="center_vertical" />
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
<RelativeLayout
android:id="@+id/push_disabled"
<RelativeLayout android:id="@+id/push_disabled"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:minHeight="106dp"
android:background="#aa000000"
android:gravity="center_vertical|center_horizontal"
android:padding="15dp"
android:gravity="center_vertical|center_horizontal"
android:background="#aa000000"
android:visibility="gone">
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:padding="8dp"
android:background="#dd222222"
android:textColor="#ffeeeeee"
android:fontFamily="sans-serif-light"
android:padding="8dp"
android:textSize="16sp"
android:text="@string/GroupCreateActivity_contacts_dont_support_push" />
</RelativeLayout>
</RelativeLayout>
<org.thoughtcrime.securesms.components.PushRecipientsPanel
android:id="@+id/recipients"
<org.thoughtcrime.securesms.components.PushRecipientsPanel android:id="@+id/recipients"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingLeft="15dp"
android:paddingRight="15dp" />
<ListView
android:id="@+id/selected_contacts_list"
<ListView android:id="@+id/selected_contacts_list"
android:layout_width="match_parent"
android:layout_height="wrap_content" />