fixed regression where the selected conversation wasn't highlighted anymore on tabled layout
This commit is contained in:
parent
37d08276a8
commit
845b39cdcc
|
@ -90,6 +90,7 @@ public abstract class XmppActivity extends Activity {
|
|||
|
||||
protected int mPrimaryTextColor;
|
||||
protected int mSecondaryTextColor;
|
||||
protected int mPrimaryBackgroundColor;
|
||||
protected int mSecondaryBackgroundColor;
|
||||
protected int mColorRed;
|
||||
protected int mColorOrange;
|
||||
|
@ -331,6 +332,7 @@ public abstract class XmppActivity extends Activity {
|
|||
mColorOrange = getResources().getColor(R.color.orange);
|
||||
mColorGreen = getResources().getColor(R.color.green);
|
||||
mPrimaryColor = getResources().getColor(R.color.primary);
|
||||
mPrimaryBackgroundColor = getResources().getColor(R.color.primarybackground);
|
||||
mSecondaryBackgroundColor = getResources().getColor(R.color.secondarybackground);
|
||||
this.mTheme = findTheme();
|
||||
setTheme(this.mTheme);
|
||||
|
@ -740,7 +742,11 @@ public abstract class XmppActivity extends Activity {
|
|||
public int getOnlineColor() {
|
||||
return this.mColorGreen;
|
||||
}
|
||||
|
||||
|
||||
public int getPrimaryBackgroundColor() {
|
||||
return this.mPrimaryBackgroundColor;
|
||||
}
|
||||
|
||||
public int getSecondaryBackgroundColor() {
|
||||
return this.mSecondaryBackgroundColor;
|
||||
}
|
||||
|
|
|
@ -46,17 +46,10 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
|
|||
}
|
||||
Conversation conversation = getItem(position);
|
||||
if (this.activity instanceof ConversationActivity) {
|
||||
ConversationActivity activity = (ConversationActivity) this.activity;
|
||||
if (!activity.isConversationsOverviewHideable()) {
|
||||
if (conversation == activity.getSelectedConversation()) {
|
||||
view.setBackgroundColor(activity
|
||||
.getSecondaryBackgroundColor());
|
||||
} else {
|
||||
view.setBackgroundColor(Color.TRANSPARENT);
|
||||
}
|
||||
} else {
|
||||
view.setBackgroundColor(Color.TRANSPARENT);
|
||||
}
|
||||
View swipeableItem = view.findViewById(R.id.swipeable_item);
|
||||
ConversationActivity a = (ConversationActivity) this.activity;
|
||||
int c = !a.isConversationsOverviewHideable() && conversation == a.getSelectedConversation() ? a.getSecondaryBackgroundColor() : a.getPrimaryBackgroundColor();
|
||||
swipeableItem.setBackgroundColor(c);
|
||||
}
|
||||
TextView convName = (TextView) view.findViewById(R.id.conversation_name);
|
||||
if (conversation.getMode() == Conversation.MODE_SINGLE || activity.useSubjectToIdentifyConference()) {
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
<View
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:background="@color/divider"/>
|
||||
android:background="@color/primary"/>
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/swipeable_item"
|
||||
|
|
Loading…
Reference in New Issue