Skip to content

Commit 91065c1

Browse files
alperozturk96backportbot[bot]
alperozturk96
authored and
backportbot[bot]
committed
add missing search types
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
1 parent da0cf5f commit 91065c1

8 files changed

Lines changed: 129 additions & 21 deletions

File tree

‎app/src/main/java/com/nextcloud/model/SearchResultEntryType.kt‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,20 @@ enum class SearchResultEntryType {
1515
Note,
1616
Contact,
1717
Deck,
18+
Settings,
19+
PDF,
20+
Generic,
21+
SpreadSheet,
22+
Presentation,
23+
Form,
24+
FormTemplate,
25+
Drawing,
26+
Document,
27+
Whiteboard,
28+
TextVCard,
29+
TextCode,
30+
Link,
31+
Font,
1832
Unknown;
1933

2034
fun iconId(): Int = when (this) {
@@ -23,6 +37,20 @@ enum class SearchResultEntryType {
2337
Note -> R.drawable.ic_edit
2438
Contact -> R.drawable.file_vcard
2539
Deck -> R.drawable.ic_deck
40+
Settings -> R.drawable.ic_settings
41+
PDF -> R.drawable.file_pdf
42+
Generic -> R.drawable.ic_generic_file_type
43+
SpreadSheet -> R.drawable.file_xls
44+
Presentation -> R.drawable.file_ppt
45+
Form -> R.drawable.ic_form
46+
FormTemplate -> R.drawable.ic_form_template
47+
Drawing -> R.drawable.ic_drawing
48+
Document -> R.drawable.file_doc
49+
Whiteboard -> R.drawable.file_whiteboard
50+
TextVCard -> R.drawable.file_vcard
51+
TextCode -> R.drawable.file_code
52+
Link -> R.drawable.ic_link
53+
Font -> R.drawable.ic_font
2654
Unknown -> R.drawable.ic_find_in_page
2755
}
2856
}

‎app/src/main/java/com/nextcloud/utils/extensions/SearchResultEntryExtensions.kt‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,29 @@ package com.nextcloud.utils.extensions
1010
import com.nextcloud.model.SearchResultEntryType
1111
import com.owncloud.android.lib.common.SearchResultEntry
1212

13-
fun SearchResultEntry.getType(): SearchResultEntryType = if (icon == "icon-folder") {
14-
SearchResultEntryType.Folder
15-
} else if (icon.startsWith("icon-note")) {
16-
SearchResultEntryType.Note
17-
} else if (icon.startsWith("icon-contacts")) {
18-
SearchResultEntryType.Contact
19-
} else if (icon.startsWith("icon-calendar")) {
20-
SearchResultEntryType.CalendarEvent
21-
} else if (icon.startsWith("icon-deck")) {
22-
SearchResultEntryType.Deck
23-
} else {
24-
SearchResultEntryType.Unknown
13+
fun SearchResultEntry.getType(): SearchResultEntryType {
14+
val value = icon.lowercase()
15+
16+
return when {
17+
value.contains("icon-folder") -> SearchResultEntryType.Folder
18+
value.contains("icon-note") -> SearchResultEntryType.Note
19+
value.contains("icon-contacts") -> SearchResultEntryType.Contact
20+
value.contains("icon-calendar") || value.contains("text-calendar") -> SearchResultEntryType.CalendarEvent
21+
value.contains("icon-deck") -> SearchResultEntryType.Deck
22+
value.contains("icon-settings") -> SearchResultEntryType.Settings
23+
value.contains("application-pdf") -> SearchResultEntryType.PDF
24+
value.contains("package-x-generic") -> SearchResultEntryType.Generic
25+
value.contains("x-office-spreadsheet") -> SearchResultEntryType.SpreadSheet
26+
value.contains("x-office-presentation") -> SearchResultEntryType.Presentation
27+
value.contains("x-office-form") -> SearchResultEntryType.Form
28+
value.contains("x-office-form-template") -> SearchResultEntryType.FormTemplate
29+
value.contains("x-office-drawing") -> SearchResultEntryType.Drawing
30+
value.contains("x-office-document") -> SearchResultEntryType.Document
31+
value.contains("whiteboard") -> SearchResultEntryType.Whiteboard
32+
value.contains("text-vcard") -> SearchResultEntryType.TextVCard
33+
value.contains("text-code") -> SearchResultEntryType.TextCode
34+
value.contains("link") -> SearchResultEntryType.Link
35+
value.contains("font") -> SearchResultEntryType.Font
36+
else -> SearchResultEntryType.Unknown
37+
}
2538
}

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

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -137,15 +137,20 @@ class UnifiedSearchItemViewHolder(
137137
setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_find_in_page))
138138
viewThemeUtils.platform.colorImageView(this, ColorRole.SECONDARY)
139139
}
140-
filesAction.loadFileThumbnail(entry) { client ->
141-
GlideHelper.loadIntoImageView(
142-
context,
143-
client,
144-
entry.thumbnailUrl,
145-
binding.thumbnail,
146-
entryType.iconId(),
147-
circleCrop = entry.rounded
148-
)
140+
141+
if (entry.thumbnailUrl.isNotBlank()) {
142+
filesAction.loadFileThumbnail(entry) { client ->
143+
GlideHelper.loadIntoImageView(
144+
context,
145+
client,
146+
entry.thumbnailUrl,
147+
binding.thumbnail,
148+
entryType.iconId(),
149+
circleCrop = entry.rounded
150+
)
151+
}
152+
} else {
153+
binding.thumbnail.setImageDrawable(ContextCompat.getDrawable(context, entryType.iconId()))
149154
}
150155
}
151156

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:pathData="M18,18H12V12.21C11.34,12.82 10.47,13.2 9.5,13.2C7.46,13.2 5.8,11.54 5.8,9.5A3.7,3.7 0,0 1,9.5 5.8C11.54,5.8 13.2,7.46 13.2,9.5C13.2,10.47 12.82,11.34 12.21,12H18M19,3H5C3.89,3 3,3.89 3,5V19A2,2 0,0 0,5 21H19A2,2 0,0 0,21 19V5C21,3.89 20.1,3 19,3Z"
8+
android:fillColor="#b39114"/>
9+
</vector>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="16dp"
3+
android:height="16dp"
4+
android:viewportWidth="16"
5+
android:viewportHeight="16">
6+
<path
7+
android:pathData="m12.167,4.667h2.5V14.667H15.5V15.5H12.167V14.667H13V12.167H9.667L8.417,14.667H9.667V15.5H6.333V14.667H7.167L12.167,4.667M13,5.5 L10.083,11.333H13V5.5M2.167,0.5H6.333C7.258,0.5 8,1.242 8,2.167V11.333H5.5V7.167H3V11.333H0.5V2.167C0.5,1.242 1.242,0.5 2.167,0.5M3,2.167V5.5H5.5V2.167Z"
8+
android:fillColor="#969696"/>
9+
</vector>

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="16dp"
3+
android:height="16dp"
4+
android:viewportWidth="16"
5+
android:viewportHeight="16">
6+
<path
7+
android:pathData="M2.5,1C2.22,1 2,1.22 2,1.5V14.5C2,14.78 2.22,15 2.5,15H13.5C13.78,15 14,14.78 14,14.5V4L11,1H2.5Z"
8+
android:fillColor="#188079"/>
9+
<path
10+
android:pathData="M12,6H4V12H12V6ZM3,5V13H13V5H3Z"
11+
android:fillColor="#fff"
12+
android:fillAlpha="0.95"
13+
android:fillType="evenOdd"/>
14+
<path
15+
android:pathData="m8,7v1h-1v2h1v1h-3v-1h1v-2h-1v-1h3z"
16+
android:fillColor="#fff"
17+
android:fillType="evenOdd"/>
18+
</vector>

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="16dp"
3+
android:height="16dp"
4+
android:viewportWidth="16"
5+
android:viewportHeight="16">
6+
<path
7+
android:pathData="M2.5,1C2.22,1 2,1.22 2,1.5V14.5C2,14.78 2.22,15 2.5,15H13.5C13.78,15 14,14.78 14,14.5V4L11,1H2.5Z"
8+
android:fillColor="#27ABA3"/>
9+
<path
10+
android:pathData="M12,6H4V9H12V6ZM11,7H5V8H11V7Z"
11+
android:fillColor="#fff"
12+
android:fillType="evenOdd"/>
13+
<path
14+
android:pathData="m12,10h-8v3h8v-3zM11,11h-6v1h6v-1z"
15+
android:fillColor="#fff"
16+
android:fillType="evenOdd"/>
17+
</vector>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24">
6+
<path
7+
android:pathData="M5.12,5H18.87L17.93,4H5.93L5.12,5M20.54,5.23C20.83,5.57 21,6 21,6.5V19A2,2 0,0 1,19 21H5A2,2 0,0 1,3 19V6.5C3,6 3.17,5.57 3.46,5.23L4.84,3.55C5.12,3.21 5.53,3 6,3H18C18.47,3 18.88,3.21 19.15,3.55L20.54,5.23M6,18H12V15H6V18Z"
8+
android:fillColor="#969696"/>
9+
</vector>

0 commit comments

Comments
 (0)