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

Merge branch 'deprecated-method' of https://github.com/hareshkh/Conversations into hareshkh-deprecated-method

Browse source
This commit is contained in:
Daniel Gultsch 2017-03-31 09:27:22 +02:00
parent 4bfc54e51d c7912ed7ef
commit 9682f4d454
7 changed files with 31 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/eu/siacs/conversations/services/NotificationService.java
View file

@ -14,6 +14,7 @@ import android.support.v4.app.NotificationCompat.BigPictureStyle;
import android.support.v4.app.NotificationCompat.Builder; import android.support.v4.app.NotificationCompat.Builder;
import android.support.v4.app.NotificationManagerCompat; import android.support.v4.app.NotificationManagerCompat;
import android.support.v4.app.RemoteInput; import android.support.v4.app.RemoteInput;
import android.support.v4.content.ContextCompat;
import android.text.Html; import android.text.Html;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.style.StyleSpan; import android.text.style.StyleSpan;
@ -223,7 +224,7 @@ public class NotificationService {
} }
private void setNotificationColor(final Builder mBuilder) { private void setNotificationColor(final Builder mBuilder) {
mBuilder.setColor(mXmppConnectionService.getResources().getColor(R.color.primary500)); mBuilder.setColor(ContextCompat.getColor(mXmppConnectionService, R.color.primary500));
} }
public void updateNotification(final boolean notify) { public void updateNotification(final boolean notify) {

5
src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
View file

@ -13,6 +13,7 @@ import android.preference.PreferenceManager;
import android.provider.ContactsContract.CommonDataKinds; import android.provider.ContactsContract.CommonDataKinds;
import android.provider.ContactsContract.Contacts; import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Intents; import android.provider.ContactsContract.Intents;
import android.support.v4.content.ContextCompat;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
@ -452,7 +453,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
key.setText(CryptoHelper.prettifyFingerprint(otrFingerprint)); key.setText(CryptoHelper.prettifyFingerprint(otrFingerprint));
if (otrFingerprint != null && otrFingerprint.equals(messageFingerprint)) { if (otrFingerprint != null && otrFingerprint.equals(messageFingerprint)) {
keyType.setText(R.string.otr_fingerprint_selected_message); keyType.setText(R.string.otr_fingerprint_selected_message);
keyType.setTextColor(getResources().getColor(R.color.accent)); keyType.setTextColor(ContextCompat.getColor(this, R.color.accent));
} else { } else {
keyType.setText(R.string.otr_fingerprint); keyType.setText(R.string.otr_fingerprint);
} }
@ -501,7 +502,7 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
TextView keyType = (TextView) view.findViewById(R.id.key_type); TextView keyType = (TextView) view.findViewById(R.id.key_type);
keyType.setText(R.string.openpgp_key_id); keyType.setText(R.string.openpgp_key_id);
if ("pgp".equals(messageFingerprint)) { if ("pgp".equals(messageFingerprint)) {
keyType.setTextColor(getResources().getColor(R.color.accent)); keyType.setTextColor(ContextCompat.getColor(this, R.color.accent));
} }
key.setText(OpenPgpUtils.convertKeyIdToHex(contact.getPgpKeyId())); key.setText(OpenPgpUtils.convertKeyIdToHex(contact.getPgpKeyId()));
view.setOnClickListener(new OnClickListener() { view.setOnClickListener(new OnClickListener() {

3
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
View file

@ -14,6 +14,7 @@ import android.os.Bundle;
import android.provider.Settings; import android.provider.Settings;
import android.security.KeyChain; import android.security.KeyChain;
import android.security.KeyChainAliasCallback; import android.security.KeyChainAliasCallback;
import android.support.v4.content.ContextCompat;
import android.text.Editable; import android.text.Editable;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.view.Menu; import android.view.Menu;
@ -922,7 +923,7 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
if (ownAxolotlFingerprint != null && Config.supportOmemo()) { if (ownAxolotlFingerprint != null && Config.supportOmemo()) {
this.mAxolotlFingerprintBox.setVisibility(View.VISIBLE); this.mAxolotlFingerprintBox.setVisibility(View.VISIBLE);
if (ownAxolotlFingerprint.equals(messageFingerprint)) { if (ownAxolotlFingerprint.equals(messageFingerprint)) {
this.mOwnFingerprintDesc.setTextColor(getResources().getColor(R.color.accent)); this.mOwnFingerprintDesc.setTextColor(ContextCompat.getColor(this, R.color.accent));
} else { } else {
this.mOwnFingerprintDesc.setTextColor(getSecondaryTextColor()); this.mOwnFingerprintDesc.setTextColor(getSecondaryTextColor());
} }

3
src/main/java/eu/siacs/conversations/ui/OmemoActivity.java
View file

@ -4,6 +4,7 @@ import android.app.AlertDialog;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.content.ContextCompat;
import android.view.ContextMenu; import android.view.ContextMenu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
@ -228,7 +229,7 @@ public abstract class OmemoActivity extends XmppActivity {
keyType.setVisibility(View.GONE); keyType.setVisibility(View.GONE);
} }
if (highlight) { if (highlight) {
keyType.setTextColor(getResources().getColor(R.color.accent)); keyType.setTextColor(ContextCompat.getColor(this, R.color.accent));
keyType.setText(getString(x509 ? R.string.omemo_fingerprint_x509_selected_message : R.string.omemo_fingerprint_selected_message)); keyType.setText(getString(x509 ? R.string.omemo_fingerprint_x509_selected_message : R.string.omemo_fingerprint_selected_message));
} else { } else {
keyType.setText(getString(x509 ? R.string.omemo_fingerprint_x509 : R.string.omemo_fingerprint)); keyType.setText(getString(x509 ? R.string.omemo_fingerprint_x509 : R.string.omemo_fingerprint));

29
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
View file

@ -42,6 +42,7 @@ import android.os.IBinder;
import android.os.PowerManager; import android.os.PowerManager;
import android.os.SystemClock; import android.os.SystemClock;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.v4.content.ContextCompat;
import android.text.InputType; import android.text.InputType;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.Pair; import android.util.Pair;
@ -379,22 +380,22 @@ public abstract class XmppActivity extends Activity {
metrics = getResources().getDisplayMetrics(); metrics = getResources().getDisplayMetrics();
ExceptionHelper.init(getApplicationContext()); ExceptionHelper.init(getApplicationContext());
mPrimaryTextColor = getResources().getColor(R.color.black87); mPrimaryTextColor = ContextCompat.getColor(this, R.color.black87);
mSecondaryTextColor = getResources().getColor(R.color.black54); mSecondaryTextColor = ContextCompat.getColor(this, R.color.black54);
mTertiaryTextColor = getResources().getColor(R.color.black12); mTertiaryTextColor = ContextCompat.getColor(this, R.color.black12);
mColorRed = getResources().getColor(R.color.red800); mColorRed = ContextCompat.getColor(this, R.color.red800);
mColorOrange = getResources().getColor(R.color.orange500); mColorOrange = ContextCompat.getColor(this, R.color.orange500);
mColorGreen = getResources().getColor(R.color.green500); mColorGreen = ContextCompat.getColor(this, R.color.green500);
mPrimaryColor = getResources().getColor(R.color.primary500); mPrimaryColor = ContextCompat.getColor(this, R.color.primary500);
mPrimaryBackgroundColor = getResources().getColor(R.color.grey50); mPrimaryBackgroundColor = ContextCompat.getColor(this, R.color.grey50);
mSecondaryBackgroundColor = getResources().getColor(R.color.grey200); mSecondaryBackgroundColor = ContextCompat.getColor(this, R.color.grey200);
if(isDarkTheme()) { if(isDarkTheme()) {
mPrimaryTextColor = getResources().getColor(R.color.white); mPrimaryTextColor = ContextCompat.getColor(this, R.color.white);
mSecondaryTextColor = getResources().getColor(R.color.white70); mSecondaryTextColor = ContextCompat.getColor(this, R.color.white70);
mTertiaryTextColor = getResources().getColor(R.color.white12); mTertiaryTextColor = ContextCompat.getColor(this, R.color.white12);
mPrimaryBackgroundColor = getResources().getColor(R.color.grey800); mPrimaryBackgroundColor = ContextCompat.getColor(this, R.color.grey800);
mSecondaryBackgroundColor = getResources().getColor(R.color.grey900); mSecondaryBackgroundColor = ContextCompat.getColor(this, R.color.grey900);
} }
this.mTheme = findTheme(); this.mTheme = findTheme();

9
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
View file

@ -11,6 +11,7 @@ import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.support.v4.content.ContextCompat;
import android.text.Spannable; import android.text.Spannable;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
@ -153,9 +154,9 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
private int getMessageTextColor(boolean onDark, boolean primary) { private int getMessageTextColor(boolean onDark, boolean primary) {
if (onDark) { if (onDark) {
return activity.getResources().getColor(primary ? R.color.white : R.color.white70); return ContextCompat.getColor(activity, primary ? R.color.white : R.color.white70);
} else { } else {
return activity.getResources().getColor(primary ? R.color.black87 : R.color.black54); return ContextCompat.getColor(activity, primary ? R.color.black87 : R.color.black54);
} }
} }
@ -334,7 +335,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
body.setSpan(new DividerSpan(false), end, end + 2, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); body.setSpan(new DividerSpan(false), end, end + 2, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
} }
int color = darkBackground ? this.getMessageTextColor(darkBackground, false) int color = darkBackground ? this.getMessageTextColor(darkBackground, false)
: getContext().getResources().getColor(R.color.bubble); : ContextCompat.getColor(activity, R.color.bubble);
DisplayMetrics metrics = getContext().getResources().getDisplayMetrics(); DisplayMetrics metrics = getContext().getResources().getDisplayMetrics();
body.setSpan(new QuoteSpan(color, metrics), start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); body.setSpan(new QuoteSpan(color, metrics), start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
return 0; return 0;
@ -474,7 +475,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
} }
viewHolder.messageBody.setTextColor(this.getMessageTextColor(darkBackground, true)); viewHolder.messageBody.setTextColor(this.getMessageTextColor(darkBackground, true));
viewHolder.messageBody.setLinkTextColor(this.getMessageTextColor(darkBackground, true)); viewHolder.messageBody.setLinkTextColor(this.getMessageTextColor(darkBackground, true));
viewHolder.messageBody.setHighlightColor(activity.getResources().getColor(darkBackground viewHolder.messageBody.setHighlightColor(ContextCompat.getColor(activity, darkBackground
? (type == SENT || !mUseGreenBackground ? R.color.black26 : R.color.grey800) : R.color.grey500)); ? (type == SENT || !mUseGreenBackground ? R.color.black26 : R.color.grey800) : R.color.grey500));
viewHolder.messageBody.setTypeface(null, Typeface.NORMAL); viewHolder.messageBody.setTypeface(null, Typeface.NORMAL);
} }

3
src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java
View file

@ -1,6 +1,7 @@
package eu.siacs.conversations.ui.forms; package eu.siacs.conversations.ui.forms;
import android.content.Context; import android.content.Context;
import android.support.v4.content.ContextCompat;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.style.ForegroundColorSpan; import android.text.style.ForegroundColorSpan;
import android.text.style.StyleSpan; import android.text.style.StyleSpan;
@ -59,7 +60,7 @@ public abstract class FormFieldWrapper {
int start = label.length(); int start = label.length();
int end = label.length() + 2; int end = label.length() + 2;
spannableString.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), start, end, 0); spannableString.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), start, end, 0);
spannableString.setSpan(new ForegroundColorSpan(context.getResources().getColor(R.color.accent)), start, end, 0); spannableString.setSpan(new ForegroundColorSpan(ContextCompat.getColor(context, R.color.accent)), start, end, 0);
} }
return spannableString; return spannableString;
} }