New View More

iOSClient/Main/CCMain.m

@@ -1056,9 +1056,8 @@
 
 - (void)getActivityServerSuccess:(NSArray *)listOfActivity
 {
-    for (OCActivity *activity in listOfActivity) {
+    for (OCActivity *activity in listOfActivity)
         [CCCoreData addActivityServer:activity account:app.activeAccount];
-    }
     
     // Reload Activity Data Source
     [app.controlCenterActivity reloadDatasource];

iOSClient/Main/CCMore.swift

@@ -26,10 +26,16 @@ import UIKit
 
 class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
 
-    @IBOutlet var tableView: UITableView!
+    @IBOutlet weak var tableView: UITableView!
+    @IBOutlet weak var labelQuota: UILabel!
+    @IBOutlet weak var progressQuota: UIProgressView!
 
-    let section = ["pizza", "deep dish pizza", "calzone"]
-    let items = [["Margarita", "BBQ Chicken", "Pepperoni"], ["sausage", "meat lovers", "veggie lovers"], ["sausage", "chicken pesto", "prawns", "mushrooms"]]
+    let section = ["Main", "Menu", "Settings"]
+    let items = [["A", "B", "C"], ["A", "B", "C"], ["A", "B", "C", "D"]]
+    
+    let appDelegate = UIApplication.shared.delegate as! AppDelegate
+    
+    var externalSite: [TableExternalSites]?
     
     override func viewDidLoad() {
         
@@ -40,7 +46,14 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
         tableView.dataSource = self
     }
     
-
+    override func viewDidAppear(_ animated: Bool) {
+        
+        // Get External Site
+        externalSite = CCCoreData.getAllTableExternalSites(with:  NSPredicate(format: "(account == '\(appDelegate.activeAccount!))")) as? [TableExternalSites]
+        
+        tableView.reloadData()
+    }
+    
     func numberOfSections(in tableView: UITableView) -> Int {
         return self.section.count
     }
@@ -63,7 +76,6 @@ class CCMore: UIViewController, UITableViewDelegate, UITableViewDataSource {
         return cell
     }
 
-    
     // method to run when table view cell is tapped
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         print("You tapped cell number \(indexPath.row).")

iOSClient/Main/Main.storyboard

@@ -81,7 +81,7 @@
                                 <rect key="frame" x="0.0" y="20" width="375" height="166"/>
                             </imageView>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="Xym-IM-aqh">
-                                <rect key="frame" x="0.0" y="194" width="375" height="453"/>
+                                <rect key="frame" x="0.0" y="194" width="375" height="413"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Cell" rowHeight="50" id="zQQ-52-W9I" customClass="CCCellMore" customModule="Nextcloud" customModuleProvider="target">
@@ -124,26 +124,43 @@
                                 <rect key="frame" x="16" y="73" width="60" height="60"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES" flexibleMaxY="YES"/>
                             </imageView>
+                            <progressView opaque="NO" contentMode="scaleToFill" verticalHuggingPriority="750" progress="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="HgC-Ub-Dtb">
+                                <rect key="frame" x="10" y="627" width="297" height="2"/>
+                            </progressView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WdB-hd-mrv">
+                                <rect key="frame" x="16" y="638" width="343" height="17"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="cxb-Vw-8zb" firstAttribute="top" secondItem="myb-PI-7vm" secondAttribute="bottom" id="4l7-cf-DHE"/>
+                            <constraint firstItem="WdB-hd-mrv" firstAttribute="leading" secondItem="XtC-Je-LUc" secondAttribute="leadingMargin" id="9ET-QC-35O"/>
                             <constraint firstAttribute="trailing" secondItem="cxb-Vw-8zb" secondAttribute="trailing" id="AjJ-cB-0xu"/>
                             <constraint firstItem="Xym-IM-aqh" firstAttribute="leading" secondItem="cxb-Vw-8zb" secondAttribute="leading" id="DKF-Y7-cmv"/>
+                            <constraint firstItem="WdB-hd-mrv" firstAttribute="trailing" secondItem="XtC-Je-LUc" secondAttribute="trailingMargin" id="FPW-TD-fS8"/>
+                            <constraint firstAttribute="leadingMargin" secondItem="HgC-Ub-Dtb" secondAttribute="leading" constant="6" id="HZo-wI-3Vc"/>
+                            <constraint firstItem="WdB-hd-mrv" firstAttribute="top" secondItem="HgC-Ub-Dtb" secondAttribute="bottom" constant="9" id="J6a-bU-rSQ"/>
                             <constraint firstItem="Xym-IM-aqh" firstAttribute="trailing" secondItem="cxb-Vw-8zb" secondAttribute="trailing" id="SNN-Jv-Ezx"/>
+                            <constraint firstAttribute="trailingMargin" secondItem="HgC-Ub-Dtb" secondAttribute="trailing" constant="52" id="UCm-fo-XLY"/>
+                            <constraint firstItem="HgC-Ub-Dtb" firstAttribute="top" secondItem="Xym-IM-aqh" secondAttribute="bottom" constant="20" id="bcj-pp-ogX"/>
                             <constraint firstItem="Xym-IM-aqh" firstAttribute="top" secondItem="cxb-Vw-8zb" secondAttribute="bottom" constant="8" id="gtG-qs-qFg"/>
-                            <constraint firstAttribute="bottom" secondItem="Xym-IM-aqh" secondAttribute="bottom" constant="20" symbolic="YES" id="iky-9q-uu8"/>
+                            <constraint firstAttribute="bottom" secondItem="Xym-IM-aqh" secondAttribute="bottom" constant="60" id="iky-9q-uu8"/>
                             <constraint firstItem="vKf-mG-hvt" firstAttribute="top" secondItem="cxb-Vw-8zb" secondAttribute="bottom" constant="481" id="qZP-h6-sJW"/>
                             <constraint firstItem="cxb-Vw-8zb" firstAttribute="leading" secondItem="XtC-Je-LUc" secondAttribute="leading" id="qyg-dI-shE"/>
                         </constraints>
                     </view>
                     <connections>
+                        <outlet property="labelQuota" destination="WdB-hd-mrv" id="E8O-S8-Hh2"/>
+                        <outlet property="progressQuota" destination="HgC-Ub-Dtb" id="l5v-Nu-A4I"/>
                         <outlet property="tableView" destination="Xym-IM-aqh" id="BM5-cf-ZtQ"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="D6O-WR-IEL" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="9874" y="1218"/>
+            <point key="canvasLocation" x="9872.7999999999993" y="1217.5412293853074"/>
         </scene>
         <!--Offline Container-->
         <scene sceneID="AYB-62-j4s">