aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout/fragment_conversation.xml188
-rw-r--r--res/values/strings.xml4
-rw-r--r--res/xml/preferences.xml5
3 files changed, 112 insertions, 85 deletions
diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml
index ca09d7708..ab9bb528f 100644
--- a/res/layout/fragment_conversation.xml
+++ b/res/layout/fragment_conversation.xml
@@ -3,32 +3,33 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#e5e5e5">
+ android:background="#e5e5e5" >
<RelativeLayout
- android:background="#eee"
android:id="@+id/textsend"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
- android:layout_alignParentLeft="true">
+ android:layout_alignParentLeft="true"
+ android:background="#eee" >
<EditText
android:id="@+id/textinput"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:minHeight="48dp"
android:layout_alignParentLeft="true"
- android:paddingBottom="12dp"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:paddingTop="12dp"
android:layout_toLeftOf="@+id/textSendButton"
android:background="#eee"
android:ems="10"
android:inputType="textShortMessage|textMultiLine|textCapSentences"
- android:minLines="1" >
- <requestFocus />
+ android:minHeight="48dp"
+ android:minLines="1"
+ android:paddingBottom="12dp"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:paddingTop="12dp" >
+
+ <requestFocus />
</EditText>
<ImageButton
@@ -52,101 +53,118 @@
android:divider="@null"
android:dividerHeight="0dp"
android:listSelector="@android:color/transparent"
+ android:stackFromBottom="true"
android:transcriptMode="alwaysScroll"
- tools:listitem="@layout/message_sent"
- android:stackFromBottom="true">
-
+ tools:listitem="@layout/message_sent" >
</ListView>
+
<LinearLayout
android:id="@+id/info_box"
- android:layout_height="wrap_content"
- android:layout_width="fill_parent"
- 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"
- >
+ android:orientation="vertical" >
- <TextView
- android:id="@+id/muc_error_msg"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="#eee"
- android:textStyle="bold"
- android:padding="8dp"
- android:textSize="20sp"/>
- <TextView
- android:layout_width="wrap_content"
+ <LinearLayout
+ android:id="@+id/muc_error"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:text="Click to edit conference details"
- android:textColor="#eee"
- android:paddingLeft="8dp"
- android:paddingBottom="8dp"
- 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"
- >
+ android:background="@drawable/redbackground"
+ android:orientation="vertical"
+ android:visibility="gone" >
- <TextView
- android:layout_width="wrap_content"
+ <TextView
+ android:id="@+id/muc_error_msg"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="8dp"
+ android:textColor="#eee"
+ android:textSize="20sp"
+ android:textStyle="bold" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingBottom="8dp"
+ android:paddingLeft="8dp"
+ android:text="Click to 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:text="Unknown OTR Fingerprint"
- android:textColor="#eee"
- android:textStyle="bold"
- android:padding="8dp"
- android:textSize="20sp"/>
- <TextView
- android:layout_width="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="8dp"
+ android:text="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="8dp"
+ android:paddingLeft="8dp"
+ android:textColor="#eee"
+ android:textSize="14sp"
+ android:typeface="monospace" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/pgp_keyentry"
+ android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:id="@+id/otr_fingerprint"
- android:textColor="#eee"
- android:paddingLeft="8dp"
- android:paddingBottom="8dp"
- android:textSize="14sp"
- android:typeface="monospace"/>
-
+ android:background="@drawable/bluebackground"
+ android:orientation="vertical"
+ android:visibility="gone" >
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="8dp"
+ android:text="OpenPGP encrypted messages found"
+ android:textColor="#eee"
+ android:textSize="20sp"
+ android:textStyle="bold" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingBottom="8dp"
+ android:paddingLeft="8dp"
+ android:text="Click here to enter passphrase and decrypt messages"
+ android:textColor="#eee"
+ android:textSize="14sp" />
+ </LinearLayout>
</LinearLayout>
+
<LinearLayout
- android:id="@+id/pgp_keyentry"
+ android:id="@+id/last_seen"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:background="@drawable/bluebackground"
+ android:background="#7f333333"
android:orientation="vertical"
android:visibility="gone"
- >
+ android:layout_below="@+id/info_box">
<TextView
+ android:id="@+id/last_seen_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="OpenPGP encrypted messages found"
- android:textColor="#eee"
- android:textStyle="bold"
- android:padding="8dp"
- android:textSize="20sp"/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="#eee"
- android:text="Click here to enter passphrase and decrypt messages"
- android:paddingLeft="8dp"
- android:paddingBottom="8dp"
- android:textSize="14sp"/>
-
- </LinearLayout>
+ android:layout_gravity="center"
+ android:padding="4dp"
+ android:text="@string/last_seen"
+ android:textColor="#e5e5e5"
+ android:textSize="14sp" />
</LinearLayout>
+
</RelativeLayout> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6767568e5..48849eb47 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -147,6 +147,8 @@
<string name="pref_never_send_crash_summary">By sending in stack traces you are helping the ongoing development of Conversations</string>
<string name="pref_confirm_messages">Confirm Messages</string>
<string name="pref_confirm_messages_summary">Let your contact know when you have received and read a message</string>
+ <string name="pref_show_last_seen">Display last seen</string>
+ <string name="pref_show_last_seen_summary">Display the latest time a contact has been seen online</string>
<string name="openpgp_error">OpenKeychain reporeted an error</string>
<string name="error_decrypting_file">I/O Error decrypting file</string>
<string name="error_copying_image_file">Error copying image file.</string>
@@ -234,4 +236,6 @@
<string name="hours">hours</string>
<string name="mins">mins</string>
<string name="missing_public_keys">Missing public key announcements</string>
+ <string name="last_seen">last seen %1$s ago on %2$s</string>
+ <string name="never_seen">never seen</string>
</resources> \ No newline at end of file
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 40039cd5c..be9a2be70 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -72,6 +72,11 @@
android:title="@string/pref_conference_name"
android:summary="@string/pref_conference_name_summary"
android:defaultValue="true"/>
+ <CheckBoxPreference
+ android:key="show_last_seen"
+ android:title="@string/pref_show_last_seen"
+ android:summary="@string/pref_show_last_seen_summary"
+ android:defaultValue="false"/>
</PreferenceCategory>
<PreferenceCategory
android:title="@string/pref_advanced_options">