TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-03 03:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Day theme partially applied.

Browse Source
This commit is contained in:
Anton Chekulaev
2020-08-20 16:47:15 +10:00
parent 2f09440355
commit 37a3ae9c32
20 changed files with 161 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@@ -346,7 +346,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
private int keyboardHeight = 0;
private final IdentityRecordList identityRecords = new IdentityRecordList();
private final DynamicNoActionBarTheme dynamicTheme = new DynamicNoActionBarTheme();
private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
// Message status bar
@@ -365,7 +364,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
@Override
protected void onPreCreate() {
dynamicTheme.onCreate(this);
dynamicLanguage.onCreate(this);
}
@@ -528,7 +526,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
@Override
protected void onResume() {
super.onResume();
dynamicTheme.onResume(this);
dynamicLanguage.onResume(this);
EventBus.getDefault().register(this);
@@ -1733,7 +1730,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
protected void initializeActionBar() {
Toolbar toolbar = findViewById(R.id.toolbar);
toolbar.getOverflowIcon().setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_IN);
setSupportActionBar(toolbar);
ActionBar supportActionBar = getSupportActionBar();
@@ -2078,10 +2074,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
}
private void setActionBarColor(MaterialColor color) {
ActionBar supportActionBar = getSupportActionBar();
if (supportActionBar == null) throw new AssertionError();
supportActionBar.setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.action_bar_background)));
setStatusBarColor(getResources().getColor(R.color.action_bar_background));
//TODO AC: As we're trying to theme everything properly this method seems a bit broken
// and it's not used anyway so it's a subject to be deleted.
// ActionBar supportActionBar = getSupportActionBar();
// if (supportActionBar == null) throw new AssertionError();
// supportActionBar.setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.action_bar_background)));
// setStatusBarColor(getResources().getColor(R.color.action_bar_background));
}
// FIXME: This name is confusing because we also have updateInputPanel and setInputPanelEnabled

12
src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt
View File

@@ -7,19 +7,20 @@ import android.animation.ValueAnimator
import android.content.Context
import android.content.Context.VIBRATOR_SERVICE
import android.content.res.ColorStateList
import android.graphics.Color
import android.graphics.PointF
import android.graphics.drawable.GradientDrawable
import android.os.Build
import android.os.VibrationEffect
import android.os.VibrationEffect.DEFAULT_AMPLITUDE
import android.os.Vibrator
import androidx.annotation.ColorRes
import androidx.annotation.DrawableRes
import android.util.AttributeSet
import android.view.Gravity
import android.view.MotionEvent
import android.widget.ImageView
import android.widget.RelativeLayout
import androidx.annotation.ColorRes
import androidx.annotation.DrawableRes
import network.loki.messenger.R
import org.thoughtcrime.securesms.loki.utilities.*
@@ -70,10 +71,13 @@ class NewConversationButtonSetView : RelativeLayout {
result.layoutParams = LayoutParams(size, size)
result.setBackgroundResource(R.drawable.new_conversation_button_background)
val background = result.background as GradientDrawable
val colorID = if (isMain) R.color.accent else R.color.new_conversation_button_collapsed_background
background.color = ColorStateList.valueOf(resources.getColorWithID(colorID, context.theme))
@ColorRes val backgroundColorID = if (isMain)
R.color.accent else
R.color.new_conversation_button_collapsed_background
background.color = ColorStateList.valueOf(resources.getColorWithID(backgroundColorID, context.theme))
result.scaleType = ImageView.ScaleType.CENTER
result.setImageResource(iconID)
result.imageTintList = ColorStateList.valueOf(resources.getColorWithID(R.color.text, context.theme))
result
}