blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Apply proper tinting to conversation app bar.

master
Alex Hart 2019-10-18 09:55:27 -03:00
parent 4f75d1a5db
commit 42967dab13
11 changed files with 56 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
res/drawable/ic_arrow_left_conversation_24.xml 100644
View File

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:autoMirrored="true"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?conversation_subtitle_color"
android:pathData="M20,11.25l-14.439,0l1.559,-1.249l5.471,-5.471l-1.061,-1.06l-8.53,8.53l8.53,8.53l1.061,-1.06l-5.471,-5.471l-1.559,-1.249l14.439,0l0,-1.5z"/>
</vector>

9
res/drawable/ic_more_vert_conversation_24.xml 100644
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?conversation_subtitle_color"
android:pathData="M13.5,5.5A1.5,1.5 0,1 1,12 4,1.5 1.5,0 0,1 13.5,5.5ZM12,10.5A1.5,1.5 0,1 0,13.5 12,1.5 1.5,0 0,0 12,10.5ZM12,17a1.5,1.5 0,1 0,1.5 1.5A1.5,1.5 0,0 0,12 17Z"/>
</vector>

2
res/drawable/ic_search_dark_24.xml → res/drawable/ic_search_conversation_24.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?icon_tint_dark"
android:fillColor="?conversation_subtitle_color"
android:pathData="M17.257,16.2 L15.9,15.385a8.022,8.022 0,1 0,-0.519 0.519l0.812,1.353L20.439,21.5 21.5,20.439ZM10,16.5A6.5,6.5 0,1 1,16.5 10,6.508 6.508,0 0,1 10,16.5Z"/>
</vector>

9
res/drawable/ic_timer_conversation_24.xml 100644
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?conversation_subtitle_color"
android:pathData="M13,14.5a1,1 0,0 1,-2 0L11.5,8h1ZM21,14A9,9 0,1 1,4.935 8.436,1.232 1.232,0 0,1 4,7.25 1.25,1.25 0,0 1,5.25 6a1.232,1.232 0,0 1,1.186 0.935,8.948 8.948,0 0,1 4.752,-1.894L10,1h4L12.812,5.041a8.948,8.948 0,0 1,4.752 1.894A1.232,1.232 0,0 1,18.75 6,1.25 1.25,0 0,1 20,7.25a1.232,1.232 0,0 1,-0.935 1.186A8.955,8.955 0,0 1,21 14ZM19.5,14A7.5,7.5 0,1 0,12 21.5,7.509 7.509,0 0,0 19.5,14Z"/>
</vector>

2
res/drawable/ic_x_dark_20.xml → res/drawable/ic_x_conversation_20.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="20"
android:viewportHeight="20">
<path
android:fillColor="?icon_tint_dark"
android:fillColor="?conversation_subtitle_color"
android:pathData="M16.03,5.03l-1.06,-1.06l-4.97,4.969l-4.97,-4.969l-1.06,1.06l4.969,4.97l-4.969,4.97l1.06,1.06l4.97,-4.969l4.97,4.969l1.06,-1.06l-4.969,-4.97l4.969,-4.97z"/>
</vector>

1
res/layout/conversation_activity.xml
View File

@ -19,7 +19,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:navigationIcon="@drawable/ic_arrow_left_24"
app:contentInsetStart="46dp"
tools:background="#ff007f00">

5
res/layout/expiration_timer_menu.xml
View File

@ -13,8 +13,7 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="center"
app:srcCompat="@drawable/ic_timer_24"
android:tint="@color/transparent_white_80"
app:srcCompat="@drawable/ic_timer_conversation_24"
android:scaleType="fitCenter"/>
<TextView
@ -25,6 +24,6 @@
android:gravity="center_horizontal|bottom"
android:paddingBottom="3dp"
android:paddingTop="1dp"
android:textColor="@android:color/white"
android:textColor="?conversation_subtitle_color"
android:textSize="10sp" />
</FrameLayout>

13
res/values/styles.xml
View File

@ -313,9 +313,9 @@
</style>
<style name="Signal.SearchView.Dark">
<item name="closeIcon">@drawable/ic_x_dark_20</item>
<item name="searchHintIcon">@drawable/ic_search_dark_24</item>
<item name="searchIcon">@drawable/ic_search_dark_24</item>
<item name="closeIcon">@drawable/ic_x_conversation_20</item>
<item name="searchHintIcon">@drawable/ic_search_conversation_24</item>
<item name="searchIcon">@drawable/ic_search_conversation_24</item>
</style>
<style name="Signal.Toolbar.Overflow" parent="Widget.AppCompat.ActionButton.Overflow">
@ -325,11 +325,8 @@
</style>
<style name="Signal.Toolbar.Overflow.Conversation">
<item name="android:tint">?conversation_subtitle_color</item>
</style>
<style name="Signal.Toolbar.Navigation.Conversation" parent="Widget.AppCompat.Toolbar.Button.Navigation">
<item name="android:tint">?conversation_subtitle_color</item>
<item name="srcCompat">@drawable/ic_more_vert_conversation_24</item>
<item name="android:tint">@null</item>
</style>
<style name="TextSecure.ActionModeStyle" parent="@style/Widget.AppCompat.ActionMode">

23
res/values/themes.xml
View File

@ -71,7 +71,8 @@
<item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
<item name="android:windowBackground">@color/signal_primary</item>
<item name="android:windowContentOverlay">@null</item>
<item name="toolbarNavigationButtonStyle">@style/Signal.Toolbar.Navigation.Conversation</item>
<item name="homeAsUpIndicator">@drawable/ic_arrow_left_conversation_24</item>
<item name="android:homeAsUpIndicator">@drawable/ic_arrow_left_conversation_24</item>
<item name="colorButtonNormal">@color/white</item>
<item name="contact_filter_toolbar_icon_tint">?conversation_subtitle_color</item>
</style>
@ -583,27 +584,39 @@
</style>
<style name="TextSecure.LightNoActionBar.DarkToolbar" parent="TextSecure.LightNoActionBar">
<item name="toolbarNavigationButtonStyle">@style/Signal.Toolbar.Navigation.Conversation</item>
<item name="android:windowLightStatusBar" tools:ignore="NewApi">false</item>
<item name="homeAsUpIndicator">@drawable/ic_arrow_left_conversation_24</item>
<item name="android:homeAsUpIndicator">@drawable/ic_arrow_left_conversation_24</item>
<item name="collapseIcon">@drawable/ic_arrow_left_conversation_24</item>
<item name="android:collapseIcon" tools:ignore="NewApi">@drawable/ic_arrow_left_conversation_24</item>
</style>
<style name="TextSecure.DarkNoActionBar.DarkToolbar" parent="TextSecure.DarkNoActionBar">
<item name="toolbarNavigationButtonStyle">@style/Signal.Toolbar.Navigation.Conversation</item>
<item name="android:windowLightStatusBar" tools:ignore="NewApi">false</item>
<item name="homeAsUpIndicator">@drawable/ic_arrow_left_conversation_24</item>
<item name="android:homeAsUpIndicator">@drawable/ic_arrow_left_conversation_24</item>
<item name="collapseIcon">@drawable/ic_arrow_left_conversation_24</item>
<item name="android:collapseIcon" tools:ignore="NewApi">@drawable/ic_arrow_left_conversation_24</item>
</style>
<style name="TextSecure.LightTheme.Conversation">
<item name="android:actionBarStyle">@style/TextSecure.DarkActionBar.Conversation</item>
<item name="actionBarStyle">@style/TextSecure.DarkActionBar.Conversation</item>
<item name="toolbarNavigationButtonStyle">@style/Signal.Toolbar.Navigation.Conversation</item>
<item name="android:windowLightStatusBar" tools:ignore="NewApi">false</item>
<item name="homeAsUpIndicator">@drawable/ic_arrow_left_conversation_24</item>
<item name="android:homeAsUpIndicator">@drawable/ic_arrow_left_conversation_24</item>
<item name="collapseIcon">@drawable/ic_arrow_left_conversation_24</item>
<item name="android:collapseIcon" tools:ignore="NewApi">@drawable/ic_arrow_left_conversation_24</item>
</style>
<style name="TextSecure.DarkTheme.Conversation">
<item name="android:actionBarStyle">@style/TextSecure.DarkActionBar.Conversation</item>
<item name="actionBarStyle">@style/TextSecure.DarkActionBar.Conversation</item>
<item name="toolbarNavigationButtonStyle">@style/Signal.Toolbar.Navigation.Conversation</item>
<item name="android:windowLightStatusBar" tools:ignore="NewApi">false</item>
<item name="homeAsUpIndicator">@drawable/ic_arrow_left_conversation_24</item>
<item name="android:homeAsUpIndicator">@drawable/ic_arrow_left_conversation_24</item>
<item name="collapseIcon">@drawable/ic_arrow_left_conversation_24</item>
<item name="android:collapseIcon" tools:ignore="NewApi">@drawable/ic_arrow_left_conversation_24</item>
</style>
<style name="TextSecure.LightTheme.WebRTCCall">

2
src/org/thoughtcrime/securesms/components/DarkSearchView.java
View File

@ -30,6 +30,6 @@ public class DarkSearchView extends androidx.appcompat.widget.SearchView {
super(context, attrs, defStyleAttr);
EditText searchText = findViewById(androidx.appcompat.R.id.search_src_text);
searchText.setTextColor(ContextCompat.getColor(context, R.color.transparent_white_90));
searchText.setTextColor(ThemeUtil.getThemedColor(context, R.attr.conversation_subtitle_color));
}
}

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

@ -1615,11 +1615,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
ActionBar supportActionBar = getSupportActionBar();
if (supportActionBar == null) throw new AssertionError();
Drawable drawable = ContextCompat.getDrawable(this, R.drawable.ic_arrow_left_24);
DrawableCompat.setTint(drawable, ThemeUtil.getThemedColor(this, R.attr.icon_tint_dark));
toolbar.setCollapseIcon(drawable);
supportActionBar.setHomeAsUpIndicator(drawable);
supportActionBar.setDisplayHomeAsUpEnabled(true);
supportActionBar.setDisplayShowTitleEnabled(false);
}