Skip to content

Commit 785a254

Browse files
alperozturk96alperozturk96
committed
fix email address appearance in suggestion adapter
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
1 parent f27a78c commit 785a254

7 files changed

Lines changed: 66 additions & 52 deletions

File tree

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import it.niedermann.owncloud.notes.persistence.isSuccess
2727
import it.niedermann.owncloud.notes.share.dialog.ExpirationDatePickerDialogFragment
2828
import it.niedermann.owncloud.notes.share.helper.SharePermissionManager
2929
import it.niedermann.owncloud.notes.share.model.QuickPermissionType
30-
import it.niedermann.owncloud.notes.share.model.SharePasswordRequest
3130
import it.niedermann.owncloud.notes.share.model.UpdateShareRequest
3231
import it.niedermann.owncloud.notes.share.repository.ShareRepository
3332
import it.niedermann.owncloud.notes.shared.util.DisplayUtils

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,19 @@ class SuggestionAdapter(context: Context, cursor: Cursor?, private val account:
4646
override fun bindView(view: View, context: Context, cursor: Cursor) {
4747
val suggestion =
4848
cursor.getString(cursor.getColumnIndexOrThrow(SearchManager.SUGGEST_COLUMN_TEXT_1))
49-
view.findViewById<TextView>(R.id.suggestion_text).text = suggestion
49+
val suggestionTextView = view.findViewById<TextView>(R.id.suggestion_text)
50+
suggestionTextView.text = suggestion
51+
52+
val sublineColumn = cursor.getColumnIndex(SearchManager.SUGGEST_COLUMN_TEXT_2)
53+
if (sublineColumn != -1 && suggestionTextView.text.isEmpty()) {
54+
val subline = cursor.getStringOrNull(sublineColumn)
55+
if (!subline.isNullOrEmpty()) {
56+
suggestionTextView.visibility = View.VISIBLE
57+
suggestionTextView.text = subline
58+
} else {
59+
suggestionTextView.visibility = View.GONE
60+
}
61+
}
5062

5163
val icon = view.findViewById<ImageView>(R.id.suggestion_icon)
5264
val iconColumn = cursor.getColumnIndex(SearchManager.SUGGEST_COLUMN_ICON_1)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
android:id="@+id/copy_internal_link_icon"
2222
android:layout_width="@dimen/default_icon_size"
2323
android:layout_height="@dimen/default_icon_size"
24-
android:layout_gravity="top"
24+
android:layout_gravity="center"
2525
android:layout_marginStart="@dimen/spacer_2x"
2626
android:layout_marginEnd="@dimen/spacer_2x"
2727
android:background="@drawable/round_bgnd"

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

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
1+
<?xml version="1.0" encoding="utf-8"?><!--
32
~ Nextcloud Notes - Android Client
43
~
54
~ SPDX-FileCopyrightText: 2015-2025 Nextcloud GmbH and Nextcloud contributors
65
~ SPDX-License-Identifier: GPL-3.0-or-later
76
-->
87
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
9-
xmlns:tools="http://schemas.android.com/tools"
108
xmlns:app="http://schemas.android.com/apk/res-auto"
9+
xmlns:tools="http://schemas.android.com/tools"
1110
android:id="@+id/share_by_link_container"
1211
android:layout_width="match_parent"
1312
android:layout_height="wrap_content"
@@ -51,47 +50,49 @@
5150
android:layout_height="wrap_content"
5251
android:ellipsize="end"
5352
android:gravity="center_vertical"
54-
android:visibility="gone"
5553
android:singleLine="true"
56-
tools:text="5 downloads remaining"
57-
tools:visibility="visible"
5854
android:textColor="@color/fg_default_selection"
59-
android:textSize="@dimen/note_font_size_small" />
55+
android:textSize="@dimen/note_font_size_small"
56+
android:visibility="gone"
57+
tools:text="5 downloads remaining"
58+
tools:visibility="visible" />
6059

6160
<androidx.appcompat.widget.AppCompatTextView
6261
android:id="@+id/permission_name"
6362
android:layout_width="wrap_content"
6463
android:layout_height="wrap_content"
6564
android:gravity="center_vertical"
6665
android:singleLine="true"
67-
tools:text="View only"
66+
android:textColor="@color/defaultBrand"
67+
android:textSize="@dimen/note_font_size_minimum"
6868
app:drawableEndCompat="@drawable/ic_baseline_arrow_drop_down_24"
69-
app:drawableTint="@color/defaultBrand"
7069
app:drawableRightCompat="@drawable/ic_baseline_arrow_drop_down_24"
71-
android:textColor="@color/defaultBrand"
72-
android:textSize="@dimen/note_font_size_minimum" />
70+
app:drawableTint="@color/defaultBrand"
71+
tools:text="View only" />
7372
</LinearLayout>
7473

75-
<ImageView
74+
<com.google.android.material.button.MaterialButton
7675
android:id="@+id/copy_link"
77-
android:layout_width="wrap_content"
78-
android:layout_height="wrap_content"
76+
style="@style/Button.IconButton"
77+
android:layout_width="@dimen/minimum_size_for_touchable_area"
78+
android:layout_height="match_parent"
7979
android:layout_gravity="center_vertical"
8080
android:contentDescription="@string/note_share_activity_copy_icon_content_description"
81-
android:paddingStart="@dimen/spacer_2x"
82-
android:paddingTop="@dimen/spacer_1hx"
83-
android:paddingEnd="@dimen/spacer_2x"
84-
android:paddingBottom="@dimen/spacer_1hx"
81+
android:minHeight="@dimen/minimum_size_for_touchable_area"
8582
android:scaleType="fitCenter"
86-
android:src="@drawable/ic_content_copy" />
83+
app:icon="@drawable/ic_content_copy"
84+
app:iconSize="@dimen/iconized_single_line_item_icon_size"
85+
app:iconTint="@color/icon_color_default" />
8786

88-
<ImageView
87+
<com.google.android.material.button.MaterialButton
8988
android:id="@+id/overflow_menu"
90-
android:layout_width="wrap_content"
89+
style="@style/Button.IconButton"
90+
android:layout_width="@dimen/minimum_size_for_touchable_area"
9191
android:layout_height="match_parent"
9292
android:contentDescription="@string/note_share_activity_more_icon_content_description"
93-
android:paddingStart="@dimen/spacer_2x"
94-
android:paddingEnd="@dimen/spacer_2x"
95-
android:src="@drawable/ic_dots_vertical" />
93+
android:minHeight="@dimen/minimum_size_for_touchable_area"
94+
app:icon="@drawable/ic_dots_vertical"
95+
app:iconSize="@dimen/iconized_single_line_item_icon_size"
96+
app:iconTint="@color/icon_color_default" />
9697

9798
</LinearLayout>

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

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
1+
<?xml version="1.0" encoding="utf-8"?><!--
32
~ Nextcloud Notes - Android Client
43
~
54
~ SPDX-FileCopyrightText: 2015-2025 Nextcloud GmbH and Nextcloud contributors
65
~ SPDX-License-Identifier: GPL-3.0-or-later
76
-->
87
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
9-
xmlns:tools="http://schemas.android.com/tools"
108
xmlns:app="http://schemas.android.com/apk/res-auto"
9+
xmlns:tools="http://schemas.android.com/tools"
1110
android:id="@+id/share_by_link_container"
1211
android:layout_width="match_parent"
1312
android:layout_height="wrap_content"
@@ -37,12 +36,12 @@
3736
android:layout_width="18dp"
3837
android:layout_height="18dp"
3938
android:layout_gravity="bottom|end"
39+
android:layout_margin="@dimen/spacer_1hx"
4040
android:background="@drawable/round_bgnd"
4141
android:contentDescription="@null"
4242
android:padding="1dp"
43-
android:layout_margin="@dimen/spacer_1hx"
4443
android:src="@drawable/schedule_24px"
45-
android:tint="@color/text_color" />
44+
app:tint="@color/text_color" />
4645
</FrameLayout>
4746

4847
<LinearLayout
@@ -63,8 +62,8 @@
6362
android:textColor="@color/widget_foreground"
6463
android:textSize="@dimen/note_font_size_small"
6564
android:visibility="gone"
66-
tools:visibility="visible"
67-
tools:text="Share label"/>
65+
tools:text="Share label"
66+
tools:visibility="visible" />
6867

6968
<TextView
7069
android:id="@+id/name"
@@ -83,47 +82,47 @@
8382
android:layout_height="wrap_content"
8483
android:ellipsize="end"
8584
android:gravity="center_vertical"
86-
android:visibility="gone"
8785
android:singleLine="true"
88-
tools:text="5 downloads remaining"
89-
tools:visibility="visible"
9086
android:textColor="@color/widget_foreground"
91-
android:textSize="@dimen/note_font_size_minimum" />
87+
android:textSize="@dimen/note_font_size_minimum"
88+
android:visibility="gone"
89+
tools:text="5 downloads remaining"
90+
tools:visibility="visible" />
9291

9392
<androidx.appcompat.widget.AppCompatTextView
9493
android:id="@+id/permission_name"
9594
android:layout_width="wrap_content"
9695
android:layout_height="wrap_content"
9796
android:gravity="center_vertical"
9897
android:singleLine="true"
99-
tools:text="View only"
98+
android:textColor="@color/defaultBrand"
99+
android:textSize="@dimen/note_font_size_minimum"
100100
app:drawableEndCompat="@drawable/ic_baseline_arrow_drop_down_24"
101-
app:drawableTint="@color/defaultBrand"
102101
app:drawableRightCompat="@drawable/ic_baseline_arrow_drop_down_24"
103-
android:textColor="@color/defaultBrand"
104-
android:textSize="@dimen/note_font_size_minimum" />
102+
app:drawableTint="@color/defaultBrand"
103+
tools:text="View only" />
105104
</LinearLayout>
106105

107106
<com.google.android.material.button.MaterialButton
108107
android:id="@+id/copy_link"
109-
style="@style/Button.IconButton"
108+
style="?attr/materialIconButtonStyle"
110109
android:layout_width="@dimen/minimum_size_for_touchable_area"
111110
android:layout_height="match_parent"
112-
android:minHeight="@dimen/minimum_size_for_touchable_area"
113111
android:layout_gravity="center_vertical"
114112
android:contentDescription="@string/copy_link"
113+
android:minHeight="@dimen/minimum_size_for_touchable_area"
115114
app:cornerRadius="@dimen/iconized_single_line_item_icon_size"
116115
app:icon="@drawable/ic_content_copy"
117116
app:iconSize="@dimen/iconized_single_line_item_icon_size"
118117
app:iconTint="@color/icon_color_default" />
119118

120119
<com.google.android.material.button.MaterialButton
121120
android:id="@+id/overflow_menu"
122-
style="@style/Button.IconButton"
121+
style="?attr/materialIconButtonStyle"
123122
android:layout_width="@dimen/minimum_size_for_touchable_area"
124123
android:layout_height="match_parent"
125-
android:minHeight="@dimen/minimum_size_for_touchable_area"
126124
android:contentDescription="@string/note_share_activity_more_icon_content_description"
125+
android:minHeight="@dimen/minimum_size_for_touchable_area"
127126
app:cornerRadius="@dimen/iconized_single_line_item_icon_size"
128127
app:icon="@drawable/ic_dots_vertical"
129128
app:iconSize="@dimen/iconized_single_line_item_icon_size"

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
1+
<?xml version="1.0" encoding="utf-8"?><!--
32
~ Nextcloud - Android Client
43
~
54
~ SPDX-FileCopyrightText: 2021 TSI-mc
@@ -65,11 +64,11 @@
6564

6665
<com.google.android.material.button.MaterialButton
6766
android:id="@+id/overflow_menu"
68-
style="@style/Button.IconButton"
67+
style="?attr/materialIconButtonStyle"
6968
android:layout_width="@dimen/minimum_size_for_touchable_area"
7069
android:layout_height="match_parent"
71-
android:minHeight="@dimen/minimum_size_for_touchable_area"
7270
android:contentDescription="@string/note_share_activity_more_icon_content_description"
71+
android:minHeight="@dimen/minimum_size_for_touchable_area"
7372
app:cornerRadius="@dimen/iconized_single_line_item_icon_size"
7473
app:icon="@drawable/ic_dots_vertical"
7574
app:iconSize="@dimen/iconized_single_line_item_icon_size"

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,25 @@
88
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
99
android:layout_width="match_parent"
1010
android:layout_height="wrap_content"
11+
xmlns:tools="http://schemas.android.com/tools"
1112
android:orientation="horizontal"
12-
android:padding="8dp">
13+
android:padding="@dimen/spacer_1x">
1314

1415
<ImageView
1516
android:id="@+id/suggestion_icon"
1617
android:layout_width="@dimen/default_icon_size"
1718
android:layout_height="@dimen/default_icon_size"
18-
android:layout_marginEnd="8dp"
19+
android:layout_marginEnd="@dimen/spacer_1x"
1920
android:contentDescription="@string/note_share_activity_icon_content_description" />
2021

2122
<TextView
2223
android:id="@+id/suggestion_text"
2324
android:gravity="center"
2425
android:layout_width="wrap_content"
2526
android:layout_height="@dimen/default_icon_size"
27+
tools:text="@tools:sample/lorem/random"
28+
android:maxLines="1"
29+
android:ellipsize="end"
2630
android:textSize="@dimen/note_font_size_small" />
2731

2832
</LinearLayout>

0 commit comments

Comments
 (0)