diff options
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/activity_publish_profile_picture.xml | 2 | ||||
-rw-r--r-- | res/layout/message_null.xml | 5 | ||||
-rw-r--r-- | res/layout/share_with.xml | 55 |
3 files changed, 15 insertions, 47 deletions
diff --git a/res/layout/activity_publish_profile_picture.xml b/res/layout/activity_publish_profile_picture.xml index b3c6c427..e5d9d1a0 100644 --- a/res/layout/activity_publish_profile_picture.xml +++ b/res/layout/activity_publish_profile_picture.xml @@ -69,7 +69,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:enabled="false" - android:text="@string/publish_avatar" + android:text="@string/publish" android:textColor="@color/secondarytext" /> </LinearLayout> diff --git a/res/layout/message_null.xml b/res/layout/message_null.xml new file mode 100644 index 00000000..4c7dd938 --- /dev/null +++ b/res/layout/message_null.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content"> +</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/share_with.xml b/res/layout/share_with.xml index a578b2cb..41b6033d 100644 --- a/res/layout/share_with.xml +++ b/res/layout/share_with.xml @@ -1,50 +1,13 @@ -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" +<?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:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" > -<LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > + <ListView + android:id="@+id/choose_conversation_list" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:listitem="@layout/conversation_list_row" /> - <TextView - android:id="@+id/conversations_header" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/share_with_active_conversations" - style="@style/sectionHeader" - android:paddingLeft="8dp" - android:paddingTop="8dp" - android:paddingRight="8dp"/> - - - <LinearLayout - android:id="@+id/conversations" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:divider="?android:dividerHorizontal" - android:showDividers="middle" > - - </LinearLayout> - <TextView - android:id="@+id/contacts_header" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/contacts" - style="@style/sectionHeader" - android:paddingLeft="8dp" - android:paddingTop="8dp" - android:paddingRight="8dp"/> - <LinearLayout - android:id="@+id/contacts" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:divider="?android:dividerHorizontal" - android:showDividers="middle" > - - </LinearLayout> -</LinearLayout> -</ScrollView>
\ No newline at end of file +</LinearLayout>
\ No newline at end of file |