diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-03-29 11:53:34 +0200 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-03-29 11:53:34 +0200 |
commit | e388dfc0b8c32ea5916ae6f803217061dac58663 (patch) | |
tree | 64162bd7e68fbe0ae83b354ff7d6878948c2bee1 /src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java | |
parent | 77b1f2138e19545a48ea93c97f8518a87b065831 (diff) | |
parent | 6244834096727cfc1aaaeba7845a6d9cfe27d2b0 (diff) |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts:
src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java
src/main/java/eu/siacs/conversations/utils/UIHelper.java
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java index 720a7454..9e01837a 100644 --- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java @@ -38,6 +38,7 @@ import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; +import de.thedevstack.conversationsplus.ConversationsPlusColors; import de.thedevstack.conversationsplus.ui.listeners.ShowResourcesListDialogListener; import eu.siacs.conversations.Config; import eu.siacs.conversations.R; @@ -336,24 +337,24 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate if (accountInfoEdited() && !mInitMode) { this.mSaveButton.setText(R.string.save); this.mSaveButton.setEnabled(true); - this.mSaveButton.setTextColor(getPrimaryTextColor()); + this.mSaveButton.setTextColor(ConversationsPlusColors.primaryText()); } else if (mAccount != null && (mAccount.getStatus() == Account.State.CONNECTING || mFetchingAvatar)) { this.mSaveButton.setEnabled(false); - this.mSaveButton.setTextColor(getSecondaryTextColor()); + this.mSaveButton.setTextColor(ConversationsPlusColors.secondaryText()); this.mSaveButton.setText(R.string.account_status_connecting); } else if (mAccount != null && mAccount.getStatus() == Account.State.DISABLED && !mInitMode) { this.mSaveButton.setEnabled(true); - this.mSaveButton.setTextColor(getPrimaryTextColor()); + this.mSaveButton.setTextColor(ConversationsPlusColors.primaryText()); this.mSaveButton.setText(R.string.enable); } else { this.mSaveButton.setEnabled(true); - this.mSaveButton.setTextColor(getPrimaryTextColor()); + this.mSaveButton.setTextColor(ConversationsPlusColors.primaryText()); if (!mInitMode) { if (mAccount != null && mAccount.isOnlineAndConnected()) { this.mSaveButton.setText(R.string.save); if (!accountInfoEdited()) { this.mSaveButton.setEnabled(false); - this.mSaveButton.setTextColor(getSecondaryTextColor()); + this.mSaveButton.setTextColor(ConversationsPlusColors.secondaryText()); } } else { this.mSaveButton.setText(R.string.connect); @@ -552,7 +553,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate getActionBar().setHomeButtonEnabled(false); } this.mCancelButton.setEnabled(false); - this.mCancelButton.setTextColor(getSecondaryTextColor()); + this.mCancelButton.setTextColor(ConversationsPlusColors.secondaryText()); } if (Config.DOMAIN_LOCK == null) { final KnownHostsAdapter mKnownHostsAdapter = new KnownHostsAdapter(this, |