Skip to content

Commit 28dbfc9

Browse files
committed
fix(share-activity): ui/ux
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
1 parent 2e8ac4a commit 28dbfc9

1 file changed

Lines changed: 27 additions & 9 deletions

File tree

app/src/main/java/com/owncloud/android/ui/activity/ShareActivity.kt

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@ package com.owncloud.android.ui.activity
1616
import android.content.Intent
1717
import android.os.Bundle
1818
import androidx.lifecycle.lifecycleScope
19+
import com.nextcloud.android.common.ui.theme.utils.ColorRole
1920
import com.nextcloud.client.account.User
21+
import com.nextcloud.client.di.Injectable
2022
import com.owncloud.android.R
2123
import com.owncloud.android.databinding.ShareActivityBinding
2224
import com.owncloud.android.datamodel.OCFile
2325
import com.owncloud.android.datamodel.SyncedFolderObserver
24-
import com.owncloud.android.datamodel.ThumbnailsCacheManager
26+
import com.owncloud.android.datamodel.SyncedFolderProvider
2527
import com.owncloud.android.lib.common.operations.RemoteOperation
2628
import com.owncloud.android.lib.common.operations.RemoteOperationResult
2729
import com.owncloud.android.lib.common.utils.Log_OC
@@ -33,11 +35,21 @@ import com.owncloud.android.ui.fragment.FileDetailSharingFragment
3335
import com.owncloud.android.ui.fragment.FileDetailsSharingProcessFragment
3436
import com.owncloud.android.utils.DisplayUtils
3537
import com.owncloud.android.utils.MimeTypeUtil
38+
import com.owncloud.android.utils.overlay.OverlayManager
39+
import javax.inject.Inject
3640
import kotlinx.coroutines.Dispatchers
3741
import kotlinx.coroutines.launch
3842
import kotlinx.coroutines.withContext
3943

40-
class ShareActivity : FileActivity() {
44+
class ShareActivity :
45+
FileActivity(),
46+
Injectable {
47+
48+
@Inject
49+
lateinit var syncedFolderProvider: SyncedFolderProvider
50+
51+
@Inject
52+
lateinit var overlayManager: OverlayManager
4153

4254
override fun onCreate(savedInstanceState: Bundle?) {
4355
super.onCreate(savedInstanceState)
@@ -97,6 +109,7 @@ class ShareActivity : FileActivity() {
97109

98110
private fun setupHeader(binding: ShareActivityBinding, file: OCFile, user: User) {
99111
binding.shareBackButton.setOnClickListener { navigateToParentFolder(user) }
112+
viewThemeUtils.platform.colorImageView(binding.shareBackButton, ColorRole.ON_SURFACE)
100113
setupFileIcon(binding, file, user)
101114
with(binding) {
102115
shareFileName.text = getString(R.string.share_file, file.fileName)
@@ -113,14 +126,19 @@ class ShareActivity : FileActivity() {
113126
MimeTypeUtil.getFolderIcon(preferences.isDarkModeEnabled(), overlayIconId, this, viewThemeUtils)
114127
)
115128
} else {
116-
binding.shareFileIcon.setImageDrawable(
117-
MimeTypeUtil.getFileTypeIcon(file.mimeType, file.fileName, this, viewThemeUtils)
129+
DisplayUtils.setThumbnail(
130+
file,
131+
binding.shareFileIcon,
132+
user,
133+
storageManager,
134+
mutableListOf(),
135+
false,
136+
this,
137+
null,
138+
preferences,
139+
viewThemeUtils,
140+
overlayManager
118141
)
119-
if (MimeTypeUtil.isImage(file)) {
120-
ThumbnailsCacheManager.getBitmapFromDiskCache(file.remoteId.toString())?.let {
121-
binding.shareFileIcon.setImageBitmap(it)
122-
}
123-
}
124142
}
125143
}
126144

0 commit comments

Comments
 (0)