Skip to content

Commit ede66e8

Browse files
committed
fix: vertical padding, theming
Signed-off-by: alperozturk <[email protected]>
1 parent 7f20029 commit ede66e8

File tree

5 files changed

+11
-6
lines changed

5 files changed

+11
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ enum class SearchResultEntryType {
1818
Unknown;
1919

2020
fun iconId(): Int = when (this) {
21+
CalendarEvent -> R.drawable.file_calendar
2122
Folder -> R.drawable.folder
2223
Note -> R.drawable.ic_edit
2324
Contact -> R.drawable.file_vcard
24-
CalendarEvent -> R.drawable.file_calendar
2525
Deck -> R.drawable.ic_deck
26-
else -> R.drawable.ic_find_in_page
26+
Unknown -> R.drawable.ic_find_in_page
2727
}
2828
}

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ package com.owncloud.android.ui.adapter
1010
import android.content.Context
1111
import android.view.View
1212
import com.afollestad.sectionedrecyclerview.SectionedViewHolder
13+
import com.nextcloud.android.common.ui.theme.utils.ColorRole
1314
import com.nextcloud.common.NextcloudClient
1415
import com.nextcloud.model.SearchResultEntryType
1516
import com.nextcloud.utils.CalendarEventManager
@@ -20,6 +21,7 @@ import com.owncloud.android.databinding.UnifiedSearchItemBinding
2021
import com.owncloud.android.datamodel.FileDataStorageManager
2122
import com.owncloud.android.lib.common.SearchResultEntry
2223
import com.owncloud.android.ui.interfaces.UnifiedSearchListInterface
24+
import com.owncloud.android.utils.theme.ViewThemeUtils
2325

2426
@Suppress("LongParameterList")
2527
class UnifiedSearchItemViewHolder(
@@ -29,7 +31,8 @@ class UnifiedSearchItemViewHolder(
2931
private val listInterface: UnifiedSearchListInterface,
3032
private val filesAction: FilesAction,
3133
val context: Context,
32-
private val nextcloudClient: NextcloudClient
34+
private val nextcloudClient: NextcloudClient,
35+
private val viewThemeUtils: ViewThemeUtils
3336
) : SectionedViewHolder(binding.root) {
3437

3538
interface FilesAction {
@@ -50,6 +53,7 @@ class UnifiedSearchItemViewHolder(
5053
}
5154

5255
val entryType = entry.getType()
56+
viewThemeUtils.platform.colorImageView(binding.thumbnail, ColorRole.PRIMARY)
5357
GlideHelper.loadIntoImageView(
5458
context,
5559
nextcloudClient,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ class UnifiedSearchListAdapter(
9191
listInterface,
9292
filesAction,
9393
context,
94-
nextcloudClient
94+
nextcloudClient,
95+
viewThemeUtils
9596
)
9697
}
9798
VIEW_TYPE_CURRENT_DIR -> {

app/src/main/java/com/owncloud/android/ui/fragment/UnifiedSearchFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ class UnifiedSearchFragment :
208208
// Because this fragment is opened with TextView onClick on the previous screen
209209
maxWidth = Integer.MAX_VALUE
210210
viewThemeUtils.androidx.themeToolbarSearchView(this)
211-
setQuery(vm.query.value, false)
211+
setQuery(vm.query.value ?: initialQuery, false)
212212
setOnQueryTextListener(this@UnifiedSearchFragment)
213213
isIconified = false
214214
clearFocus()

app/src/main/res/layout/unified_search_header.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
android:layout_height="wrap_content"
2222
android:ellipsize="middle"
2323
android:paddingHorizontal="@dimen/standard_padding"
24-
android:paddingVertical="@dimen/standard_half_padding"
24+
android:paddingVertical="@dimen/standard_padding"
2525
android:textColor="@color/color_accent"
2626
tools:text="Files" />
2727
</RelativeLayout>

0 commit comments

Comments
 (0)