diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-06-13 11:50:47 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-06-13 11:50:47 +0200 |
| commit | eb7ed786055a45401dc2f688fc0fbcec5da0f89e (patch) | |
| tree | fbcb6862c88078f9bad465ece35cd036e12515c6 /res | |
| parent | 899da6155561a43e51f62bdf7ccab657c02522f3 (diff) | |
moved last seen to contact details
Diffstat (limited to '')
| -rw-r--r-- | res/layout/activity_contact_details.xml | 11 | ||||
| -rw-r--r-- | res/layout/fragment_conversation.xml | 20 | ||||
| -rw-r--r-- | res/xml/preferences.xml | 5 |
3 files changed, 10 insertions, 26 deletions
diff --git a/res/layout/activity_contact_details.xml b/res/layout/activity_contact_details.xml index ce172fd95..5eecfa877 100644 --- a/res/layout/activity_contact_details.xml +++ b/res/layout/activity_contact_details.xml @@ -17,7 +17,8 @@ android:text="@string/action_contact_details" /> <RelativeLayout android:layout_width="wrap_content" - android:layout_height="88dp" + android:layout_height="wrap_content" + android:minHeight="88dp" android:padding="8dp"> <QuickContactBadge @@ -52,6 +53,14 @@ android:paddingLeft="16dp" android:textSize="24sp" android:textStyle="bold" /> + <TextView + android:id="@+id/details_lastseen" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingLeft="8dp" + android:singleLine="true" + android:textColor="#5b5b5b" + android:textSize="14sp" /> </LinearLayout> </RelativeLayout> diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml index a81b70317..703a525e9 100644 --- a/res/layout/fragment_conversation.xml +++ b/res/layout/fragment_conversation.xml @@ -147,24 +147,4 @@ </LinearLayout> </LinearLayout> - <LinearLayout - android:id="@+id/last_seen" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - 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:layout_gravity="center" - android:padding="4dp" - android:text="@string/never_seen" - android:textColor="#e5e5e5" - android:textSize="14sp" /> - </LinearLayout> - </RelativeLayout>
\ No newline at end of file diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index be9a2be70..40039cd5c 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -72,11 +72,6 @@ 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"> |