diff --git a/.tx/config b/.tx/config index c8dc97ed7..53d7212aa 100644 --- a/.tx/config +++ b/.tx/config @@ -1,6 +1,6 @@ [main] host = https://www.transifex.com -lang_map = nl_NL:nl +lang_map = nl_NL:nl, ja_JP:ja [delta-chat-app.stringsxml] file_filter = res/values-/strings.xml diff --git a/build.gradle b/build.gradle index 19ba16a44..d661b4f94 100644 --- a/build.gradle +++ b/build.gradle @@ -64,10 +64,9 @@ dependencies { implementation 'com.codewaves.stickyheadergrid:stickyheadergrid:0.9.4' // glues the current time segment text in the gallery to the top. implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:7.2.0' - debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.3' - releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3' - debugImplementation 'com.squareup.leakcanary:leakcanary-support-fragment:1.6.3' - + //debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.6.3' + //releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.6.3' + //debugImplementation 'com.squareup.leakcanary:leakcanary-support-fragment:1.6.3' testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12' diff --git a/jni/messenger-backend b/jni/messenger-backend index e7e9a8796..86230cd4a 160000 --- a/jni/messenger-backend +++ b/jni/messenger-backend @@ -1 +1 @@ -Subproject commit e7e9a8796df83f253a417c039016cc14d8179653 +Subproject commit 86230cd4ae8faa93ef3dda97cb8e9b83a3b7bcbf diff --git a/res/drawable-xhdpi/background_hd_dark.jpg b/res/drawable-xhdpi/background_hd_dark.jpg new file mode 100644 index 000000000..48ba9cbd0 Binary files /dev/null and b/res/drawable-xhdpi/background_hd_dark.jpg differ diff --git a/res/drawable/conversation_list_divider_shape.xml b/res/drawable/conversation_list_divider_shape.xml index 726ef9eae..459e9420a 100644 --- a/res/drawable/conversation_list_divider_shape.xml +++ b/res/drawable/conversation_list_divider_shape.xml @@ -1,6 +1,6 @@ - + diff --git a/res/drawable/conversation_list_divider_shape_dark.xml b/res/drawable/conversation_list_divider_shape_dark.xml index 425c92605..0ca1786e2 100644 --- a/res/drawable/conversation_list_divider_shape_dark.xml +++ b/res/drawable/conversation_list_divider_shape_dark.xml @@ -1,6 +1,6 @@ - + diff --git a/res/layout/activity_select_chat_background.xml b/res/layout/activity_select_chat_background.xml index 7fe8e662b..9a7b0ada7 100644 --- a/res/layout/activity_select_chat_background.xml +++ b/res/layout/activity_select_chat_background.xml @@ -18,26 +18,29 @@ android:layout_gravity="center">