aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-01-24 10:50:18 +0100
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-01-24 10:50:18 +0100
commit92465091c68fc82f914866c27f767015bc756fb6 (patch)
tree33b976403aae684fe223669494f0a3472b9b5e90 /res
parent35f8ab58f4b6f97f02031b056d2a5f6f993672cf (diff)
some history fixes
Diffstat (limited to 'res')
-rw-r--r--res/layout/activity_new_conversation.xml82
-rw-r--r--res/layout/fragment_conversation.xml64
-rw-r--r--res/layout/fragment_conversations_overview.xml29
3 files changed, 93 insertions, 82 deletions
diff --git a/res/layout/activity_new_conversation.xml b/res/layout/activity_new_conversation.xml
deleted file mode 100644
index 68836761..00000000
--- a/res/layout/activity_new_conversation.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<RelativeLayout 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:background="#f9f9f9">
-
- <EditText
- android:id="@+id/new_conversation_search"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true"
- android:layout_alignParentTop="true"
- android:ems="10"
- android:inputType="textEmailAddress"
- android:hint="Search or enter Jabber ID"
- android:background="#ffffff"
- android:layout_marginTop="12dp"
- android:layout_marginBottom="12dp"
- android:layout_marginLeft="8dp"
- android:layout_marginRight="8dp"/>
-
- <ScrollView
- android:id="@+id/scrollView1"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:layout_alignParentBottom="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true"
- android:layout_below="@+id/new_conversation_search"
- android:background="#e5e5e5" >
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="380dp"
- android:orientation="vertical"
- android:padding="8dp" >
-
- <TextView
- android:id="@+id/phone_contacts_header"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Phone Contacts"
- style="@style/sectionHeader"/>
- <LinearLayout
- android:id="@+id/phone_contacts"
- android:layout_height="fill_parent"
- android:layout_width="fill_parent"
- android:orientation="vertical">
-
- </LinearLayout>
- <TextView
- android:id="@+id/jabber_contacts_header"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Jabber Contacts"
- style="@style/sectionHeader"/>
- <LinearLayout
- android:id="@+id/jabber_contacts"
- android:layout_height="fill_parent"
- android:layout_width="fill_parent"
- android:orientation="vertical">
-
- </LinearLayout>
- <TextView
- android:id="@+id/new_contact_header"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="create new contact"
- style="@style/sectionHeader"
- android:visibility="gone"/>
- <LinearLayout
- android:id="@+id/create_new_contact"
- android:layout_height="fill_parent"
- android:layout_width="fill_parent"
- android:orientation="vertical"
- android:visibility="gone">
-
- </LinearLayout>
- </LinearLayout>
- </ScrollView>
-</RelativeLayout> \ No newline at end of file
diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml
new file mode 100644
index 00000000..02fe1f90
--- /dev/null
+++ b/res/layout/fragment_conversation.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="#f9f9f9">
+
+ <RelativeLayout
+ android:id="@+id/textsend"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true" >
+
+ <EditText
+ android:id="@+id/editText1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_toLeftOf="@+id/imageButton1"
+ android:ems="10"
+ android:inputType="textMultiLine"
+ android:minLines="1"
+ android:background="#ffffff"
+ android:layout_marginTop="12dp"
+ android:layout_marginBottom="12dp"
+ android:layout_marginLeft="8dp"
+ android:layout_marginRight="8dp">
+ </EditText>
+
+ <ImageButton
+ android:id="@+id/imageButton1"
+ android:layout_width="48dp"
+ android:layout_height="48dp"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:background="?android:selectableItemBackground"
+ android:src="@drawable/ic_action_send_now" />
+
+ </RelativeLayout>
+
+ <ScrollView
+ android:id="@+id/scrollView1"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:layout_above="@+id/textsend"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:background="#e5e5e5" >
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:background="#e5e5e5"
+ android:orientation="vertical" >
+
+ <TextView
+ android:id="@+id/textView1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="TextView" />
+ </LinearLayout>
+ </ScrollView>
+
+</RelativeLayout>
diff --git a/res/layout/fragment_conversations_overview.xml b/res/layout/fragment_conversations_overview.xml
new file mode 100644
index 00000000..ae60de40
--- /dev/null
+++ b/res/layout/fragment_conversations_overview.xml
@@ -0,0 +1,29 @@
+<android.support.v4.widget.SlidingPaneLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:id="@+id/slidingpanelayout">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="336dp"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <ListView
+ android:id="@+id/list"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:divider="#b5b5b5"
+ android:dividerHeight="1dp"
+ android:background="#f9f9f9"
+ />
+
+</LinearLayout>
+<LinearLayout
+ android:id="@+id/selected_conversation"
+ android:layout_width="400dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:background="#e5e5e5"
+ android:orientation="vertical">
+</LinearLayout>
+</android.support.v4.widget.SlidingPaneLayout> \ No newline at end of file