From 3c6b43b2bde2b1ab5368fad1f126ea317a2f50c6 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 24 May 2018 11:52:13 -0300 Subject: [PATCH] Implement Dark Theme (DayNight with automatic option) This is just a first rough implementation. A real UI designer should look over this. --- .../briar/android/BriarApplicationImpl.java | 13 +++ .../briar/android/activity/BriarActivity.java | 1 - .../android/blog/BlogPostViewHolder.java | 4 +- .../briar/android/forum/ForumListAdapter.java | 5 -- .../privategroup/list/GroupViewHolder.java | 3 - .../android/reporting/DevReportActivity.java | 10 ++- .../android/settings/SettingsFragment.java | 23 ++++++ .../threaded/BaseThreadItemViewHolder.java | 11 ++- .../android/threaded/ThreadListActivity.java | 1 + .../briar/android/util/UiUtils.java | 21 +++++ .../android/view/LargeTextInputView.java | 3 +- .../android/view/TrustIndicatorView.java | 2 +- .../components/RepeatableImageKey.java | 4 +- .../components/emoji/EmojiDrawer.java | 19 +++-- .../components/emoji/EmojiToggle.java | 7 +- .../main/res/drawable-night-hdpi/msg_in.9.png | Bin 0 -> 1990 bytes .../res/drawable-night-hdpi/msg_in_top.9.png | Bin 0 -> 1600 bytes .../main/res/drawable-night-mdpi/msg_in.9.png | Bin 0 -> 1435 bytes .../res/drawable-night-mdpi/msg_in_top.9.png | Bin 0 -> 1177 bytes .../res/drawable-night-xhdpi/msg_in.9.png | Bin 0 -> 2835 bytes .../res/drawable-night-xhdpi/msg_in_top.9.png | Bin 0 -> 2289 bytes .../res/drawable-night-xxhdpi/msg_in.9.png | Bin 0 -> 3885 bytes .../drawable-night-xxhdpi/msg_in_top.9.png | Bin 0 -> 3084 bytes .../res/drawable-night/contact_connected.xml | 24 ++++++ .../drawable-night/contact_disconnected.xml | 9 +++ .../res/drawable-night/ic_our_identity.xml | 9 +++ .../drawable-night/qr_code_explanation.xml | 28 +++++++ .../main/res/drawable-night/splash_screen.xml | 71 ++++++++++++++++ .../main/res/drawable/action_delete_black.xml | 1 - briar-android/src/main/res/drawable/blogs.xml | 1 - .../main/res/drawable/border_explanation.xml | 2 +- .../src/main/res/drawable/bubble_white.xml | 1 - .../main/res/drawable/contact_connected.xml | 24 +++--- .../res/drawable/contact_disconnected.xml | 13 ++- ...c_backspace_black.xml => ic_backspace.xml} | 1 - .../res/drawable/ic_contact_introduction.xml | 1 - .../src/main/res/drawable/ic_contacts.xml | 1 - .../main/res/drawable/ic_emoji_activity.xml | 2 +- .../res/drawable/ic_emoji_animals_nature.xml | 2 +- .../main/res/drawable/ic_emoji_emoticons.xml | 2 +- .../src/main/res/drawable/ic_emoji_flags.xml | 2 +- .../main/res/drawable/ic_emoji_food_drink.xml | 2 +- .../main/res/drawable/ic_emoji_objects.xml | 2 +- .../src/main/res/drawable/ic_emoji_recent.xml | 2 +- .../res/drawable/ic_emoji_smiley_people.xml | 2 +- .../main/res/drawable/ic_emoji_symbols.xml | 2 +- .../src/main/res/drawable/ic_emoji_toggle.xml | 1 - .../res/drawable/ic_emoji_travel_places.xml | 2 +- .../res/drawable/ic_forums_black_24dp.xml | 1 - .../src/main/res/drawable/ic_group.xml | 1 - .../src/main/res/drawable/ic_info.xml | 10 --- ...{ic_keyboard_black.xml => ic_keyboard.xml} | 1 - ...identity_black.xml => ic_our_identity.xml} | 1 - .../src/main/res/drawable/ic_repeat.xml | 1 - .../res/drawable/ic_settings_black_24dp.xml | 1 - .../res/drawable/ic_signout_black_24dp.xml | 1 - .../src/main/res/drawable/ic_visibility.xml | 1 - .../main/res/drawable/ic_visibility_off.xml | 1 - .../res/drawable/level_indicator_circle.xml | 4 +- .../drawable/list_item_thread_background.xml | 4 +- .../main/res/drawable/message_delivered.xml | 12 ++- .../src/main/res/drawable/message_sent.xml | 12 ++- .../src/main/res/drawable/message_stored.xml | 12 ++- .../res/drawable/social_send_now_white.xml | 4 +- .../src/main/res/drawable/transport_bt.xml | 12 ++- .../src/main/res/drawable/transport_lan.xml | 17 ++-- .../src/main/res/drawable/transport_tor.xml | 12 ++- .../layout-land/fragment_keyagreement_id.xml | 1 - .../main/res/layout/activity_conversation.xml | 6 +- .../main/res/layout/activity_dev_report.xml | 13 +-- .../main/res/layout/activity_nav_drawer.xml | 3 +- .../res/layout/activity_open_database.xml | 2 +- .../src/main/res/layout/activity_password.xml | 3 +- .../res/layout/activity_sharing_status.xml | 48 ++++++++--- .../main/res/layout/activity_test_data.xml | 22 +++-- .../layout/activity_threaded_conversation.xml | 2 - .../src/main/res/layout/author_view.xml | 4 +- .../src/main/res/layout/emoji_drawer.xml | 9 +-- .../src/main/res/layout/fragment_blog.xml | 1 - .../main/res/layout/fragment_blog_post.xml | 3 +- .../src/main/res/layout/fragment_error.xml | 2 +- .../res/layout/fragment_keyagreement_id.xml | 2 +- .../main/res/layout/fragment_link_dialog.xml | 6 +- .../src/main/res/layout/fragment_reblog.xml | 4 +- .../main/res/layout/introduction_message.xml | 7 +- .../res/layout/list_item_blog_comment.xml | 2 +- .../main/res/layout/list_item_blog_post.xml | 10 +-- .../src/main/res/layout/list_item_contact.xml | 8 +- .../res/layout/list_item_contact_small.xml | 2 +- .../layout/list_item_conversation_msg_in.xml | 4 +- .../list_item_conversation_notice_in.xml | 6 +- .../list_item_conversation_notice_out.xml | 5 +- .../layout/list_item_conversation_request.xml | 6 +- .../src/main/res/layout/list_item_crash.xml | 4 +- .../src/main/res/layout/list_item_forum.xml | 13 +-- .../src/main/res/layout/list_item_group.xml | 19 ++--- .../layout/list_item_group_join_notice.xml | 2 +- .../res/layout/list_item_group_member.xml | 2 +- .../main/res/layout/list_item_invitations.xml | 9 +-- .../layout/list_item_revealable_contact.xml | 9 ++- .../main/res/layout/list_item_rss_feed.xml | 16 ++-- .../layout/list_item_selectable_contact.xml | 7 +- .../src/main/res/layout/list_item_thread.xml | 4 +- .../main/res/layout/list_item_transport.xml | 2 +- .../src/main/res/layout/navigation_menu.xml | 7 +- .../src/main/res/layout/power_view.xml | 2 +- briar-android/src/main/res/layout/splash.xml | 3 +- .../src/main/res/layout/text_input_view.xml | 76 ++++++++++-------- .../main/res/layout/text_input_view_large.xml | 63 ++++++++------- .../src/main/res/values-night/color.xml | 13 +++ briar-android/src/main/res/values/arrays.xml | 16 ++++ briar-android/src/main/res/values/color.xml | 8 +- briar-android/src/main/res/values/strings.xml | 5 ++ briar-android/src/main/res/values/styles.xml | 17 +--- briar-android/src/main/res/values/themes.xml | 6 +- briar-android/src/main/res/xml/settings.xml | 21 +++-- 116 files changed, 619 insertions(+), 328 deletions(-) create mode 100644 briar-android/src/main/res/drawable-night-hdpi/msg_in.9.png create mode 100644 briar-android/src/main/res/drawable-night-hdpi/msg_in_top.9.png create mode 100644 briar-android/src/main/res/drawable-night-mdpi/msg_in.9.png create mode 100644 briar-android/src/main/res/drawable-night-mdpi/msg_in_top.9.png create mode 100644 briar-android/src/main/res/drawable-night-xhdpi/msg_in.9.png create mode 100644 briar-android/src/main/res/drawable-night-xhdpi/msg_in_top.9.png create mode 100644 briar-android/src/main/res/drawable-night-xxhdpi/msg_in.9.png create mode 100644 briar-android/src/main/res/drawable-night-xxhdpi/msg_in_top.9.png create mode 100644 briar-android/src/main/res/drawable-night/contact_connected.xml create mode 100644 briar-android/src/main/res/drawable-night/contact_disconnected.xml create mode 100644 briar-android/src/main/res/drawable-night/ic_our_identity.xml create mode 100644 briar-android/src/main/res/drawable-night/qr_code_explanation.xml create mode 100644 briar-android/src/main/res/drawable-night/splash_screen.xml rename briar-android/src/main/res/drawable/{ic_backspace_black.xml => ic_backspace.xml} (94%) delete mode 100644 briar-android/src/main/res/drawable/ic_info.xml rename briar-android/src/main/res/drawable/{ic_keyboard_black.xml => ic_keyboard.xml} (95%) rename briar-android/src/main/res/drawable/{ic_our_identity_black.xml => ic_our_identity.xml} (95%) create mode 100644 briar-android/src/main/res/values-night/color.xml diff --git a/briar-android/src/main/java/org/briarproject/briar/android/BriarApplicationImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/BriarApplicationImpl.java index bbb8a568c..0b2f03466 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/BriarApplicationImpl.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/BriarApplicationImpl.java @@ -19,6 +19,7 @@ import org.briarproject.briar.android.logging.CachingLogHandler; import org.briarproject.briar.android.reporting.BriarReportPrimer; import org.briarproject.briar.android.reporting.BriarReportSenderFactory; import org.briarproject.briar.android.reporting.DevReportActivity; +import org.briarproject.briar.android.util.UiUtils; import java.util.Collection; import java.util.logging.Handler; @@ -85,6 +86,7 @@ public class BriarApplicationImpl extends Application Localizer.initialize(prefs); super.attachBaseContext( Localizer.getInstance().setLocale(base)); + setTheme(base, prefs); ACRA.init(this); } @@ -123,6 +125,17 @@ public class BriarApplicationImpl extends Application Localizer.getInstance().setLocale(this); } + private void setTheme(Context ctx, SharedPreferences prefs) { + String theme = prefs.getString("pref_key_theme", null); + if (theme == null) { + // set default value + theme = getString(R.string.pref_theme_light_value); + prefs.edit().putString("pref_key_theme", theme).apply(); + } + // set theme + UiUtils.setTheme(ctx, theme); + } + private void enableStrictMode() { ThreadPolicy.Builder threadPolicy = new ThreadPolicy.Builder(); threadPolicy.detectAll(); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java index d557e717f..3d2d8361c 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/activity/BriarActivity.java @@ -92,7 +92,6 @@ public abstract class BriarActivity extends BaseActivity { window.setEnterTransition(slide); window.setTransitionBackgroundFadeDuration(getResources() .getInteger(android.R.integer.config_longAnimTime)); - window.setBackgroundDrawableResource(android.R.color.transparent); } /** diff --git a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java index 228059415..b330aeb7a 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/blog/BlogPostViewHolder.java @@ -11,7 +11,7 @@ import android.text.Spanned; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.ImageView; +import android.widget.ImageButton; import android.widget.TextView; import org.briarproject.bramble.api.identity.Author; @@ -40,7 +40,7 @@ class BlogPostViewHolder extends RecyclerView.ViewHolder { private final ViewGroup layout; private final AuthorView reblogger; private final AuthorView author; - private final ImageView reblogButton; + private final ImageButton reblogButton; private final TextView body; private final ViewGroup commentContainer; private final boolean fullText; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListAdapter.java index d2c4b96d3..f16e83970 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListAdapter.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListAdapter.java @@ -2,7 +2,6 @@ package org.briarproject.briar.android.forum; import android.content.Context; import android.content.Intent; -import android.support.v4.content.ContextCompat; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; @@ -55,12 +54,8 @@ class ForumListAdapter ui.postCount.setText(ctx.getResources() .getQuantityString(R.plurals.posts, postCount, postCount)); - ui.postCount.setTextColor( - ContextCompat.getColor(ctx, R.color.briar_text_secondary)); } else { ui.postCount.setText(ctx.getString(R.string.no_posts)); - ui.postCount.setTextColor( - ContextCompat.getColor(ctx, R.color.briar_text_tertiary)); } // Date diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupViewHolder.java index a2992ef89..b64eb25a2 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupViewHolder.java @@ -16,7 +16,6 @@ import org.briarproject.briar.android.privategroup.conversation.GroupActivity; import org.briarproject.briar.android.util.UiUtils; import org.briarproject.briar.android.view.TextAvatarView; -import static android.support.v4.content.ContextCompat.getColor; import static android.view.View.GONE; import static android.view.View.VISIBLE; import static org.briarproject.briar.android.activity.BriarActivity.GROUP_ID; @@ -83,8 +82,6 @@ class GroupViewHolder extends RecyclerView.ViewHolder { postCount.setText(ctx.getResources() .getQuantityString(R.plurals.messages, messageCount, messageCount)); - postCount.setTextColor( - getColor(ctx, R.color.briar_text_secondary)); long lastUpdate = group.getTimestamp(); date.setText(UiUtils.formatDate(ctx, lastUpdate)); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java index a25e1e41f..e9f49eaf9 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/reporting/DevReportActivity.java @@ -33,6 +33,7 @@ import java.util.Map.Entry; import java.util.Set; import java.util.logging.Logger; +import static android.support.v7.app.AppCompatDelegate.MODE_NIGHT_YES; import static android.view.View.GONE; import static android.view.View.INVISIBLE; import static android.view.View.VISIBLE; @@ -84,6 +85,7 @@ public class DevReportActivity extends BaseCrashReportDialog @Override public void onCreate(Bundle state) { + getDelegate().setLocalNightMode(MODE_NIGHT_YES); getDelegate().installViewFactory(); getDelegate().onCreate(state); super.onCreate(state); @@ -94,6 +96,7 @@ public class DevReportActivity extends BaseCrashReportDialog getDelegate().setSupportActionBar(tb); View requestReport = findViewById(R.id.request_report); + View reportForm = findViewById(R.id.report_form); userCommentView = findViewById(R.id.user_comment); userEmailView = findViewById(R.id.user_email); includeDebugReport = findViewById(R.id.include_debug_report); @@ -111,13 +114,18 @@ public class DevReportActivity extends BaseCrashReportDialog if (isFeedback()) { includeDebugReport .setText(getString(R.string.include_debug_report_feedback)); + reportForm.setVisibility(VISIBLE); + requestReport.setVisibility(INVISIBLE); } else { includeDebugReport.setChecked(true); + reportForm.setVisibility(INVISIBLE); + requestReport.setVisibility(VISIBLE); } findViewById(R.id.acceptButton).setOnClickListener(v -> { reviewing = true; - requestReport.setVisibility(GONE); + reportForm.setVisibility(VISIBLE); + requestReport.setVisibility(INVISIBLE); ((InputMethodManager) getSystemService(INPUT_METHOD_SERVICE)) .showSoftInput(userCommentView, SHOW_FORCED); }); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java index d9faceff5..7442c20f0 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java @@ -34,6 +34,7 @@ import org.briarproject.bramble.util.StringUtils; import org.briarproject.briar.R; import org.briarproject.briar.android.Localizer; import org.briarproject.briar.android.navdrawer.NavDrawerActivity; +import org.briarproject.briar.android.util.UiUtils; import org.briarproject.briar.android.util.UserFeedback; import java.util.ArrayList; @@ -44,6 +45,8 @@ import java.util.logging.Logger; import javax.inject.Inject; import static android.app.Activity.RESULT_OK; +import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK; +import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; import static android.media.RingtoneManager.ACTION_RINGTONE_PICKER; import static android.media.RingtoneManager.EXTRA_RINGTONE_DEFAULT_URI; import static android.media.RingtoneManager.EXTRA_RINGTONE_EXISTING_URI; @@ -99,6 +102,7 @@ public class SettingsFragment extends PreferenceFragmentCompat private SettingsActivity listener; private ListPreference language; + private ListPreference theme; private ListPreference enableBluetooth; private ListPreference torNetwork; private CheckBoxPreference notifyPrivateMessages; @@ -135,6 +139,7 @@ public class SettingsFragment extends PreferenceFragmentCompat language = (ListPreference) findPreference(LANGUAGE); setLanguageEntries(); + theme = (ListPreference) findPreference("pref_key_theme"); enableBluetooth = (ListPreference) findPreference("pref_key_bluetooth"); torNetwork = (ListPreference) findPreference("pref_key_tor_network"); notifyPrivateMessages = (CheckBoxPreference) findPreference( @@ -154,6 +159,23 @@ public class SettingsFragment extends PreferenceFragmentCompat setSettingsEnabled(false); language.setOnPreferenceChangeListener(this); + theme.setOnPreferenceChangeListener((preference, newValue) -> { + if (getActivity() != null) { + // activate new theme + UiUtils.setTheme(getActivity(), (String) newValue); + // bring up parent activity, so it can change its theme as well + Intent intent = + new Intent(getActivity(), NavDrawerActivity.class); + intent.setFlags( + FLAG_ACTIVITY_CLEAR_TASK | FLAG_ACTIVITY_NEW_TASK); + startActivity(intent); + // bring this activity back to the foreground + intent = new Intent(getActivity(), getActivity().getClass()); + startActivity(intent); + getActivity().finish(); + } + return true; + }); enableBluetooth.setOnPreferenceChangeListener(this); torNetwork.setOnPreferenceChangeListener(this); if (SDK_INT >= 21) { @@ -320,6 +342,7 @@ public class SettingsFragment extends PreferenceFragmentCompat } private void setSettingsEnabled(boolean enabled) { + // theme not needed here, because handled by SharedPreferences enableBluetooth.setEnabled(enabled); torNetwork.setEnabled(enabled); notifyPrivateMessages.setEnabled(enabled); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/BaseThreadItemViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/BaseThreadItemViewHolder.java index 0532e6a95..dc21378d6 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/BaseThreadItemViewHolder.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/BaseThreadItemViewHolder.java @@ -4,10 +4,8 @@ import android.animation.Animator; import android.animation.ArgbEvaluator; import android.animation.ValueAnimator; import android.content.Context; -import android.graphics.drawable.ColorDrawable; import android.support.annotation.CallSuper; import android.support.annotation.UiThread; -import android.support.v4.content.ContextCompat; import android.support.v7.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; @@ -20,6 +18,8 @@ import org.briarproject.briar.R; import org.briarproject.briar.android.threaded.ThreadItemAdapter.ThreadItemListener; import org.briarproject.briar.android.view.AuthorView; +import static android.support.v4.content.ContextCompat.getColor; + @UiThread @NotNullByDefault public abstract class BaseThreadItemViewHolder @@ -61,10 +61,9 @@ public abstract class BaseThreadItemViewHolder private void animateFadeOut() { setIsRecyclable(false); ValueAnimator anim = new ValueAnimator(); - ColorDrawable viewColor = new ColorDrawable(ContextCompat - .getColor(getContext(), R.color.forum_cell_highlight)); - anim.setIntValues(viewColor.getColor(), ContextCompat - .getColor(getContext(), R.color.window_background)); + int viewColor = getColor(getContext(), R.color.thread_item_highlight); + anim.setIntValues(viewColor, + getColor(getContext(), R.color.window_background)); anim.setEvaluator(new ArgbEvaluator()); anim.setInterpolator(new AccelerateInterpolator()); anim.addListener(new Animator.AnimatorListener() { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java index 4c0e145dc..2d30f5c8d 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/threaded/ThreadListActivity.java @@ -286,6 +286,7 @@ public abstract class ThreadListActivity 0) ui.editText.setMaxLines(maxLines); if (fillHeight) { - LinearLayout layout = findViewById(R.id.input_layout); + ViewGroup layout = findViewById(R.id.input_layout); LayoutParams params = (LayoutParams) layout.getLayoutParams(); params.height = 0; params.weight = 1; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TrustIndicatorView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TrustIndicatorView.java index 918755eb6..3aac50e9b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/view/TrustIndicatorView.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TrustIndicatorView.java @@ -38,7 +38,7 @@ public class TrustIndicatorView extends ImageView { res = R.drawable.trust_indicator_verified; break; case OURSELVES: - res = R.drawable.ic_our_identity_black; + res = R.drawable.ic_our_identity; break; default: res = R.drawable.trust_indicator_unknown; diff --git a/briar-android/src/main/java/org/thoughtcrime/securesms/components/RepeatableImageKey.java b/briar-android/src/main/java/org/thoughtcrime/securesms/components/RepeatableImageKey.java index 453f82f8c..51e740186 100644 --- a/briar-android/src/main/java/org/thoughtcrime/securesms/components/RepeatableImageKey.java +++ b/briar-android/src/main/java/org/thoughtcrime/securesms/components/RepeatableImageKey.java @@ -2,11 +2,11 @@ package org.thoughtcrime.securesms.components; import android.content.Context; import android.support.annotation.UiThread; +import android.support.v7.widget.AppCompatImageButton; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; import android.view.ViewConfiguration; -import android.widget.ImageButton; import static android.view.HapticFeedbackConstants.KEYBOARD_TAP; import static android.view.MotionEvent.ACTION_CANCEL; @@ -14,7 +14,7 @@ import static android.view.MotionEvent.ACTION_DOWN; import static android.view.MotionEvent.ACTION_UP; @UiThread -public class RepeatableImageKey extends ImageButton { +public class RepeatableImageKey extends AppCompatImageButton { private KeyEventListener listener; diff --git a/briar-android/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java b/briar-android/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java index 7ba1810f9..d54f4cbca 100644 --- a/briar-android/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java +++ b/briar-android/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java @@ -1,10 +1,13 @@ package org.thoughtcrime.securesms.components.emoji; import android.content.Context; +import android.content.res.ColorStateList; import android.support.annotation.NonNull; import android.support.annotation.UiThread; +import android.support.v4.content.ContextCompat; import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager; +import android.support.v7.widget.AppCompatImageView; import android.util.AttributeSet; import android.view.KeyEvent; import android.view.LayoutInflater; @@ -26,6 +29,7 @@ import java.util.logging.Logger; import javax.annotation.Nullable; +import static android.support.v4.widget.ImageViewCompat.setImageTintList; import static android.view.KeyEvent.ACTION_DOWN; import static android.view.KeyEvent.KEYCODE_DEL; import static android.widget.ImageView.ScaleType.CENTER_INSIDE; @@ -142,8 +146,10 @@ public class EmojiDrawer extends LinearLayout { return pages.size(); } + @NonNull @Override - public Object instantiateItem(ViewGroup container, int position) { + public Object instantiateItem(@NonNull ViewGroup container, + int position) { EmojiPageView page = new EmojiPageView(context); page.setModel(pages.get(position)); page.setEmojiSelectedListener(listener); @@ -152,21 +158,24 @@ public class EmojiDrawer extends LinearLayout { } @Override - public void destroyItem(ViewGroup container, int position, - Object object) { + public void destroyItem(@NonNull ViewGroup container, int position, + @NonNull Object object) { container.removeView((View) object); } @Override - public boolean isViewFromObject(View view, Object object) { + public boolean isViewFromObject(@NonNull View view, + @NonNull Object object) { return view == object; } @Override public View getCustomTabView(ViewGroup viewGroup, int i) { - ImageView image = new ImageView(context); + ImageView image = new AppCompatImageView(context); image.setScaleType(CENTER_INSIDE); image.setImageResource(pages.get(i).getIcon()); + setImageTintList(image, ColorStateList.valueOf( + ContextCompat.getColor(context, R.color.color_primary))); return image; } diff --git a/briar-android/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java b/briar-android/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java index 75e79bb27..5858af0a7 100644 --- a/briar-android/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java +++ b/briar-android/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java @@ -4,8 +4,8 @@ import android.content.Context; import android.graphics.drawable.Drawable; import android.support.annotation.UiThread; import android.support.v4.content.ContextCompat; +import android.support.v7.widget.AppCompatImageButton; import android.util.AttributeSet; -import android.widget.ImageButton; import org.briarproject.briar.R; import org.thoughtcrime.securesms.components.emoji.EmojiDrawer.EmojiDrawerListener; @@ -13,7 +13,8 @@ import org.thoughtcrime.securesms.components.emoji.EmojiDrawer.EmojiDrawerListen import javax.annotation.Nullable; @UiThread -public class EmojiToggle extends ImageButton implements EmojiDrawerListener { +public class EmojiToggle extends AppCompatImageButton + implements EmojiDrawerListener { private final Drawable emojiToggle; private final Drawable imeToggle; @@ -33,7 +34,7 @@ public class EmojiToggle extends ImageButton implements EmojiDrawerListener { emojiToggle = ContextCompat .getDrawable(getContext(), R.drawable.ic_emoji_toggle); imeToggle = ContextCompat - .getDrawable(getContext(), R.drawable.ic_keyboard_black); + .getDrawable(getContext(), R.drawable.ic_keyboard); setToEmoji(); } diff --git a/briar-android/src/main/res/drawable-night-hdpi/msg_in.9.png b/briar-android/src/main/res/drawable-night-hdpi/msg_in.9.png new file mode 100644 index 0000000000000000000000000000000000000000..008d7833b1e82d1c4a3a0712bd0950f98d67dbef GIT binary patch literal 1990 zcmV;%2RZnOP)002P<1^@s7?$T)*00006VoOIv0RI60 z0RN!9r;`8x2YX3GK~#9!?OV%hT}2rG&75-|?M*@@O)C+x5+jW++Lf)LppjaRZn_Xs z#EsypJ0A=253soFsvx*<--Y6CnqFwY(k=ukgmz^`3TbUI)V!MeIOmLu%*5}`o%6am z=QcOVz;I5;xx+WV`5wRTn;FI!Lz?EQXU+4xwWyDT5S*)bDTH_{X27ivp8>chgm^ph zOZ^gt;W~i75S^yq*;S`1;7-N!xxb+0! zDBL*GH>oD=0|>Q-I{<0`4tt*W2QoGx#0vmcv=lyoH2_b95U<85c|nw z04xY0CbCM%l~Ph*LjVmWX|}=Ax{ox?y5xM*a7F;U2;hiX9A;U`bpTHQ{0(3w&d#_t zG0Q+!)nI9-DW#N2AM5|8k;2vj(xt0@?0TNJN*q%bg&hH~0l?RK#)S~C_`ZLyheaG# zGXixgt$Mxw(a6Zi_ZbJP0&t|1lB*T*)iN(#y?XVE@B5!-7|b!9lvKWE8Nj1@z5ZLh zUiY%j*EMve4PXTT_kF*b*_Y?gB>7o9=Yl%f=0M&En&fVplA4VUV5MoRz zSxX5hxn(920OscAP6;7SG#ZV$KFC&6fNZS}b=ex$mNJc104wwJ^Ir)erjH#v_Dz9; zm8eir!Jg_`S=snO07C#qCMG71OioVzlJio&uHx7lfTonv=P{h7t-{F)fPVly2JrCy z{ri6kA0EV|GRUV2 z;;e_%mqk2tr9CXqoLt2@J#a3$eV!=fN)VYvS6D#;QT?J+tAiX;a<5q{6);cM8j{q| zC-GNWsr1au%qNvf<%fQGbX8aDK#-!q0XR2q-1zC@#fu;IG144Revnh9YK9Sh{`~p7 zK@gnjlTcNovc!0l@?F1veQ9A~VY&}Om5DR9a{7Sss>Q{{XNrv$Nn<)tGMR&!Z0H!Z zA%vI-!*HV@p&ZloaAWCo&}=FmzoxRF)w#L34}9N$*l&(S1#20CtpHf5*XtiQ8jauk zP5h{1(=?+4vHAJ=FPE2>e|{cpl+p`|*cyQK+qZ9Dd0uIlPPcr6@RiU*fjKXsK!PQR zo)w;gC31FBR}G1E289Zhl&o3|AS^nQ?j^e^JW=gsi)wFX&ig{`DWPc4&Z`Ax(S!FW zke{PazA0E@hOBmdboy1n{~I&>xvfX&7CHIz)f7=&Ak^BrG^qh?-*q{ z17Wh;hKZJ&arr_LjHQ}c);(@%as9 zNy8~o=VW_Fl5e2pJqCcEJ$v>G*L5%LW>Zv0vH~M*>jKQIshcHi9p~KX>FM`}hlhV; zjMa7_SVu_0-Equ?0>>kKmU%eDxpnK-uh*_!n;IVUbK$~;@1&Ie z0OI9X@{q1G%~6Mox}u_?WhJ6%WvXca%CobxZ$5qc^jpVq4h@KAoltr522loTilLM; z_Mm``Z&CAf(OKZ`0`BC=lSfBKM=zC1rPp=?SV@PlY}q9<%v0NUlYrF(P`PvGP7AW~{X&BkDzE}l*775I-;M?r z)!ZI`M?nh+aJFs&yyw8$0!>wQZCQJisqR^@bb)O%cj8UXalx=?Zx_Hwbt^+8(0&WQ8s* z(JDg=-4}7JH)@OUPl4rceQcLrC#L0GUZ77hT>=HBZAr~Kw975fUuj=p*7Hp*%6cU$ zFCQ9OzzgI2R#DlGxwXF&jsf(teP5{0G66H+(;PPGCzXkNcF_p84?@|v%T6i+rcUzz Y19*jy?~GIQApigX07*qoM6N<$f(z553jhEB literal 0 HcmV?d00001 diff --git a/briar-android/src/main/res/drawable-night-hdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-night-hdpi/msg_in_top.9.png new file mode 100644 index 0000000000000000000000000000000000000000..4d34c50659e80df651b330f5302aae551170b7f2 GIT binary patch literal 1600 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 literal 0 HcmV?d00001 diff --git a/briar-android/src/main/res/drawable-night-mdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-night-mdpi/msg_in_top.9.png new file mode 100644 index 0000000000000000000000000000000000000000..ebad24e9f486147a8e13530ab92f20e84ac131d2 GIT binary patch literal 1177 zcmV;K1ZMk*P)%x1>nL97ZOWsRb=fEZ5 zy?5@p=j(UQxkN-5Mh*ZR92~rNczAfmUq~rk(wqyWQfYfHK7G zE11m4eo5mFRPa2nZ@-XIk^taKDJ%9%rIZo?6oAKZ+Y0kx++oatasUbd@{GZz2!Icu z4rwuGTSvq?C7+Qf;%l58#iBi;Ewml&@nn30TKc`WTl;Kyms6V|W5? zoLEvyskjdeS6*Ax86`!l5jX${z=G#_?Q!}@DPIO~X}lguDeon)!y*7OOjiK@lv3Uw z!{ity00;s64dAhq@|{V{9s=kBXiw@Z6_-Ux9IQrsuZBtLk6`Kpc*@~qEwJB7NU>kO zz*8)@ySw|Y>$=|~Ba%{<01UKqB5n>kIXU@JO8J@);)9Ij-33rIW;bRe{U8ru0YC}B za-~vvWn*Kbomap$eAdG83WC)#=`u_Q)u%i<>z5fmZmd74wGLw{Y>aZ zQwTCa6|jho9Hvcfe}DgXB3jM}o|bj=`nH*J)oS(4D2jf|DA-(GsRb`}*FLM&YCB;V z{+fZHJIoCbER0Pk2S-Oo4}IVNIi;Wi6GV0$HrRJnuh&27^?K(i1UWpQ1nUz+jdTC# zj-h>geEdnb+pSG0h=!qq5!PoN#^veh=@*?&=bNly$kyx$fG1~XXJ5?%@3^p@7ML2z zhn0+oW%s}&-K-Fthkf|JsY?QLqNIXUijpz&DtldFlLmu{yh&+bm-9prlA`KnL243r zIxz>P5eq2?lC0X0r&<#0|1*s;vGzo;w#EDst28tR#gv6pyiD8A5Z8B+rIfR`xA%aE zz9phEZV^c-%Np^02FTZni6J>70OV@5+Aq~=^+CB@-VMXBd5iRN^~71Q`;@p=oOGC( zPPw305x~Os_V%lbi;G|9^Z9!>?5TCu2=G}lR7xo)21z33HJ>YdetzBp@Zs9p+H$2* z`Lb9nzI{V_IeO({KrC`%kS2;r(2%X5(P;RMM&sj^m6fIS_4UtP*L{D^O66hzi$+}& zDE)!5+A%Z57qr`Ztyb%*)oOj_IL@7|t*uX&mX;pghJ+h8N86}q@-46Ptf)sMvs};f zzMDf%-PfZ7&nsW&ROlqE6J)hAVa$rAY}#g$aFY~4 rrNy4BKtnEeW>x7E3sXu>J*)i-n*__;ti%aA00000NkvXXu0mjfY`-)n literal 0 HcmV?d00001 diff --git a/briar-android/src/main/res/drawable-night-xhdpi/msg_in.9.png b/briar-android/src/main/res/drawable-night-xhdpi/msg_in.9.png new file mode 100644 index 0000000000000000000000000000000000000000..13597cfa4ea0bdb67d162cfdd7cc06ef3381272f GIT binary patch literal 2835 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 LNkvXXu0mjfuN7=Q literal 0 HcmV?d00001 diff --git a/briar-android/src/main/res/drawable-night-xxhdpi/msg_in.9.png b/briar-android/src/main/res/drawable-night-xxhdpi/msg_in.9.png new file mode 100644 index 0000000000000000000000000000000000000000..cef3f185e0daca7c700b160dd38f313909a9eaf4 GIT binary patch literal 3885 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 literal 0 HcmV?d00001 diff --git a/briar-android/src/main/res/drawable-night-xxhdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-night-xxhdpi/msg_in_top.9.png new file mode 100644 index 0000000000000000000000000000000000000000..60ea93838e90612c838e4974865aaa917c448738 GIT binary patch literal 3084 zcmV+n4D<7eP)*L zJ_I6PfGC7KWQflO^ZF7cTgTbwwND5XzQF#0d_oEembmlYo%eR9n?J5+ueZ0mr{}S= zJF`{NXvTZ%zPexky1J^SriL-bpe~8knXBtqU5EY#2>@etq?5stBpH^~2oXOG07qQ? zn<3(b3V-3J03gZ+O95brh%c8M>^T5n*1aZX0pJJ#{!?;2;Ad&s&wIoT7N}8Vw0B`^RC)osWMEr8eN&K8{H6#Fx0N@xAFO?YV zc?A>bgB<|C$B6iy66R;h1W5oG0>J+O;NOV&-AbetLg)j2jEFy|YR@D9oB+T;9hL2w zP|KrM6C}HDf@A^A#%hg1kO?x)PlyR(n#EuRtVdOm+A*2+W^GNKBhABNb5JIu z^GG*~nQ6=vipq=@(uB7VI=-Cj@@Hrqp3tSOcn z*JI_Qy^tiyKjy5MNt+4B^re{1`$^`aHK^cBIAI#?G3Q)Y@E8CFi1<|iIG-fR-{!5D z(<%xfq;hPB0B{HZ`vC9+0G=S?YmFo3L69l*o~dIoh~*eUu}q3JDxFcx+}Gx{Ul!(= zQ2Scl>)#1VcHl(TvNZyFE?0J5$%DyJH^nQcxN$kI)VoYv^#z-HEl$ zl+8)0)Z&9#k&2TfIcVAxAmV4W#guY`PZ1)1aRDZ3L(LG^6KvAZ{3{JB^_=E+O+xMo zbebc0sX?W5{!SUtOsSDFWM&j##tJi;$aoH2r`9kc zzEY;1t|hV#v$YCS6``?XyAPKm(kx)4|d z7J)@z5m+7C0h5vI zzwKc@)}m!;W0HW`YJOp{U*PhyY(;EY+pGv?izZwwTUM|#_UN@)sl}UTCNo|2SquR9 z)vH(ETw7cF`6>j-i1>L2xD%Ffk3Yq>wzl3HjYe;;NK(ODZluSC%&`;lt*xzJ4Tr;D zuK-xF$HYv)vUaA?S+>2s{qFJc@dqmememgP0LM)N0NlTS|NWz*qu+EGtO)Fn?gxQ2 zbL{NwTptVuH#!Vf9yNFHF>4mnhS-5d-Ce_ScB3IL{qbpimxUaz;=CBTAjsh0%oq}S`+ z8V-klS}Cvs0GsjfvtxUE`}abKzpNBkB>v$yB3WFJ46eQ^A>Sc_EeENjBh!(0W)70c5FabF9TY2ZUB<$Z%%4cU zYA5e|(>&MCtqr?=F_>llgoso7I|-=GwJuZ$?q{3!2AniRy`Edn0B>B<`_X6O!?O zbb|GDqj&G#{UsuPW;7bTMbptK$@+(7-JWcXjB-2i@c?V(v|4c5gY0cY{K9ZJe23BmQ(uu{ta-yLLk&FauUmSEunnUazf6%y}gh6{r+u5uy4~;E*-Hp!JjC# zW#Ds(RhC?NHzjAXz}qCpO5A8 zw`^Tf%$_{9PEaSd^X~5MCL+GR3T;hWB({{2*IAz#Ag6+qd48FG%`NB1a*m9s!_1e& zmoH!b+4=M5e@b(^7(v8KFx?i;Y~p41shZg`rIaGHG?@rS#F`7Sh+sslxe{v;1d9P6 zB7&_3v4~(qtho{kgb=_vuajW0c8-j5tZk8R5WzZ5tW4%Wu*gC#on-NqD_7n)ckbLz zh!V?1tXdz17D7lz(_6Fj)z)Hp1opQ%OueMQ{Jhue-9*G6cBK!0S7a^?2`UoImRy~A zxt4isZ*Sj1#2=5x<3H21E?#Qg3Z3jNw?*0XqUl}SRv0&-Y-YU_!EA;2 zx@BXAl{4QuoL3JDp}kz`dY zRsn)dzTzQM>L66Ad@zzl601o|Rgz$~r*Sh9xk{o1O>GC$4OIyS{`z`fj{%)vBt$GL zxonO+c*sN%A`z>QI9ui9{EUQ%RVxX}ViB=Oh*%^fL@W{_76}oHgoKDiLc}5=Vv&## zu}FwmBt$F{62CCUTKy7jx*xd2nDdtYakh?fk_cBjfr2~ub!{tj0YHU*}O@RVS8kVC>;z*LlIc(Fq(Bd>)*uU_?DbXHNz1(e0000 + + + + + + \ No newline at end of file diff --git a/briar-android/src/main/res/drawable-night/contact_disconnected.xml b/briar-android/src/main/res/drawable-night/contact_disconnected.xml new file mode 100644 index 000000000..60c5f829c --- /dev/null +++ b/briar-android/src/main/res/drawable-night/contact_disconnected.xml @@ -0,0 +1,9 @@ + + + diff --git a/briar-android/src/main/res/drawable-night/ic_our_identity.xml b/briar-android/src/main/res/drawable-night/ic_our_identity.xml new file mode 100644 index 000000000..685ad6b8c --- /dev/null +++ b/briar-android/src/main/res/drawable-night/ic_our_identity.xml @@ -0,0 +1,9 @@ + + + diff --git a/briar-android/src/main/res/drawable-night/qr_code_explanation.xml b/briar-android/src/main/res/drawable-night/qr_code_explanation.xml new file mode 100644 index 000000000..433179877 --- /dev/null +++ b/briar-android/src/main/res/drawable-night/qr_code_explanation.xml @@ -0,0 +1,28 @@ + + + + + + + + + + diff --git a/briar-android/src/main/res/drawable-night/splash_screen.xml b/briar-android/src/main/res/drawable-night/splash_screen.xml new file mode 100644 index 000000000..b1904b003 --- /dev/null +++ b/briar-android/src/main/res/drawable-night/splash_screen.xml @@ -0,0 +1,71 @@ + + + + + + + + + \ No newline at end of file diff --git a/briar-android/src/main/res/drawable/action_delete_black.xml b/briar-android/src/main/res/drawable/action_delete_black.xml index 814d0993f..2cedb57ff 100644 --- a/briar-android/src/main/res/drawable/action_delete_black.xml +++ b/briar-android/src/main/res/drawable/action_delete_black.xml @@ -1,7 +1,6 @@ + android:color="@color/color_primary"/> \ No newline at end of file diff --git a/briar-android/src/main/res/drawable/bubble_white.xml b/briar-android/src/main/res/drawable/bubble_white.xml index 21d0e8e15..bb79ab2fa 100644 --- a/briar-android/src/main/res/drawable/bubble_white.xml +++ b/briar-android/src/main/res/drawable/bubble_white.xml @@ -14,4 +14,3 @@ android:width="1dp"/> - diff --git a/briar-android/src/main/res/drawable/contact_connected.xml b/briar-android/src/main/res/drawable/contact_connected.xml index fc0426085..a53142509 100644 --- a/briar-android/src/main/res/drawable/contact_connected.xml +++ b/briar-android/src/main/res/drawable/contact_connected.xml @@ -1,26 +1,26 @@ + android:width="24dp" + android:height="24dp" + android:alpha="0.56" + android:viewportHeight="24" + android:viewportWidth="24"> +C7.58,20,4,16.42,4,12 S7.58,4,12,4 S20,7.58,20,12 S16.42,20,12,20 Z"/> + android:pathData="M0,0 L24,0 L24,24 L0,24 Z"/> - \ No newline at end of file +C16.4904,19.1779,13.581,20.3215,10.8973,19.9503 Z" + android:strokeLineCap="round" + android:strokeLineJoin="round" + android:strokeWidth="0.76779664"/> + diff --git a/briar-android/src/main/res/drawable/contact_disconnected.xml b/briar-android/src/main/res/drawable/contact_disconnected.xml index 76c100237..c1a088235 100644 --- a/briar-android/src/main/res/drawable/contact_disconnected.xml +++ b/briar-android/src/main/res/drawable/contact_disconnected.xml @@ -1,5 +1,10 @@ - - + + diff --git a/briar-android/src/main/res/drawable/ic_backspace_black.xml b/briar-android/src/main/res/drawable/ic_backspace.xml similarity index 94% rename from briar-android/src/main/res/drawable/ic_backspace_black.xml rename to briar-android/src/main/res/drawable/ic_backspace.xml index b0224405a..e4ecae7b1 100644 --- a/briar-android/src/main/res/drawable/ic_backspace_black.xml +++ b/briar-android/src/main/res/drawable/ic_backspace.xml @@ -1,7 +1,6 @@ \ No newline at end of file diff --git a/briar-android/src/main/res/drawable/ic_emoji_animals_nature.xml b/briar-android/src/main/res/drawable/ic_emoji_animals_nature.xml index d63c31365..29b9c0c45 100644 --- a/briar-android/src/main/res/drawable/ic_emoji_animals_nature.xml +++ b/briar-android/src/main/res/drawable/ic_emoji_animals_nature.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/briar-android/src/main/res/drawable/ic_emoji_emoticons.xml b/briar-android/src/main/res/drawable/ic_emoji_emoticons.xml index cb97f4e15..262be839f 100644 --- a/briar-android/src/main/res/drawable/ic_emoji_emoticons.xml +++ b/briar-android/src/main/res/drawable/ic_emoji_emoticons.xml @@ -6,7 +6,7 @@ android:viewportWidth="24"> diff --git a/briar-android/src/main/res/drawable/ic_emoji_food_drink.xml b/briar-android/src/main/res/drawable/ic_emoji_food_drink.xml index 958664070..625a7c12b 100644 --- a/briar-android/src/main/res/drawable/ic_emoji_food_drink.xml +++ b/briar-android/src/main/res/drawable/ic_emoji_food_drink.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/briar-android/src/main/res/drawable/ic_emoji_objects.xml b/briar-android/src/main/res/drawable/ic_emoji_objects.xml index 70f0ec6ea..7b15232cf 100644 --- a/briar-android/src/main/res/drawable/ic_emoji_objects.xml +++ b/briar-android/src/main/res/drawable/ic_emoji_objects.xml @@ -4,6 +4,6 @@ android:viewportHeight="24" android:viewportWidth="24"> \ No newline at end of file diff --git a/briar-android/src/main/res/drawable/ic_emoji_recent.xml b/briar-android/src/main/res/drawable/ic_emoji_recent.xml index 3f891e2e4..fc0081fc7 100644 --- a/briar-android/src/main/res/drawable/ic_emoji_recent.xml +++ b/briar-android/src/main/res/drawable/ic_emoji_recent.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/briar-android/src/main/res/drawable/ic_emoji_smiley_people.xml b/briar-android/src/main/res/drawable/ic_emoji_smiley_people.xml index 12dfdcd2e..8af140980 100644 --- a/briar-android/src/main/res/drawable/ic_emoji_smiley_people.xml +++ b/briar-android/src/main/res/drawable/ic_emoji_smiley_people.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/briar-android/src/main/res/drawable/ic_emoji_symbols.xml b/briar-android/src/main/res/drawable/ic_emoji_symbols.xml index 28d8ff8cf..524912968 100644 --- a/briar-android/src/main/res/drawable/ic_emoji_symbols.xml +++ b/briar-android/src/main/res/drawable/ic_emoji_symbols.xml @@ -4,6 +4,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/briar-android/src/main/res/drawable/ic_emoji_toggle.xml b/briar-android/src/main/res/drawable/ic_emoji_toggle.xml index b497d47fd..32324f57b 100644 --- a/briar-android/src/main/res/drawable/ic_emoji_toggle.xml +++ b/briar-android/src/main/res/drawable/ic_emoji_toggle.xml @@ -1,7 +1,6 @@ diff --git a/briar-android/src/main/res/drawable/ic_forums_black_24dp.xml b/briar-android/src/main/res/drawable/ic_forums_black_24dp.xml index 039f929dd..5bb4d8ebc 100644 --- a/briar-android/src/main/res/drawable/ic_forums_black_24dp.xml +++ b/briar-android/src/main/res/drawable/ic_forums_black_24dp.xml @@ -1,7 +1,6 @@ - - diff --git a/briar-android/src/main/res/drawable/ic_keyboard_black.xml b/briar-android/src/main/res/drawable/ic_keyboard.xml similarity index 95% rename from briar-android/src/main/res/drawable/ic_keyboard_black.xml rename to briar-android/src/main/res/drawable/ic_keyboard.xml index f1f26791a..dfcb91016 100644 --- a/briar-android/src/main/res/drawable/ic_keyboard_black.xml +++ b/briar-android/src/main/res/drawable/ic_keyboard.xml @@ -1,7 +1,6 @@ - + diff --git a/briar-android/src/main/res/drawable/list_item_thread_background.xml b/briar-android/src/main/res/drawable/list_item_thread_background.xml index c47b28c76..40891618b 100644 --- a/briar-android/src/main/res/drawable/list_item_thread_background.xml +++ b/briar-android/src/main/res/drawable/list_item_thread_background.xml @@ -3,9 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - \ No newline at end of file diff --git a/briar-android/src/main/res/drawable/message_delivered.xml b/briar-android/src/main/res/drawable/message_delivered.xml index 414c707b6..885356268 100644 --- a/briar-android/src/main/res/drawable/message_delivered.xml +++ b/briar-android/src/main/res/drawable/message_delivered.xml @@ -1,5 +1,9 @@ - - + + diff --git a/briar-android/src/main/res/drawable/message_sent.xml b/briar-android/src/main/res/drawable/message_sent.xml index 37dd9ca84..a205b178d 100644 --- a/briar-android/src/main/res/drawable/message_sent.xml +++ b/briar-android/src/main/res/drawable/message_sent.xml @@ -1,5 +1,9 @@ - - + + diff --git a/briar-android/src/main/res/drawable/message_stored.xml b/briar-android/src/main/res/drawable/message_stored.xml index d687ff520..f1a1a31b0 100644 --- a/briar-android/src/main/res/drawable/message_stored.xml +++ b/briar-android/src/main/res/drawable/message_stored.xml @@ -1,5 +1,9 @@ - - + + diff --git a/briar-android/src/main/res/drawable/social_send_now_white.xml b/briar-android/src/main/res/drawable/social_send_now_white.xml index 29d5069d5..9c8a759a3 100644 --- a/briar-android/src/main/res/drawable/social_send_now_white.xml +++ b/briar-android/src/main/res/drawable/social_send_now_white.xml @@ -1,6 +1,6 @@ - + + diff --git a/briar-android/src/main/res/drawable/transport_lan.xml b/briar-android/src/main/res/drawable/transport_lan.xml index ad12a9625..60844d4d4 100644 --- a/briar-android/src/main/res/drawable/transport_lan.xml +++ b/briar-android/src/main/res/drawable/transport_lan.xml @@ -1,6 +1,13 @@ - - - + + + diff --git a/briar-android/src/main/res/drawable/transport_tor.xml b/briar-android/src/main/res/drawable/transport_tor.xml index 9084ddbad..ce8f0060f 100644 --- a/briar-android/src/main/res/drawable/transport_tor.xml +++ b/briar-android/src/main/res/drawable/transport_tor.xml @@ -1,5 +1,9 @@ - - + + diff --git a/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml b/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml index 2c98d2974..c1f5cb114 100644 --- a/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml +++ b/briar-android/src/main/res/layout-land/fragment_keyagreement_id.xml @@ -46,7 +46,6 @@ + android:layout_weight="1"/> \ No newline at end of file diff --git a/briar-android/src/main/res/layout/activity_dev_report.xml b/briar-android/src/main/res/layout/activity_dev_report.xml index fc9e649ce..ab17da50e 100644 --- a/briar-android/src/main/res/layout/activity_dev_report.xml +++ b/briar-android/src/main/res/layout/activity_dev_report.xml @@ -6,9 +6,11 @@ android:layout_height="match_parent"> @@ -112,11 +114,10 @@ android:id="@+id/request_report" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/window_background" android:clickable="true" android:gravity="center" android:padding="@dimen/margin_large" - android:visibility="gone"> + android:visibility="invisible">