TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 11:28:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash on conversation color picker open.

Browse Source
This commit is contained in:
Alex Hart 2019-10-18 10:33:10 -03:00
parent 44dba4bd98
commit 88f2b67984
5 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
res/layout/recipient_preference_activity.xml
View File

@ -49,7 +49,6 @@
android:background="@color/transparent" android:background="@color/transparent"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:theme="@style/TextSecure.DarkActionBar.Conversation" android:theme="@style/TextSecure.DarkActionBar.Conversation"
app:navigationIcon="@drawable/ic_arrow_left_24"
app:layout_collapseMode="pin" > app:layout_collapseMode="pin" >
</androidx.appcompat.widget.Toolbar> </androidx.appcompat.widget.Toolbar>

8
res/values-v21/themes.xml
View File

@ -6,13 +6,13 @@
</style> </style>
<style name="TextSecure.DarkTheme" parent="@style/TextSecure.BaseDarkTheme"> <style name="TextSecure.DarkTheme" parent="@style/TextSecure.BaseDarkTheme">
<item name="android:statusBarColor">?android:attr/windowBackground</item> <item name="android:statusBarColor">@color/core_grey_95</item>
<item name="android:navigationBarColor">?android:attr/windowBackground</item> <item name="android:navigationBarColor">@color/core_grey_95</item>
</style> </style>
<style name="TextSecure.DarkNoActionBar" parent="@style/TextSecure.BaseDarkNoActionBar"> <style name="TextSecure.DarkNoActionBar" parent="@style/TextSecure.BaseDarkNoActionBar">
<item name="android:statusBarColor">?android:attr/windowBackground</item> <item name="android:statusBarColor">@color/core_grey_95</item>
<item name="android:navigationBarColor">?android:attr/windowBackground</item> <item name="android:navigationBarColor">@color/core_grey_95</item>
<item name="android:colorControlActivated">@color/signal_primary_dark</item> <item name="android:colorControlActivated">@color/signal_primary_dark</item>
</style> </style>

18
res/values-v23/themes.xml
View File

@ -2,34 +2,34 @@
<resources> <resources>
<style name="TextSecure.LightTheme" parent="TextSecure.BaseLightTheme"> <style name="TextSecure.LightTheme" parent="TextSecure.BaseLightTheme">
<item name="android:windowLightStatusBar">true</item> <item name="android:windowLightStatusBar">true</item>
<item name="android:statusBarColor">?android:attr/windowBackground</item> <item name="android:statusBarColor">@color/white</item>
</style> </style>
<style name="TextSecure.DarkTheme" parent="TextSecure.BaseDarkTheme"> <style name="TextSecure.DarkTheme" parent="TextSecure.BaseDarkTheme">
<item name="android:navigationBarColor">?android:attr/windowBackground</item> <item name="android:navigationBarColor">@color/core_grey_95</item>
<item name="android:statusBarColor">?android:attr/windowBackground</item> <item name="android:statusBarColor">@color/core_grey_95</item>
<item name="android:windowLightStatusBar">false</item> <item name="android:windowLightStatusBar">false</item>
</style> </style>
<style name="TextSecure.LightRegistrationTheme" parent="TextSecure.LightNoActionBar"> <style name="TextSecure.LightRegistrationTheme" parent="TextSecure.LightNoActionBar">
<item name="android:windowLightStatusBar">true</item> <item name="android:windowLightStatusBar">true</item>
<item name="android:statusBarColor">@color/core_grey_02</item> <item name="android:statusBarColor">@color/white</item>
</style> </style>
<style name="TextSecure.DarkRegistrationTheme" parent="TextSecure.DarkNoActionBar"> <style name="TextSecure.DarkRegistrationTheme" parent="TextSecure.DarkNoActionBar">
<item name="android:windowLightStatusBar">false</item> <item name="android:windowLightStatusBar">false</item>
<item name="android:statusBarColor">@color/core_black</item> <item name="android:statusBarColor">@color/core_grey_95</item>
<item name="android:navigationBarColor">?android:attr/windowBackground</item> <item name="android:navigationBarColor">@color/core_grey_95</item>
</style> </style>
<style name="TextSecure.LightNoActionBar" parent="TextSecure.BaseLightNoActionBar"> <style name="TextSecure.LightNoActionBar" parent="TextSecure.BaseLightNoActionBar">
<item name="android:statusBarColor">?android:attr/windowBackground</item> <item name="android:statusBarColor">@color/white</item>
<item name="android:windowLightStatusBar">true</item> <item name="android:windowLightStatusBar">true</item>
</style> </style>
<style name="TextSecure.DarkNoActionBar" parent="TextSecure.BaseDarkNoActionBar"> <style name="TextSecure.DarkNoActionBar" parent="TextSecure.BaseDarkNoActionBar">
<item name="android:statusBarColor">?android:attr/windowBackground</item> <item name="android:statusBarColor">@color/core_grey_95</item>
<item name="android:windowLightStatusBar">false</item> <item name="android:windowLightStatusBar">false</item>
<item name="android:navigationBarColor">?android:attr/windowBackground</item> <item name="android:navigationBarColor">@color/core_grey_95</item>
</style> </style>
</resources> </resources>

24
res/values-v27/themes.xml
View File

@ -2,43 +2,43 @@
<resources> <resources>
<style name="TextSecure.LightTheme" parent="TextSecure.BaseLightTheme"> <style name="TextSecure.LightTheme" parent="TextSecure.BaseLightTheme">
<item name="android:windowLightStatusBar">true</item> <item name="android:windowLightStatusBar">true</item>
<item name="android:statusBarColor">?android:attr/windowBackground</item> <item name="android:statusBarColor">@color/white</item>
<item name="android:navigationBarColor">?android:attr/windowBackground</item> <item name="android:navigationBarColor">@color/white</item>
<item name="android:windowLightNavigationBar">true</item> <item name="android:windowLightNavigationBar">true</item>
</style> </style>
<style name="TextSecure.DarkTheme" parent="TextSecure.BaseDarkTheme"> <style name="TextSecure.DarkTheme" parent="TextSecure.BaseDarkTheme">
<item name="android:statusBarColor">?android:attr/windowBackground</item> <item name="android:statusBarColor">@color/core_grey_95</item>
<item name="android:windowLightStatusBar">false</item> <item name="android:windowLightStatusBar">false</item>
<item name="android:navigationBarColor">?android:attr/windowBackground</item> <item name="android:navigationBarColor">@color/core_grey_95</item>
<item name="android:windowLightNavigationBar">false</item> <item name="android:windowLightNavigationBar">false</item>
</style> </style>
<style name="TextSecure.LightRegistrationTheme" parent="TextSecure.LightNoActionBar"> <style name="TextSecure.LightRegistrationTheme" parent="TextSecure.LightNoActionBar">
<item name="android:windowLightStatusBar">true</item> <item name="android:windowLightStatusBar">true</item>
<item name="android:statusBarColor">@color/core_grey_02</item> <item name="android:statusBarColor">@color/white</item>
<item name="android:navigationBarColor">?android:attr/windowBackground</item> <item name="android:navigationBarColor">@color/white</item>
<item name="android:windowLightNavigationBar">true</item> <item name="android:windowLightNavigationBar">true</item>
</style> </style>
<style name="TextSecure.DarkRegistrationTheme" parent="TextSecure.DarkNoActionBar"> <style name="TextSecure.DarkRegistrationTheme" parent="TextSecure.DarkNoActionBar">
<item name="android:windowLightStatusBar">false</item> <item name="android:windowLightStatusBar">false</item>
<item name="android:statusBarColor">@color/core_black</item> <item name="android:statusBarColor">@color/core_grey_95</item>
<item name="android:navigationBarColor">?android:attr/windowBackground</item> <item name="android:navigationBarColor">@color/core_grey_95</item>
<item name="android:windowLightNavigationBar">false</item> <item name="android:windowLightNavigationBar">false</item>
</style> </style>
<style name="TextSecure.LightNoActionBar" parent="TextSecure.BaseLightNoActionBar"> <style name="TextSecure.LightNoActionBar" parent="TextSecure.BaseLightNoActionBar">
<item name="android:statusBarColor">?android:attr/windowBackground</item> <item name="android:statusBarColor">@color/white</item>
<item name="android:windowLightStatusBar">true</item> <item name="android:windowLightStatusBar">true</item>
<item name="android:navigationBarColor">?android:attr/windowBackground</item> <item name="android:navigationBarColor">@color/white</item>
<item name="android:windowLightNavigationBar">true</item> <item name="android:windowLightNavigationBar">true</item>
</style> </style>
<style name="TextSecure.DarkNoActionBar" parent="TextSecure.BaseDarkNoActionBar"> <style name="TextSecure.DarkNoActionBar" parent="TextSecure.BaseDarkNoActionBar">
<item name="android:statusBarColor">?android:attr/windowBackground</item> <item name="android:statusBarColor">@color/core_grey_95</item>
<item name="android:windowLightStatusBar">false</item> <item name="android:windowLightStatusBar">false</item>
<item name="android:navigationBarColor">?android:attr/windowBackground</item> <item name="android:navigationBarColor">@color/core_grey_95</item>
<item name="android:windowLightNavigationBar">false</item> <item name="android:windowLightNavigationBar">false</item>
</style> </style>
</resources> </resources>

1
src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
View File

@ -199,7 +199,6 @@ public class RecipientPreferenceActivity extends PassphraseRequiredActionBarActi
}); });
Toolbar toolbar = ViewUtil.findById(this, R.id.toolbar); Toolbar toolbar = ViewUtil.findById(this, R.id.toolbar);
DrawableCompat.setTint(toolbar.getNavigationIcon(), ThemeUtil.getThemedColor(this, R.attr.conversation_subtitle_color));
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setLogo(null); getSupportActionBar().setLogo(null);