aboutsummaryrefslogtreecommitdiffstats
path: root/res/layout/fragment_conversation.xml
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout/fragment_conversation.xml')
-rw-r--r--res/layout/fragment_conversation.xml175
1 files changed, 63 insertions, 112 deletions
diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml
index c09a7d5f..b712c304 100644
--- a/res/layout/fragment_conversation.xml
+++ b/res/layout/fragment_conversation.xml
@@ -3,15 +3,33 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#e5e5e5" >
+ android:background="@color/secondarybackground" >
- <RelativeLayout
- android:id="@+id/textsend"
+
+
+ <ListView
+ android:id="@+id/messages_view"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
+ android:layout_above="@+id/snackbar"
android:layout_alignParentLeft="true"
- android:background="#eee" >
+ android:layout_alignParentTop="true"
+ android:background="@color/secondarybackground"
+ android:divider="@null"
+ android:dividerHeight="0dp"
+ android:listSelector="@android:color/transparent"
+ android:stackFromBottom="true"
+ android:transcriptMode="normal"
+ tools:listitem="@layout/message_sent" >
+ </ListView>
+
+ <RelativeLayout
+ android:id="@+id/textsend"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:background="@color/primarybackground" >
<EditText
android:id="@+id/textinput"
@@ -19,7 +37,7 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/textSendButton"
- android:background="#eee"
+ android:background="@color/primarybackground"
android:ems="10"
android:inputType="textShortMessage|textMultiLine|textCapSentences"
android:minHeight="48dp"
@@ -27,7 +45,8 @@
android:paddingBottom="12dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
- android:paddingTop="12dp" >
+ android:paddingTop="12dp"
+ android:textColor="@color/primarytext">
<requestFocus />
</EditText>
@@ -42,110 +61,42 @@
android:src="@drawable/ic_action_send_now" />
</RelativeLayout>
- <ListView
- android:id="@+id/messages_view"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_above="@+id/textsend"
- android:layout_alignParentLeft="true"
- android:layout_below="@+id/info_box"
- android:background="#e5e5e5"
- android:divider="@null"
- android:dividerHeight="0dp"
- android:listSelector="@android:color/transparent"
- android:stackFromBottom="true"
- android:transcriptMode="normal"
- tools:listitem="@layout/message_sent" >
- </ListView>
-
- <LinearLayout
- android:id="@+id/info_box"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical" >
-
- <LinearLayout
- android:id="@+id/muc_error"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/redbackground"
- android:orientation="vertical"
- android:visibility="gone" >
-
- <TextView
- android:id="@+id/muc_error_msg"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="6dp"
- android:textColor="#eee"
- android:textSize="20sp"
- android:textStyle="bold" />
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingBottom="6dp"
- android:paddingLeft="6dp"
- android:text="@string/edit_conference_details"
- android:textColor="#eee"
- android:textSize="14sp" />
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/new_fingerprint"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/redbackground"
- android:orientation="vertical"
- android:visibility="gone" >
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="6dp"
- android:text="@string/unknown_otr_fingerprint"
- android:textColor="#eee"
- android:textSize="20sp"
- android:textStyle="bold" />
-
- <TextView
- android:id="@+id/otr_fingerprint"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingBottom="6dp"
- android:paddingLeft="6dp"
- android:textColor="#eee"
- android:textSize="14sp"
- android:singleLine="true"
- android:typeface="monospace" />
- </LinearLayout>
-
- <LinearLayout
- android:id="@+id/pgp_keyentry"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/bluebackground"
- android:orientation="vertical"
- android:visibility="gone" >
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="6dp"
- android:text="@string/openpgp_messages_found"
- android:textColor="#eee"
- android:textSize="20sp"
- android:textStyle="bold" />
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingBottom="6dp"
- android:paddingLeft="6dp"
- android:text="@string/openpgp_click_to_decrypt"
- android:textColor="#eee"
- android:textSize="14sp" />
- </LinearLayout>
- </LinearLayout>
+ <RelativeLayout
+ android:id="@+id/snackbar"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_above="@+id/textsend"
+ android:background="@drawable/snackbar"
+ android:minHeight="48dp"
+ android:layout_marginLeft="8dp"
+ android:layout_marginRight="8dp"
+ android:layout_marginBottom="4dp"
+ android:visibility="gone" >
+
+ <TextView
+ android:id="@+id/snackbar_message"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:paddingLeft="24dp"
+ android:textColor="@color/ondarktext"
+ android:textSize="14sp" />
+
+ <TextView
+ android:id="@+id/snackbar_action"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:paddingBottom="16dp"
+ android:paddingLeft="24dp"
+ android:paddingRight="24dp"
+ android:paddingTop="16dp"
+ android:textAllCaps="true"
+ android:textColor="@color/ondarktext"
+ android:textSize="14sp"
+ android:textStyle="bold" />
+ </RelativeLayout>
</RelativeLayout> \ No newline at end of file