awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

change color to deltagreen, closes #49

Browse Source
This commit is contained in:
B. Petersen
2018-09-26 21:57:54 +02:00
parent 8790d6bd20
commit 884733505a
5 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/layout/conversation_list_fragment.xml
+1
View File
@@ -72,6 +72,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
app:backgroundTint="@color/signal_primary"
android:src="@drawable/ic_create_white_24dp"
android:focusable="true"
android:contentDescription="@string/conversation_list_fragment__fab_content_description"/>
res/values/colors.xml
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<color name="signal_primary">#ff2090ea</color>
<color name="signal_primary_dark">#ff1c7ac5</color>
<color name="signal_primary">#ff415e6b</color>
<color name="signal_primary_dark">#ff364e59</color>
<color name="signal_primary_alpha33">#552090ea</color>
<color name="signal_primary_alpha_focus">#882090ea</color>
res/values/styles.xml
-8
View File
@@ -19,23 +19,15 @@
</style>
<style name="AppCompatAlertDialogStyleLight" parent="Theme.AppCompat.Light.Dialog.Alert">
<item name="colorAccent">@color/signal_primary_dark</item>
</style>
<style name="AppCompatAlertDialogStyleDark" parent="Theme.AppCompat.Dialog.Alert">
<item name="colorAccent">@color/signal_primary</item>
<item name="android:textColor">@null</item>
</style>
<style name="AppCompatDialogStyleLight" parent="Theme.AppCompat.Light.Dialog">
<item name="colorAccent">@color/signal_primary_dark</item>
<item name="android:windowBackground">@drawable/dialog_background</item>
</style>
<style name="AppCompatDialogStyleDark" parent="Theme.AppCompat.Dialog">
<item name="colorAccent">@color/signal_primary</item>
<item name="android:windowBackground">@drawable/dialog_background</item>
<item name="android:textColor">@null</item>
</style>
<!-- ActionBar styles -->
src/org/thoughtcrime/securesms/ConversationActivity.java
-9
View File
@@ -349,7 +349,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
titleView.setTitle(glideRequests, dcChat);
titleView.setVerified(dcChat.isVerified());
setActionBarColor(recipient.getColor());
setBlockedUserState(recipient, isSecureText, isDefaultSms);
setGroupShareProfileReminder(recipient);
calculateCharactersRemaining();
@@ -1122,7 +1121,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
Log.w(TAG, "onModifiedRun(): " + recipient.getRegistered());
titleView.setTitle(glideRequests, dcChat);
setBlockedUserState(recipient, isSecureText, isDefaultSms);
setActionBarColor(recipient.getColor());
setGroupShareProfileReminder(recipient);
updateReminders();
updateDefaultSubscriptionId(recipient.getDefaultSubscriptionId());
@@ -1288,13 +1286,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
return future;
}
private void setActionBarColor(MaterialColor color) {
ActionBar supportActionBar = getSupportActionBar();
if (supportActionBar == null) throw new AssertionError();
supportActionBar.setBackgroundDrawable(new ColorDrawable(color.toActionBarColor(this)));
setStatusBarColor(color.toStatusBarColor(this));
}
private void setBlockedUserState(Recipient recipient, boolean isSecureText, boolean isDefaultSms) {
if (false) { // TODO: do we need a unblock button here? typically, the chatlist is closed when blocked
unblockButton.setVisibility(View.VISIBLE);
src/org/thoughtcrime/securesms/components/AvatarImageView.java
+1 -1
View File
@@ -36,7 +36,7 @@ public class AvatarImageView extends AppCompatImageView {
if (attrs != null) {
TypedArray typedArray = context.getTheme().obtainStyledAttributes(attrs, R.styleable.AvatarImageView, 0, 0);
inverted = typedArray.getBoolean(0, false);
//inverted = typedArray.getBoolean(0, false);
typedArray.recycle();
}
}