Skip to content

Commit 2a1042f

Browse files
AndyScherzingerAndyScherzinger
committed
style(sharing): Improve sharing activities' design
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
1 parent 1913ae5 commit 2a1042f

File tree

7 files changed

+76
-28
lines changed

7 files changed

+76
-28
lines changed

‎app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ private void initializeArguments() {
164164
repository.getSharesForNotesAndSaveShareEntities();
165165

166166
runOnUiThread(() -> {
167-
binding.title.setText(R.string.activity_sharing_title);
168167
binding.fileName.setText(note.getTitle());
169168
binding.searchContainer.setVisibility(View.VISIBLE);
170169
binding.sharesList.setVisibility(View.VISIBLE);

‎app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareDetailActivity.kt‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import android.os.Bundle
1212
import android.text.TextUtils
1313
import android.view.View
1414
import androidx.lifecycle.lifecycleScope
15+
import com.nextcloud.android.common.ui.theme.utils.ColorRole
1516
import com.nextcloud.android.sso.helper.SingleAccountHelper
1617
import com.owncloud.android.lib.common.utils.Log_OC
1718
import com.owncloud.android.lib.resources.shares.OCShare
@@ -46,7 +47,8 @@ import java.util.Date
4647
* 2. This will handle both Advanced Permissions and Send New Email functionality for existing shares to modify them.
4748
*/
4849
@Suppress("TooManyFunctions")
49-
class NoteShareDetailActivity : BrandedActivity(),
50+
class NoteShareDetailActivity :
51+
BrandedActivity(),
5052
ExpirationDatePickerDialogFragment.OnExpiryDateListener {
5153

5254
companion object {
@@ -86,6 +88,8 @@ class NoteShareDetailActivity : BrandedActivity(),
8688

8789
binding = ActivityNoteShareDetailBinding.inflate(layoutInflater)
8890
setContentView(binding.root)
91+
setSupportActionBar(binding.toolbar)
92+
binding.toolbar.setNavigationOnClickListener({ v -> backPressed() })
8993
val arguments = intent.extras
9094

9195
arguments?.let {
@@ -122,6 +126,9 @@ class NoteShareDetailActivity : BrandedActivity(),
122126
}
123127
}
124128

129+
private fun backPressed() {
130+
finish()
131+
}
125132

126133
override fun applyBrand(color: Int) {
127134
val util = BrandingUtil.of(color, this)
@@ -136,6 +143,8 @@ class NoteShareDetailActivity : BrandedActivity(),
136143
colorTextView(shareProcessAdvancePermissionTitle)
137144

138145
themeCheckbox(shareProcessAllowResharingCheckbox)
146+
147+
colorTextView(title, ColorRole.ON_SURFACE)
139148
}
140149

141150
util.androidx.run {
@@ -152,6 +161,8 @@ class NoteShareDetailActivity : BrandedActivity(),
152161

153162
colorMaterialButtonPrimaryFilled(shareProcessBtnNext)
154163
colorMaterialButtonPrimaryOutlined(shareProcessBtnCancel)
164+
165+
themeToolbar(toolbar)
155166
}
156167
}
157168
util.platform.colorViewBackground(window.decorView)
@@ -448,12 +459,9 @@ class NoteShareDetailActivity : BrandedActivity(),
448459
}
449460
}
450461

451-
452-
private fun getReSharePermission(): Int {
453-
return SharePermissionsBuilder().apply {
454-
setSharePermission(true)
455-
}.build()
456-
}
462+
private fun getReSharePermission(): Int = SharePermissionsBuilder().apply {
463+
setSharePermission(true)
464+
}.build()
457465

458466
/**
459467
* method to validate the step 1 screen information

‎app/src/main/res/drawable/file_calendar.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<!--
22
~ Nextcloud - Android Client
33
~
4-
~ SPDX-FileCopyrightText: 2018-2024 Google LLC
4+
~ SPDX-FileCopyrightText: 2018-2025 Google LLC
55
~ SPDX-License-Identifier: Apache-2.0
66
-->
77
<vector xmlns:android="http://schemas.android.com/apk/res/android"
88
android:width="24dp"
99
android:height="24dp"
1010
android:tint="#757575"
11-
android:viewportWidth="24.0"
12-
android:viewportHeight="24.0">
11+
android:viewportWidth="960"
12+
android:viewportHeight="960">
1313
<path
14-
android:fillColor="#FF000000"
15-
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" />
14+
android:fillColor="@android:color/white"
15+
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" />
1616
</vector>

‎app/src/main/res/drawable/ic_close_24px.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<!--
2+
~ Nextcloud Notes - Android Client
3+
~
4+
~ SPDX-FileCopyrightText: 2018-2025 Google LLC
5+
~ SPDX-License-Identifier: Apache-2.0
6+
-->
7+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
8+
android:width="24dp"
9+
android:height="24dp"
10+
android:tint="?attr/colorControlNormal"
11+
android:viewportWidth="960"
12+
android:viewportHeight="960">
13+
<path
14+
android:fillColor="@android:color/white"
15+
android:pathData="M256,760L200,704L424,480L200,256L256,200L480,424L704,200L760,256L536,480L760,704L704,760L480,536L256,760Z" />
16+
</vector>

‎app/src/main/res/layout/activity_note_share.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@
5959
android:layout_height="wrap_content"
6060
android:ellipsize="end"
6161
android:lines="1"
62+
android:text="@string/activity_sharing_title"
6263
android:textColor="@color/fontAppbar"
63-
android:textSize="18sp"
64-
tools:text="Share Note" />
64+
android:textSize="18sp" />
6565

6666
<TextView
6767
android:id="@+id/file_name"

‎app/src/main/res/layout/activity_note_share_detail.xml‎

Lines changed: 37 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,29 @@
1212
android:layout_width="match_parent"
1313
android:layout_height="match_parent"
1414
android:focusable="true"
15-
android:focusableInTouchMode="true"
16-
android:minHeight="400dp">
15+
android:focusableInTouchMode="true">
16+
17+
<com.google.android.material.appbar.MaterialToolbar
18+
android:id="@+id/toolbar"
19+
android:layout_width="match_parent"
20+
android:layout_height="wrap_content"
21+
app:layout_constraintEnd_toEndOf="parent"
22+
app:layout_constraintStart_toStartOf="parent"
23+
app:layout_constraintTop_toTopOf="parent"
24+
app:navigationIcon="@drawable/ic_close_24px">
25+
26+
<TextView
27+
android:id="@+id/title"
28+
android:layout_width="match_parent"
29+
android:layout_height="wrap_content"
30+
android:layout_marginEnd="@dimen/spacer_2x"
31+
android:ellipsize="end"
32+
android:lines="1"
33+
android:text="@string/activity_sharing_details_title"
34+
android:textColor="@color/fontAppbar"
35+
android:textSize="18sp" />
36+
37+
</com.google.android.material.appbar.MaterialToolbar>
1738

1839
<androidx.core.widget.NestedScrollView
1940
android:layout_width="match_parent"
@@ -22,7 +43,7 @@
2243
android:padding="@dimen/spacer_2x"
2344
app:layout_constraintEnd_toEndOf="parent"
2445
app:layout_constraintStart_toStartOf="parent"
25-
app:layout_constraintTop_toTopOf="parent">
46+
app:layout_constraintTop_toBottomOf="@id/toolbar">
2647

2748
<LinearLayout
2849
android:orientation="vertical"
@@ -219,34 +240,37 @@
219240
android:visibility="gone"/>
220241

221242
<LinearLayout
222-
android:orientation="horizontal"
223-
android:layout_marginTop="@dimen/spacer_2x"
224-
android:gravity="end"
225243
android:layout_width="match_parent"
226-
android:layout_height="wrap_content">
244+
android:layout_height="wrap_content"
245+
android:layout_marginTop="@dimen/spacer_2x"
246+
android:orientation="horizontal"
247+
android:weightSum="1.0">
227248

228249
<com.google.android.material.button.MaterialButton
229250
android:id="@+id/share_process_btn_cancel"
230251
style="@style/Widget.Material3.Button.OutlinedButton"
231-
android:layout_width="@dimen/button_width"
232-
android:layout_height="wrap_content"
252+
android:layout_width="@dimen/zero"
253+
android:layout_height="match_parent"
233254
android:layout_marginEnd="@dimen/spacer_1x"
255+
android:layout_weight=".5"
234256
android:text="@string/note_share_detail_activity_cancel"
235257
app:cornerRadius="@dimen/button_corner_radius" />
236258

237259
<com.google.android.material.button.MaterialButton
238260
android:id="@+id/share_process_btn_next"
239-
android:layout_width="@dimen/button_extra_width"
240-
android:layout_height="wrap_content"
261+
android:layout_width="@dimen/zero"
262+
android:layout_height="match_parent"
263+
android:layout_marginStart="@dimen/spacer_1x"
264+
android:layout_weight=".5"
241265
android:text="@string/note_share_detail_activity_common_next"
242266
android:theme="@style/Widget.Material3.Button.IconButton.Filled"
243-
app:cornerRadius="@dimen/button_corner_radius"/>
267+
app:cornerRadius="@dimen/button_corner_radius" />
244268

245269
</LinearLayout>
246270

247271
<View
248272
android:layout_width="match_parent"
249-
android:layout_height="@dimen/bottom_navigation_view_margin" />
273+
android:layout_height="?android:attr/actionBarSize" />
250274

251275
</LinearLayout>
252276

‎app/src/main/res/values/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,7 @@
517517
<string name="ecosystem_apps_more">More Nextcloud Apps</string>
518518
<string name="ecosystem_apps_display_more">More</string>
519519
<string name="activity_sharing_title">Sharing</string>
520+
<string name="activity_sharing_details_title">Sharing Details</string>
520521
<string name="share_expires">Share expires on %1$s</string>
521522
<string name="dismiss">Dismiss</string>
522523
</resources>

0 commit comments

Comments
 (0)