moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-27 19:22:15 -05:00
Code Issues Releases Wiki Activity

moved last seen to contact details

Browse Source
This commit is contained in:
iNPUTmice 2014-06-13 11:50:47 +02:00
parent 899da61555
commit eb7ed78605
6 changed files with 14 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
res/layout/activity_contact_details.xml
View File

@ -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>

20
res/layout/fragment_conversation.xml
View File

@ -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>

5
res/xml/preferences.xml
View File

@ -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">

4
src/eu/siacs/conversations/ui/ContactDetailsActivity.java
View File

@ -48,6 +48,7 @@ public class ContactDetailsActivity extends XmppActivity {
private TextView accountJidTv;
private TextView status;
private TextView askAgain;
private TextView lastseen;
private CheckBox send;
private CheckBox receive;
private QuickContactBadge badge;
@ -111,6 +112,7 @@ public class ContactDetailsActivity extends XmppActivity {
contactJidTv = (TextView) findViewById(R.id.details_contactjid);
accountJidTv = (TextView) findViewById(R.id.details_account);
status = (TextView) findViewById(R.id.details_contactstatus);
lastseen = (TextView) findViewById(R.id.details_lastseen);
send = (CheckBox) findViewById(R.id.details_send_presence);
receive = (CheckBox) findViewById(R.id.details_receive_presence);
askAgain = (TextView) findViewById(R.id.ask_again);
@ -202,6 +204,8 @@ public class ContactDetailsActivity extends XmppActivity {
receive.setChecked(false);
}
}
lastseen.setText(UIHelper.lastseen(getApplicationContext(),contact.lastseen.time));
switch (contact.getMostAvailableStatus()) {
case Presences.CHAT:

10
src/eu/siacs/conversations/ui/ConversationActivity.java
View File

@ -269,11 +269,6 @@ public class ConversationActivity extends XmppActivity {
getActionBar().setTitle(R.string.app_name);
invalidateOptionsMenu();
hideKeyboard();
ConversationFragment selectedFragment = (ConversationFragment) getFragmentManager()
.findFragmentByTag("conversation");
if (selectedFragment != null) {
selectedFragment.lastSeen.setVisibility(View.GONE);
}
}
@Override
@ -293,11 +288,6 @@ public class ConversationActivity extends XmppActivity {
getConversationList(), null, false);
listView.invalidateViews();
}
ConversationFragment selectedFragment = (ConversationFragment) getFragmentManager()
.findFragmentByTag("conversation");
if ((selectedFragment != null) && (showLastseen())) {
selectedFragment.lastSeen.setVisibility(View.VISIBLE);
}
}
}

15
src/eu/siacs/conversations/ui/ConversationFragment.java
View File

@ -107,9 +107,7 @@ public class ConversationFragment extends Fragment {
private LinearLayout pgpInfo;
private LinearLayout mucError;
public LinearLayout lastSeen;
private TextView mucErrorText;
private TextView lastSeenText;
private OnClickListener clickToMuc = new OnClickListener() {
@Override
@ -163,8 +161,6 @@ public class ConversationFragment extends Fragment {
mucError = (LinearLayout) view.findViewById(R.id.muc_error);
mucError.setOnClickListener(clickToMuc);
mucErrorText = (TextView) view.findViewById(R.id.muc_error_msg);
lastSeen = (LinearLayout) view.findViewById(R.id.last_seen);
lastSeenText = (TextView) view.findViewById(R.id.last_seen_text);
messagesView = (ListView) view.findViewById(R.id.messages_view);
messagesView.setTranscriptMode(ListView.TRANSCRIPT_MODE_NORMAL);
@ -607,11 +603,6 @@ public class ConversationFragment extends Fragment {
activity.getActionBar().setTitle(
conversation.getName(useSubject));
activity.invalidateOptionsMenu();
if (activity.showLastseen()) {
lastSeen.setVisibility(View.VISIBLE);
}
} else {
lastSeen.setVisibility(View.GONE);
}
}
if (conversation.getMode() == Conversation.MODE_MULTI) {
@ -687,11 +678,6 @@ public class ConversationFragment extends Fragment {
break;
}
}
if (activity.showLastseen()) {
Contact contact = conversation.getContact();
lastSeenText.setText(UIHelper.lastseen(getActivity(),
contact.lastseen.time));
}
for(Message message : this.conversation.getMessages()) {
if (!this.messageList.contains(message)) {
this.messageList.add(message);
@ -899,7 +885,6 @@ public class ConversationFragment extends Fragment {
public void onPresenceSelected(boolean success,
String presence) {
if (success) {
Log.d("xmppService","selected presence "+presence);
message.setPresence(presence);
xmppService.sendMessage(message);
messageSent();