🎨 Migrate to outlined icon style

LICENSES/LicenseRef-XTrademarks.txt

@@ -0,0 +1,49 @@
+Trademark policy
+April 2023
+
+
+You may not violate others’ intellectual property rights, including copyright and trademark.
+
+A trademark is a word, logo, phrase, or device that distinguishes a trademark holder’s good or service in the marketplace. Trademark law may prevent others from using a trademark in an unauthorized or confusing manner.  
+
+
+What is in violation of this policy?
+
+Using another’s trademark in a way that may mislead or confuse people about your affiliation may be a violation of our trademark policy.
+
+
+What is not a violation of this policy?
+
+Referencing another’s trademark is not automatically a violation of X's trademark policy. Examples of non-violations include:
+
+* using a trademark in a way that is outside the scope of the trademark registration e.g., in a different territory, or a different class of goods or services than that identified in the registration; and
+* using a trademark in a nominative or other fair use manner. For more information, see our Misleading and deceptive identities policy (https://help.twitter.com/en/rules-and-policies/twitter-impersonation-and-deceptive-identities-policy.html).
+
+
+Who can report violations of this policy?
+
+X only investigates requests that are submitted by the trademark holder or their authorized representative e.g., a legal representative or other representative for a brand. 
+
+
+How can I report violations of this policy?
+
+You can submit a trademark report through our trademark report form (https://help.twitter.com/forms/trademark). Please provide all the information requested in the form. If you submit an incomplete report, we’ll need to follow up about the missing information. Please note that this will result in a delay in processing your report.
+
+Note: We may provide the account holder with your name and other information included in the copy of the report.
+
+
+What happens if you violate this policy?
+
+If we determine that you violated our trademark policy, we may suspend your account. Depending on the type of violation, we may give you an opportunity to comply with our policies. In other instances, an account may be permanently suspended upon first review. If you believe that your account was suspended in error, you can submit an appeal (https://help.twitter.com/forms/general?subtopic=suspended).
+
+
+Additional resources
+
+Learn more about our range of enforcement options (https://help.twitter.com/rules-and-policies/enforcement-options) and our approach to policy development and enforcement (https://help.twitter.com/rules-and-policies/enforcement-philosophy).
+
+
+Legal disclaimer
+
+By using the X trademarks and resources on this site, you agree to follow the X Trademark Guidelines in our Brand Guidelines — as well as our Terms of Service and all other X rules and policies. If you have any questions, contact us at [email protected].
+
+A copy can be found at https://about.x.com/en/who-we-are/brand-toolkit and https://help.twitter.com/en/rules-and-policies/x-trademark-policy

app/lint.xml

@@ -22,8 +22,9 @@
     <issue id="UnusedResources">
         <ignore regexp="store_short_desc|store_full_desc|store_short_dev_desc|store_full_dev_desc" />
         <ignore
-            regexp="screenshot_01_gridView|screenshot_02_listView|screenshot_03_drawer|screenshot_04_accounts|screenshot_05_autoUpload|screenshot_06_davdroid"/>
-        <ignore path="**/raw/encryption_key_words.txt" />
+            regexp="screenshot_01_gridView|screenshot_02_listView|screenshot_03_drawer|screenshot_04_accounts|screenshot_05_autoUpload|screenshot_06_davdroid" />
+        <ignore path="**/drawable/zdc_*.xml" />
+		<ignore path="**/drawable/iconclose.xml" />
     </issue>
 
     <issue id="ImpliedQuantity">

app/src/main/java/com/nextcloud/client/etm/EtmViewModel.kt

@@ -76,7 +76,7 @@ class EtmViewModel @Inject constructor(
             pageClass = EtmPreferencesFragment::class
         ),
         EtmMenuEntry(
-            iconRes = R.drawable.ic_user,
+            iconRes = R.drawable.ic_user_outline,
             titleRes = R.string.etm_accounts,
             pageClass = EtmAccountsFragment::class
         ),

app/src/main/java/com/nextcloud/ui/fileactions/FileAction.kt

@@ -27,8 +27,8 @@ enum class FileAction(@IdRes val id: Int, @StringRes val title: Int, @DrawableRe
     MOVE_OR_COPY(R.id.action_move_or_copy, R.string.actionbar_move_or_copy, R.drawable.ic_external),
 
     // favorites
-    FAVORITE(R.id.action_favorite, R.string.favorite, R.drawable.ic_star),
-    UNSET_FAVORITE(R.id.action_unset_favorite, R.string.unset_favorite, R.drawable.ic_star_outline),
+    FAVORITE(R.id.action_favorite, R.string.favorite, R.drawable.ic_star_outline),
+    UNSET_FAVORITE(R.id.action_unset_favorite, R.string.unset_favorite, R.drawable.ic_star),
 
     // Uploads and downloads
     DOWNLOAD_FILE(R.id.action_download_file, R.string.filedetails_download, R.drawable.ic_cloud_download),

app/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java

@@ -1144,7 +1144,7 @@ Drawable doAvatarInBackground() {
                 try {
                     return TextDrawable.createAvatarByUserId(displayName, mAvatarRadius);
                 } catch (Exception e1) {
-                    return ResourcesCompat.getDrawable(mResources, R.drawable.ic_user, null);
+                    return ResourcesCompat.getDrawable(mResources, R.drawable.ic_user_outline, null);
                 }
             } else {
                 return BitmapUtils.bitmapToCircularBitmapDrawable(mResources, avatar);

app/src/main/java/com/owncloud/android/providers/UsersAndGroupsSearchProvider.java

@@ -282,7 +282,7 @@ private Cursor searchForUsersOrGroups(Uri uri) {
 
                         case FEDERATED:
                             if (federatedShareAllowed) {
-                                icon = R.drawable.ic_user;
+                                icon = R.drawable.ic_user_outline;
                                 dataUri = Uri.withAppendedPath(remoteBaseUri, shareWith);
 
                                 if (userName.equals(shareWith)) {

app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -507,7 +507,6 @@ private void setDrawerHeaderLogo(Drawable drawable, String serverName) {
      * @param navigationView the drawers navigation view
      */
     private void setupDrawerMenu(NavigationView navigationView) {
-        navigationView.setItemIconTintList(null);
 
         // setup actions for drawer menu items
         navigationView.setNavigationItemSelectedListener(
@@ -518,7 +517,6 @@ private void setupDrawerMenu(NavigationView navigationView) {
                 return true;
             });
 
-
         User account = accountManager.getUser();
         filterDrawerMenu(navigationView.getMenu(), account);
     }

app/src/main/java/com/owncloud/android/ui/activity/UserInfoActivity.java

@@ -253,7 +253,7 @@ private void populateUserInfoUi(UserInfo userInfo) {
             binding.emptyList.emptyListView.setVisibility(View.VISIBLE);
 
             setErrorMessageForMultiList(getString(R.string.userinfo_no_info_headline),
-                                        getString(R.string.userinfo_no_info_text), R.drawable.ic_user);
+                                        getString(R.string.userinfo_no_info_text), R.drawable.ic_user_outline);
         } else {
             binding.loadingContent.setVisibility(View.VISIBLE);
             binding.emptyList.emptyListView.setVisibility(View.GONE);

app/src/main/java/com/owncloud/android/ui/adapter/GalleryRowHolder.kt

@@ -100,9 +100,9 @@ class GalleryRowHolder(
         }
 
         return FrameLayout(context).apply {
-            addView(checkbox)
             addView(shimmer)
             addView(rowCellImageView)
+            addView(checkbox)
         }
     }
 
@@ -174,9 +174,9 @@ class GalleryRowHolder(
         val height = ((fileHeight ?: defaultThumbnailSize) * shrinkRatio).toInt()
 
         val frameLayout = binding.rowLayout[index] as FrameLayout
-        val checkBoxImageView = frameLayout[0] as ImageView
-        val shimmer = frameLayout[1] as LoaderImageView
-        val thumbnail = (frameLayout[2] as ImageView).apply {
+        val checkBoxImageView = frameLayout[2] as ImageView
+        val shimmer = frameLayout[0] as LoaderImageView
+        val thumbnail = (frameLayout[1] as ImageView).apply {
             adjustViewBounds = true
             scaleType = ImageView.ScaleType.FIT_CENTER
         }

app/src/main/java/com/owncloud/android/ui/adapter/ShareViewHolder.java

@@ -150,7 +150,7 @@ private void setImage(ImageView avatar, String name) {
     }
 
     private void setUserImage(ImageView avatar) {
-        ImageViewExtensionsKt.makeRoundedWithIcon(avatar, context, R.drawable.ic_user);
+        ImageViewExtensionsKt.makeRoundedWithIcon(avatar, context, R.drawable.ic_user_outline);
         viewThemeUtils.platform.colorImageViewBackgroundAndIcon(avatar);
     }
 }

app/src/main/java/com/owncloud/android/ui/adapter/UserListAdapter.java

@@ -280,7 +280,7 @@ private void setAvatar(User user, DisplayUtils.AvatarGenerationListener avatarGe
             } catch (Exception e) {
                 Log_OC.e(TAG, "Error calculating RGB value for account list item.", e);
                 // use user icon as a fallback
-                binding.userIcon.setImageResource(R.drawable.ic_user);
+                binding.userIcon.setImageResource(R.drawable.ic_user_outline);
             }
         }
 

app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java

@@ -323,15 +323,20 @@ private void onOverflowIconClicked() {
     private void setupViewPager() {
         binding.tabLayout.removeAllTabs();
 
-        binding.tabLayout.addTab(binding.tabLayout.newTab().setText(R.string.drawer_item_activities).setIcon(R.drawable.ic_activity));
-
+        binding.tabLayout.addTab(
+            binding
+                .tabLayout
+                .newTab()
+                .setText(R.string.drawer_item_activities)
+                .setIcon(R.drawable.selector_tab_activities)
+                                );
 
         if (showSharingTab()) {
-            binding.tabLayout.addTab(binding.tabLayout.newTab().setText(R.string.share_dialog_title).setIcon(R.drawable.shared_via_users));
+            binding.tabLayout.addTab(binding.tabLayout.newTab().setText(R.string.share_dialog_title).setIcon(R.drawable.selector_tab_share));
         }
 
         if (MimeTypeUtil.isImage(getFile())) {
-            binding.tabLayout.addTab(binding.tabLayout.newTab().setText(R.string.filedetails_details).setIcon(R.drawable.image_32dp));
+            binding.tabLayout.addTab(binding.tabLayout.newTab().setText(R.string.filedetails_details).setIcon(R.drawable.selector_media));
         }
 
         viewThemeUtils.material.themeTabLayout(binding.tabLayout);

app/src/main/java/com/owncloud/android/ui/fragment/ProfileBottomSheetDialog.kt

@@ -80,7 +80,7 @@ class ProfileBottomSheetDialog(
             actionBinding.name.text = action.title
 
             val icon = when (action.appId) {
-                "profile" -> R.drawable.ic_user
+                "profile" -> R.drawable.ic_user_outline
                 "email" -> R.drawable.ic_email
                 "spreed" -> R.drawable.ic_talk
                 else -> R.drawable.ic_edit

app/src/main/java/com/owncloud/android/ui/fragment/contactsbackup/BackupListAdapter.kt

@@ -206,7 +206,7 @@ class BackupListAdapter(
                     )
                 )
             } catch (e: Resources.NotFoundException) {
-                holder.binding.icon.setImageResource(R.drawable.ic_user)
+                holder.binding.icon.setImageResource(R.drawable.ic_user_outline)
             }
         }
 
@@ -257,7 +257,7 @@ class BackupListAdapter(
                 context,
                 url,
                 target,
-                R.drawable.ic_user
+                R.drawable.ic_user_outline
             )
         }
     }

app/src/main/res/drawable-night/ic_battery_alert.xml

@@ -1,15 +1,15 @@
 <!--
   ~ Nextcloud - Android Client
   ~
-  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-FileCopyrightText: 2018-2025 Google LLC
   ~ SPDX-License-Identifier: Apache-2.0
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="960"
+    android:viewportHeight="960">
     <path
         android:fillColor="#FFF"
-        android:pathData="M15.67,4L14,4L14,2h-4v2L8.33,4C7.6,4 7,4.6 7,5.33v15.33C7,21.4 7.6,22 8.33,22h7.33c0.74,0 1.34,-0.6 1.34,-1.33L17,5.33C17,4.6 16.4,4 15.67,4zM13,18h-2v-2h2v2zM13,14h-2L11,9h2v5z" />
+        android:pathData="M440,560L520,560L520,320L440,320L440,560ZM480,720Q497,720 508.5,708.5Q520,697 520,680Q520,663 508.5,651.5Q497,640 480,640Q463,640 451.5,651.5Q440,663 440,680Q440,697 451.5,708.5Q463,720 480,720ZM320,880Q303,880 291.5,868.5Q280,857 280,840L280,200Q280,183 291.5,171.5Q303,160 320,160L400,160L400,80L560,80L560,160L640,160Q657,160 668.5,171.5Q680,183 680,200L680,840Q680,857 668.5,868.5Q657,880 640,880L320,880ZM360,800L600,800L600,240L360,240L360,800ZM360,800L360,800L600,800L600,800L360,800Z" />
 </vector>

app/src/main/res/drawable-night/shared_via_users.xml

@@ -1,7 +1,7 @@
 <!--
   ~ Nextcloud - Android Client
   ~
-  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-FileCopyrightText: 2018-2025 Google LLC
   ~ SPDX-License-Identifier: Apache-2.0
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
@@ -12,5 +12,5 @@
     android:viewportHeight="960">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M720,880Q670,880 635,845Q600,810 600,760Q600,753 601,745.5Q602,738 604,732L322,568Q305,583 284,591.5Q263,600 240,600Q190,600 155,565Q120,530 120,480Q120,430 155,395Q190,360 240,360Q263,360 284,368.5Q305,377 322,392L604,228Q602,222 601,214.5Q600,207 600,200Q600,150 635,115Q670,80 720,80Q770,80 805,115Q840,150 840,200Q840,250 805,285Q770,320 720,320Q697,320 676,311.5Q655,303 638,288L356,452Q358,458 359,465.5Q360,473 360,480Q360,487 359,494.5Q358,502 356,508L638,672Q655,657 676,648.5Q697,640 720,640Q770,640 805,675Q840,710 840,760Q840,810 805,845Q770,880 720,880Z" />
-</vector>
+        android:pathData="M680,880Q630,880 595,845Q560,810 560,760Q560,754 563,732L282,568Q266,583 245,591.5Q224,600 200,600Q150,600 115,565Q80,530 80,480Q80,430 115,395Q150,360 200,360Q224,360 245,368.5Q266,377 282,392L563,228Q561,221 560.5,214.5Q560,208 560,200Q560,150 595,115Q630,80 680,80Q730,80 765,115Q800,150 800,200Q800,250 765,285Q730,320 680,320Q656,320 635,311.5Q614,303 598,288L317,452Q319,459 319.5,465.5Q320,472 320,480Q320,488 319.5,494.5Q319,501 317,508L598,672Q614,657 635,648.5Q656,640 680,640Q730,640 765,675Q800,710 800,760Q800,810 765,845Q730,880 680,880Z"/>
+</vector>

app/src/main/res/drawable/account_circle_white.xml

@@ -1,11 +1,16 @@
 <!--
   ~ Nextcloud - Android Client
   ~
-  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-FileCopyrightText: 2018-2025 Google LLC
   ~ SPDX-License-Identifier: Apache-2.0
 -->
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z"/>
+<vector  xmlns:android="http://schemas.android.com/apk/res/android"
+android:height="24dp"
+android:tint="#FFFFFF"
+android:viewportHeight="960"
+android:viewportWidth="960"
+android:width="24dp">
+<path
+    android:fillColor="@android:color/white"
+    android:pathData="M234,684Q285,645 348,622.5Q411,600 480,600Q549,600 612,622.5Q675,645 726,684Q761,643 780.5,591Q800,539 800,480Q800,347 706.5,253.5Q613,160 480,160Q347,160 253.5,253.5Q160,347 160,480Q160,539 179.5,591Q199,643 234,684ZM480,520Q421,520 380.5,479.5Q340,439 340,380Q340,321 380.5,280.5Q421,240 480,240Q539,240 579.5,280.5Q620,321 620,380Q620,439 579.5,479.5Q539,520 480,520ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q533,800 580,784.5Q627,769 666,740Q627,711 580,695.5Q533,680 480,680Q427,680 380,695.5Q333,711 294,740Q333,769 380,784.5Q427,800 480,800ZM480,440Q506,440 523,423Q540,406 540,380Q540,354 523,337Q506,320 480,320Q454,320 437,337Q420,354 420,380Q420,406 437,423Q454,440 480,440ZM480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380ZM480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Z" />
 </vector>

app/src/main/res/drawable/add_to_home_screen.xml

@@ -1,7 +1,7 @@
 <!--
   ~ Nextcloud - Android Client
   ~
-  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-FileCopyrightText: 2018-2025 Google LLC
   ~ SPDX-License-Identifier: Apache-2.0
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
@@ -13,5 +13,5 @@
     android:viewportHeight="960">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M320,920Q287,920 263.5,896.5Q240,873 240,840L240,680L320,680L320,720L720,720L720,240L320,240L320,280L240,280L240,120Q240,87 263.5,63.5Q287,40 320,40L720,40Q753,40 776.5,63.5Q800,87 800,120L800,840Q800,873 776.5,896.5Q753,920 720,920L320,920ZM176,680L120,624L344,400L200,400L200,320L480,320L480,600L400,600L400,456L176,680Z" />
+        android:pathData="M280,920Q247,920 223.5,896.5Q200,873 200,840L200,120Q200,87 223.5,63.5Q247,40 280,40L680,40Q713,40 736.5,63.5Q760,87 760,120L760,244Q778,251 789,266Q800,281 800,300L800,380Q800,399 789,414Q778,429 760,436L760,840Q760,873 736.5,896.5Q713,920 680,920L280,920ZM280,840L680,840Q680,840 680,840Q680,840 680,840L680,120Q680,120 680,120Q680,120 680,120L280,120Q280,120 280,120Q280,120 280,120L280,840Q280,840 280,840Q280,840 280,840ZM280,840Q280,840 280,840Q280,840 280,840L280,120Q280,120 280,120Q280,120 280,120L280,120Q280,120 280,120Q280,120 280,120L280,840Q280,840 280,840Q280,840 280,840ZM396,620L520,496L520,600L600,600L600,360L360,360L360,440L464,440L340,564L396,620Z" />
 </vector>

app/src/main/res/drawable/all_files.xml

@@ -1,15 +1,16 @@
 <!--
   ~ Nextcloud - Android Client
   ~
-  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-FileCopyrightText: 2018-2025 Google LLC
   ~ SPDX-License-Identifier: Apache-2.0
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:tint="#757575"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-
-    <path android:fillColor="#FF000000" android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L400,160L480,240L800,240Q833,240 856.5,263.5Q880,287 880,320L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800ZM160,720L800,720Q800,720 800,720Q800,720 800,720L800,320Q800,320 800,320Q800,320 800,320L447,320L367,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720ZM160,720Q160,720 160,720Q160,720 160,720L160,240Q160,240 160,240Q160,240 160,240L160,240L160,320L160,320Q160,320 160,320Q160,320 160,320L160,720Q160,720 160,720Q160,720 160,720Z" />
 </vector>

app/src/main/res/drawable/arrow_right.xml

@@ -1,11 +1,17 @@
 <!--
   ~ Nextcloud - Android Client
   ~
-  ~ SPDX-FileCopyrightText: 2018-2024 Google LLC
+  ~ SPDX-FileCopyrightText: 2018-2025 Google LLC
   ~ SPDX-License-Identifier: Apache-2.0
 -->
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="#FFFFFF"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M647,520L160,520L160,440L647,440L423,216L480,160L800,480L480,800L423,744L647,520Z" />
 </vector>