|
@@ -113,11 +113,10 @@
|
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
|
android:paddingStart="@dimen/standard_padding"
|
|
android:paddingStart="@dimen/standard_padding"
|
|
|
android:paddingEnd="@dimen/standard_padding"
|
|
android:paddingEnd="@dimen/standard_padding"
|
|
|
-
|
|
|
|
|
android:orientation="vertical">
|
|
android:orientation="vertical">
|
|
|
|
|
|
|
|
<LinearLayout
|
|
<LinearLayout
|
|
|
- android:id="@+id/menu_copy_message"
|
|
|
|
|
|
|
+ android:id="@+id/menu_reply_to_message"
|
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="@dimen/bottom_sheet_item_height"
|
|
android:layout_height="@dimen/bottom_sheet_item_height"
|
|
|
android:background="?android:attr/selectableItemBackground"
|
|
android:background="?android:attr/selectableItemBackground"
|
|
@@ -126,21 +125,21 @@
|
|
|
tools:ignore="UseCompoundDrawables">
|
|
tools:ignore="UseCompoundDrawables">
|
|
|
|
|
|
|
|
<ImageView
|
|
<ImageView
|
|
|
- android:id="@+id/menu_icon_copy_message"
|
|
|
|
|
|
|
+ android:id="@+id/menu_icon_reply_to_message"
|
|
|
android:layout_width="wrap_content"
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
|
android:contentDescription="@null"
|
|
android:contentDescription="@null"
|
|
|
- android:src="@drawable/ic_content_copy"
|
|
|
|
|
|
|
+ android:src="@drawable/ic_reply"
|
|
|
app:tint="@color/high_emphasis_menu_icon" />
|
|
app:tint="@color/high_emphasis_menu_icon" />
|
|
|
|
|
|
|
|
<androidx.appcompat.widget.AppCompatTextView
|
|
<androidx.appcompat.widget.AppCompatTextView
|
|
|
- android:id="@+id/menu_text_copy_message"
|
|
|
|
|
|
|
+ android:id="@+id/menu_text_reply_to_message"
|
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_gravity="start|center_vertical"
|
|
android:layout_gravity="start|center_vertical"
|
|
|
android:paddingStart="@dimen/standard_double_padding"
|
|
android:paddingStart="@dimen/standard_double_padding"
|
|
|
android:paddingEnd="@dimen/zero"
|
|
android:paddingEnd="@dimen/zero"
|
|
|
- android:text="@string/nc_copy_message"
|
|
|
|
|
|
|
+ android:text="@string/nc_reply"
|
|
|
android:textAlignment="viewStart"
|
|
android:textAlignment="viewStart"
|
|
|
android:textColor="@color/high_emphasis_text"
|
|
android:textColor="@color/high_emphasis_text"
|
|
|
android:textSize="@dimen/bottom_sheet_text_size" />
|
|
android:textSize="@dimen/bottom_sheet_text_size" />
|
|
@@ -148,7 +147,7 @@
|
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
|
|
|
|
<LinearLayout
|
|
<LinearLayout
|
|
|
- android:id="@+id/menu_mark_as_unread"
|
|
|
|
|
|
|
+ android:id="@+id/menu_reply_privately"
|
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="@dimen/bottom_sheet_item_height"
|
|
android:layout_height="@dimen/bottom_sheet_item_height"
|
|
|
android:background="?android:attr/selectableItemBackground"
|
|
android:background="?android:attr/selectableItemBackground"
|
|
@@ -157,21 +156,21 @@
|
|
|
tools:ignore="UseCompoundDrawables">
|
|
tools:ignore="UseCompoundDrawables">
|
|
|
|
|
|
|
|
<ImageView
|
|
<ImageView
|
|
|
- android:id="@+id/menu_icon_mark_as_unread"
|
|
|
|
|
|
|
+ android:id="@+id/menu_icon_reply_privately"
|
|
|
android:layout_width="wrap_content"
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
|
android:contentDescription="@null"
|
|
android:contentDescription="@null"
|
|
|
- android:src="@drawable/ic_eye_off"
|
|
|
|
|
|
|
+ android:src="@drawable/ic_reply"
|
|
|
app:tint="@color/high_emphasis_menu_icon" />
|
|
app:tint="@color/high_emphasis_menu_icon" />
|
|
|
|
|
|
|
|
<androidx.appcompat.widget.AppCompatTextView
|
|
<androidx.appcompat.widget.AppCompatTextView
|
|
|
- android:id="@+id/menu_text_mark_as_unread"
|
|
|
|
|
|
|
+ android:id="@+id/menu_text_reply_privately"
|
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_gravity="start|center_vertical"
|
|
android:layout_gravity="start|center_vertical"
|
|
|
android:paddingStart="@dimen/standard_double_padding"
|
|
android:paddingStart="@dimen/standard_double_padding"
|
|
|
android:paddingEnd="@dimen/zero"
|
|
android:paddingEnd="@dimen/zero"
|
|
|
- android:text="@string/nc_mark_as_unread"
|
|
|
|
|
|
|
+ android:text="@string/nc_reply_privately"
|
|
|
android:textAlignment="viewStart"
|
|
android:textAlignment="viewStart"
|
|
|
android:textColor="@color/high_emphasis_text"
|
|
android:textColor="@color/high_emphasis_text"
|
|
|
android:textSize="@dimen/bottom_sheet_text_size" />
|
|
android:textSize="@dimen/bottom_sheet_text_size" />
|
|
@@ -210,7 +209,7 @@
|
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
|
|
|
|
<LinearLayout
|
|
<LinearLayout
|
|
|
- android:id="@+id/menu_reply_to_message"
|
|
|
|
|
|
|
+ android:id="@+id/menu_mark_as_unread"
|
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="@dimen/bottom_sheet_item_height"
|
|
android:layout_height="@dimen/bottom_sheet_item_height"
|
|
|
android:background="?android:attr/selectableItemBackground"
|
|
android:background="?android:attr/selectableItemBackground"
|
|
@@ -219,21 +218,21 @@
|
|
|
tools:ignore="UseCompoundDrawables">
|
|
tools:ignore="UseCompoundDrawables">
|
|
|
|
|
|
|
|
<ImageView
|
|
<ImageView
|
|
|
- android:id="@+id/menu_icon_reply_to_message"
|
|
|
|
|
|
|
+ android:id="@+id/menu_icon_mark_as_unread"
|
|
|
android:layout_width="wrap_content"
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
|
android:contentDescription="@null"
|
|
android:contentDescription="@null"
|
|
|
- android:src="@drawable/ic_reply"
|
|
|
|
|
|
|
+ android:src="@drawable/ic_eye_off"
|
|
|
app:tint="@color/high_emphasis_menu_icon" />
|
|
app:tint="@color/high_emphasis_menu_icon" />
|
|
|
|
|
|
|
|
<androidx.appcompat.widget.AppCompatTextView
|
|
<androidx.appcompat.widget.AppCompatTextView
|
|
|
- android:id="@+id/menu_text_reply_to_message"
|
|
|
|
|
|
|
+ android:id="@+id/menu_text_mark_as_unread"
|
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_gravity="start|center_vertical"
|
|
android:layout_gravity="start|center_vertical"
|
|
|
android:paddingStart="@dimen/standard_double_padding"
|
|
android:paddingStart="@dimen/standard_double_padding"
|
|
|
android:paddingEnd="@dimen/zero"
|
|
android:paddingEnd="@dimen/zero"
|
|
|
- android:text="@string/nc_reply"
|
|
|
|
|
|
|
+ android:text="@string/nc_mark_as_unread"
|
|
|
android:textAlignment="viewStart"
|
|
android:textAlignment="viewStart"
|
|
|
android:textColor="@color/high_emphasis_text"
|
|
android:textColor="@color/high_emphasis_text"
|
|
|
android:textSize="@dimen/bottom_sheet_text_size" />
|
|
android:textSize="@dimen/bottom_sheet_text_size" />
|
|
@@ -241,7 +240,7 @@
|
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
|
|
|
|
<LinearLayout
|
|
<LinearLayout
|
|
|
- android:id="@+id/menu_reply_privately"
|
|
|
|
|
|
|
+ android:id="@+id/menu_copy_message"
|
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="@dimen/bottom_sheet_item_height"
|
|
android:layout_height="@dimen/bottom_sheet_item_height"
|
|
|
android:background="?android:attr/selectableItemBackground"
|
|
android:background="?android:attr/selectableItemBackground"
|
|
@@ -250,21 +249,21 @@
|
|
|
tools:ignore="UseCompoundDrawables">
|
|
tools:ignore="UseCompoundDrawables">
|
|
|
|
|
|
|
|
<ImageView
|
|
<ImageView
|
|
|
- android:id="@+id/menu_icon_reply_privately"
|
|
|
|
|
|
|
+ android:id="@+id/menu_icon_copy_message"
|
|
|
android:layout_width="wrap_content"
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
|
android:contentDescription="@null"
|
|
android:contentDescription="@null"
|
|
|
- android:src="@drawable/ic_reply"
|
|
|
|
|
|
|
+ android:src="@drawable/ic_content_copy"
|
|
|
app:tint="@color/high_emphasis_menu_icon" />
|
|
app:tint="@color/high_emphasis_menu_icon" />
|
|
|
|
|
|
|
|
<androidx.appcompat.widget.AppCompatTextView
|
|
<androidx.appcompat.widget.AppCompatTextView
|
|
|
- android:id="@+id/menu_text_reply_privately"
|
|
|
|
|
|
|
+ android:id="@+id/menu_text_copy_message"
|
|
|
android:layout_width="match_parent"
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_gravity="start|center_vertical"
|
|
android:layout_gravity="start|center_vertical"
|
|
|
android:paddingStart="@dimen/standard_double_padding"
|
|
android:paddingStart="@dimen/standard_double_padding"
|
|
|
android:paddingEnd="@dimen/zero"
|
|
android:paddingEnd="@dimen/zero"
|
|
|
- android:text="@string/nc_reply_privately"
|
|
|
|
|
|
|
+ android:text="@string/nc_copy_message"
|
|
|
android:textAlignment="viewStart"
|
|
android:textAlignment="viewStart"
|
|
|
android:textColor="@color/high_emphasis_text"
|
|
android:textColor="@color/high_emphasis_text"
|
|
|
android:textSize="@dimen/bottom_sheet_text_size" />
|
|
android:textSize="@dimen/bottom_sheet_text_size" />
|
|
@@ -302,7 +301,6 @@
|
|
|
|
|
|
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
|
|
|
|
-
|
|
|
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
|
|
|
|
</LinearLayout>
|
|
</LinearLayout>
|
Marcel Hibbe