From ea7aa63bb951ce8680d28a131f4f7230076708ef Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Sat, 31 Mar 2018 15:25:57 +0200 Subject: updated manage account activity to new colors --- .../java/de/pixart/messenger/ui/ConversationFragment.java | 1 + .../de/pixart/messenger/ui/ManageAccountActivity.java | 2 +- .../de/pixart/messenger/ui/ShareViaAccountActivity.java | 2 +- .../java/de/pixart/messenger/ui/ShareWithActivity.java | 2 +- .../de/pixart/messenger/ui/adapter/AccountAdapter.java | 3 ++- src/main/java/de/pixart/messenger/ui/util/Color.java | 11 +++++------ src/main/res/layout/account_row.xml | 9 +++------ src/main/res/layout/activity_choose_contact.xml | 5 ++++- src/main/res/layout/activity_contact_details.xml | 4 +--- src/main/res/layout/activity_manage_accounts.xml | 14 ++++++++++++++ src/main/res/layout/activity_share_with.xml | 15 +++++++++++++++ src/main/res/layout/conversation_list_row.xml | 4 +--- src/main/res/layout/manage_accounts.xml | 14 -------------- src/main/res/layout/share_with.xml | 13 ------------- 14 files changed, 49 insertions(+), 50 deletions(-) create mode 100644 src/main/res/layout/activity_manage_accounts.xml create mode 100644 src/main/res/layout/activity_share_with.xml delete mode 100644 src/main/res/layout/manage_accounts.xml delete mode 100644 src/main/res/layout/share_with.xml diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java index 8fb0cceb1..dbf303cd5 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -2488,6 +2488,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke @Override public void success(Message message) { + //TODO the following two call can be made before the callback message.setEncryption(Message.ENCRYPTION_DECRYPTED); activity.xmppConnectionService.sendMessage(message); getActivity().runOnUiThread(() -> messageSent()); diff --git a/src/main/java/de/pixart/messenger/ui/ManageAccountActivity.java b/src/main/java/de/pixart/messenger/ui/ManageAccountActivity.java index b98efde3b..3c1b58fc0 100644 --- a/src/main/java/de/pixart/messenger/ui/ManageAccountActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ManageAccountActivity.java @@ -74,7 +74,7 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda super.onCreate(savedInstanceState); - setContentView(R.layout.manage_accounts); + setContentView(R.layout.activity_manage_accounts); if (savedInstanceState != null) { String jid = savedInstanceState.getString(STATE_SELECTED_ACCOUNT); diff --git a/src/main/java/de/pixart/messenger/ui/ShareViaAccountActivity.java b/src/main/java/de/pixart/messenger/ui/ShareViaAccountActivity.java index e7ee427db..509cd63f4 100644 --- a/src/main/java/de/pixart/messenger/ui/ShareViaAccountActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ShareViaAccountActivity.java @@ -43,7 +43,7 @@ public class ShareViaAccountActivity extends XmppActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.manage_accounts); + setContentView(R.layout.activity_manage_accounts); accountListView = findViewById(R.id.account_list); this.mAccountAdapter = new AccountAdapter(this, accountList); diff --git a/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java b/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java index f0d41e998..a061bcded 100644 --- a/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java @@ -176,7 +176,7 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer getSupportActionBar().setHomeButtonEnabled(false); } - setContentView(R.layout.share_with); + setContentView(R.layout.activity_share_with); setTitle(getString(R.string.title_activity_sharewith)); mListView = findViewById(R.id.choose_conversation_list); diff --git a/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java index 792d365ef..81a3017a8 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java @@ -21,6 +21,7 @@ import de.pixart.messenger.Config; import de.pixart.messenger.R; import de.pixart.messenger.entities.Account; import de.pixart.messenger.ui.XmppActivity; +import de.pixart.messenger.ui.util.Color; import de.pixart.messenger.utils.UIHelper; public class AccountAdapter extends ArrayAdapter { @@ -56,7 +57,7 @@ public class AccountAdapter extends ArrayAdapter { break; case DISABLED: case CONNECTING: - statusView.setTextColor(activity.getSecondaryTextColor()); + statusView.setTextColor(Color.get(activity, android.R.attr.textColorSecondary)); break; default: statusView.setTextColor(activity.getWarningTextColor()); diff --git a/src/main/java/de/pixart/messenger/ui/util/Color.java b/src/main/java/de/pixart/messenger/ui/util/Color.java index 4a4ec45df..58ce6a465 100644 --- a/src/main/java/de/pixart/messenger/ui/util/Color.java +++ b/src/main/java/de/pixart/messenger/ui/util/Color.java @@ -31,19 +31,18 @@ package de.pixart.messenger.ui.util; import android.content.Context; -import android.content.res.Resources; +import android.content.res.TypedArray; import android.support.annotation.AttrRes; import android.support.annotation.ColorInt; -import android.util.TypedValue; public class Color { public static @ColorInt int get(Context context, @AttrRes int attr) { - TypedValue typedValue = new TypedValue(); - Resources.Theme theme = context.getTheme(); - theme.resolveAttribute(attr, typedValue, true); - return typedValue.data; + TypedArray typedArray = context.obtainStyledAttributes(new int[]{attr}); + int color = typedArray.getColor(0, 0); + typedArray.recycle(); + return color; } } \ No newline at end of file diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml index c50485f56..d0cf3d96c 100644 --- a/src/main/res/layout/account_row.xml +++ b/src/main/res/layout/account_row.xml @@ -24,7 +24,7 @@ android:layout_centerVertical="true" android:layout_toRightOf="@+id/account_image" android:orientation="vertical" - android:paddingLeft="8dp"> + android:paddingLeft="@dimen/avatar_item_distance"> + android:textAppearance="@style/TextAppearance.AppCompat.Subhead" /> + android:textAppearance="@style/TextAppearance.AppCompat.Body2" /> \ No newline at end of file diff --git a/src/main/res/layout/activity_choose_contact.xml b/src/main/res/layout/activity_choose_contact.xml index 66e416de5..c5158510b 100644 --- a/src/main/res/layout/activity_choose_contact.xml +++ b/src/main/res/layout/activity_choose_contact.xml @@ -2,12 +2,15 @@ + android:layout_height="match_parent" + android:background="?attr/color_background_primary"> \ No newline at end of file diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index 75ef17978..ef8fe4134 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -1,7 +1,5 @@ - + + + + + + \ No newline at end of file diff --git a/src/main/res/layout/activity_share_with.xml b/src/main/res/layout/activity_share_with.xml new file mode 100644 index 000000000..0b0e11f54 --- /dev/null +++ b/src/main/res/layout/activity_share_with.xml @@ -0,0 +1,15 @@ + + + + + + \ No newline at end of file diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index 9addc66cb..08d176f11 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -50,9 +50,7 @@ android:ellipsize="end" android:maxLines="1" android:paddingRight="4dp" - android:textAppearance="@style/TextAppearance.AppCompat.Subhead" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeHeadline" /> + android:textAppearance="@style/TextAppearance.AppCompat.Subhead" /> - - - - - \ No newline at end of file diff --git a/src/main/res/layout/share_with.xml b/src/main/res/layout/share_with.xml deleted file mode 100644 index 162d02efe..000000000 --- a/src/main/res/layout/share_with.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file -- cgit v1.2.3