Commit e157fdfc authored by akwizgran's avatar akwizgran

Merge branch '1251-dark-theme-old-message-bubbles' into 'master'

Dark Theme Changes

See merge request !884
parents f53aeef0 f8a8c0d8
...@@ -335,7 +335,7 @@ public class BlogFragment extends BaseFragment ...@@ -335,7 +335,7 @@ public class BlogFragment extends BaseFragment
View.OnClickListener onClick = v -> list.smoothScrollToPosition(0); View.OnClickListener onClick = v -> list.smoothScrollToPosition(0);
snackbar.setActionTextColor(ContextCompat snackbar.setActionTextColor(ContextCompat
.getColor(getContext(), .getColor(getContext(),
R.color.briar_button_positive)); R.color.briar_button_text_positive));
snackbar.setAction(R.string.blogs_blog_post_scroll_to, onClick); snackbar.setAction(R.string.blogs_blog_post_scroll_to, onClick);
} }
snackbar.show(); snackbar.show();
......
...@@ -250,7 +250,7 @@ public class FeedFragment extends BaseFragment implements ...@@ -250,7 +250,7 @@ public class FeedFragment extends BaseFragment implements
OnClickListener onClick = v -> list.smoothScrollToPosition(0); OnClickListener onClick = v -> list.smoothScrollToPosition(0);
s.setActionTextColor(ContextCompat s.setActionTextColor(ContextCompat
.getColor(getContext(), .getColor(getContext(),
R.color.briar_button_positive)); R.color.briar_button_text_positive));
s.setAction(R.string.blogs_blog_post_scroll_to, onClick); s.setAction(R.string.blogs_blog_post_scroll_to, onClick);
} }
s.show(); s.show();
......
...@@ -103,7 +103,7 @@ public class ForumListFragment extends BaseEventFragment implements ...@@ -103,7 +103,7 @@ public class ForumListFragment extends BaseEventFragment implements
snackbar.getView().setBackgroundResource(R.color.briar_primary); snackbar.getView().setBackgroundResource(R.color.briar_primary);
snackbar.setAction(R.string.show, this); snackbar.setAction(R.string.show, this);
snackbar.setActionTextColor(ContextCompat snackbar.setActionTextColor(ContextCompat
.getColor(getContext(), R.color.briar_button_positive)); .getColor(getContext(), R.color.briar_button_text_positive));
return contentView; return contentView;
} }
......
...@@ -77,7 +77,7 @@ public class GroupListFragment extends BaseFragment implements ...@@ -77,7 +77,7 @@ public class GroupListFragment extends BaseFragment implements
snackbar.getView().setBackgroundResource(R.color.briar_primary); snackbar.getView().setBackgroundResource(R.color.briar_primary);
snackbar.setAction(R.string.show, this); snackbar.setAction(R.string.show, this);
snackbar.setActionTextColor(ContextCompat snackbar.setActionTextColor(ContextCompat
.getColor(getContext(), R.color.briar_button_positive)); .getColor(getContext(), R.color.briar_button_text_positive));
return v; return v;
} }
......
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="42dp" android:width="24dp"
android:height="42dp" android:height="24dp"
android:viewportHeight="24.0" android:viewportHeight="24.0"
android:viewportWidth="24.0"> android:viewportWidth="24.0">
<path <path
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<Button <Button
android:id="@+id/continueButton" android:id="@+id/continueButton"
style="@style/BriarButton.Default" style="@style/BriarButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
......
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<Button <Button
android:id="@+id/change_password" android:id="@+id/change_password"
style="@style/BriarButton.Default" style="@style/BriarButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/strength_meter" android:layout_below="@id/strength_meter"
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<Button <Button
android:id="@+id/download_briar_button" android:id="@+id/download_briar_button"
style="@style/BriarButton.Default" style="@style/BriarButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_medium" android:layout_margin="@dimen/margin_medium"
......
...@@ -60,6 +60,7 @@ ...@@ -60,6 +60,7 @@
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/margin_large" android:layout_marginTop="@dimen/margin_large"
android:clickable="true" android:clickable="true"
android:focusable="true"
android:onClick="onForgottenPasswordClick" android:onClick="onForgottenPasswordClick"
android:text="@string/forgotten_password" android:text="@string/forgotten_password"
android:textColor="?android:attr/textColorLink"/> android:textColor="?android:attr/textColorLink"/>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:padding="@dimen/margin_small" android:padding="@dimen/margin_small"
tools:context=".android.blogs.RssFeedImportActivity"> tools:context=".android.blog.RssFeedImportActivity">
<EditText <android.support.v7.widget.CardView
android:id="@+id/urlInput"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" android:layout_weight="1"
android:gravity="top" android:elevation="@dimen/cardview_default_elevation"
android:hint="@string/blogs_rss_feeds_import_hint" app:cardBackgroundColor="@color/card_background"
android:inputType="textUri" app:cardCornerRadius="0dp"
android:paddingLeft="@dimen/margin_large" app:cardUseCompatPadding="false">
android:paddingRight="@dimen/margin_large"/>
<EditText
android:id="@+id/urlInput"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/transparent"
android:gravity="top"
android:hint="@string/blogs_rss_feeds_import_hint"
android:inputType="textUri"
android:padding="@dimen/margin_medium"
android:textColor="?android:attr/textColorPrimary"/>
</android.support.v7.widget.CardView>
<Button <Button
android:id="@+id/importButton" android:id="@+id/importButton"
......
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<Button <Button
android:id="@+id/continueButton" android:id="@+id/continueButton"
style="@style/BriarButton.Default" style="@style/BriarButton"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_medium" android:layout_marginTop="@dimen/margin_medium"
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<Button <Button
android:id="@+id/next" android:id="@+id/next"
style="@style/BriarButton.Default" style="@style/BriarButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_activity_horizontal" android:layout_marginTop="@dimen/margin_activity_horizontal"
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<Button <Button
android:id="@+id/next" android:id="@+id/next"
style="@style/BriarButton.Default" style="@style/BriarButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:enabled="false" android:enabled="false"
......
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
<Button <Button
android:id="@+id/next" android:id="@+id/next"
style="@style/BriarButton.Default" style="@style/BriarButton"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:enabled="false" android:enabled="false"
......
...@@ -12,22 +12,20 @@ ...@@ -12,22 +12,20 @@
<org.thoughtcrime.securesms.components.emoji.EmojiTextView <org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/text" android:id="@+id/text"
style="@style/TextMessage"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textIsSelectable="true"
android:textSize="@dimen/text_size_medium"
tools:text="Short message"/> tools:text="Short message"/>
<TextView <TextView
android:id="@+id/time" android:id="@+id/time"
style="@style/TextMessage.Timestamp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="right|end" android:layout_gravity="right|end"
android:layout_marginTop="@dimen/message_bubble_timestamp_margin" android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
android:maxLines="1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:textSize="@dimen/text_size_tiny"
tools:text="Dec 24, 13:37"/> tools:text="Dec 24, 13:37"/>
</LinearLayout> </LinearLayout>
...@@ -17,24 +17,22 @@ ...@@ -17,24 +17,22 @@
<org.thoughtcrime.securesms.components.emoji.EmojiTextView <org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/text" android:id="@+id/text"
style="@style/TextMessage"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/briar_text_primary_inverse" android:textColor="@color/briar_text_primary_inverse"
android:textIsSelectable="true"
android:textSize="@dimen/text_size_medium"
tools:text="This is a long long long message that spans over several lines.\n\nIt ends here."/> tools:text="This is a long long long message that spans over several lines.\n\nIt ends here."/>
<TextView <TextView
android:id="@+id/time" android:id="@+id/time"
style="@style/TextMessage.Timestamp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_below="@+id/text" android:layout_below="@+id/text"
android:layout_marginTop="@dimen/message_bubble_timestamp_margin" android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
android:maxLines="1"
android:textColor="@color/private_message_date_inverse" android:textColor="@color/private_message_date_inverse"
android:textSize="@dimen/text_size_tiny"
tools:text="Dec 24, 13:37"/> tools:text="Dec 24, 13:37"/>
<ImageView <ImageView
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<org.thoughtcrime.securesms.components.emoji.EmojiTextView <org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/msgText" android:id="@+id/msgText"
style="@style/TextMessage"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="left|start" android:layout_gravity="left|start"
...@@ -15,8 +16,6 @@ ...@@ -15,8 +16,6 @@
android:layout_marginRight="@dimen/message_bubble_margin_non_tail" android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
android:background="@drawable/msg_in_top" android:background="@drawable/msg_in_top"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textIsSelectable="true"
android:textSize="@dimen/text_size_medium"
tools:text="Short message"/> tools:text="Short message"/>
<RelativeLayout <RelativeLayout
...@@ -29,17 +28,16 @@ ...@@ -29,17 +28,16 @@
<org.thoughtcrime.securesms.components.emoji.EmojiTextView <org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/text" android:id="@+id/text"
style="@style/TextMessage.Notice"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minWidth="80dp" android:minWidth="80dp"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:textIsSelectable="true"
android:textSize="@dimen/text_size_medium"
android:textStyle="italic"
tools:text="@string/forum_invitation_received"/> tools:text="@string/forum_invitation_received"/>
<TextView <TextView
android:id="@+id/time" android:id="@+id/time"
style="@style/TextMessage.Timestamp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignEnd="@+id/text" android:layout_alignEnd="@+id/text"
...@@ -47,7 +45,6 @@ ...@@ -47,7 +45,6 @@
android:layout_below="@+id/text" android:layout_below="@+id/text"
android:layout_marginTop="@dimen/message_bubble_timestamp_margin" android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
android:textColor="?android:attr/textColorTertiary" android:textColor="?android:attr/textColorTertiary"
android:textSize="@dimen/text_size_tiny"
tools:text="Dec 24, 13:37"/> tools:text="Dec 24, 13:37"/>
</RelativeLayout> </RelativeLayout>
......
...@@ -9,14 +9,13 @@ ...@@ -9,14 +9,13 @@
<org.thoughtcrime.securesms.components.emoji.EmojiTextView <org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/msgText" android:id="@+id/msgText"
style="@style/TextMessage"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/message_bubble_margin_non_tail" android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
android:layout_marginRight="@dimen/message_bubble_margin_tail" android:layout_marginRight="@dimen/message_bubble_margin_tail"
android:background="@drawable/msg_out_top" android:background="@drawable/msg_out_top"
android:textColor="@color/briar_text_primary_inverse" android:textColor="@color/briar_text_primary_inverse"
android:textIsSelectable="true"
android:textSize="@dimen/text_size_medium"
tools:text="This is a long long long message that spans over several lines.\n\nIt ends here."/> tools:text="This is a long long long message that spans over several lines.\n\nIt ends here."/>
<RelativeLayout <RelativeLayout
...@@ -29,16 +28,15 @@ ...@@ -29,16 +28,15 @@
<org.thoughtcrime.securesms.components.emoji.EmojiTextView <org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/text" android:id="@+id/text"
style="@style/TextMessage.Notice"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:textIsSelectable="true"
android:textSize="@dimen/text_size_medium"
android:textStyle="italic"
tools:text="@string/introduction_request_received"/> tools:text="@string/introduction_request_received"/>
<TextView <TextView
android:id="@+id/time" android:id="@+id/time"
style="@style/TextMessage.Timestamp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
...@@ -46,7 +44,6 @@ ...@@ -46,7 +44,6 @@
android:layout_below="@+id/text" android:layout_below="@+id/text"
android:layout_marginTop="@dimen/message_bubble_timestamp_margin" android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
android:textColor="?android:attr/textColorTertiary" android:textColor="?android:attr/textColorTertiary"
android:textSize="@dimen/text_size_tiny"
tools:text="Dec 24, 13:37"/> tools:text="Dec 24, 13:37"/>
<android.support.v7.widget.AppCompatImageView <android.support.v7.widget.AppCompatImageView
......
...@@ -8,14 +8,13 @@ ...@@ -8,14 +8,13 @@
<org.thoughtcrime.securesms.components.emoji.EmojiTextView <org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/msgText" android:id="@+id/msgText"
style="@style/TextMessage"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/message_bubble_margin_tail" android:layout_marginLeft="@dimen/message_bubble_margin_tail"
android:layout_marginRight="@dimen/message_bubble_margin_non_tail" android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
android:background="@drawable/msg_in_top" android:background="@drawable/msg_in_top"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textIsSelectable="true"
android:textSize="@dimen/text_size_medium"
tools:text="Short message"/> tools:text="Short message"/>
<RelativeLayout <RelativeLayout
...@@ -28,17 +27,15 @@ ...@@ -28,17 +27,15 @@
<org.thoughtcrime.securesms.components.emoji.EmojiTextView <org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/text" android:id="@+id/text"
style="@style/TextMessage.Notice"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minWidth="80dp"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:textIsSelectable="true"
android:textSize="@dimen/text_size_medium"
android:textStyle="italic"
tools:text="@string/introduction_request_received"/> tools:text="@string/introduction_request_received"/>
<TextView <TextView
android:id="@+id/time" android:id="@+id/time"
style="@style/TextMessage.Timestamp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignEnd="@+id/text" android:layout_alignEnd="@+id/text"
...@@ -46,7 +43,6 @@ ...@@ -46,7 +43,6 @@
android:layout_below="@+id/acceptButton" android:layout_below="@+id/acceptButton"
android:layout_marginTop="@dimen/message_bubble_timestamp_margin" android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
android:textColor="?android:attr/textColorTertiary" android:textColor="?android:attr/textColorTertiary"
android:textSize="@dimen/text_size_tiny"
tools:text="Dec 24, 13:37"/> tools:text="Dec 24, 13:37"/>
<Button <Button
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<Button <Button
android:id="@+id/button" android:id="@+id/button"
style="@style/BriarButton.Default" style="@style/BriarButton"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="8dp"
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
android:layout_margin="8dp" android:layout_margin="8dp"
android:contentDescription="@string/help" android:contentDescription="@string/help"
android:src="@drawable/ic_help_outline_white" android:src="@drawable/ic_help_outline_white"
android:tint="@color/briar_button_positive" android:tint="@color/briar_button_text_positive"
app:layout_constraintBottom_toBottomOf="@+id/button" app:layout_constraintBottom_toBottomOf="@+id/button"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/button"/> app:layout_constraintTop_toTopOf="@+id/button"/>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
android:layout_width="@dimen/avatar_forum_size" android:layout_width="@dimen/avatar_forum_size"
android:layout_height="@dimen/avatar_forum_size" android:layout_height="@dimen/avatar_forum_size"
android:layout_gravity="bottom|left" android:layout_gravity="bottom|left"
android:src="@color/briar_button_positive"/> android:src="@color/briar_button_text_positive"/>
<android.support.v7.widget.AppCompatTextView <android.support.v7.widget.AppCompatTextView
android:id="@+id/textAvatarView" android:id="@+id/textAvatarView"
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
android:id="@+id/emoji_toggle" android:id="@+id/emoji_toggle"
android:layout_width="@dimen/text_input_height" android:layout_width="@dimen/text_input_height"
android:layout_height="@dimen/text_input_height" android:layout_height="@dimen/text_input_height"
android:layout_gravity="bottom"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:padding="@dimen/margin_small" android:padding="@dimen/margin_small"
android:scaleType="center" android:scaleType="center"
...@@ -32,21 +33,24 @@ ...@@ -32,21 +33,24 @@
android:layout_weight="1" android:layout_weight=