|
@@ -37,6 +37,7 @@ class NCOffline: UIViewController ,UICollectionViewDataSource, UICollectionViewD
|
|
|
|
|
|
private var sectionDatasource = CCSectionDataSourceMetadata()
|
|
|
|
|
|
+ private var typeLayout = ""
|
|
|
private var datasourceSorted = ""
|
|
|
private var datasourceAscending = true
|
|
|
private var datasourceGroupBy = ""
|
|
@@ -100,12 +101,9 @@ class NCOffline: UIViewController ,UICollectionViewDataSource, UICollectionViewD
|
|
|
|
|
|
self.navigationItem.title = titleCurrentFolder
|
|
|
|
|
|
- datasourceSorted = CCUtility.getOrderSettings()
|
|
|
- datasourceAscending = CCUtility.getAscendingSettings()
|
|
|
- datasourceGroupBy = CCUtility.getGroupBySettings()
|
|
|
- datasourceDirectoryOnTop = CCUtility.getDirectoryOnTop()
|
|
|
+ (typeLayout, datasourceSorted, datasourceAscending, datasourceGroupBy, datasourceDirectoryOnTop) = NCUtility.sharedInstance.getLayoutForView(key: k_layout_view_offline)
|
|
|
|
|
|
- if CCUtility.getLayoutOffline() == "list" {
|
|
|
+ if typeLayout == "list" {
|
|
|
collectionView.collectionViewLayout = listLayout
|
|
|
} else {
|
|
|
collectionView.collectionViewLayout = gridLayout
|
|
@@ -156,7 +154,8 @@ class NCOffline: UIViewController ,UICollectionViewDataSource, UICollectionViewD
|
|
|
self.collectionView.setContentOffset(CGPoint(x:0,y:0), animated: false)
|
|
|
})
|
|
|
})
|
|
|
- CCUtility.setLayoutOffline("list")
|
|
|
+ typeLayout = "list"
|
|
|
+ NCUtility.sharedInstance.setLayoutForView(key: k_layout_view_offline, layout: typeLayout, sort: datasourceSorted, ascending: datasourceAscending, groupBy: datasourceGroupBy, directoryOnTop: datasourceDirectoryOnTop)
|
|
|
} else {
|
|
|
// grid layout
|
|
|
UIView.animate(withDuration: 0.0, animations: {
|
|
@@ -166,7 +165,8 @@ class NCOffline: UIViewController ,UICollectionViewDataSource, UICollectionViewD
|
|
|
self.collectionView.setContentOffset(CGPoint(x:0,y:0), animated: false)
|
|
|
})
|
|
|
})
|
|
|
- CCUtility.setLayoutOffline("grid")
|
|
|
+ typeLayout = "grid"
|
|
|
+ NCUtility.sharedInstance.setLayoutForView(key: k_layout_view_offline, layout: typeLayout, sort: datasourceSorted, ascending: datasourceAscending, groupBy: datasourceGroupBy, directoryOnTop: datasourceDirectoryOnTop)
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -306,55 +306,54 @@ class NCOffline: UIViewController ,UICollectionViewDataSource, UICollectionViewD
|
|
|
|
|
|
switch indexPath.section {
|
|
|
|
|
|
- case 0: switch indexPath.row {
|
|
|
-
|
|
|
- case 0: CCUtility.setOrderSettings("fileName"); CCUtility.setAscendingSettings(true)
|
|
|
- case 1: CCUtility.setOrderSettings("fileName"); CCUtility.setAscendingSettings(false)
|
|
|
-
|
|
|
- case 2: CCUtility.setOrderSettings("date"); CCUtility.setAscendingSettings(false)
|
|
|
- case 3: CCUtility.setOrderSettings("date"); CCUtility.setAscendingSettings(true)
|
|
|
-
|
|
|
- case 4: CCUtility.setOrderSettings("size"); CCUtility.setAscendingSettings(true)
|
|
|
- case 5: CCUtility.setOrderSettings("size"); CCUtility.setAscendingSettings(false)
|
|
|
+ case 0: switch indexPath.row {
|
|
|
+
|
|
|
+ case 0: datasourceSorted = "fileName"; datasourceAscending = true
|
|
|
+ case 1: datasourceSorted = "fileName"; datasourceAscending = false
|
|
|
+
|
|
|
+ case 2: datasourceSorted = "date"; datasourceAscending = false
|
|
|
+ case 3: datasourceSorted = "date"; datasourceAscending = true
|
|
|
+
|
|
|
+ case 4: datasourceSorted = "size"; datasourceAscending = true
|
|
|
+ case 5: datasourceSorted = "size"; datasourceAscending = false
|
|
|
|
|
|
default: ()
|
|
|
}
|
|
|
+
|
|
|
case 1: switch indexPath.row {
|
|
|
|
|
|
case 0:
|
|
|
- if datasourceGroupBy == "alphabetic" {
|
|
|
- CCUtility.setGroupBySettings("none")
|
|
|
- } else {
|
|
|
- CCUtility.setGroupBySettings("alphabetic")
|
|
|
- }
|
|
|
+ if datasourceGroupBy == "alphabetic" {
|
|
|
+ datasourceGroupBy = "none"
|
|
|
+ } else {
|
|
|
+ datasourceGroupBy = "alphabetic"
|
|
|
+ }
|
|
|
case 1:
|
|
|
- if datasourceGroupBy == "typefile" {
|
|
|
- CCUtility.setGroupBySettings("none")
|
|
|
- } else {
|
|
|
- CCUtility.setGroupBySettings("typefile")
|
|
|
- }
|
|
|
+ if datasourceGroupBy == "typefile" {
|
|
|
+ datasourceGroupBy = "none"
|
|
|
+ } else {
|
|
|
+ datasourceGroupBy = "typefile"
|
|
|
+ }
|
|
|
case 2:
|
|
|
- if datasourceGroupBy == "date" {
|
|
|
- CCUtility.setGroupBySettings("none")
|
|
|
- } else {
|
|
|
- CCUtility.setGroupBySettings("date")
|
|
|
- }
|
|
|
-
|
|
|
+ if datasourceGroupBy == "date" {
|
|
|
+ datasourceGroupBy = "none"
|
|
|
+ } else {
|
|
|
+ datasourceGroupBy = "date"
|
|
|
+ }
|
|
|
+
|
|
|
+ default: ()
|
|
|
+ }
|
|
|
+ case 2:
|
|
|
+ if datasourceDirectoryOnTop {
|
|
|
+ datasourceDirectoryOnTop = false
|
|
|
+ } else {
|
|
|
+ datasourceDirectoryOnTop = true
|
|
|
+ }
|
|
|
default: ()
|
|
|
}
|
|
|
- case 2: if datasourceDirectoryOnTop {
|
|
|
- CCUtility.setDirectoryOnTop(false)
|
|
|
- } else {
|
|
|
- CCUtility.setDirectoryOnTop(true)
|
|
|
- }
|
|
|
- default: ()
|
|
|
- }
|
|
|
-
|
|
|
- datasourceAscending = CCUtility.getAscendingSettings()
|
|
|
- datasourceSorted = CCUtility.getOrderSettings()
|
|
|
- datasourceGroupBy = CCUtility.getGroupBySettings()
|
|
|
- datasourceDirectoryOnTop = CCUtility.getDirectoryOnTop()
|
|
|
|
|
|
+ NCUtility.sharedInstance.setLayoutForView(key: k_layout_view_offline, layout: typeLayout, sort: datasourceSorted, ascending: datasourceAscending, groupBy: datasourceGroupBy, directoryOnTop: datasourceDirectoryOnTop)
|
|
|
+
|
|
|
loadDatasource()
|
|
|
}
|
|
|
|