narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

fixed #452

Browse source
This commit is contained in:
iNPUTmice 2014-09-22 13:23:35 +02:00
parent bb065020ff
commit 45aede14bd
6 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/values/strings.xml
View file

@ -259,5 +259,7 @@
<string name="pref_use_indicate_received_summary">Received masseges will be marked with a green tick. Be aware that this might no work in every case.</string> <string name="pref_use_indicate_received_summary">Received masseges will be marked with a green tick. Be aware that this might no work in every case.</string>
<string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate contact status</string> <string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate contact status</string>
<string name="pref_expert_options_other">Other</string> <string name="pref_expert_options_other">Other</string>
<string name="pref_conference_name">Conference name</string>
<string name="pref_conference_name_summary">Use room’s subject instead of JID to identify conferences</string>
</resources> </resources>

5
res/xml/preferences.xml
View file

@ -63,6 +63,11 @@
android:title="@string/pref_notification_grace_period" /> android:title="@string/pref_notification_grace_period" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/pref_ui_options" > <PreferenceCategory android:title="@string/pref_ui_options" >
<CheckBoxPreference
android:defaultValue="true"
android:key="use_subject"
android:summary="@string/pref_conference_name_summary"
android:title="@string/pref_conference_name" />
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="false" android:defaultValue="false"
android:key="use_larger_font" android:key="use_larger_font"

4
src/eu/siacs/conversations/ui/ConversationActivity.java
View file

@ -154,7 +154,11 @@ public class ConversationActivity extends XmppActivity implements
if (ab != null) { if (ab != null) {
ab.setDisplayHomeAsUpEnabled(true); ab.setDisplayHomeAsUpEnabled(true);
ab.setHomeButtonEnabled(true); ab.setHomeButtonEnabled(true);
if (getSelectedConversation().getMode() == Conversation.MODE_SINGLE || activity.useSubjectToIdentifyConference()) {
ab.setTitle(getSelectedConversation().getName()); ab.setTitle(getSelectedConversation().getName());
} else {
ab.setTitle(getSelectedConversation().getContactJid().split("/")[0]);
}
} }
invalidateOptionsMenu(); invalidateOptionsMenu();
if (!getSelectedConversation().isRead()) { if (!getSelectedConversation().isRead()) {

4
src/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -380,7 +380,11 @@ public class ConversationFragment extends Fragment {
activity.getSlidingPaneLayout().closePane(); activity.getSlidingPaneLayout().closePane();
activity.getActionBar().setDisplayHomeAsUpEnabled(true); activity.getActionBar().setDisplayHomeAsUpEnabled(true);
activity.getActionBar().setHomeButtonEnabled(true); activity.getActionBar().setHomeButtonEnabled(true);
if (conversation.getMode() == Conversation.MODE_SINGLE || activity.useSubjectToIdentifyConference()) {
activity.getActionBar().setTitle(conversation.getName()); activity.getActionBar().setTitle(conversation.getName());
} else {
activity.getActionBar().setTitle(conversation.getContactJid().split("/")[0]);
}
activity.invalidateOptionsMenu(); activity.invalidateOptionsMenu();
} }
} }

7
src/eu/siacs/conversations/ui/XmppActivity.java
View file

@ -63,6 +63,8 @@ public abstract class XmppActivity extends Activity {
protected int mColorGreen; protected int mColorGreen;
protected int mPrimaryColor; protected int mPrimaryColor;
protected boolean mUseSubject = true;
private DisplayMetrics metrics; private DisplayMetrics metrics;
protected interface OnValueEdited { protected interface OnValueEdited {
@ -207,6 +209,7 @@ public abstract class XmppActivity extends Activity {
if (getPreferences().getBoolean("use_larger_font", false)) { if (getPreferences().getBoolean("use_larger_font", false)) {
setTheme(R.style.ConversationsTheme_LargerText); setTheme(R.style.ConversationsTheme_LargerText);
} }
mUseSubject = getPreferences().getBoolean("use_subject", true);
} }
protected SharedPreferences getPreferences() { protected SharedPreferences getPreferences() {
@ -214,6 +217,10 @@ public abstract class XmppActivity extends Activity {
.getDefaultSharedPreferences(getApplicationContext()); .getDefaultSharedPreferences(getApplicationContext());
} }
public boolean useSubjectToIdentifyConference() {
return mUseSubject;
}
public void switchToConversation(Conversation conversation) { public void switchToConversation(Conversation conversation) {
switchToConversation(conversation, null, false); switchToConversation(conversation, null, false);
} }

4
src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
View file

@ -52,7 +52,11 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
} }
TextView convName = (TextView) view TextView convName = (TextView) view
.findViewById(R.id.conversation_name); .findViewById(R.id.conversation_name);
if (conv.getMode() == Conversation.MODE_SINGLE || activity.useSubjectToIdentifyConference()) {
convName.setText(conv.getName()); convName.setText(conv.getName());
} else {
convName.setText(conv.getContactJid().split("/")[0]);
}
TextView convLastMsg = (TextView) view TextView convLastMsg = (TextView) view
.findViewById(R.id.conversation_lastmsg); .findViewById(R.id.conversation_lastmsg);
ImageView imagePreview = (ImageView) view ImageView imagePreview = (ImageView) view