浏览代码

Merge pull request #7242 from nextcloud/tintHeader

do not tint nc logo
Andy Scherzinger 4 年之前
父节点
当前提交
2373c4feac
共有 3 个文件被更改,包括 2 次插入5 次删除
  1. 1 1
      src/main/res/drawable/nextcloud_logo.xml
  2. 1 3
      src/main/res/layout/drawer_header.xml
  3. 0 1
      src/main/res/values/colors.xml

文件差异内容过多而无法显示
+ 1 - 1
src/main/res/drawable/nextcloud_logo.xml


+ 1 - 3
src/main/res/layout/drawer_header.xml

@@ -19,7 +19,6 @@
   License along with this program. If not, see <http://www.gnu.org/licenses/>.
   -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/drawer_header_view"
     android:layout_width="match_parent"
     android:layout_height="@dimen/drawer_header_height"
@@ -32,7 +31,6 @@
         android:layout_margin="@dimen/standard_margin"
         android:contentDescription="@string/empty"
         android:scaleType="fitCenter"
-        android:src="@drawable/nextcloud_logo"
-        app:tint="@color/drawer_logo_color" />
+        android:src="@drawable/nextcloud_logo" />
 
 </FrameLayout>

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

@@ -77,7 +77,6 @@
     <color name="switch_thumb_color_unchecked">#FFFFFF</color>
     <color name="switch_track_color_unchecked">#4D000000</color>
     <color name="drawer_active_item_background">#80000000</color>
-    <color name="drawer_logo_color">#FFFFFF</color>
 
     <!-- Excluded from future app dark theme -->
     <color name="themed_fg">#FFFFFF</color>

部分文件因为文件数量过多而无法显示