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

Merge pull request #828 from Ampli-fier/master

Browse Source 
Dark Theme improvements
This commit is contained in:
björn petersen
2019-04-14 00:59:43 +02:00
committed by GitHub
parent 2aea46660c 6742895fec
commit 17845bce7f
9 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
res/drawable-xhdpi/background_hd_dark.jpg
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 78 KiB

res/drawable/conversation_list_divider_shape.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:left="83dp">
<item android:left="0dp">
<shape android:shape="rectangle">
<solid android:color="@color/gray12" />
<size android:height="1px" />
res/drawable/conversation_list_divider_shape_dark.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:left="83dp">
<item android:left="0dp">
<shape android:shape="rectangle">
<solid android:color="#33ffffff" />
<size android:height="1px" />
res/layout/activity_select_chat_background.xml
+11 -8
View File
@@ -18,26 +18,29 @@
android:layout_gravity="center">
<Button
style="@style/ButtonPrimary"
android:background="@color/universal_overlay"
android:id="@+id/set_default_button"
android:layout_gravity="fill_vertical"
style="@style/ButtonPrimary"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_gravity="center_horizontal"
android:layout_margin="15dp"
android:background="@color/universal_overlay"
android:minWidth="200dp"
android:text="Set default" />
android:text="@string/pref_background_btn_default"
android:textAllCaps="false" />
<Button
style="@style/ButtonPrimary"
android:background="@color/universal_overlay"
android:id="@+id/from_gallery_button"
android:layout_gravity="fill_vertical"
style="@style/ButtonPrimary"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_gravity="center_horizontal"
android:layout_margin="15dp"
android:background="@color/universal_overlay"
android:minWidth="200dp"
android:text="From gallery" />
android:text="@string/pref_background_btn_gallery"
android:textAllCaps="false" />
</LinearLayout>
</FrameLayout>
res/layout/conversation_list_item_view.xml
+1 -1
View File
@@ -137,6 +137,6 @@
<View android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_alignParentBottom="true"
android:background="@drawable/attachment_selector_shadow"/>
android:background="?attr/conversation_list_item_divider"/>
</org.thoughtcrime.securesms.ConversationListItem>
res/values/strings.xml
+2
View File
@@ -395,6 +395,8 @@
<string name="pref_managekeys_secret_keys_exported_to_x">Secret keys written successfully to \"%1$s\".</string>
<string name="pref_managekeys_secret_keys_imported_from_x">Secret keys imported from \"%1$s\".</string>
<string name="pref_background">Background</string>
<string name="pref_background_btn_default">Use default image</string>
<string name="pref_background_btn_gallery">Select from gallery</string>
<string name="pref_imap_folder_handling">IMAP folder handling</string>
<string name="pref_imap_folder_warn_disable_defaults">If you disable this option, make sure, your server and your other clients are configured accordingly.\n\nOtherwise things may not work at all.</string>
<string name="pref_watch_inbox_folder">Watch Inbox folder</string>
res/values/themes.xml
+1 -1
View File
@@ -289,7 +289,7 @@
<item name="import_export_item_background_shadow_color">@color/import_export_item_background_shadow_dark</item>
<item name="import_export_item_card_background">@drawable/clickable_card_dark</item>
<item name="fab_color">@color/gray95</item>
<item name="fab_color">@color/gray78</item>
<item name="input_panel_bg_color">@color/gray95</item>
<item name="lower_right_divet">@drawable/divet_lower_right_light</item>
src/org/thoughtcrime/securesms/ConversationActivity.java
+4 -1
View File
@@ -753,7 +753,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
Drawable image = Drawable.createFromPath(backgroundImagePath);
getWindow().setBackgroundDrawable(image);
}
else if(!dynamicTheme.isDarkTheme(this)) {
else if(dynamicTheme.isDarkTheme(this)) {
getWindow().setBackgroundDrawableResource(R.drawable.background_hd_dark);
}
else {
getWindow().setBackgroundDrawableResource(R.drawable.background_hd);
}
}
src/org/thoughtcrime/securesms/preferences/ChatBackgroundActivity.java
+2 -2
View File
@@ -169,8 +169,8 @@ public class ChatBackgroundActivity extends PassphraseRequiredActionBarActivity
private void setDefaultLayoutBackgroundImage() {
if(dynamicTheme.isDarkTheme(this)) {
preview.setImageDrawable(null);
preview.setBackgroundColor(Color.BLACK);
Drawable image = getResources().getDrawable(R.drawable.background_hd_dark);
preview.setImageDrawable(image);
}
else {
Drawable image = getResources().getDrawable(R.drawable.background_hd);