From 2e43a5c0a6176911f0ab86b3c55dd57845b45f30 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Fri, 13 Apr 2018 23:33:56 +0200 Subject: more theme working --- .../de/pixart/messenger/services/AudioPlayer.java | 3 +- .../java/de/pixart/messenger/ui/AboutActivity.java | 15 +++- .../messenger/ui/ContactDetailsActivity.java | 10 ++- .../de/pixart/messenger/ui/RecordingActivity.java | 30 +++++++- .../de/pixart/messenger/ui/SettingsActivity.java | 21 ++++-- .../pixart/messenger/ui/ShareLocationActivity.java | 2 - .../java/de/pixart/messenger/ui/XmppActivity.java | 15 ++-- .../messenger/ui/adapter/ConversationAdapter.java | 4 +- .../messenger/ui/adapter/ListItemAdapter.java | 6 +- .../messenger/ui/adapter/MessageAdapter.java | 64 +++++++++------- .../res/drawable-hdpi/ic_attachment_white_24dp.png | Bin 0 -> 792 bytes .../drawable-hdpi/ic_help_circle_white_24dp.png | Bin 0 -> 966 bytes src/main/res/drawable-hdpi/ic_image_white_24dp.png | Bin 0 -> 649 bytes src/main/res/drawable-hdpi/ic_lock_black_18dp.png | Bin 0 -> 363 bytes src/main/res/drawable-hdpi/ic_lock_blue_18dp.png | Bin 718 -> 0 bytes src/main/res/drawable-hdpi/ic_lock_white_18dp.png | Bin 0 -> 362 bytes .../res/drawable-hdpi/ic_mode_edit_black_18dp.png | Bin 0 -> 285 bytes .../res/drawable-hdpi/ic_mode_edit_blue_18dp.png | Bin 376 -> 0 bytes .../res/drawable-hdpi/ic_mode_edit_white_18dp.png | Bin 0 -> 291 bytes src/main/res/drawable-hdpi/ic_pause_black_36dp.png | Bin 126 -> 148 bytes src/main/res/drawable-hdpi/ic_pause_white_36dp.png | Bin 121 -> 149 bytes .../res/drawable-hdpi/ic_play_arrow_black_36dp.png | Bin 209 -> 236 bytes .../res/drawable-hdpi/ic_play_arrow_white_36dp.png | Bin 211 -> 242 bytes .../res/drawable-hdpi/ic_security_white_24dp.png | Bin 0 -> 846 bytes .../drawable-hdpi/ic_verified_user_black_18dp.png | Bin 0 -> 471 bytes .../drawable-hdpi/ic_verified_user_blue_18dp.png | Bin 840 -> 0 bytes .../drawable-hdpi/ic_verified_user_white_18dp.png | Bin 0 -> 488 bytes .../res/drawable-mdpi/ic_attachment_white_24dp.png | Bin 0 -> 584 bytes .../drawable-mdpi/ic_help_circle_white_24dp.png | Bin 0 -> 656 bytes src/main/res/drawable-mdpi/ic_image_white_24dp.png | Bin 0 -> 506 bytes src/main/res/drawable-mdpi/ic_lock_black_18dp.png | Bin 0 -> 225 bytes src/main/res/drawable-mdpi/ic_lock_blue_18dp.png | Bin 492 -> 0 bytes src/main/res/drawable-mdpi/ic_lock_white_18dp.png | Bin 0 -> 229 bytes .../res/drawable-mdpi/ic_mode_edit_black_18dp.png | Bin 0 -> 166 bytes .../res/drawable-mdpi/ic_mode_edit_blue_18dp.png | Bin 229 -> 0 bytes .../res/drawable-mdpi/ic_mode_edit_white_18dp.png | Bin 0 -> 171 bytes src/main/res/drawable-mdpi/ic_pause_black_36dp.png | Bin 103 -> 117 bytes src/main/res/drawable-mdpi/ic_pause_white_36dp.png | Bin 106 -> 119 bytes .../res/drawable-mdpi/ic_play_arrow_black_36dp.png | Bin 166 -> 194 bytes .../res/drawable-mdpi/ic_play_arrow_white_36dp.png | Bin 169 -> 195 bytes .../res/drawable-mdpi/ic_security_white_24dp.png | Bin 0 -> 637 bytes .../drawable-mdpi/ic_verified_user_black_18dp.png | Bin 0 -> 262 bytes .../drawable-mdpi/ic_verified_user_blue_18dp.png | Bin 556 -> 0 bytes .../drawable-mdpi/ic_verified_user_white_18dp.png | Bin 0 -> 270 bytes .../drawable-xhdpi/ic_attachment_white_24dp.png | Bin 0 -> 801 bytes .../drawable-xhdpi/ic_help_circle_white_24dp.png | Bin 0 -> 1109 bytes .../res/drawable-xhdpi/ic_image_white_24dp.png | Bin 0 -> 731 bytes src/main/res/drawable-xhdpi/ic_lock_black_18dp.png | Bin 0 -> 342 bytes src/main/res/drawable-xhdpi/ic_lock_blue_18dp.png | Bin 863 -> 0 bytes src/main/res/drawable-xhdpi/ic_lock_white_18dp.png | Bin 0 -> 342 bytes .../res/drawable-xhdpi/ic_mode_edit_black_18dp.png | Bin 0 -> 223 bytes .../res/drawable-xhdpi/ic_mode_edit_blue_18dp.png | Bin 330 -> 0 bytes .../res/drawable-xhdpi/ic_mode_edit_white_18dp.png | Bin 0 -> 232 bytes .../res/drawable-xhdpi/ic_pause_black_36dp.png | Bin 133 -> 156 bytes .../res/drawable-xhdpi/ic_pause_white_36dp.png | Bin 149 -> 155 bytes .../drawable-xhdpi/ic_play_arrow_black_36dp.png | Bin 251 -> 265 bytes .../drawable-xhdpi/ic_play_arrow_white_36dp.png | Bin 255 -> 283 bytes .../res/drawable-xhdpi/ic_security_white_24dp.png | Bin 0 -> 956 bytes .../drawable-xhdpi/ic_verified_user_black_18dp.png | Bin 0 -> 466 bytes .../drawable-xhdpi/ic_verified_user_blue_18dp.png | Bin 950 -> 0 bytes .../drawable-xhdpi/ic_verified_user_white_18dp.png | Bin 0 -> 475 bytes .../drawable-xxhdpi/ic_attachment_white_24dp.png | Bin 0 -> 1199 bytes .../drawable-xxhdpi/ic_help_circle_white_24dp.png | Bin 0 -> 1676 bytes .../res/drawable-xxhdpi/ic_image_white_24dp.png | Bin 0 -> 975 bytes .../res/drawable-xxhdpi/ic_lock_black_18dp.png | Bin 0 -> 650 bytes src/main/res/drawable-xxhdpi/ic_lock_blue_18dp.png | Bin 1438 -> 0 bytes .../res/drawable-xxhdpi/ic_lock_white_18dp.png | Bin 0 -> 657 bytes .../drawable-xxhdpi/ic_mode_edit_black_18dp.png | Bin 0 -> 444 bytes .../res/drawable-xxhdpi/ic_mode_edit_blue_18dp.png | Bin 599 -> 0 bytes .../drawable-xxhdpi/ic_mode_edit_white_18dp.png | Bin 0 -> 450 bytes .../res/drawable-xxhdpi/ic_pause_black_36dp.png | Bin 188 -> 247 bytes .../res/drawable-xxhdpi/ic_pause_white_36dp.png | Bin 220 -> 249 bytes .../drawable-xxhdpi/ic_play_arrow_black_36dp.png | Bin 323 -> 366 bytes .../drawable-xxhdpi/ic_play_arrow_white_36dp.png | Bin 328 -> 390 bytes .../res/drawable-xxhdpi/ic_security_white_24dp.png | Bin 0 -> 1338 bytes .../ic_verified_user_black_18dp.png | Bin 0 -> 842 bytes .../drawable-xxhdpi/ic_verified_user_blue_18dp.png | Bin 1662 -> 0 bytes .../ic_verified_user_white_18dp.png | Bin 0 -> 867 bytes .../drawable-xxxhdpi/ic_attachment_white_24dp.png | Bin 0 -> 1475 bytes .../drawable-xxxhdpi/ic_help_circle_white_24dp.png | Bin 0 -> 2216 bytes .../res/drawable-xxxhdpi/ic_image_white_24dp.png | Bin 0 -> 1210 bytes .../res/drawable-xxxhdpi/ic_lock_black_18dp.png | Bin 0 -> 643 bytes .../res/drawable-xxxhdpi/ic_lock_white_18dp.png | Bin 0 -> 649 bytes .../drawable-xxxhdpi/ic_mode_edit_black_18dp.png | Bin 0 -> 331 bytes .../drawable-xxxhdpi/ic_mode_edit_white_18dp.png | Bin 0 -> 345 bytes .../res/drawable-xxxhdpi/ic_pause_black_36dp.png | Bin 0 -> 364 bytes .../res/drawable-xxxhdpi/ic_pause_white_36dp.png | Bin 0 -> 365 bytes .../drawable-xxxhdpi/ic_play_arrow_black_36dp.png | Bin 0 -> 394 bytes .../drawable-xxxhdpi/ic_play_arrow_white_36dp.png | Bin 0 -> 461 bytes .../drawable-xxxhdpi/ic_security_white_24dp.png | Bin 0 -> 1707 bytes .../ic_verified_user_black_18dp.png | Bin 0 -> 772 bytes .../ic_verified_user_white_18dp.png | Bin 0 -> 807 bytes src/main/res/drawable/date_bubble.xml | 4 +- src/main/res/drawable/message_border.xml | 2 +- .../res/drawable/message_bubble_received_light.xml | 21 ++++++ .../drawable/message_bubble_received_lightred.xml | 21 ------ .../drawable/message_bubble_received_warning.xml | 21 ++++++ .../res/drawable/message_bubble_received_white.xml | 21 ------ src/main/res/drawable/message_bubble_sent_blue.xml | 21 ++++++ .../res/drawable/message_bubble_sent_light.xml | 21 ++++++ .../res/drawable/message_bubble_sent_lightblue.xml | 21 ------ .../res/drawable/message_bubble_sent_white.xml | 21 ------ .../res/drawable/rounded_rectangle_primary.xml | 2 +- src/main/res/layout/activity_about.xml | 8 +- src/main/res/layout/activity_contact_details.xml | 14 ++-- src/main/res/layout/activity_edit_account.xml | 12 +-- src/main/res/layout/activity_muc_details.xml | 11 +-- src/main/res/layout/activity_recording.xml | 26 +++---- src/main/res/layout/activity_set_presence.xml | 2 +- src/main/res/layout/activity_share_locaction.xml | 9 +-- src/main/res/layout/contact.xml | 2 +- src/main/res/layout/contact_key.xml | 4 +- src/main/res/layout/conversation_list_row.xml | 9 ++- src/main/res/layout/dialog_clear_history.xml | 2 +- src/main/res/layout/dialog_presence.xml | 4 +- src/main/res/layout/enter_jid_dialog.xml | 4 +- src/main/res/layout/fragment_conversation.xml | 25 ++++--- .../res/layout/fragment_conversations_overview.xml | 4 +- src/main/res/layout/join_conference_dialog.xml | 4 +- src/main/res/layout/magic_create.xml | 2 +- src/main/res/layout/message_content.xml | 6 +- src/main/res/layout/message_received.xml | 9 ++- src/main/res/layout/message_sent.xml | 9 ++- src/main/res/layout/message_status.xml | 2 +- src/main/res/layout/presence_template.xml | 2 +- src/main/res/layout/simple_list_item.xml | 5 +- src/main/res/layout/welcome.xml | 10 +-- src/main/res/values-de/strings.xml | 1 - src/main/res/values/arrays.xml | 9 +++ src/main/res/values/attrs.xml | 22 +++++- src/main/res/values/colors.xml | 11 ++- src/main/res/values/defaults.xml | 1 + src/main/res/values/strings.xml | 5 +- src/main/res/values/styles.xml | 11 ++- src/main/res/values/themes.xml | 81 ++++++++++++++++++++- src/main/res/xml/preferences.xml | 64 ++++++++-------- .../messenger/services/PushManagementService.java | 24 ------ 137 files changed, 459 insertions(+), 301 deletions(-) create mode 100644 src/main/res/drawable-hdpi/ic_attachment_white_24dp.png create mode 100644 src/main/res/drawable-hdpi/ic_help_circle_white_24dp.png create mode 100644 src/main/res/drawable-hdpi/ic_image_white_24dp.png create mode 100644 src/main/res/drawable-hdpi/ic_lock_black_18dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_lock_blue_18dp.png create mode 100644 src/main/res/drawable-hdpi/ic_lock_white_18dp.png create mode 100644 src/main/res/drawable-hdpi/ic_mode_edit_black_18dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_mode_edit_blue_18dp.png create mode 100644 src/main/res/drawable-hdpi/ic_mode_edit_white_18dp.png create mode 100644 src/main/res/drawable-hdpi/ic_security_white_24dp.png create mode 100644 src/main/res/drawable-hdpi/ic_verified_user_black_18dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_verified_user_blue_18dp.png create mode 100644 src/main/res/drawable-hdpi/ic_verified_user_white_18dp.png create mode 100644 src/main/res/drawable-mdpi/ic_attachment_white_24dp.png create mode 100644 src/main/res/drawable-mdpi/ic_help_circle_white_24dp.png create mode 100644 src/main/res/drawable-mdpi/ic_image_white_24dp.png create mode 100644 src/main/res/drawable-mdpi/ic_lock_black_18dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_lock_blue_18dp.png create mode 100644 src/main/res/drawable-mdpi/ic_lock_white_18dp.png create mode 100644 src/main/res/drawable-mdpi/ic_mode_edit_black_18dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_mode_edit_blue_18dp.png create mode 100644 src/main/res/drawable-mdpi/ic_mode_edit_white_18dp.png create mode 100644 src/main/res/drawable-mdpi/ic_security_white_24dp.png create mode 100644 src/main/res/drawable-mdpi/ic_verified_user_black_18dp.png delete mode 100644 src/main/res/drawable-mdpi/ic_verified_user_blue_18dp.png create mode 100644 src/main/res/drawable-mdpi/ic_verified_user_white_18dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_attachment_white_24dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_help_circle_white_24dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_image_white_24dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_lock_black_18dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_lock_blue_18dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_lock_white_18dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_mode_edit_black_18dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_mode_edit_blue_18dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_mode_edit_white_18dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_security_white_24dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_verified_user_black_18dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_verified_user_blue_18dp.png create mode 100644 src/main/res/drawable-xhdpi/ic_verified_user_white_18dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_attachment_white_24dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_help_circle_white_24dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_image_white_24dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_lock_blue_18dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_mode_edit_blue_18dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_security_white_24dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_verified_user_black_18dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_verified_user_blue_18dp.png create mode 100644 src/main/res/drawable-xxhdpi/ic_verified_user_white_18dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_attachment_white_24dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_help_circle_white_24dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_image_white_24dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_lock_white_18dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_mode_edit_black_18dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_mode_edit_white_18dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_pause_black_36dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_pause_white_36dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_play_arrow_black_36dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_play_arrow_white_36dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_security_white_24dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_verified_user_black_18dp.png create mode 100644 src/main/res/drawable-xxxhdpi/ic_verified_user_white_18dp.png create mode 100644 src/main/res/drawable/message_bubble_received_light.xml delete mode 100644 src/main/res/drawable/message_bubble_received_lightred.xml create mode 100644 src/main/res/drawable/message_bubble_received_warning.xml delete mode 100644 src/main/res/drawable/message_bubble_received_white.xml create mode 100644 src/main/res/drawable/message_bubble_sent_blue.xml create mode 100644 src/main/res/drawable/message_bubble_sent_light.xml delete mode 100644 src/main/res/drawable/message_bubble_sent_lightblue.xml delete mode 100644 src/main/res/drawable/message_bubble_sent_white.xml delete mode 100644 src/open/java/de/pixart/messenger/services/PushManagementService.java diff --git a/src/main/java/de/pixart/messenger/services/AudioPlayer.java b/src/main/java/de/pixart/messenger/services/AudioPlayer.java index 6d8a3cf4c..e1f97ef1a 100644 --- a/src/main/java/de/pixart/messenger/services/AudioPlayer.java +++ b/src/main/java/de/pixart/messenger/services/AudioPlayer.java @@ -17,7 +17,6 @@ import android.widget.TextView; import java.lang.ref.WeakReference; import java.util.Locale; -import de.pixart.messenger.Config; import de.pixart.messenger.R; import de.pixart.messenger.entities.Message; import de.pixart.messenger.ui.ConversationsActivity; @@ -27,7 +26,7 @@ import de.pixart.messenger.utils.WeakReferenceSet; public class AudioPlayer implements View.OnClickListener, MediaPlayer.OnCompletionListener, SeekBar.OnSeekBarChangeListener, Runnable { - private static final int REFRESH_INTERVAL = Config.REFRESH_UI_INTERVAL; + private static final int REFRESH_INTERVAL = 250; private static final Object LOCK = new Object(); public static MediaPlayer player = null; private static Message currentlyPlayingMessage = null; diff --git a/src/main/java/de/pixart/messenger/ui/AboutActivity.java b/src/main/java/de/pixart/messenger/ui/AboutActivity.java index ac8b72ec0..e417149d6 100644 --- a/src/main/java/de/pixart/messenger/ui/AboutActivity.java +++ b/src/main/java/de/pixart/messenger/ui/AboutActivity.java @@ -1,17 +1,26 @@ package de.pixart.messenger.ui; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; import de.pixart.messenger.R; -import static de.pixart.messenger.ui.XmppActivity.configureActionBar; +public class AboutActivity extends XmppActivity { -public class AboutActivity extends AppCompatActivity { + @Override + protected void refreshUiReal() { + + } + + @Override + void onBackendConnected() { + + } @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + this.mTheme = findTheme(); + setTheme(this.mTheme); setContentView(R.layout.activity_about); setSupportActionBar(findViewById(R.id.toolbar)); configureActionBar(getSupportActionBar()); diff --git a/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java index ba9771be1..a42e3a8c0 100644 --- a/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java @@ -361,16 +361,18 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp if (contact == null) { return; } - + int ic_notifications = getThemeResource(R.attr.icon_notifications, R.drawable.ic_notifications_black_24dp); + int ic_notifications_off = getThemeResource(R.attr.icon_notifications_off, R.drawable.ic_notifications_off_black_24dp); + int ic_notifications_paused = getThemeResource(R.attr.icon_notifications_paused, R.drawable.ic_notifications_paused_black_24dp); long mutedTill = mConversation.getLongAttribute(Conversation.ATTRIBUTE_MUTED_TILL, 0); if (mutedTill == Long.MAX_VALUE) { mNotifyStatusText.setText(R.string.notify_never); - mNotifyStatusButton.setImageResource(R.drawable.ic_notifications_off_grey600_24dp); + mNotifyStatusButton.setImageResource(ic_notifications_off); } else if (System.currentTimeMillis() < mutedTill) { mNotifyStatusText.setText(R.string.notify_paused); - mNotifyStatusButton.setImageResource(R.drawable.ic_notifications_paused_grey600_24dp); + mNotifyStatusButton.setImageResource(ic_notifications_paused); } else { - mNotifyStatusButton.setImageResource(R.drawable.ic_notifications_grey600_24dp); + mNotifyStatusButton.setImageResource(ic_notifications); mNotifyStatusText.setText(R.string.notify_on_all_messages); } if (getSupportActionBar() != null) { diff --git a/src/main/java/de/pixart/messenger/ui/RecordingActivity.java b/src/main/java/de/pixart/messenger/ui/RecordingActivity.java index 21462ebfa..7ea474c75 100644 --- a/src/main/java/de/pixart/messenger/ui/RecordingActivity.java +++ b/src/main/java/de/pixart/messenger/ui/RecordingActivity.java @@ -8,7 +8,6 @@ import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.SystemClock; -import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.View; import android.view.WindowManager; @@ -25,7 +24,7 @@ import de.pixart.messenger.Config; import de.pixart.messenger.R; import de.pixart.messenger.persistance.FileBackend; -public class RecordingActivity extends AppCompatActivity implements View.OnClickListener { +public class RecordingActivity extends XmppActivity implements View.OnClickListener { private TextView mTimerTextView; private Button mCancelButton; @@ -51,6 +50,8 @@ public class RecordingActivity extends AppCompatActivity implements View.OnClick protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_recording); + this.mTheme = findTheme(); + setTheme(this.mTheme); this.mTimerTextView = this.findViewById(R.id.timer); this.mCancelButton = this.findViewById(R.id.cancel_button); this.mCancelButton.setOnClickListener(this); @@ -58,6 +59,12 @@ public class RecordingActivity extends AppCompatActivity implements View.OnClick this.mStopButton.setOnClickListener(this); this.setFinishOnTouchOutside(false); getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + this.setTitle(R.string.attach_record_voice); + } + + @Override + protected void refreshUiReal() { + } @Override @@ -79,6 +86,11 @@ public class RecordingActivity extends AppCompatActivity implements View.OnClick } } + @Override + void onBackendConnected() { + + } + private boolean startRecording() { mRecorder = new MediaRecorder(); mRecorder.setAudioSource(MediaRecorder.AudioSource.MIC); @@ -162,4 +174,18 @@ public class RecordingActivity extends AppCompatActivity implements View.OnClick break; } } + + public boolean isDarkTheme() { + return this.mTheme == R.style.ConversationsDialog_Dark; + } + + protected int findTheme() { + Boolean dark = getPreferences().getString(SettingsActivity.THEME, getResources().getString(R.string.theme)).equals("dark"); + + if (dark) { + return R.style.ConversationsDialog_Dark; + } else { + return R.style.ConversationsDialog; + } + } } \ No newline at end of file diff --git a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java index 48c5f46fd..190fc0c43 100644 --- a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java @@ -69,6 +69,8 @@ public class SettingsActivity extends XmppActivity implements @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + this.mTheme = findTheme(); + setTheme(this.mTheme); setContentView(R.layout.activity_settings); FragmentManager fm = getFragmentManager(); mSettingsFragment = (SettingsFragment) fm.findFragmentById(R.id.settings_content); @@ -77,9 +79,7 @@ public class SettingsActivity extends XmppActivity implements fm.beginTransaction().replace(R.id.settings_content, mSettingsFragment).commit(); } mSettingsFragment.setActivityIntent(getIntent()); - this.mTheme = findTheme(); - setTheme(this.mTheme); - getWindow().getDecorView().setBackgroundColor(Color.get(this, R.attr.color_background_primary)); + getWindow().getDecorView().setBackgroundColor(Color.get(this, R.attr.color_background_secondary)); setSupportActionBar(findViewById(R.id.toolbar)); configureActionBar(getSupportActionBar()); } @@ -92,8 +92,9 @@ public class SettingsActivity extends XmppActivity implements @Override public void onStart() { super.onStart(); - PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(this); + updateTheme(); + PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(this); multiAccountPreference = mSettingsFragment.findPreference("enable_multi_accounts"); if (multiAccountPreference != null) { isMultiAccountChecked = ((CheckBoxPreference) multiAccountPreference).isChecked(); @@ -269,6 +270,13 @@ public class SettingsActivity extends XmppActivity implements } } + private void updateTheme() { + final int theme = findTheme(); + if (this.mTheme != theme) { + recreate(); + } + } + private void changeOmemoSettingSummary() { ListPreference omemoPreference = (ListPreference) mSettingsFragment.findPreference(OMEMO_SETTING); if (omemoPreference != null) { @@ -495,10 +503,7 @@ public class SettingsActivity extends XmppActivity implements } else if (name.equals(AUTOMATIC_MESSAGE_DELETION)) { xmppConnectionService.expireOldMessages(true); } else if (name.equals(THEME)) { - final int theme = findTheme(); - if (this.mTheme != theme) { - recreate(); - } + updateTheme(); } } diff --git a/src/main/java/de/pixart/messenger/ui/ShareLocationActivity.java b/src/main/java/de/pixart/messenger/ui/ShareLocationActivity.java index 9ad877db1..2620d91c6 100644 --- a/src/main/java/de/pixart/messenger/ui/ShareLocationActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ShareLocationActivity.java @@ -188,11 +188,9 @@ public class ShareLocationActivity extends LocationActivity implements LocationL private void setShareButtonEnabled(final boolean enabled) { if (enabled) { this.mShareButton.setEnabled(true); - this.mShareButton.setTextColor(0xff2e4272); this.mShareButton.setText(R.string.share); } else { this.mShareButton.setEnabled(false); - this.mShareButton.setTextColor(0x8a000000); this.mShareButton.setText(R.string.locating); } } diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java index a2e938e8f..a3ddb8a95 100644 --- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java +++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java @@ -412,16 +412,20 @@ public abstract class XmppActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + this.mTheme = findTheme(); + setTheme(this.mTheme); metrics = getResources().getDisplayMetrics(); ExceptionHelper.init(getApplicationContext()); this.isCameraFeatureAvailable = getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA); mColorRed = ContextCompat.getColor(this, R.color.red800); - mColorWarningButton = ContextCompat.getColor(this, R.color.warning_button); + if (isDarkTheme()) { + mColorWarningButton = ContextCompat.getColor(this, R.color.warning_button_dark); + } else { + mColorWarningButton = ContextCompat.getColor(this, R.color.warning_button); + } mColorWhite = ContextCompat.getColor(this, R.color.white70); mColorOrange = ContextCompat.getColor(this, R.color.orange500); mColorGreen = ContextCompat.getColor(this, R.color.realgreen); - this.mTheme = findTheme(); - setTheme(this.mTheme); this.mUsingEnterKey = usingEnterKey(); mUseSubject = getPreferences().getBoolean("use_subject", getResources().getBoolean(R.bool.use_subject)); } @@ -1011,10 +1015,9 @@ public abstract class XmppActivity extends AppCompatActivity { protected int findTheme() { Boolean dark = getPreferences().getString(SettingsActivity.THEME, getResources().getString(R.string.theme)).equals("dark"); - Boolean larger = getPreferences().getBoolean("use_larger_font", getResources().getBoolean(R.bool.use_larger_font)); - if (larger) { - return R.style.ConversationsTheme_LargerText; + if (dark) { + return R.style.ConversationsTheme_Dark; } else { return R.style.ConversationsTheme; } diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java index 249aa9cb4..d6e875a94 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java @@ -246,11 +246,11 @@ public class ConversationAdapter extends ArrayAdapter { viewHolder.name.setTextColor(ContextCompat.getColor(activity, R.color.notavailable)); break; default: - viewHolder.name.setTextColor(ContextCompat.getColor(activity, R.color.black87)); + viewHolder.name.setTextColor(Color.get(activity, R.attr.text_Color_Main)); break; } } else { - viewHolder.name.setTextColor(ContextCompat.getColor(activity, R.color.black87)); + viewHolder.name.setTextColor(Color.get(activity, R.attr.text_Color_Main)); } if (activity.xmppConnectionService.indicateReceived()) { diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java index 432bc0d4b..75d105484 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java @@ -8,7 +8,6 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.AsyncTask; import android.preference.PreferenceManager; -import android.support.v4.content.ContextCompat; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -27,6 +26,7 @@ import de.pixart.messenger.databinding.ContactBinding; import de.pixart.messenger.entities.ListItem; import de.pixart.messenger.ui.SettingsActivity; import de.pixart.messenger.ui.XmppActivity; +import de.pixart.messenger.ui.util.Color; import de.pixart.messenger.utils.IrregularUnicodeDetector; import de.pixart.messenger.utils.UIHelper; import rocks.xmpp.addr.Jid; @@ -104,7 +104,7 @@ public class ListItemAdapter extends ArrayAdapter { } } if (offline) { - viewHolder.name.setTextColor(ContextCompat.getColor(activity, R.color.black87)); + viewHolder.name.setTextColor(Color.get(activity, R.attr.text_Color_Main)); viewHolder.name.setAlpha(INACTIVE_ALPHA); viewHolder.jid.setAlpha(INACTIVE_ALPHA); viewHolder.avatar.setAlpha(INACTIVE_ALPHA); @@ -113,7 +113,7 @@ public class ListItemAdapter extends ArrayAdapter { if (ShowPresenceColoredNames()) { viewHolder.name.setTextColor(color); } else { - viewHolder.name.setTextColor(ContextCompat.getColor(activity, R.color.black87)); + viewHolder.name.setTextColor(Color.get(activity, R.attr.text_Color_Main)); } viewHolder.name.setAlpha(ACTIVE_ALPHA); viewHolder.jid.setAlpha(ACTIVE_ALPHA); diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java index 6040017d6..3eba89ffe 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java @@ -152,7 +152,6 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie private OnContactPictureClicked mOnContactPictureClickedListener; private OnContactPictureLongClicked mOnContactPictureLongClickedListener; private boolean mIndicateReceived = false; - private boolean mUseWhiteBackground = false; private OnQuoteListener onQuoteListener; public MessageAdapter(XmppActivity activity, List messages) { @@ -239,9 +238,9 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie public int getMessageTextColor(boolean onDark, boolean primary) { if (onDark) { - return ContextCompat.getColor(activity, primary ? R.color.dark : R.color.primary); + return ContextCompat.getColor(activity, primary ? R.color.white : R.color.white70); } else { - return ContextCompat.getColor(activity, primary ? R.color.dark : R.color.primary); + return ContextCompat.getColor(activity, primary ? R.color.black87 : R.color.black54); } } @@ -257,7 +256,8 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie if (viewHolder.edit_indicator != null) { if (message.edited()) { viewHolder.edit_indicator.setVisibility(View.VISIBLE); - viewHolder.edit_indicator.setAlpha(0.7f); + viewHolder.edit_indicator.setImageResource(darkBackground ? R.drawable.ic_mode_edit_white_18dp : R.drawable.ic_mode_edit_black_18dp); + viewHolder.edit_indicator.setAlpha(darkBackground ? 0.7f : 0.57f); } else { viewHolder.edit_indicator.setVisibility(View.GONE); } @@ -304,7 +304,8 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie } break; case Message.STATUS_SEND_FAILED: - if (isResendable) { + DownloadableFile file = activity.xmppConnectionService.getFileBackend().getFile(message); + if (isResendable && file.exists()) { info = getContext().getString(R.string.send_failed_resend); } else { info = getContext().getString(R.string.send_failed); @@ -318,6 +319,7 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie break; } if (error && type == SENT) { + viewHolder.time.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_Waring); viewHolder.time.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_Waring); DownloadableFile file = activity.xmppConnectionService.getFileBackend().getFile(message); if (file.exists()) { @@ -328,6 +330,9 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie isResendable = false; viewHolder.resend_button.setVisibility(View.VISIBLE); } + } else { + isResendable = false; + viewHolder.resend_button.setVisibility(View.GONE); } viewHolder.resend_button.setText(R.string.send_again); viewHolder.resend_button.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_resend_grey600_48dp, 0, 0, 0); @@ -341,6 +346,11 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie }); } else if (!error && type == SENT) { viewHolder.resend_button.setVisibility(View.GONE); + if (darkBackground) { + viewHolder.time.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption_OnDark); + } else { + viewHolder.time.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Caption); + } viewHolder.time.setTextColor(this.getMessageTextColor(darkBackground, false)); } else { if (darkBackground) { @@ -363,11 +373,15 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie } } if (verified) { - viewHolder.indicator.setImageResource(R.drawable.ic_verified_user_blue_18dp); + viewHolder.indicator.setImageResource(darkBackground ? R.drawable.ic_verified_user_white_18dp : R.drawable.ic_verified_user_black_18dp); } else { - viewHolder.indicator.setImageResource(R.drawable.ic_lock_blue_18dp); + viewHolder.indicator.setImageResource(darkBackground ? R.drawable.ic_lock_white_18dp : R.drawable.ic_lock_black_18dp); + } + if (darkBackground) { + viewHolder.indicator.setAlpha(0.7f); + } else { + viewHolder.indicator.setAlpha(0.57f); } - viewHolder.indicator.setAlpha(0.7f); viewHolder.indicator.setVisibility(View.VISIBLE); } @@ -426,11 +440,16 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie viewHolder.messageBody.setTextIsSelectable(false); } - private void displayEmojiMessage(final ViewHolder viewHolder, final String body) { + private void displayEmojiMessage(final ViewHolder viewHolder, final String body, final boolean darkBackground) { viewHolder.download_button.setVisibility(View.GONE); viewHolder.audioPlayer.setVisibility(View.GONE); viewHolder.image.setVisibility(View.GONE); viewHolder.messageBody.setVisibility(View.VISIBLE); + if (darkBackground) { + viewHolder.messageBody.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Body1_OnDark); + } else { + viewHolder.messageBody.setTextAppearance(getContext(), R.style.TextAppearance_Conversations_Body1); + } Spannable span = new SpannableString(body); float size = Emoticons.isEmoji(body) ? 3.0f : 2.0f; span.setSpan(new RelativeSizeSpan(size), 0, body.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); @@ -869,7 +888,7 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie } } - boolean darkBackground = false; // default: (type == SENT && (!isInValidSession || !mUseWhiteBackground)); + boolean darkBackground = type == SENT && !isInValidSession || activity.isDarkTheme(); if (type == DATE_SEPARATOR) { if (UIHelper.today(message.getTimeSent())) { @@ -959,13 +978,7 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie } } else { displayInfoMessage(viewHolder, activity.getString(R.string.install_openkeychain), darkBackground); - viewHolder.message_box.setOnClickListener(new OnClickListener() { - - @Override - public void onClick(View v) { - activity.showInstallPgpDialog(); - } - }); + viewHolder.message_box.setOnClickListener(v -> activity.showInstallPgpDialog()); } } else if (message.getEncryption() == Message.ENCRYPTION_DECRYPTION_FAILED) { displayDecryptionFailed(viewHolder, darkBackground); @@ -973,7 +986,7 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie if (message.isGeoUri()) { displayLocationMessage(viewHolder, message); } else if (message.bodyIsOnlyEmojis() && message.getType() != Message.TYPE_PRIVATE) { - displayEmojiMessage(viewHolder, message.getBody().trim()); + displayEmojiMessage(viewHolder, message.getBody().trim(), darkBackground); } else if (message.isXmppUri()) { displayXmppMessage(viewHolder, message.getBody().trim()); } else if (message.treatAsDownloadable()) { @@ -997,12 +1010,14 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie if (type == RECEIVED) { if (isInValidSession) { - viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_white); + viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_light); viewHolder.encryption.setVisibility(View.GONE); } else { - viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_lightred); + viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_warning); viewHolder.encryption.setVisibility(View.VISIBLE); - viewHolder.encryption.setTextColor(activity.getWarningTextColor()); + if (!darkBackground) { + viewHolder.encryption.setTextColor(activity.getWarningTextColor()); + } if (omemoEncryption && !message.isTrusted()) { viewHolder.encryption.setText(R.string.not_trusted); } else { @@ -1012,11 +1027,7 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie } if (type == SENT) { - if (mUseWhiteBackground) { - viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_sent_white); - } else { - viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_sent_lightblue); - } + viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_sent_blue); } displayStatus(viewHolder, message, type, darkBackground); @@ -1144,7 +1155,6 @@ public class MessageAdapter extends ArrayAdapter implements CopyTextVie public void updatePreferences() { SharedPreferences p = PreferenceManager.getDefaultSharedPreferences(activity); this.mIndicateReceived = p.getBoolean("indicate_received", activity.getResources().getBoolean(R.bool.indicate_received)); - this.mUseWhiteBackground = p.getBoolean("use_white_background", activity.getResources().getBoolean(R.bool.use_white_background)); } public void loadAvatar(Message message, ImageView imageView, int size) { diff --git a/src/main/res/drawable-hdpi/ic_attachment_white_24dp.png b/src/main/res/drawable-hdpi/ic_attachment_white_24dp.png new file mode 100644 index 000000000..411d0cbdd Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_attachment_white_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_help_circle_white_24dp.png b/src/main/res/drawable-hdpi/ic_help_circle_white_24dp.png new file mode 100644 index 000000000..ebdafee96 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_help_circle_white_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_image_white_24dp.png b/src/main/res/drawable-hdpi/ic_image_white_24dp.png new file mode 100644 index 000000000..36a2e453f Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_image_white_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_lock_black_18dp.png b/src/main/res/drawable-hdpi/ic_lock_black_18dp.png new file mode 100644 index 000000000..66b066502 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_lock_black_18dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_lock_blue_18dp.png b/src/main/res/drawable-hdpi/ic_lock_blue_18dp.png deleted file mode 100644 index fa671448b..000000000 Binary files a/src/main/res/drawable-hdpi/ic_lock_blue_18dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_lock_white_18dp.png b/src/main/res/drawable-hdpi/ic_lock_white_18dp.png new file mode 100644 index 000000000..826fbb241 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_lock_white_18dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-hdpi/ic_mode_edit_black_18dp.png new file mode 100644 index 000000000..852043ff9 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_mode_edit_black_18dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_mode_edit_blue_18dp.png b/src/main/res/drawable-hdpi/ic_mode_edit_blue_18dp.png deleted file mode 100644 index 6ceb6a898..000000000 Binary files a/src/main/res/drawable-hdpi/ic_mode_edit_blue_18dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-hdpi/ic_mode_edit_white_18dp.png new file mode 100644 index 000000000..ff4f18758 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_mode_edit_white_18dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_pause_black_36dp.png b/src/main/res/drawable-hdpi/ic_pause_black_36dp.png index ec02d44a9..7dbeb0d72 100644 Binary files a/src/main/res/drawable-hdpi/ic_pause_black_36dp.png and b/src/main/res/drawable-hdpi/ic_pause_black_36dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_pause_white_36dp.png b/src/main/res/drawable-hdpi/ic_pause_white_36dp.png index 9d826b7e0..94d85dc12 100644 Binary files a/src/main/res/drawable-hdpi/ic_pause_white_36dp.png and b/src/main/res/drawable-hdpi/ic_pause_white_36dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_play_arrow_black_36dp.png b/src/main/res/drawable-hdpi/ic_play_arrow_black_36dp.png index 848f67624..67d0c8209 100644 Binary files a/src/main/res/drawable-hdpi/ic_play_arrow_black_36dp.png and b/src/main/res/drawable-hdpi/ic_play_arrow_black_36dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png b/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png index 1ce6531de..29adeed05 100644 Binary files a/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png and b/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_security_white_24dp.png b/src/main/res/drawable-hdpi/ic_security_white_24dp.png new file mode 100644 index 000000000..bdc6aa0cc Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_security_white_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_verified_user_black_18dp.png b/src/main/res/drawable-hdpi/ic_verified_user_black_18dp.png new file mode 100644 index 000000000..ac5b29673 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_verified_user_black_18dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_verified_user_blue_18dp.png b/src/main/res/drawable-hdpi/ic_verified_user_blue_18dp.png deleted file mode 100644 index d6c12872f..000000000 Binary files a/src/main/res/drawable-hdpi/ic_verified_user_blue_18dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_verified_user_white_18dp.png b/src/main/res/drawable-hdpi/ic_verified_user_white_18dp.png new file mode 100644 index 000000000..f248d6acb Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_verified_user_white_18dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_attachment_white_24dp.png b/src/main/res/drawable-mdpi/ic_attachment_white_24dp.png new file mode 100644 index 000000000..e6e585bab Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_attachment_white_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_help_circle_white_24dp.png b/src/main/res/drawable-mdpi/ic_help_circle_white_24dp.png new file mode 100644 index 000000000..ff8593829 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_help_circle_white_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_image_white_24dp.png b/src/main/res/drawable-mdpi/ic_image_white_24dp.png new file mode 100644 index 000000000..0626807e0 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_image_white_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_lock_black_18dp.png b/src/main/res/drawable-mdpi/ic_lock_black_18dp.png new file mode 100644 index 000000000..472922f85 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_lock_black_18dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_lock_blue_18dp.png b/src/main/res/drawable-mdpi/ic_lock_blue_18dp.png deleted file mode 100644 index df90535c8..000000000 Binary files a/src/main/res/drawable-mdpi/ic_lock_blue_18dp.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_lock_white_18dp.png b/src/main/res/drawable-mdpi/ic_lock_white_18dp.png new file mode 100644 index 000000000..e9b327fd0 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_lock_white_18dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-mdpi/ic_mode_edit_black_18dp.png new file mode 100644 index 000000000..81fc6d74b Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_mode_edit_black_18dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_mode_edit_blue_18dp.png b/src/main/res/drawable-mdpi/ic_mode_edit_blue_18dp.png deleted file mode 100644 index 6ae50a9f5..000000000 Binary files a/src/main/res/drawable-mdpi/ic_mode_edit_blue_18dp.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-mdpi/ic_mode_edit_white_18dp.png new file mode 100644 index 000000000..2ee70ae71 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_mode_edit_white_18dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_pause_black_36dp.png b/src/main/res/drawable-mdpi/ic_pause_black_36dp.png index 5c0dce2df..4dffa8e53 100644 Binary files a/src/main/res/drawable-mdpi/ic_pause_black_36dp.png and b/src/main/res/drawable-mdpi/ic_pause_black_36dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_pause_white_36dp.png b/src/main/res/drawable-mdpi/ic_pause_white_36dp.png index 6176e3f83..e81331fdc 100644 Binary files a/src/main/res/drawable-mdpi/ic_pause_white_36dp.png and b/src/main/res/drawable-mdpi/ic_pause_white_36dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_play_arrow_black_36dp.png b/src/main/res/drawable-mdpi/ic_play_arrow_black_36dp.png index b598dac4b..e9c288c99 100644 Binary files a/src/main/res/drawable-mdpi/ic_play_arrow_black_36dp.png and b/src/main/res/drawable-mdpi/ic_play_arrow_black_36dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png b/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png index c791b597e..57c9fa546 100644 Binary files a/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png and b/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_security_white_24dp.png b/src/main/res/drawable-mdpi/ic_security_white_24dp.png new file mode 100644 index 000000000..45c2aa1e7 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_security_white_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_verified_user_black_18dp.png b/src/main/res/drawable-mdpi/ic_verified_user_black_18dp.png new file mode 100644 index 000000000..87ad3d549 Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_verified_user_black_18dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_verified_user_blue_18dp.png b/src/main/res/drawable-mdpi/ic_verified_user_blue_18dp.png deleted file mode 100644 index d4e510f34..000000000 Binary files a/src/main/res/drawable-mdpi/ic_verified_user_blue_18dp.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_verified_user_white_18dp.png b/src/main/res/drawable-mdpi/ic_verified_user_white_18dp.png new file mode 100644 index 000000000..10ccdca7b Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_verified_user_white_18dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_attachment_white_24dp.png b/src/main/res/drawable-xhdpi/ic_attachment_white_24dp.png new file mode 100644 index 000000000..e0e9d1b5b Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_attachment_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_help_circle_white_24dp.png b/src/main/res/drawable-xhdpi/ic_help_circle_white_24dp.png new file mode 100644 index 000000000..7c837362e Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_help_circle_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_image_white_24dp.png b/src/main/res/drawable-xhdpi/ic_image_white_24dp.png new file mode 100644 index 000000000..fc59b9f5c Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_image_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_lock_black_18dp.png b/src/main/res/drawable-xhdpi/ic_lock_black_18dp.png new file mode 100644 index 000000000..a387eb83c Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_lock_black_18dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_lock_blue_18dp.png b/src/main/res/drawable-xhdpi/ic_lock_blue_18dp.png deleted file mode 100644 index 4f91b14fe..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_lock_blue_18dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_lock_white_18dp.png b/src/main/res/drawable-xhdpi/ic_lock_white_18dp.png new file mode 100644 index 000000000..cdbc15769 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_lock_white_18dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-xhdpi/ic_mode_edit_black_18dp.png new file mode 100644 index 000000000..2e555538b Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_mode_edit_black_18dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_mode_edit_blue_18dp.png b/src/main/res/drawable-xhdpi/ic_mode_edit_blue_18dp.png deleted file mode 100644 index c11f36b6c..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_mode_edit_blue_18dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-xhdpi/ic_mode_edit_white_18dp.png new file mode 100644 index 000000000..9b4fd84ee Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_mode_edit_white_18dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_pause_black_36dp.png b/src/main/res/drawable-xhdpi/ic_pause_black_36dp.png index 875a01f8a..ec6617a79 100644 Binary files a/src/main/res/drawable-xhdpi/ic_pause_black_36dp.png and b/src/main/res/drawable-xhdpi/ic_pause_black_36dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_pause_white_36dp.png b/src/main/res/drawable-xhdpi/ic_pause_white_36dp.png index d8b29d7da..e84d8f6ed 100644 Binary files a/src/main/res/drawable-xhdpi/ic_pause_white_36dp.png and b/src/main/res/drawable-xhdpi/ic_pause_white_36dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_play_arrow_black_36dp.png b/src/main/res/drawable-xhdpi/ic_play_arrow_black_36dp.png index 744ae66d1..5345ee3c4 100644 Binary files a/src/main/res/drawable-xhdpi/ic_play_arrow_black_36dp.png and b/src/main/res/drawable-xhdpi/ic_play_arrow_black_36dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png b/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png index 52eb1459f..547ef30aa 100644 Binary files a/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png and b/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_security_white_24dp.png b/src/main/res/drawable-xhdpi/ic_security_white_24dp.png new file mode 100644 index 000000000..3a543dc09 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_security_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_verified_user_black_18dp.png b/src/main/res/drawable-xhdpi/ic_verified_user_black_18dp.png new file mode 100644 index 000000000..59b603892 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_verified_user_black_18dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_verified_user_blue_18dp.png b/src/main/res/drawable-xhdpi/ic_verified_user_blue_18dp.png deleted file mode 100644 index bda56c8a8..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_verified_user_blue_18dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_verified_user_white_18dp.png b/src/main/res/drawable-xhdpi/ic_verified_user_white_18dp.png new file mode 100644 index 000000000..b4380a9ef Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_verified_user_white_18dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_attachment_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_attachment_white_24dp.png new file mode 100644 index 000000000..96da53737 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_attachment_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_help_circle_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_help_circle_white_24dp.png new file mode 100644 index 000000000..4222dd85b Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_help_circle_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_image_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_image_white_24dp.png new file mode 100644 index 000000000..251d10772 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_image_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png b/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png new file mode 100644 index 000000000..e6b063ab7 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_lock_black_18dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_lock_blue_18dp.png b/src/main/res/drawable-xxhdpi/ic_lock_blue_18dp.png deleted file mode 100644 index 203d01866..000000000 Binary files a/src/main/res/drawable-xxhdpi/ic_lock_blue_18dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png b/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png new file mode 100644 index 000000000..98fd945ef Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_lock_white_18dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.png new file mode 100644 index 000000000..2bcdf9d9f Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_mode_edit_black_18dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_mode_edit_blue_18dp.png b/src/main/res/drawable-xxhdpi/ic_mode_edit_blue_18dp.png deleted file mode 100644 index 779164a27..000000000 Binary files a/src/main/res/drawable-xxhdpi/ic_mode_edit_blue_18dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.png new file mode 100644 index 000000000..b6a786799 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_mode_edit_white_18dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_pause_black_36dp.png b/src/main/res/drawable-xxhdpi/ic_pause_black_36dp.png index a9bfd1fb7..c3b01aff3 100644 Binary files a/src/main/res/drawable-xxhdpi/ic_pause_black_36dp.png and b/src/main/res/drawable-xxhdpi/ic_pause_black_36dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_pause_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_pause_white_36dp.png index 8b721f9f5..1babab1f5 100644 Binary files a/src/main/res/drawable-xxhdpi/ic_pause_white_36dp.png and b/src/main/res/drawable-xxhdpi/ic_pause_white_36dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_play_arrow_black_36dp.png b/src/main/res/drawable-xxhdpi/ic_play_arrow_black_36dp.png index ded8cda96..bacb6e21d 100644 Binary files a/src/main/res/drawable-xxhdpi/ic_play_arrow_black_36dp.png and b/src/main/res/drawable-xxhdpi/ic_play_arrow_black_36dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png index b08c0c260..23bb1ba9f 100644 Binary files a/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png and b/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_security_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_security_white_24dp.png new file mode 100644 index 000000000..61101e18e Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_security_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_verified_user_black_18dp.png b/src/main/res/drawable-xxhdpi/ic_verified_user_black_18dp.png new file mode 100644 index 000000000..9f2fb4eab Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_verified_user_black_18dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_verified_user_blue_18dp.png b/src/main/res/drawable-xxhdpi/ic_verified_user_blue_18dp.png deleted file mode 100644 index a5138355a..000000000 Binary files a/src/main/res/drawable-xxhdpi/ic_verified_user_blue_18dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_verified_user_white_18dp.png b/src/main/res/drawable-xxhdpi/ic_verified_user_white_18dp.png new file mode 100644 index 000000000..8501bc4a1 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_verified_user_white_18dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_attachment_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_attachment_white_24dp.png new file mode 100644 index 000000000..80be319c3 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_attachment_white_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_help_circle_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_help_circle_white_24dp.png new file mode 100644 index 000000000..169404a2b Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_help_circle_white_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_image_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_image_white_24dp.png new file mode 100644 index 000000000..08c624751 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_image_white_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png b/src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png new file mode 100644 index 000000000..b12436e84 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_lock_black_18dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_lock_white_18dp.png b/src/main/res/drawable-xxxhdpi/ic_lock_white_18dp.png new file mode 100644 index 000000000..dd1472c9f Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_lock_white_18dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_18dp.png b/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_18dp.png new file mode 100644 index 000000000..94715a840 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_mode_edit_black_18dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_18dp.png b/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_18dp.png new file mode 100644 index 000000000..89beb1938 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_mode_edit_white_18dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_pause_black_36dp.png b/src/main/res/drawable-xxxhdpi/ic_pause_black_36dp.png new file mode 100644 index 000000000..057caefe7 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_pause_black_36dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_pause_white_36dp.png b/src/main/res/drawable-xxxhdpi/ic_pause_white_36dp.png new file mode 100644 index 000000000..46870cb66 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_pause_white_36dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_play_arrow_black_36dp.png b/src/main/res/drawable-xxxhdpi/ic_play_arrow_black_36dp.png new file mode 100644 index 000000000..1c57756b0 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_play_arrow_black_36dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_36dp.png b/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_36dp.png new file mode 100644 index 000000000..2745c3ab9 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_36dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_security_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_security_white_24dp.png new file mode 100644 index 000000000..e26e7953b Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_security_white_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_verified_user_black_18dp.png b/src/main/res/drawable-xxxhdpi/ic_verified_user_black_18dp.png new file mode 100644 index 000000000..b266feacc Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_verified_user_black_18dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_verified_user_white_18dp.png b/src/main/res/drawable-xxxhdpi/ic_verified_user_white_18dp.png new file mode 100644 index 000000000..fe4a64ea5 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_verified_user_white_18dp.png differ diff --git a/src/main/res/drawable/date_bubble.xml b/src/main/res/drawable/date_bubble.xml index 3edf349e9..1669d5a02 100644 --- a/src/main/res/drawable/date_bubble.xml +++ b/src/main/res/drawable/date_bubble.xml @@ -13,9 +13,9 @@ android:top="6dp" /> + android:color="?attr/color_border"> + android:color="?attr/color_bubble_date"> \ No newline at end of file diff --git a/src/main/res/drawable/message_border.xml b/src/main/res/drawable/message_border.xml index 83eef8eb8..6b3180944 100644 --- a/src/main/res/drawable/message_border.xml +++ b/src/main/res/drawable/message_border.xml @@ -10,6 +10,6 @@ android:right="1.5dp" android:top="1.5dp" /> - + \ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_received_light.xml b/src/main/res/drawable/message_bubble_received_light.xml new file mode 100644 index 000000000..5cb1ac4db --- /dev/null +++ b/src/main/res/drawable/message_bubble_received_light.xml @@ -0,0 +1,21 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_received_lightred.xml b/src/main/res/drawable/message_bubble_received_lightred.xml deleted file mode 100644 index b3bf6d451..000000000 --- a/src/main/res/drawable/message_bubble_received_lightred.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_received_warning.xml b/src/main/res/drawable/message_bubble_received_warning.xml new file mode 100644 index 000000000..22959c88a --- /dev/null +++ b/src/main/res/drawable/message_bubble_received_warning.xml @@ -0,0 +1,21 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_received_white.xml b/src/main/res/drawable/message_bubble_received_white.xml deleted file mode 100644 index 32e146460..000000000 --- a/src/main/res/drawable/message_bubble_received_white.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_sent_blue.xml b/src/main/res/drawable/message_bubble_sent_blue.xml new file mode 100644 index 000000000..2613296c6 --- /dev/null +++ b/src/main/res/drawable/message_bubble_sent_blue.xml @@ -0,0 +1,21 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_sent_light.xml b/src/main/res/drawable/message_bubble_sent_light.xml new file mode 100644 index 000000000..a66321a19 --- /dev/null +++ b/src/main/res/drawable/message_bubble_sent_light.xml @@ -0,0 +1,21 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_sent_lightblue.xml b/src/main/res/drawable/message_bubble_sent_lightblue.xml deleted file mode 100644 index 1ee3ad0c8..000000000 --- a/src/main/res/drawable/message_bubble_sent_lightblue.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/main/res/drawable/message_bubble_sent_white.xml b/src/main/res/drawable/message_bubble_sent_white.xml deleted file mode 100644 index 73d080cf1..000000000 --- a/src/main/res/drawable/message_bubble_sent_white.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/main/res/drawable/rounded_rectangle_primary.xml b/src/main/res/drawable/rounded_rectangle_primary.xml index 3a32aa8e5..8ea2b0b5c 100644 --- a/src/main/res/drawable/rounded_rectangle_primary.xml +++ b/src/main/res/drawable/rounded_rectangle_primary.xml @@ -8,7 +8,7 @@ android:left="2dp" android:right="2dp" android:top="2dp" /> - + diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml index af61483ab..2e503d8bd 100644 --- a/src/main/res/layout/activity_about.xml +++ b/src/main/res/layout/activity_about.xml @@ -23,7 +23,8 @@ android:layout_marginBottom="@dimen/activity_vertical_margin" android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin"> + android:layout_marginTop="@dimen/activity_vertical_margin" + android:background="?attr/color_background_primary"> + android:layout_marginTop="@dimen/activity_vertical_margin" + android:background="?attr/color_background_primary"> diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index 191694b7e..f39c59fc2 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -30,24 +30,22 @@ android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginTop="@dimen/activity_vertical_margin"> - - + + android:src="@drawable/ic_notifications_black_24dp" /> diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 6050a72ab..96e82e40d 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -70,10 +70,12 @@ + android:inputType="textEmailAddress" + android:textColor="?attr/text_Color_Main" /> @@ -534,7 +536,7 @@ android:layout_height="wrap_content" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:background="?attr/selectableItemBackgroundBorderless" + android:background="?attr/color_background_secondary" android:contentDescription="@string/copy_otr_clipboard_description" android:padding="@dimen/image_button_padding" android:src="?attr/icon_copy" @@ -580,7 +582,7 @@ android:id="@+id/action_copy_axolotl_to_clipboard" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="?attr/selectableItemBackgroundBorderless" + android:background="?attr/color_background_secondary" android:contentDescription="@string/copy_omemo_clipboard_description" android:padding="@dimen/image_button_padding" android:src="?attr/icon_copy" @@ -590,7 +592,7 @@ android:id="@+id/action_regenerate_omemo_key" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="?attr/selectableItemBackgroundBorderless" + android:background="?attr/color_background_secondary" android:contentDescription="@string/regenerate_omemo_key" android:padding="@dimen/image_button_padding" android:src="?attr/icon_refresh" diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index 4a74883ad..676f2eaf9 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -14,8 +14,7 @@ + android:layout_height="fill_parent"> @@ -160,7 +157,7 @@ android:layout_alignParentLeft="true" android:layout_alignParentRight="false" android:padding="1dp" - app:riv_border_color="@color/grey500" + app:riv_border_color="?attr/color_border" app:riv_border_width="1dp" app:riv_corner_radius="36dp" /> diff --git a/src/main/res/layout/activity_recording.xml b/src/main/res/layout/activity_recording.xml index b1bcb2a65..c6a57f98d 100644 --- a/src/main/res/layout/activity_recording.xml +++ b/src/main/res/layout/activity_recording.xml @@ -1,16 +1,16 @@ + android:background="?attr/color_background_primary"> + android:layout_alignParentStart="true" + android:layout_below="@+id/timer">