From 2a1042f3ddda5adc60047622e992486107485309 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 24 Dec 2025 11:46:38 +0100 Subject: [PATCH 1/3] style(sharing): Improve sharing activities' design Signed-off-by: Andy Scherzinger --- .../notes/share/NoteShareActivity.java | 1 - .../notes/share/NoteShareDetailActivity.kt | 22 +++++--- app/src/main/res/drawable/file_calendar.xml | 10 ++-- app/src/main/res/drawable/ic_close_24px.xml | 16 ++++++ .../main/res/layout/activity_note_share.xml | 4 +- .../res/layout/activity_note_share_detail.xml | 50 ++++++++++++++----- app/src/main/res/values/strings.xml | 1 + 7 files changed, 76 insertions(+), 28 deletions(-) create mode 100644 app/src/main/res/drawable/ic_close_24px.xml 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 index 153d92e2e..b5fb2d543 100644 --- 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 index 1cf9ec2e9..b30d10a15 100644 --- 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) @@ -448,12 +459,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 index 2fdb050e8..094fbd878 100644 --- a/app/src/main/res/drawable/file_calendar.xml +++ b/app/src/main/res/drawable/file_calendar.xml @@ -1,16 +1,16 @@ + android:viewportWidth="960" + android:viewportHeight="960"> + 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" /> diff --git a/app/src/main/res/drawable/ic_close_24px.xml b/app/src/main/res/drawable/ic_close_24px.xml new file mode 100644 index 000000000..e5758814d --- /dev/null +++ b/app/src/main/res/drawable/ic_close_24px.xml @@ -0,0 +1,16 @@ + + + + diff --git a/app/src/main/res/layout/activity_note_share.xml b/app/src/main/res/layout/activity_note_share.xml index 525fb7a9a..ffeb8cf6b 100644 --- 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" /> + android:focusableInTouchMode="true"> + + + + + + + app:layout_constraintTop_toBottomOf="@id/toolbar"> + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/spacer_2x" + android:orientation="horizontal" + android:weightSum="1.0"> + app:cornerRadius="@dimen/button_corner_radius" /> + android:layout_height="?android:attr/actionBarSize" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 41af06b9d..17a1de26c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -517,6 +517,7 @@ More Nextcloud Apps More Sharing + Sharing Details Share expires on %1$s Dismiss From 5dafe04bb948b31f0a7e2a2ebb8c0764fa469b81 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 24 Dec 2025 14:35:12 +0100 Subject: [PATCH 2/3] fix(sharing): Show share note in any case Signed-off-by: Andy Scherzinger --- .../niedermann/owncloud/notes/share/NoteShareDetailActivity.kt | 3 +++ 1 file changed, 3 insertions(+) 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 index b30d10a15..532d2edd0 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt +++ b/app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt @@ -203,6 +203,9 @@ class NoteShareDetailActivity : } else { binding.shareProcessSetExpDateSwitch.visibility = View.GONE } + + binding.noteText.setText(share?.note) + shareProcessStep = SCREEN_TYPE_PERMISSION } From c5d175c1557bff6bd5eec892f43f85f60d9dac99 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Wed, 24 Dec 2025 14:37:36 +0100 Subject: [PATCH 3/3] TEST - remove before merging Signed-off-by: Andy Scherzinger --- app/build.gradle | 2 +- gradle/verification-metadata.xml | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 3e820592a..ce09c0b61 100644 --- 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/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 0da5444e7..68b4b675d 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -12521,6 +12521,14 @@ + + + + + + + + @@ -17834,6 +17842,14 @@ + + + + + + + + @@ -18485,6 +18501,14 @@ + + + + + + + + @@ -18586,6 +18610,14 @@ + + + + + + + +