Merge pull request #2982 from nextcloud/renovate/nextcloudandroidcommonlib

AndyScherzinger · web-flow · commit c469352213f2 · 2025-12-27T12:22:40.000+01:00
fix(deps): update nextcloudandroidcommonlib to v0.31.0
diff --git a/app/build.gradle b/app/build.gradle
@@ -114,7 +114,7 @@ dependencies {
         exclude group: 'commons-logging', module: 'commons-logging'
     }
 
-    implementation("com.github.nextcloud:android-library:2.22.2") {
+    implementation("com.github.nextcloud:android-library:4596e80dec") {
         exclude group: 'org.ogce', module: 'xpp3'
     }
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/items/NoteViewHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/main/items/NoteViewHolder.java
@@ -20,11 +20,11 @@
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.widget.AppCompatImageView;
 import androidx.recyclerview.selection.ItemDetailsLookup;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.chip.Chip;
+import com.google.android.material.progressindicator.CircularProgressIndicator;
 import com.nextcloud.android.common.core.utils.DateFormatter;
 import com.nextcloud.android.common.ui.theme.utils.ColorRole;
 
@@ -66,12 +66,12 @@ protected void bindModified(@NonNull TextView noteModified, @Nullable Calendar m
         }
     }
 
-    protected void bindStatus(AppCompatImageView noteStatus, DBStatus status, int color) {
-        noteStatus.setVisibility(DBStatus.VOID.equals(status) ? INVISIBLE : VISIBLE);
+    protected void bindStatus(CircularProgressIndicator noteSyncStatus, DBStatus status, int color) {
+        noteSyncStatus.setVisibility(DBStatus.VOID.equals(status) ? INVISIBLE : VISIBLE);
 
-        final var context = noteStatus.getContext();
+        final var context = noteSyncStatus.getContext();
         final var util = BrandingUtil.of(color, context);
-        util.platform.tintDrawable(context, noteStatus.getDrawable(), ColorRole.ON_PRIMARY_CONTAINER);
+        util.material.colorProgressBar(noteSyncStatus, ColorRole.PRIMARY);
     }
 
     protected void bindCategory(@NonNull Context context, @NonNull TextView noteCategory, boolean showCategory, @NonNull String category, int color) {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/items/grid/NoteViewGridHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/main/items/grid/NoteViewGridHolder.java
@@ -50,7 +50,7 @@ public void bind(boolean isSelected, @NonNull Note note, boolean showCategory, @
         super.bind(isSelected, note, showCategory, color, searchQuery);
         @NonNull final Context context = itemView.getContext();
         bindCategory(context, binding.noteCategory, showCategory, note.getCategory(), color);
-        bindStatus(binding.noteStatus, note.getStatus(), color);
+        bindStatus(binding.noteSyncStatus, note.getStatus(), color);
         bindFavorite(binding.noteFavorite, note.getFavorite());
         bindModified(binding.noteModified, note.getModified());
         bindSearchableContent(context, binding.noteTitle, searchQuery, note.getTitle(), color);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/items/grid/NoteViewGridHolderOnlyTitle.java b/app/src/main/java/it/niedermann/owncloud/notes/main/items/grid/NoteViewGridHolderOnlyTitle.java
@@ -42,7 +42,7 @@ public void bind(boolean isSelected, @NonNull Note note, boolean showCategory, i
         super.bind(isSelected, note, showCategory, color, searchQuery);
         @NonNull final Context context = itemView.getContext();
         bindCategory(context, binding.noteCategory, showCategory, note.getCategory(), color);
-        bindStatus(binding.noteStatus, note.getStatus(), color);
+        bindStatus(binding.noteSyncStatus, note.getStatus(), color);
         bindFavorite(binding.noteFavorite, note.getFavorite());
         bindModified(binding.noteModified, note.getModified());
         bindSearchableContent(context, binding.noteTitle, searchQuery, note.getTitle(), color);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/items/list/NoteViewListHolder.java b/app/src/main/java/it/niedermann/owncloud/notes/main/items/list/NoteViewListHolder.java
@@ -57,7 +57,7 @@ public void bind(boolean isSelected, @NonNull Note note, boolean showCategory, @
         @NonNull final var context = itemView.getContext();
         binding.noteCard.setAlpha(DBStatus.LOCAL_DELETED.equals(note.getStatus()) ? 0.5f : 1.0f);
         bindCategory(context, binding.noteCategory, showCategory, note.getCategory(), color);
-        bindStatus(binding.noteStatus, note.getStatus(), color);
+        bindStatus(binding.noteSyncStatus, note.getStatus(), color);
         bindFavorite(binding.noteFavorite, note.getFavorite());
         bindModified(binding.noteModified, note.getModified());
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java
@@ -20,6 +20,7 @@
 import androidx.lifecycle.ViewModelProvider;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.nextcloud.android.common.ui.theme.utils.ColorRole;
 import com.nextcloud.android.sso.AccountImporter;
 import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException;
 
@@ -149,7 +150,7 @@ private void changeAccountSetting(@NonNull Account localAccount, @StringRes int
             mainColor$.removeObservers(this);
             final var util = BrandingUtil.of(color, this);
             util.material.colorTextInputLayout(binding.inputWrapper);
-            util.material.colorProgressBar(binding.progress);
+            util.material.colorProgressBar(binding.progress, ColorRole.PRIMARY);
         });
 
         binding.inputWrapper.setHint(title);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java
@@ -164,7 +164,6 @@ private void initializeArguments() {
                 repository.getSharesForNotesAndSaveShareEntities();
 
                 runOnUiThread(() -> {
-                    binding.title.setText(R.string.activity_sharing_title);
                     binding.fileName.setText(note.getTitle());
                     binding.searchContainer.setVisibility(View.VISIBLE);
                     binding.sharesList.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt
@@ -12,6 +12,7 @@ import android.os.Bundle
 import android.text.TextUtils
 import android.view.View
 import androidx.lifecycle.lifecycleScope
+import com.nextcloud.android.common.ui.theme.utils.ColorRole
 import com.nextcloud.android.sso.helper.SingleAccountHelper
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.shares.OCShare
@@ -46,7 +47,8 @@ import java.util.Date
  * 2. This will handle both Advanced Permissions and Send New Email functionality for existing shares to modify them.
  */
 @Suppress("TooManyFunctions")
-class NoteShareDetailActivity : BrandedActivity(),
+class NoteShareDetailActivity :
+    BrandedActivity(),
     ExpirationDatePickerDialogFragment.OnExpiryDateListener {
 
     companion object {
@@ -86,6 +88,8 @@ class NoteShareDetailActivity : BrandedActivity(),
 
         binding = ActivityNoteShareDetailBinding.inflate(layoutInflater)
         setContentView(binding.root)
+        setSupportActionBar(binding.toolbar)
+        binding.toolbar.setNavigationOnClickListener({ v -> backPressed() })
         val arguments = intent.extras
 
         arguments?.let {
@@ -122,6 +126,9 @@ class NoteShareDetailActivity : BrandedActivity(),
         }
     }
 
+    private fun backPressed() {
+        finish()
+    }
 
     override fun applyBrand(color: Int) {
         val util = BrandingUtil.of(color, this)
@@ -136,6 +143,8 @@ class NoteShareDetailActivity : BrandedActivity(),
                 colorTextView(shareProcessAdvancePermissionTitle)
 
                 themeCheckbox(shareProcessAllowResharingCheckbox)
+
+                colorTextView(title, ColorRole.ON_SURFACE)
             }
 
             util.androidx.run {
@@ -152,6 +161,8 @@ class NoteShareDetailActivity : BrandedActivity(),
 
                 colorMaterialButtonPrimaryFilled(shareProcessBtnNext)
                 colorMaterialButtonPrimaryOutlined(shareProcessBtnCancel)
+
+                themeToolbar(toolbar)
             }
         }
         util.platform.colorViewBackground(window.decorView)
@@ -192,6 +203,9 @@ class NoteShareDetailActivity : BrandedActivity(),
         } else {
             binding.shareProcessSetExpDateSwitch.visibility = View.GONE
         }
+
+        binding.noteText.setText(share?.note)
+
         shareProcessStep = SCREEN_TYPE_PERMISSION
     }
 
@@ -448,12 +462,9 @@ class NoteShareDetailActivity : BrandedActivity(),
         }
     }
 
-
-    private fun getReSharePermission(): Int {
-        return SharePermissionsBuilder().apply {
-            setSharePermission(true)
-        }.build()
-    }
+    private fun getReSharePermission(): Int = SharePermissionsBuilder().apply {
+        setSharePermission(true)
+    }.build()
 
     /**
      * method to validate the step 1 screen information
diff --git a/app/src/main/res/drawable/file_calendar.xml b/app/src/main/res/drawable/file_calendar.xml
@@ -1,16 +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">
+    android:viewportWidth="960"
+    android:viewportHeight="960">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M9,11L7,11v2h2v-2zM13,11h-2v2h2v-2zM17,11h-2v2h2v-2zM19,4h-1L18,2h-2v2L8,4L8,2L6,2v2L5,4c-1.11,0 -1.99,0.9 -1.99,2L3,20c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,6c0,-1.1 -0.9,-2 -2,-2zM19,20L5,20L5,9h14v11z" />
+        android:fillColor="@android:color/white"
+        android:pathData="M320,560Q303,560 291.5,548.5Q280,537 280,520Q280,503 291.5,491.5Q303,480 320,480Q337,480 348.5,491.5Q360,503 360,520Q360,537 348.5,548.5Q337,560 320,560ZM480,560Q463,560 451.5,548.5Q440,537 440,520Q440,503 451.5,491.5Q463,480 480,480Q497,480 508.5,491.5Q520,503 520,520Q520,537 508.5,548.5Q497,560 480,560ZM640,560Q623,560 611.5,548.5Q600,537 600,520Q600,503 611.5,491.5Q623,480 640,480Q657,480 668.5,491.5Q680,503 680,520Q680,537 668.5,548.5Q657,560 640,560ZM200,880Q167,880 143.5,856.5Q120,833 120,800L120,240Q120,207 143.5,183.5Q167,160 200,160L240,160L240,80L320,80L320,160L640,160L640,80L720,80L720,160L760,160Q793,160 816.5,183.5Q840,207 840,240L840,800Q840,833 816.5,856.5Q793,880 760,880L200,880ZM200,800L760,800Q760,800 760,800Q760,800 760,800L760,400L200,400L200,800Q200,800 200,800Q200,800 200,800ZM200,320L760,320L760,240Q760,240 760,240Q760,240 760,240L200,240Q200,240 200,240Q200,240 200,240L200,320ZM200,320L200,240Q200,240 200,240Q200,240 200,240L200,240Q200,240 200,240Q200,240 200,240L200,320Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_close_24px.xml b/app/src/main/res/drawable/ic_close_24px.xml
@@ -0,0 +1,16 @@
+<!--
+  ~ Nextcloud Notes - Android Client
+  ~
+  ~ 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="?attr/colorControlNormal"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M256,760L200,704L424,480L200,256L256,200L480,424L704,200L760,256L536,480L760,704L704,760L480,536L256,760Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_sync_blue_18dp.xml b/app/src/main/res/drawable/ic_sync_blue_18dp.xml
diff --git a/app/src/main/res/layout/activity_note_share.xml b/app/src/main/res/layout/activity_note_share.xml
@@ -59,9 +59,9 @@
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
                 android:lines="1"
+                android:text="@string/activity_sharing_title"
                 android:textColor="@color/fontAppbar"
-                android:textSize="18sp"
-                tools:text="Share Note" />
+                android:textSize="18sp" />
 
             <TextView
                 android:id="@+id/file_name"
diff --git a/app/src/main/res/layout/activity_note_share_detail.xml b/app/src/main/res/layout/activity_note_share_detail.xml
@@ -12,8 +12,29 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:focusable="true"
-    android:focusableInTouchMode="true"
-    android:minHeight="400dp">
+    android:focusableInTouchMode="true">
+
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:navigationIcon="@drawable/ic_close_24px">
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/spacer_2x"
+                android:ellipsize="end"
+                android:lines="1"
+                android:text="@string/activity_sharing_details_title"
+                android:textColor="@color/fontAppbar"
+                android:textSize="18sp" />
+
+    </com.google.android.material.appbar.MaterialToolbar>
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -22,7 +43,7 @@
         android:padding="@dimen/spacer_2x"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toBottomOf="@id/toolbar">
 
         <LinearLayout
             android:orientation="vertical"
@@ -219,34 +240,37 @@
                 android:visibility="gone"/>
 
             <LinearLayout
-                android:orientation="horizontal"
-                android:layout_marginTop="@dimen/spacer_2x"
-                android:gravity="end"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/spacer_2x"
+                android:orientation="horizontal"
+                android:weightSum="1.0">
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/share_process_btn_cancel"
                     style="@style/Widget.Material3.Button.OutlinedButton"
-                    android:layout_width="@dimen/button_width"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/zero"
+                    android:layout_height="match_parent"
                     android:layout_marginEnd="@dimen/spacer_1x"
+                    android:layout_weight=".5"
                     android:text="@string/note_share_detail_activity_cancel"
                     app:cornerRadius="@dimen/button_corner_radius" />
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/share_process_btn_next"
-                    android:layout_width="@dimen/button_extra_width"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/zero"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="@dimen/spacer_1x"
+                    android:layout_weight=".5"
                     android:text="@string/note_share_detail_activity_common_next"
                     android:theme="@style/Widget.Material3.Button.IconButton.Filled"
-                    app:cornerRadius="@dimen/button_corner_radius"/>
+                    app:cornerRadius="@dimen/button_corner_radius" />
 
             </LinearLayout>
 
             <View
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/bottom_navigation_view_margin" />
+                android:layout_height="?android:attr/actionBarSize" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/item_notes_list_note_item_grid.xml b/app/src/main/res/layout/item_notes_list_note_item_grid.xml
@@ -75,15 +75,15 @@
                     android:paddingEnd="@dimen/spacer_list_card"
                     android:src="@drawable/ic_checkbox_blank_outline" />
 
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/noteStatus"
+                <com.google.android.material.progressindicator.CircularProgressIndicator
+                    android:id="@+id/noteSyncStatus"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical|end"
-                    android:layout_marginTop="@dimen/spacer_1x"
-                    android:layout_marginEnd="2dp"
-                    android:baseline="14dp"
-                    app:srcCompat="@drawable/ic_sync_blue_18dp" />
+                    android:layout_marginStart="16dp"
+                    android:indeterminate="true"
+                    app:indicatorInset="@dimen/zero"
+                    app:indicatorSize="24dp"
+                    app:trackThickness="3dp" />
             </FrameLayout>
 
             <LinearLayout
diff --git a/app/src/main/res/layout/item_notes_list_note_item_grid_only_title.xml b/app/src/main/res/layout/item_notes_list_note_item_grid_only_title.xml
@@ -64,15 +64,15 @@
                     android:paddingEnd="@dimen/spacer_list_card"
                     android:src="@drawable/ic_checkbox_blank_outline" />
 
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/noteStatus"
+                <com.google.android.material.progressindicator.CircularProgressIndicator
+                    android:id="@+id/noteSyncStatus"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical|end"
-                    android:layout_marginTop="@dimen/spacer_1x"
-                    android:layout_marginEnd="2dp"
-                    android:baseline="14dp"
-                    app:srcCompat="@drawable/ic_sync_blue_18dp" />
+                    android:layout_marginStart="16dp"
+                    android:indeterminate="true"
+                    app:indicatorInset="@dimen/zero"
+                    app:indicatorSize="24dp"
+                    app:trackThickness="3dp" />
             </FrameLayout>
 
             <LinearLayout
diff --git a/app/src/main/res/layout/item_notes_list_note_item_with_excerpt.xml b/app/src/main/res/layout/item_notes_list_note_item_with_excerpt.xml
@@ -87,15 +87,16 @@
                     android:paddingEnd="@dimen/spacer_1x"
                     android:src="@drawable/ic_checkbox_blank_outline" />
 
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/noteStatus"
+                <com.google.android.material.progressindicator.CircularProgressIndicator
+                    android:id="@+id/noteSyncStatus"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical|end"
-                    android:layout_marginTop="12dp"
-                    android:layout_marginEnd="0dp"
-                    android:baseline="14dp"
-                    app:srcCompat="@drawable/ic_sync_blue_18dp" />
+                    android:layout_marginStart="10dp"
+                    android:layout_marginTop="18dp"
+                    android:indeterminate="true"
+                    app:indicatorInset="@dimen/zero"
+                    app:indicatorSize="28dp"
+                    app:trackThickness="3dp" />
             </FrameLayout>
 
             <LinearLayout
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
diff --git a/build.gradle b/build.gradle
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ dependencies {`
`114`	`114`	`exclude group: 'commons-logging', module: 'commons-logging'`
`115`	`115`	`}`
`116`	`116`
`117`		`- implementation("com.github.nextcloud:android-library:2.22.2") {`
	`117`	`+ implementation("com.github.nextcloud:android-library:4596e80dec") {`
`118`	`118`	`exclude group: 'org.ogce', module: 'xpp3'`
`119`	`119`	`}`
`120`	`120`