diff --git a/app/src/main/res/drawable/ic_mimetype_folder_starred.xml b/app/src/main/res/drawable/ic_mimetype_folder_starred.xml deleted file mode 100755 index e836f7cac..000000000 --- a/app/src/main/res/drawable/ic_mimetype_folder_starred.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Nextcloud Talk application - ~ - ~ @author Mario Danic - ~ Copyright (C) 2017-2019 Mario Danic <mario@lovelyhq.com> - ~ - ~ This program is free software: you can redistribute it and/or modify - ~ it under the terms of the GNU General Public License as published by - ~ the Free Software Foundation, either version 3 of the License, or - ~ at your option) any later version. - ~ - ~ This program is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - ~ GNU General Public License for more details. - ~ - ~ You should have received a copy of the GNU General Public License - ~ along with this program. If not, see <http://www.gnu.org/licenses/>. - --> - -<vector xmlns:android="http://schemas.android.com/apk/res/android" - android:width="16dp" - android:height="16dp" - android:viewportWidth="16" - android:viewportHeight="16"> - - <path - android:fillColor="#0082c9" - android:pathData="M1.5,2 C1.25,2,1,2.25,1,2.5 L1,13.5 C1,13.76,1.24,14,1.5,14 L14.5,14 -C14.76,14,15,13.759,15,13.5 L15,4.5 C15,4.25,14.75,4,14.5,4 L8,4 L6,2 L1.5,2 Z -M8,5.25 L9.1,7.9004 L12,8.125 L9.75,10 L10.5,12.75 L8,11.199 L5.5,12.75 L6.25,10 -L4,8.125 L6.9,7.9004 L8,5.25 Z" /> -</vector> \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_conversation_operations.xml b/app/src/main/res/layout/dialog_conversation_operations.xml index a267d4efe..026bb455c 100644 --- a/app/src/main/res/layout/dialog_conversation_operations.xml +++ b/app/src/main/res/layout/dialog_conversation_operations.xml @@ -31,345 +31,337 @@ android:paddingEnd="@dimen/standard_padding" android:paddingBottom="@dimen/standard_half_padding"> + <TextView + android:id="@+id/conversation_operation_header" + android:layout_width="wrap_content" + android:layout_height="@dimen/bottom_sheet_item_height" + android:gravity="start|center_vertical" + android:textColor="@color/medium_emphasis_text" + android:textSize="@dimen/bottom_sheet_text_size" + tools:text="conversation name" /> + <LinearLayout - android:id="@+id/operation_items_layout" + android:id="@+id/conversation_operation_remove_favorite" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> + android:layout_height="@dimen/bottom_sheet_item_height" + android:gravity="center_vertical" + android:orientation="horizontal" + tools:ignore="UseCompoundDrawables"> - <TextView - android:id="@+id/conversation_operation_header" + <ImageView android:layout_width="wrap_content" - android:layout_height="@dimen/bottom_sheet_item_height" - android:gravity="start|center_vertical" - android:textColor="@color/medium_emphasis_text" - android:textSize="@dimen/bottom_sheet_text_size" - tools:text="conversation name" /> + android:layout_height="wrap_content" + android:contentDescription="@null" + android:src="@drawable/ic_star_border_black_24dp" + app:tint="@color/grey_600" /> - <LinearLayout - android:id="@+id/conversation_operation_remove_favorite" + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" - android:layout_height="@dimen/bottom_sheet_item_height" - android:gravity="center_vertical" - android:orientation="horizontal" - tools:ignore="UseCompoundDrawables"> + android:layout_height="wrap_content" + android:layout_gravity="start|center_vertical" + android:paddingStart="40dp" + android:paddingEnd="@dimen/zero" + android:text="@string/nc_remove_from_favorites" + android:textAlignment="viewStart" + android:textColor="@color/high_emphasis_text" + android:textSize="@dimen/bottom_sheet_text_size" /> + </LinearLayout> - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:contentDescription="@null" - android:src="@drawable/ic_star_border_black_24dp" - app:tint="@color/grey_600" /> + <LinearLayout + android:id="@+id/conversation_operation_add_favorite" + android:layout_width="match_parent" + android:layout_height="@dimen/bottom_sheet_item_height" + android:gravity="center_vertical" + android:orientation="horizontal" + tools:ignore="UseCompoundDrawables"> - <androidx.appcompat.widget.AppCompatTextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="start|center_vertical" - android:paddingStart="40dp" - android:paddingEnd="@dimen/zero" - android:text="@string/nc_remove_from_favorites" - android:textAlignment="viewStart" - android:textColor="@color/high_emphasis_text" - android:textSize="@dimen/bottom_sheet_text_size" /> - </LinearLayout> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@null" + android:src="@drawable/ic_star_black_24dp" + app:tint="@color/grey_600" /> - <LinearLayout - android:id="@+id/conversation_operation_add_favorite" + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" - android:layout_height="@dimen/bottom_sheet_item_height" - android:gravity="center_vertical" - android:orientation="horizontal" - tools:ignore="UseCompoundDrawables"> + android:layout_height="wrap_content" + android:layout_gravity="start|center_vertical" + android:paddingStart="40dp" + android:paddingEnd="@dimen/zero" + android:text="@string/nc_add_to_favorites" + android:textAlignment="viewStart" + android:textColor="@color/high_emphasis_text" + android:textSize="@dimen/bottom_sheet_text_size" /> + </LinearLayout> - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:contentDescription="@null" - android:src="@drawable/ic_star_black_24dp" - app:tint="@color/grey_600" /> + <LinearLayout + android:id="@+id/conversation_operation_mark_as_read" + android:layout_width="match_parent" + android:layout_height="@dimen/bottom_sheet_item_height" + android:gravity="center_vertical" + android:orientation="horizontal" + tools:ignore="UseCompoundDrawables"> - <androidx.appcompat.widget.AppCompatTextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="start|center_vertical" - android:paddingStart="40dp" - android:paddingEnd="@dimen/zero" - android:text="@string/nc_add_to_favorites" - android:textAlignment="viewStart" - android:textColor="@color/high_emphasis_text" - android:textSize="@dimen/bottom_sheet_text_size" /> - </LinearLayout> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@null" + android:src="@drawable/ic_eye" + app:tint="@color/grey_600" /> - <LinearLayout - android:id="@+id/conversation_operation_mark_as_read" + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" - android:layout_height="@dimen/bottom_sheet_item_height" - android:gravity="center_vertical" - android:orientation="horizontal" - tools:ignore="UseCompoundDrawables"> + android:layout_height="wrap_content" + android:layout_gravity="start|center_vertical" + android:paddingStart="40dp" + android:paddingEnd="@dimen/zero" + android:text="@string/nc_mark_as_read" + android:textAlignment="viewStart" + android:textColor="@color/high_emphasis_text" + android:textSize="@dimen/bottom_sheet_text_size" /> + </LinearLayout> - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:contentDescription="@null" - android:src="@drawable/ic_eye" - app:tint="@color/grey_600" /> + <LinearLayout + android:id="@+id/conversation_operation_rename" + android:layout_width="match_parent" + android:layout_height="@dimen/bottom_sheet_item_height" + android:gravity="center_vertical" + android:orientation="horizontal" + tools:ignore="UseCompoundDrawables"> - <androidx.appcompat.widget.AppCompatTextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="start|center_vertical" - android:paddingStart="40dp" - android:paddingEnd="@dimen/zero" - android:text="@string/nc_mark_as_read" - android:textAlignment="viewStart" - android:textColor="@color/high_emphasis_text" - android:textSize="@dimen/bottom_sheet_text_size" /> - </LinearLayout> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@null" + android:src="@drawable/ic_pencil_grey600_24dp" + app:tint="@color/grey_600" /> - <LinearLayout - android:id="@+id/conversation_operation_rename" + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" - android:layout_height="@dimen/bottom_sheet_item_height" - android:gravity="center_vertical" - android:orientation="horizontal" - tools:ignore="UseCompoundDrawables"> + android:layout_height="wrap_content" + android:layout_gravity="start|center_vertical" + android:paddingStart="40dp" + android:paddingEnd="@dimen/zero" + android:text="@string/nc_rename" + android:textAlignment="viewStart" + android:textColor="@color/high_emphasis_text" + android:textSize="@dimen/bottom_sheet_text_size" /> + </LinearLayout> - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:contentDescription="@null" - android:src="@drawable/ic_pencil_grey600_24dp" - app:tint="@color/grey_600" /> + <LinearLayout + android:id="@+id/conversation_operation_make_public" + android:layout_width="match_parent" + android:layout_height="@dimen/bottom_sheet_item_height" + android:gravity="center_vertical" + android:orientation="horizontal" + tools:ignore="UseCompoundDrawables"> - <androidx.appcompat.widget.AppCompatTextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="start|center_vertical" - android:paddingStart="40dp" - android:paddingEnd="@dimen/zero" - android:text="@string/nc_rename" - android:textAlignment="viewStart" - android:textColor="@color/high_emphasis_text" - android:textSize="@dimen/bottom_sheet_text_size" /> - </LinearLayout> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@null" + android:src="@drawable/ic_link_grey600_24px" + app:tint="@color/grey_600" /> - <LinearLayout - android:id="@+id/conversation_operation_make_public" + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" - android:layout_height="@dimen/bottom_sheet_item_height" - android:gravity="center_vertical" - android:orientation="horizontal" - tools:ignore="UseCompoundDrawables"> + android:layout_height="wrap_content" + android:layout_gravity="start|center_vertical" + android:paddingStart="40dp" + android:paddingEnd="@dimen/zero" + android:text="@string/nc_make_call_public" + android:textAlignment="viewStart" + android:textColor="@color/high_emphasis_text" + android:textSize="@dimen/bottom_sheet_text_size" /> + </LinearLayout> - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:contentDescription="@null" - android:src="@drawable/ic_link_grey600_24px" - app:tint="@color/grey_600" /> + <LinearLayout + android:id="@+id/conversation_operation_change_password" + android:layout_width="match_parent" + android:layout_height="@dimen/bottom_sheet_item_height" + android:gravity="center_vertical" + android:orientation="horizontal" + tools:ignore="UseCompoundDrawables"> - <androidx.appcompat.widget.AppCompatTextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="start|center_vertical" - android:paddingStart="40dp" - android:paddingEnd="@dimen/zero" - android:text="@string/nc_make_call_public" - android:textAlignment="viewStart" - android:textColor="@color/high_emphasis_text" - android:textSize="@dimen/bottom_sheet_text_size" /> - </LinearLayout> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@null" + android:src="@drawable/ic_lock_grey600_24px" + app:tint="@color/grey_600" /> - <LinearLayout - android:id="@+id/conversation_operation_change_password" + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" - android:layout_height="@dimen/bottom_sheet_item_height" - android:gravity="center_vertical" - android:orientation="horizontal" - tools:ignore="UseCompoundDrawables"> + android:layout_height="wrap_content" + android:layout_gravity="start|center_vertical" + android:paddingStart="40dp" + android:paddingEnd="@dimen/zero" + android:text="@string/nc_change_password" + android:textAlignment="viewStart" + android:textColor="@color/high_emphasis_text" + android:textSize="@dimen/bottom_sheet_text_size" /> + </LinearLayout> - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:contentDescription="@null" - android:src="@drawable/ic_lock_grey600_24px" - app:tint="@color/grey_600" /> + <LinearLayout + android:id="@+id/conversation_operation_clear_password" + android:layout_width="match_parent" + android:layout_height="@dimen/bottom_sheet_item_height" + android:gravity="center_vertical" + android:orientation="horizontal" + tools:ignore="UseCompoundDrawables"> - <androidx.appcompat.widget.AppCompatTextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="start|center_vertical" - android:paddingStart="40dp" - android:paddingEnd="@dimen/zero" - android:text="@string/nc_change_password" - android:textAlignment="viewStart" - android:textColor="@color/high_emphasis_text" - android:textSize="@dimen/bottom_sheet_text_size" /> - </LinearLayout> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@null" + android:src="@drawable/ic_lock_open_grey600_24dp" + app:tint="@color/grey_600" /> - <LinearLayout - android:id="@+id/conversation_operation_clear_password" + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" - android:layout_height="@dimen/bottom_sheet_item_height" - android:gravity="center_vertical" - android:orientation="horizontal" - tools:ignore="UseCompoundDrawables"> + android:layout_height="wrap_content" + android:layout_gravity="start|center_vertical" + android:paddingStart="40dp" + android:paddingEnd="@dimen/zero" + android:text="@string/nc_clear_password" + android:textAlignment="viewStart" + android:textColor="@color/high_emphasis_text" + android:textSize="@dimen/bottom_sheet_text_size" /> + </LinearLayout> - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:contentDescription="@null" - android:src="@drawable/ic_lock_open_grey600_24dp" - app:tint="@color/grey_600" /> + <LinearLayout + android:id="@+id/conversation_operation_set_password" + android:layout_width="match_parent" + android:layout_height="@dimen/bottom_sheet_item_height" + android:gravity="center_vertical" + android:orientation="horizontal" + tools:ignore="UseCompoundDrawables"> - <androidx.appcompat.widget.AppCompatTextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="start|center_vertical" - android:paddingStart="40dp" - android:paddingEnd="@dimen/zero" - android:text="@string/nc_clear_password" - android:textAlignment="viewStart" - android:textColor="@color/high_emphasis_text" - android:textSize="@dimen/bottom_sheet_text_size" /> - </LinearLayout> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@null" + android:src="@drawable/ic_lock_plus_grey600_24dp" + app:tint="@color/grey_600" /> - <LinearLayout - android:id="@+id/conversation_operation_set_password" + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" - android:layout_height="@dimen/bottom_sheet_item_height" - android:gravity="center_vertical" - android:orientation="horizontal" - tools:ignore="UseCompoundDrawables"> + android:layout_height="wrap_content" + android:layout_gravity="start|center_vertical" + android:paddingStart="40dp" + android:paddingEnd="@dimen/zero" + android:text="@string/nc_set_password" + android:textAlignment="viewStart" + android:textColor="@color/high_emphasis_text" + android:textSize="@dimen/bottom_sheet_text_size" /> + </LinearLayout> - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:contentDescription="@null" - android:src="@drawable/ic_lock_plus_grey600_24dp" - app:tint="@color/grey_600" /> + <LinearLayout + android:id="@+id/conversation_operation_delete" + android:layout_width="match_parent" + android:layout_height="@dimen/bottom_sheet_item_height" + android:gravity="center_vertical" + android:orientation="horizontal" + tools:ignore="UseCompoundDrawables"> - <androidx.appcompat.widget.AppCompatTextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="start|center_vertical" - android:paddingStart="40dp" - android:paddingEnd="@dimen/zero" - android:text="@string/nc_set_password" - android:textAlignment="viewStart" - android:textColor="@color/high_emphasis_text" - android:textSize="@dimen/bottom_sheet_text_size" /> - </LinearLayout> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@null" + android:src="@drawable/ic_delete_grey600_24dp" + app:tint="@color/grey_600" /> - <LinearLayout - android:id="@+id/conversation_operation_delete" + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" - android:layout_height="@dimen/bottom_sheet_item_height" - android:gravity="center_vertical" - android:orientation="horizontal" - tools:ignore="UseCompoundDrawables"> + android:layout_height="wrap_content" + android:layout_gravity="start|center_vertical" + android:paddingStart="40dp" + android:paddingEnd="@dimen/zero" + android:text="@string/nc_delete_call" + android:textAlignment="viewStart" + android:textColor="@color/high_emphasis_text" + android:textSize="@dimen/bottom_sheet_text_size" /> + </LinearLayout> - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:contentDescription="@null" - android:src="@drawable/ic_delete_grey600_24dp" - app:tint="@color/grey_600" /> + <LinearLayout + android:id="@+id/conversation_operation_share_link" + android:layout_width="match_parent" + android:layout_height="@dimen/bottom_sheet_item_height" + android:gravity="center_vertical" + android:orientation="horizontal" + tools:ignore="UseCompoundDrawables"> - <androidx.appcompat.widget.AppCompatTextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="start|center_vertical" - android:paddingStart="40dp" - android:paddingEnd="@dimen/zero" - android:text="@string/nc_delete_call" - android:textAlignment="viewStart" - android:textColor="@color/high_emphasis_text" - android:textSize="@dimen/bottom_sheet_text_size" /> - </LinearLayout> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@null" + android:src="@drawable/ic_link_grey600_24px" + app:tint="@color/grey_600" /> - <LinearLayout - android:id="@+id/conversation_operation_share_link" + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" - android:layout_height="@dimen/bottom_sheet_item_height" - android:gravity="center_vertical" - android:orientation="horizontal" - tools:ignore="UseCompoundDrawables"> + android:layout_height="wrap_content" + android:layout_gravity="start|center_vertical" + android:paddingStart="40dp" + android:paddingEnd="@dimen/zero" + android:text="@string/nc_share_link" + android:textAlignment="viewStart" + android:textColor="@color/high_emphasis_text" + android:textSize="@dimen/bottom_sheet_text_size" /> + </LinearLayout> - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:contentDescription="@null" - android:src="@drawable/ic_link_grey600_24px" - app:tint="@color/grey_600" /> + <LinearLayout + android:id="@+id/conversation_operation_make_private" + android:layout_width="match_parent" + android:layout_height="@dimen/bottom_sheet_item_height" + android:gravity="center_vertical" + android:orientation="horizontal" + tools:ignore="UseCompoundDrawables"> - <androidx.appcompat.widget.AppCompatTextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="start|center_vertical" - android:paddingStart="40dp" - android:paddingEnd="@dimen/zero" - android:text="@string/nc_share_link" - android:textAlignment="viewStart" - android:textColor="@color/high_emphasis_text" - android:textSize="@dimen/bottom_sheet_text_size" /> - </LinearLayout> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@null" + android:src="@drawable/ic_group_grey600_24px" + app:tint="@color/grey_600" /> - <LinearLayout - android:id="@+id/conversation_operation_make_private" + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" - android:layout_height="@dimen/bottom_sheet_item_height" - android:gravity="center_vertical" - android:orientation="horizontal" - tools:ignore="UseCompoundDrawables"> + android:layout_height="wrap_content" + android:layout_gravity="start|center_vertical" + android:paddingStart="40dp" + android:paddingEnd="@dimen/zero" + android:text="@string/nc_make_call_private" + android:textAlignment="viewStart" + android:textColor="@color/high_emphasis_text" + android:textSize="@dimen/bottom_sheet_text_size" /> + </LinearLayout> - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:contentDescription="@null" - android:src="@drawable/ic_group_grey600_24px" - app:tint="@color/grey_600" /> + <LinearLayout + android:id="@+id/conversation_operation_leave" + android:layout_width="match_parent" + android:layout_height="@dimen/bottom_sheet_item_height" + android:gravity="center_vertical" + android:orientation="horizontal" + tools:ignore="UseCompoundDrawables"> - <androidx.appcompat.widget.AppCompatTextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="start|center_vertical" - android:paddingStart="40dp" - android:paddingEnd="@dimen/zero" - android:text="@string/nc_make_call_private" - android:textAlignment="viewStart" - android:textColor="@color/high_emphasis_text" - android:textSize="@dimen/bottom_sheet_text_size" /> - </LinearLayout> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:contentDescription="@null" + android:src="@drawable/ic_exit_to_app_black_24dp" + app:tint="@color/grey_600" /> - <LinearLayout - android:id="@+id/conversation_operation_leave" + <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" - android:layout_height="@dimen/bottom_sheet_item_height" - android:gravity="center_vertical" - android:orientation="horizontal" - tools:ignore="UseCompoundDrawables"> - - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:contentDescription="@null" - android:src="@drawable/ic_exit_to_app_black_24dp" - app:tint="@color/grey_600" /> - - <androidx.appcompat.widget.AppCompatTextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="start|center_vertical" - android:paddingStart="40dp" - android:paddingEnd="@dimen/zero" - android:text="@string/nc_leave" - android:textAlignment="viewStart" - android:textColor="@color/high_emphasis_text" - android:textSize="@dimen/bottom_sheet_text_size" /> - </LinearLayout> - + android:layout_height="wrap_content" + android:layout_gravity="start|center_vertical" + android:paddingStart="40dp" + android:paddingEnd="@dimen/zero" + android:text="@string/nc_leave" + android:textAlignment="viewStart" + android:textColor="@color/high_emphasis_text" + android:textSize="@dimen/bottom_sheet_text_size" /> </LinearLayout> </LinearLayout>