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

use styled colors for online/offline text

Browse source
This commit is contained in:
Daniel Gultsch 2018-04-26 21:50:24 +02:00
parent 9b2093eba5
commit 2177e575bc
6 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,7 +43,6 @@ import android.util.Log;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.Toast; import android.widget.Toast;
@ -86,8 +85,6 @@ public abstract class XmppActivity extends ActionBarActivity {
protected boolean registeredListeners = false; protected boolean registeredListeners = false;
protected int mColorRed; protected int mColorRed;
protected int mColorOrange;
protected int mColorGreen;
protected static final String FRAGMENT_TAG_DIALOG = "dialog"; protected static final String FRAGMENT_TAG_DIALOG = "dialog";
@ -407,8 +404,6 @@ public abstract class XmppActivity extends ActionBarActivity {
this.isCameraFeatureAvailable = getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA); this.isCameraFeatureAvailable = getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA);
mColorRed = ContextCompat.getColor(this, R.color.red800); mColorRed = ContextCompat.getColor(this, R.color.red800);
mColorOrange = ContextCompat.getColor(this, R.color.orange500);
mColorGreen = ContextCompat.getColor(this, R.color.green500);
this.mTheme = findTheme(); this.mTheme = findTheme();
setTheme(this.mTheme); setTheme(this.mTheme);
@ -769,10 +764,6 @@ public abstract class XmppActivity extends ActionBarActivity {
return this.mColorRed; return this.mColorRed;
} }
public int getOnlineColor() {
return this.mColorGreen;
}
public int getPixel(int dp) { public int getPixel(int dp) {
DisplayMetrics metrics = getResources().getDisplayMetrics(); DisplayMetrics metrics = getResources().getDisplayMetrics();
return ((int) (dp * metrics.density)); return ((int) (dp * metrics.density));

13
src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
View file

@ -6,6 +6,7 @@ import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.support.v4.content.ContextCompat;
import android.support.v7.widget.SwitchCompat; import android.support.v7.widget.SwitchCompat;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -60,18 +61,18 @@ public class AccountAdapter extends ArrayAdapter<Account> {
} }
TextView statusView = view.findViewById(R.id.account_status); TextView statusView = view.findViewById(R.id.account_status);
ImageView imageView = view.findViewById(R.id.account_image); ImageView imageView = view.findViewById(R.id.account_image);
loadAvatar(account,imageView); loadAvatar(account, imageView);
statusView.setText(getContext().getString(account.getStatus().getReadableId())); statusView.setText(getContext().getString(account.getStatus().getReadableId()));
switch (account.getStatus()) { switch (account.getStatus()) {
case ONLINE: case ONLINE:
statusView.setTextColor(activity.getOnlineColor()); statusView.setTextColor(Color.get(activity, R.attr.TextColorOnline));
break; break;
case DISABLED: case DISABLED:
case CONNECTING: case CONNECTING:
statusView.setTextColor(Color.get(activity,android.R.attr.textColorSecondary)); statusView.setTextColor(Color.get(activity, android.R.attr.textColorSecondary));
break; break;
default: default:
statusView.setTextColor(activity.getWarningTextColor()); statusView.setTextColor(Color.get(activity, R.attr.TextColorError));
break; break;
} }
final SwitchCompat tglAccountState = view.findViewById(R.id.tgl_account_status); final SwitchCompat tglAccountState = view.findViewById(R.id.tgl_account_status);
@ -85,7 +86,7 @@ public class AccountAdapter extends ArrayAdapter<Account> {
} }
tglAccountState.setOnCheckedChangeListener((compoundButton, b) -> { tglAccountState.setOnCheckedChangeListener((compoundButton, b) -> {
if (b == isDisabled && activity instanceof ManageAccountActivity) { if (b == isDisabled && activity instanceof ManageAccountActivity) {
((ManageAccountActivity) activity).onClickTglAccountState(account,b); ((ManageAccountActivity) activity).onClickTglAccountState(account, b);
} }
}); });
return view; return view;
@ -119,7 +120,7 @@ public class AccountAdapter extends ArrayAdapter<Account> {
public void loadAvatar(Account account, ImageView imageView) { public void loadAvatar(Account account, ImageView imageView) {
if (cancelPotentialWork(account, imageView)) { if (cancelPotentialWork(account, imageView)) {
final Bitmap bm = activity.avatarService().get(account,activity.getPixel(48),true); final Bitmap bm = activity.avatarService().get(account, activity.getPixel(48), true);
if (bm != null) { if (bm != null) {
cancelPotentialWork(account, imageView); cancelPotentialWork(account, imageView);
imageView.setImageBitmap(bm); imageView.setImageBitmap(bm);

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

@ -302,7 +302,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
break; break;
} }
if (error && type == SENT) { if (error && type == SENT) {
viewHolder.time.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_Waring); viewHolder.time.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_Warning);
} else { } else {
if (darkBackground) { if (darkBackground) {
viewHolder.time.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_OnDark); viewHolder.time.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_OnDark);

3
src/main/res/values/attrs.xml
View file

@ -20,6 +20,9 @@
<attr name="activity_background_search" format="reference"/> <attr name="activity_background_search" format="reference"/>
<attr name="activity_background_no_results" format="reference"/> <attr name="activity_background_no_results" format="reference"/>
<attr name="TextColorOnline" format="reference|color"/>
<attr name="TextColorError" format="reference|color"/>
<attr name="ic_send_cancel_offline" format="reference"/> <attr name="ic_send_cancel_offline" format="reference"/>
<attr name="ic_send_location_offline" format="reference"/> <attr name="ic_send_location_offline" format="reference"/>
<attr name="ic_send_photo_offline" format="reference"/> <attr name="ic_send_photo_offline" format="reference"/>

2
src/main/res/values/styles.xml
View file

@ -91,7 +91,7 @@
<item name="android:textStyle">bold</item> <item name="android:textStyle">bold</item>
</style> </style>
<style name="TextAppearance.Conversations.Caption.Waring" parent="TextAppearance.Conversations.Caption"> <style name="TextAppearance.Conversations.Caption.Warning" parent="TextAppearance.Conversations.Caption">
<item name="android:textColor">@color/red800</item> <item name="android:textColor">@color/red800</item>
</style> </style>

5
src/main/res/values/themes.xml
View file

@ -10,6 +10,8 @@
<item name="color_background_primary">@color/grey50</item> <item name="color_background_primary">@color/grey50</item>
<item name="color_background_secondary">@color/grey200</item> <item name="color_background_secondary">@color/grey200</item>
<item name="color_warning">@color/red_a700</item> <item name="color_warning">@color/red_a700</item>
<item name="TextColorOnline">@color/green500</item>
<item name="TextColorError">@color/red800</item>
<item name="activity_background_search">@drawable/search_background_light</item> <item name="activity_background_search">@drawable/search_background_light</item>
<item name="activity_background_no_results">@drawable/no_results_background_light</item> <item name="activity_background_no_results">@drawable/no_results_background_light</item>
@ -106,6 +108,9 @@
<item name="activity_background_no_results">@drawable/no_results_background_dark</item> <item name="activity_background_no_results">@drawable/no_results_background_dark</item>
<item name="color_warning">@color/red_a100</item> <item name="color_warning">@color/red_a100</item>
<item name="TextColorOnline">@color/green500</item>
<item name="TextColorError">@color/red500</item>
<item name="EmojiColor">@color/white</item> <item name="EmojiColor">@color/white</item>
<item name="windowActionModeOverlay">true</item> <item name="windowActionModeOverlay">true</item>