Forráskód Böngészése

Merge pull request #6065 from nextcloud/feature/newDesign-trash-selection

Fix selected item background color
Andy Scherzinger 5 éve
szülő
commit
de1a14fc0b

+ 0 - 27
src/main/res/drawable/list_selector.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ownCloud Android client application
-
-  Copyright (C) 2012  Bartek Przybylski
-  Copyright (C) 2015 ownCloud Inc.
-
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
-
-  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/>.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_mediumAnimTime">
-
-    <item android:drawable="@color/list_selector_focused_pressed" android:state_pressed="true"/>
-    <item android:drawable="@color/list_selector_focused_pressed" android:state_focused="true"/>
-    <item android:drawable="@color/bg_default" />
-
-</selector>

+ 0 - 1
src/main/res/layout/grid_image.xml

@@ -21,7 +21,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"
-    android:background="@drawable/list_selector"
     android:foreground="?android:attr/selectableItemBackground"
     android:gravity="center_horizontal"
     android:orientation="vertical">

+ 0 - 1
src/main/res/layout/grid_item.xml

@@ -21,7 +21,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"
-    android:background="@drawable/list_selector"
     android:gravity="center"
     android:orientation="vertical">
 

+ 0 - 1
src/main/res/layout/grid_sync_item.xml

@@ -22,7 +22,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center_horizontal"
-    android:background="@drawable/list_selector"
     android:gravity="center_horizontal">
 
     <com.owncloud.android.ui.SquareImageView

+ 0 - 1
src/main/res/layout/list_item.xml

@@ -21,7 +21,6 @@
     android:id="@+id/ListItemLayout"
     android:layout_width="match_parent"
     android:layout_height="@dimen/standard_list_item_size"
-    android:background="@drawable/list_selector"
     android:baselineAligned="false"
     android:descendantFocusability="blocksDescendants"
     android:foreground="?android:attr/selectableItemBackground"

+ 1 - 1
src/main/res/layout/trashbin_item.xml

@@ -22,7 +22,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="@dimen/standard_list_item_size"
-    android:background="@drawable/list_selector"
+    android:background="?android:attr/selectableItemBackground"
     android:descendantFocusability="blocksDescendants"
     android:orientation="horizontal">
 

+ 0 - 1
src/main/res/layout/uploader_list_item_layout.xml

@@ -19,7 +19,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="@dimen/standard_list_item_size"
-    android:background="@drawable/list_selector"
     android:orientation="horizontal">
 
     <ImageView

+ 0 - 2
src/main/res/values/colors.xml

@@ -19,8 +19,6 @@
 -->
 <resources>
 
-    <color name="list_selector_focused_pressed">#00ddff</color>
-
     <color name="list_item_lastmod_and_filesize_text">@color/secondary_text_color</color>
     <color name="black">#000000</color>
     <color name="white">#ffffff</color>