blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

contact selection reactive to dark theme 

// FREEBIE
master
Jake McGinty 2014-02-24 14:43:38 -08:00
parent 559228af5b
commit 829a92d371
4 changed files with 56 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/attrs.xml
View File

@ -36,6 +36,11 @@
<attr name="conversation_item_sent_push_background" format="reference" />
<attr name="conversation_item_sent_push_triangle_background" format="reference" />
<attr name="contact_selection_push_user" format="reference|color" />
<attr name="contact_selection_lay_user" format="reference|color" />
<attr name="contact_selection_push_label" format="reference|color" />
<attr name="contact_selection_lay_label" format="reference|color" />
<attr name="navigation_drawer_background" format="reference|color"/>
<attr name="navigation_drawer_text_color" format="color"/>
<attr name="navigation_drawer_icons" format="reference"/>

10
res/values/themes.xml
View File

@ -19,6 +19,11 @@
<item name="conversation_received_text_primary_color">#ff111111</item>
<item name="conversation_received_text_secondary_color">#33000000</item>
<item name="contact_selection_push_user">#ff000000</item>
<item name="contact_selection_lay_user">#a0000000</item>
<item name="contact_selection_push_label">#ff64a926</item>
<item name="contact_selection_lay_label">#99000000</item>
<item name="conversation_background">#ffdddddd</item>
<item name="conversation_editor_background">#eeeeee</item>
<item name="conversation_editor_text_color">@color/edit_text_light_theme</item>
@ -77,6 +82,11 @@
<item name="conversation_received_text_primary_color">#ffeeeeee</item>
<item name="conversation_received_text_secondary_color">#44eeeeee</item>
<item name="contact_selection_push_user">#ffdddddd</item>
<item name="contact_selection_lay_user">#ffcccccc</item>
<item name="contact_selection_push_label">#ff64a926</item>
<item name="contact_selection_lay_label">#11ffffff</item>
<item name="conversation_item_received_background">@drawable/conversation_item_received_shape_dark</item>
<item name="conversation_item_received_triangle_background">@drawable/conversation_item_received_triangle_shape_dark</item>
<item name="conversation_item_sent_background">@drawable/conversation_item_sent_shape_dark</item>

36
src/org/thoughtcrime/securesms/PushContactSelectionListFragment.java
View File

@ -20,6 +20,7 @@ package org.thoughtcrime.securesms;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.res.TypedArray;
import android.database.Cursor;
import android.database.MergeCursor;
import android.os.AsyncTask;
@ -61,9 +62,15 @@ import java.util.List;
public class PushContactSelectionListFragment extends SherlockListFragment
implements LoaderManager.LoaderCallbacks<Cursor>
{
private final int STYLE_ATTRIBUTES[] = new int[]{R.attr.contact_selection_push_user,
R.attr.contact_selection_lay_user,
R.attr.contact_selection_push_label,
R.attr.contact_selection_lay_label};
private final HashMap<Long, ContactData> selectedContacts = new HashMap<Long, ContactData>();
private static LayoutInflater li;
private TypedArray drawables;
@Override
public void onActivityCreated(Bundle icicle) {
@ -88,8 +95,12 @@ public class PushContactSelectionListFragment extends SherlockListFragment
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_select_all: handleSelectAll(); return true;
case R.id.menu_unselect_all: handleUnselectAll(); return true;
case R.id.menu_select_all:
handleSelectAll();
return true;
case R.id.menu_unselect_all:
handleUnselectAll();
return true;
}
super.onOptionsItemSelected(item);
@ -105,7 +116,7 @@ public class PushContactSelectionListFragment extends SherlockListFragment
private void handleUnselectAll() {
selectedContacts.clear();
((CursorAdapter)getListView().getAdapter()).notifyDataSetChanged();
((CursorAdapter) getListView().getAdapter()).notifyDataSetChanged();
}
private void handleSelectAll() {
@ -119,16 +130,16 @@ public class PushContactSelectionListFragment extends SherlockListFragment
while (cursor != null && cursor.moveToNext()) {
ContactData contactData = ContactAccessor.getInstance().getContactData(getActivity(), cursor);
if (contactData.numbers.isEmpty()) continue;
if (contactData.numbers.isEmpty()) continue;
else if (contactData.numbers.size() == 1) addSingleNumberContact(contactData);
else addMultipleNumberContact(contactData, null, null);
else addMultipleNumberContact(contactData, null, null);
}
} finally {
if (cursor != null)
cursor.close();
}
((CursorAdapter)getListView().getAdapter()).notifyDataSetChanged();
((CursorAdapter) getListView().getAdapter()).notifyDataSetChanged();
}
private void addSingleNumberContact(ContactData contactData) {
@ -162,6 +173,7 @@ public class PushContactSelectionListFragment extends SherlockListFragment
private void initializeResources() {
this.getListView().setFocusable(true);
this.drawables = getActivity().obtainStyledAttributes(STYLE_ATTRIBUTES);
}
@Override
@ -244,13 +256,13 @@ public class PushContactSelectionListFragment extends SherlockListFragment
this.pushSupport = pushContactData.pushSupport;
if (!pushSupport) {
this.name.setTextColor(0xa0000000);
this.number.setTextColor(0xa0000000);
this.pushLabel.setBackgroundColor(0x99000000);
this.name.setTextColor(drawables.getColor(1, 0xff000000));
this.number.setTextColor(drawables.getColor(1, 0xff000000));
this.pushLabel.setBackgroundColor(drawables.getColor(3, 0x99000000));
} else {
this.name.setTextColor(0xff000000);
this.number.setTextColor(0xff000000);
this.pushLabel.setBackgroundColor(0xff64a926);
this.name.setTextColor(drawables.getColor(0, 0xa0000000));
this.number.setTextColor(drawables.getColor(0, 0xa0000000));
this.pushLabel.setBackgroundColor(drawables.getColor(2, 0xff64a926));
}
if (selectedContacts.containsKey(contactData.id))

28
src/org/thoughtcrime/securesms/SingleContactSelectionListFragment.java
View File

@ -20,6 +20,7 @@ package org.thoughtcrime.securesms;
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.res.TypedArray;
import android.database.Cursor;
import android.database.MergeCursor;
import android.os.Bundle;
@ -55,11 +56,15 @@ import java.util.HashMap;
public class SingleContactSelectionListFragment extends SherlockListFragment
implements LoaderManager.LoaderCallbacks<Cursor>
{
private final String TAG = SingleContactSelectionListFragment.class.getSimpleName();
private final String TAG = SingleContactSelectionListFragment.class.getSimpleName();
private final int STYLE_ATTRIBUTES[] = new int[]{R.attr.contact_selection_push_user,
R.attr.contact_selection_lay_user,
R.attr.contact_selection_push_label,
R.attr.contact_selection_lay_label};
private final HashMap<Long, ContactData> selectedContacts = new HashMap<Long, ContactData>();
private static LayoutInflater li;
private OnContactSelectedListener onContactSelectedListener;
private static LayoutInflater li;
private OnContactSelectedListener onContactSelectedListener;
private TypedArray drawables;
@Override
public void onActivityCreated(Bundle icicle) {
@ -86,7 +91,7 @@ public class SingleContactSelectionListFragment extends SherlockListFragment
private void addMultipleNumberContact(ContactData contactData, TextView textView) {
String[] options = new String[contactData.numbers.size()];
int i = 0;
int i = 0;
for (NumberData option : contactData.numbers) {
options[i++] = option.type + " " + option.number;
@ -108,6 +113,7 @@ public class SingleContactSelectionListFragment extends SherlockListFragment
private void initializeResources() {
this.getListView().setFocusable(true);
this.drawables = getActivity().obtainStyledAttributes(STYLE_ATTRIBUTES);
}
@Override
@ -181,13 +187,13 @@ public class SingleContactSelectionListFragment extends SherlockListFragment
this.pushSupport = pushContactData.pushSupport;
if (!pushSupport) {
this.name.setTextColor(0xa0000000);
this.number.setTextColor(0xa0000000);
this.pushLabel.setBackgroundColor(0x99000000);
this.name.setTextColor(drawables.getColor(1, 0xff000000));
this.number.setTextColor(drawables.getColor(1, 0xff000000));
this.pushLabel.setBackgroundColor(drawables.getColor(3, 0x99000000));
} else {
this.name.setTextColor(0xff000000);
this.number.setTextColor(0xff000000);
this.pushLabel.setBackgroundColor(0xff64a926);
this.name.setTextColor(drawables.getColor(0, 0xa0000000));
this.number.setTextColor(drawables.getColor(0, 0xa0000000));
this.pushLabel.setBackgroundColor(drawables.getColor(2, 0xff64a926));
}
this.name.setText(contactData.name);