1.3 - Minor interface fixes, update version number

Viewing stats and exported lists should close the side menu if in portrait mode on the iPad.
Atelier-Shiori · Apr 2, 2019 · a31c85d · a31c85d
1 parent 6e62eb2
commit a31c85d
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 10 deletions.
diff --git a/Shukofukurou-IOS copy-Info.plist b/Shukofukurou-IOS copy-Info.plist
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>20190402</string>
+	<string>20190403</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIBackgroundModes</key>

diff --git a/Shukofukurou-IOS/Info.plist b/Shukofukurou-IOS/Info.plist
@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>20190402</string>
+	<string>20190403</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIBackgroundModes</key>

diff --git a/Shukofukurou-IOS/Navigation/MainSideBarViewController.m b/Shukofukurou-IOS/Navigation/MainSideBarViewController.m
@@ -229,6 +229,7 @@ - (IBAction)showoptions:(id)sender {
                 navcontroller.modalPresentationStyle = UIModalPresentationFormSheet;
             }
             [weakself.mainvc presentViewController:navcontroller animated:YES completion:nil];
+            [weakself hideLeftViewAnimated:weakself];
         }]];
     }
     [options addAction:[UIAlertAction actionWithTitle:[NSString stringWithFormat:@"Export Lists"] style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
@@ -240,6 +241,7 @@ - (IBAction)showoptions:(id)sender {
             navcontroller.modalPresentationStyle = UIModalPresentationFormSheet;
         }
         [weakself.mainvc presentViewController:navcontroller animated:YES completion:nil];
+        [weakself hideLeftViewAnimated:weakself];
     }]];
     [options addAction:[UIAlertAction actionWithTitle:@"Close" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
     }]];

diff --git a/Shukofukurou-IOS/Storyboards/Base.lproj/Lists.storyboard b/Shukofukurou-IOS/Storyboards/Base.lproj/Lists.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="bnb-Qg-Z8N">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="bnb-Qg-Z8N">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -256,7 +256,7 @@
                                             </subviews>
                                         </tableViewCellContentView>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="hnR-Ho-TSs" customClass="UITableViewCellSelBackground">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" id="hnR-Ho-TSs" customClass="UITableViewCellNoSelection">
                                         <rect key="frame" x="0.0" y="79" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="hnR-Ho-TSs" id="qc6-FF-GLm">
@@ -378,9 +378,9 @@
         </scene>
     </scenes>
     <resources>
-        <image name="Menu" width="50" height="50"/>
-        <image name="filter" width="60" height="60"/>
-        <image name="listsort" width="50" height="50"/>
-        <image name="status-active" width="60" height="60"/>
+        <image name="Menu" width="25" height="25"/>
+        <image name="filter" width="30" height="30"/>
+        <image name="listsort" width="25" height="25"/>
+        <image name="status-active" width="30" height="30"/>
     </resources>
 </document>
diff --git a/Shukofukurou-IOS/View Controllers/Export/ExportListTableViewController.m b/Shukofukurou-IOS/View Controllers/Export/ExportListTableViewController.m
@@ -82,14 +82,35 @@ - (void)promptExport:(int)exporttype {
     UIAlertController *alertcontroller = [UIAlertController alertControllerWithTitle:exportTitle message:[NSString stringWithFormat:@"Do you want to export your %@ list?%@", [listservice.sharedInstance currentservicename], (exporttype == MALXMLAnimeExportType || exporttype == MALXMLMangaExportType) ? @"This may take some time." : @""] preferredStyle:UIAlertControllerStyleAlert];
     UIAlertAction *yesaction = [UIAlertAction actionWithTitle:@"Yes" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         [self beginExport:exporttype];
+        [self deselectcell:exporttype];
     }];
     UIAlertAction *noaction = [UIAlertAction actionWithTitle:@"No" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+        [self deselectcell:exporttype];
     }];
     [alertcontroller addAction:noaction];
     [alertcontroller addAction:yesaction];
     [self presentViewController:alertcontroller animated:YES completion:nil];
 }
 
+- (void)deselectcell:(int)exporttype {
+    switch (exporttype) {
+        case MALXMLAnimeExportType:
+            [_malanimeformatted setSelected:NO animated:YES];
+            break;
+        case MALXMLMangaExportType:
+            [_malmangaformatted setSelected:NO animated:YES];
+            break;
+        case JsonAnimeExportType:
+            [_jsonanimeformatted setSelected:NO animated:YES];
+            break;
+        case JsonMangaExportType:
+            [_jsonmangaformatted setSelected:NO animated:YES];
+            break;
+        default:
+            break;
+    }
+}
+
 - (void)beginExport:(int)type {
     switch (type) {
         case MALXMLAnimeExportType:

diff --git a/ShukofukurouScrobble/Info.plist b/ShukofukurouScrobble/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.3</string>
 	<key>CFBundleVersion</key>
-	<string>20190402</string>
+	<string>20190403</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>