Marino Faggiana 7 жил өмнө
parent
commit
9ac82e8952

+ 17 - 0
iOSClient/Main/CCMain.m

@@ -919,6 +919,23 @@
     
         case k_returnCreateFileText: {
             
+            UINavigationController* navigationController = [[UIStoryboard storyboardWithName:@"NCText" bundle:nil] instantiateViewControllerWithIdentifier:@"NCText"];
+            
+            NCText *viewController = (NCText *)navigationController.topViewController;
+            
+            /*
+            viewController.delegate = self;
+            viewController.move.title = NSLocalizedString(@"_move_", nil);
+            viewController.tintColor = [NCBrandColor sharedInstance].navigationBarText;
+            viewController.barTintColor = [NCBrandColor sharedInstance].brand;
+            viewController.tintColorTitle = [NCBrandColor sharedInstance].navigationBarText;
+            viewController.networkingOperationQueue = app.netQueue;
+            */
+            
+            [navigationController setModalPresentationStyle:UIModalPresentationFormSheet];
+            [self presentViewController:navigationController animated:YES completion:nil];
+
+            
         }
             break;
             

+ 5 - 0
iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -65,6 +65,7 @@
 "_photo_"                   = "Photo";
 "_audio_"                   = "Audio";
 "_unknown_"                 = "Unknown";
+"_next_"                    = "Next";
 
 // App
 
@@ -563,3 +564,7 @@
 
 "_autoupload_filename_title_"       = "Auto upload filename";
 
+// Text File
+
+"_title_new_text_file_"             = "New text file";
+

+ 12 - 5
iOSClient/Text/NCText.storyboard

@@ -22,9 +22,8 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="pmg-g2-Fbs">
-                                <rect key="frame" x="0.0" y="64" width="375" height="603"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <string key="text">Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.</string>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
@@ -32,12 +31,20 @@
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="5fD-Qb-N57" firstAttribute="top" secondItem="pmg-g2-Fbs" secondAttribute="bottom" id="KKy-aG-Q0G"/>
-                            <constraint firstItem="pmg-g2-Fbs" firstAttribute="top" secondItem="Uyq-V3-KbV" secondAttribute="bottom" id="MOE-fS-vSb"/>
+                            <constraint firstItem="pmg-g2-Fbs" firstAttribute="top" secondItem="Uyq-V3-KbV" secondAttribute="bottom" constant="-64" id="MOE-fS-vSb"/>
                             <constraint firstAttribute="trailing" secondItem="pmg-g2-Fbs" secondAttribute="trailing" id="dYU-vc-Fz6"/>
                             <constraint firstItem="pmg-g2-Fbs" firstAttribute="leading" secondItem="skk-fU-Vk6" secondAttribute="leading" id="jcN-jR-tMp"/>
                         </constraints>
                     </view>
-                    <navigationItem key="navigationItem" id="LYL-SD-Ayv"/>
+                    <navigationItem key="navigationItem" id="LYL-SD-Ayv">
+                        <barButtonItem key="leftBarButtonItem" title="Item" id="brk-EO-iNZ"/>
+                        <barButtonItem key="rightBarButtonItem" title="Item" id="Hyb-2c-5Hb"/>
+                    </navigationItem>
+                    <connections>
+                        <outlet property="cancelButton" destination="brk-EO-iNZ" id="8gM-f2-AtV"/>
+                        <outlet property="nextButton" destination="Hyb-2c-5Hb" id="Zmo-Th-UUq"/>
+                        <outlet property="textView" destination="pmg-g2-Fbs" id="T5E-gh-UZ6"/>
+                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="r2i-QZ-Y8W" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
@@ -46,7 +53,7 @@
         <!--Navigation Controller-->
         <scene sceneID="lyP-Qo-Lgl">
             <objects>
-                <navigationController automaticallyAdjustsScrollViewInsets="NO" id="zKl-U9-avf" sceneMemberID="viewController">
+                <navigationController storyboardIdentifier="NCText" automaticallyAdjustsScrollViewInsets="NO" id="zKl-U9-avf" sceneMemberID="viewController">
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="UIP-td-6cq">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>

+ 24 - 0
iOSClient/Text/NCText.swift

@@ -10,5 +10,29 @@ import Foundation
 
 class NCText: UIViewController, UITextViewDelegate {
 
+    @IBOutlet weak var cancelButton: UIBarButtonItem!
+    @IBOutlet weak var nextButton: UIBarButtonItem!
+    @IBOutlet weak var textView: UITextView!
 
+    
+    override func viewDidLoad() {
+        
+        super.viewDidLoad()
+        
+        self.navigationController?.navigationBar.topItem?.title = NSLocalizedString("_title_new_text_file_", comment: "")
+        self.navigationController?.navigationBar.barTintColor = NCBrandColor.sharedInstance.brand
+        self.navigationController?.navigationBar.tintColor = NCBrandColor.sharedInstance.navigationBarText
+        self.navigationController?.navigationBar.titleTextAttributes = [NSForegroundColorAttributeName: NCBrandColor.sharedInstance.navigationBarText]
+        
+        cancelButton.title = NSLocalizedString("_cancel_", comment: "")
+        nextButton.title = NSLocalizedString("_next_", comment: "")
+        
+    }
+
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        
+        
+    }
+    
 }