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.xml115
1 files changed, 29 insertions, 86 deletions
diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml
index 749d97b2..4605889d 100644
--- a/res/layout/fragment_conversation.xml
+++ b/res/layout/fragment_conversation.xml
@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/primarybackground" >
+ android:background="@color/secondarybackground" >
<RelativeLayout
android:id="@+id/textsend"
@@ -49,7 +49,7 @@
android:layout_height="wrap_content"
android:layout_above="@+id/textsend"
android:layout_alignParentLeft="true"
- android:layout_below="@+id/info_box"
+ android:layout_below="@+id/snackbar"
android:background="@color/secondarybackground"
android:divider="@null"
android:dividerHeight="0dp"
@@ -59,94 +59,37 @@
tools:listitem="@layout/message_sent" >
</ListView>
- <LinearLayout
- android:id="@+id/info_box"
+ <RelativeLayout
+ android:id="@+id/snackbar"
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="18sp"
- android:textStyle="bold" />
+ android:minHeight="48dp"
+ android:background="@color/darkbackground"
+ android:visibility="gone">
- <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"
+ <TextView
+ android:id="@+id/snackbar_message"
+ android:layout_width="wrap_content"
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="18sp"
- 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_alignParentLeft="true"
+ android:layout_centerVertical="true"
+ android:textSize="14sp"
+ android:textColor="@color/ondarktext"
+ android:paddingLeft="24dp"/>
+ <TextView
+ android:id="@+id/snackbar_action"
+ android:layout_width="wrap_content"
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="18sp"
- 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>
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:textSize="14sp"
+ android:textColor="@color/ondarktext"
+ android:textStyle="bold"
+ android:textAllCaps="true"
+ android:paddingLeft="24dp"
+ android:paddingRight="24dp"
+ android:paddingTop="18dp"
+ android:paddingBottom="18dp"/>
+ </RelativeLayout>
</RelativeLayout> \ No newline at end of file