gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-21 20:49:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Unify naming of shared item layouts

Browse Source 
Signed-off-by: Tim Krüger <t@timkrueger.me>
This commit is contained in:
Tim Krüger 2022-04-29 14:03:59 +02:00
parent 58acf3edc8
commit afe61b7aa1
No known key found for this signature in database
GPG Key ID: FECE3A7222C52A4E
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/nextcloud/talk/adapters/SharedItemsGridAdapter.kt
View File

@ -11,7 +11,7 @@ import com.facebook.drawee.interfaces.DraweeController
import com.facebook.drawee.view.SimpleDraweeView import com.facebook.drawee.view.SimpleDraweeView
import com.facebook.imagepipeline.common.RotationOptions import com.facebook.imagepipeline.common.RotationOptions
import com.facebook.imagepipeline.request.ImageRequestBuilder import com.facebook.imagepipeline.request.ImageRequestBuilder
import com.nextcloud.talk.databinding.AttachmentItemBinding import com.nextcloud.talk.databinding.SharedItemGridBinding
import com.nextcloud.talk.repositories.SharedItem import com.nextcloud.talk.repositories.SharedItem
import com.nextcloud.talk.utils.DrawableUtils.getDrawableResourceIdForMimeType import com.nextcloud.talk.utils.DrawableUtils.getDrawableResourceIdForMimeType
import com.nextcloud.talk.utils.FileViewerUtils import com.nextcloud.talk.utils.FileViewerUtils
@ -22,13 +22,13 @@ class SharedItemsGridAdapter : RecyclerView.Adapter<SharedItemsGridAdapter.ViewH
private val TAG = SharedItemsGridAdapter::class.simpleName private val TAG = SharedItemsGridAdapter::class.simpleName
} }
class ViewHolder(val binding: AttachmentItemBinding, itemView: View) : RecyclerView.ViewHolder(itemView) class ViewHolder(val binding: SharedItemGridBinding, itemView: View) : RecyclerView.ViewHolder(itemView)
var authHeader: Map<String, String> = emptyMap() var authHeader: Map<String, String> = emptyMap()
var items: List<SharedItem> = emptyList() var items: List<SharedItem> = emptyList()
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
val binding = AttachmentItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) val binding = SharedItemGridBinding.inflate(LayoutInflater.from(parent.context), parent, false)
return ViewHolder(binding, binding.root) return ViewHolder(binding, binding.root)
} }

6
app/src/main/java/com/nextcloud/talk/adapters/SharedItemsListAdapter.kt
View File

@ -11,7 +11,7 @@ import com.facebook.drawee.backends.pipeline.Fresco
import com.facebook.drawee.interfaces.DraweeController import com.facebook.drawee.interfaces.DraweeController
import com.facebook.imagepipeline.common.RotationOptions import com.facebook.imagepipeline.common.RotationOptions
import com.facebook.imagepipeline.request.ImageRequestBuilder import com.facebook.imagepipeline.request.ImageRequestBuilder
import com.nextcloud.talk.databinding.AttachmentListItemBinding import com.nextcloud.talk.databinding.SharedItemListBinding
import com.nextcloud.talk.repositories.SharedItem import com.nextcloud.talk.repositories.SharedItem
import com.nextcloud.talk.utils.DateUtils import com.nextcloud.talk.utils.DateUtils
import com.nextcloud.talk.utils.DrawableUtils import com.nextcloud.talk.utils.DrawableUtils
@ -24,13 +24,13 @@ class SharedItemsListAdapter : RecyclerView.Adapter<SharedItemsListAdapter.ViewH
private const val ONE_SECOND_IN_MILLIS = 1000 private const val ONE_SECOND_IN_MILLIS = 1000
} }
class ViewHolder(val binding: AttachmentListItemBinding, itemView: View) : RecyclerView.ViewHolder(itemView) class ViewHolder(val binding: SharedItemListBinding, itemView: View) : RecyclerView.ViewHolder(itemView)
var authHeader: Map<String, String> = emptyMap() var authHeader: Map<String, String> = emptyMap()
var items: List<SharedItem> = emptyList() var items: List<SharedItem> = emptyList()
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
val binding = AttachmentListItemBinding.inflate(LayoutInflater.from(parent.context), parent, false) val binding = SharedItemListBinding.inflate(LayoutInflater.from(parent.context), parent, false)
return ViewHolder(binding, binding.root) return ViewHolder(binding, binding.root)
} }

2
app/src/main/res/layout/activity_shared_items.xml
View File

@ -60,7 +60,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/shared_items_tabs" app:layout_constraintTop_toBottomOf="@+id/shared_items_tabs"
android:layout_marginTop="@dimen/double_margin_between_elements" android:layout_marginTop="@dimen/double_margin_between_elements"
tools:listitem="@layout/attachment_item" /> tools:listitem="@layout/shared_item_grid" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

0
app/src/main/res/layout/attachment_item.xml → app/src/main/res/layout/shared_item_grid.xml
View File

0
app/src/main/res/layout/attachment_list_item.xml → app/src/main/res/layout/shared_item_list.xml
View File