@@ -67,6 +67,10 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
6767 private var dateFormat = " "
6868 private var timeFormat = " "
6969
70+ private val config = activity.config
71+ private val viewType = config.getFolderViewType(listItems.firstOrNull { ! it.isSectionTitle }?.mPath ? : " " )
72+ private val isListViewType = viewType == VIEW_TYPE_LIST
73+
7074 init {
7175 setupDragListener(true )
7276 initDrawables()
@@ -138,7 +142,15 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
138142 }
139143
140144 override fun onCreateViewHolder (parent : ViewGroup , viewType : Int ): ViewHolder {
141- val layout = if (viewType == TYPE_SECTION ) R .layout.item_section else R .layout.item_file_dir_list
145+ val layout = if (viewType == TYPE_SECTION ) {
146+ R .layout.item_section
147+ } else {
148+ if (isListViewType) {
149+ R .layout.item_file_dir_list
150+ } else {
151+ R .layout.item_file_dir_grid
152+ }
153+ }
142154 return createViewHolder(layout, parent)
143155 }
144156
@@ -696,20 +708,20 @@ class ItemsAdapter(activity: SimpleActivity, var listItems: MutableList<ListItem
696708 item_name.setTextColor(textColor)
697709 item_name.setTextSize(TypedValue .COMPLEX_UNIT_PX , fontSize)
698710
699- item_details.setTextColor(textColor)
700- item_details.setTextSize(TypedValue .COMPLEX_UNIT_PX , fontSize)
711+ item_details? .setTextColor(textColor)
712+ item_details? .setTextSize(TypedValue .COMPLEX_UNIT_PX , fontSize)
701713
702- item_date.setTextColor(textColor)
703- item_date.setTextSize(TypedValue .COMPLEX_UNIT_PX , smallerFontSize)
714+ item_date? .setTextColor(textColor)
715+ item_date? .setTextSize(TypedValue .COMPLEX_UNIT_PX , smallerFontSize)
704716
705717 if (listItem.isDirectory) {
706718 item_icon.setImageDrawable(folderDrawable)
707- item_details.text = getChildrenCnt(listItem)
708- item_date.beGone()
719+ item_details? .text = getChildrenCnt(listItem)
720+ item_date? .beGone()
709721 } else {
710- item_details.text = listItem.size.formatSize()
711- item_date.beVisible()
712- item_date.text = listItem.modified.formatDate(activity, dateFormat, timeFormat)
722+ item_details? .text = listItem.size.formatSize()
723+ item_date? .beVisible()
724+ item_date? .text = listItem.modified.formatDate(activity, dateFormat, timeFormat)
713725
714726 val drawable = fileDrawables.getOrElse(fileName.substringAfterLast(" ." ).toLowerCase(), { fileDrawable })
715727 val options = RequestOptions ()
0 commit comments