Merge pull request #58 from sasurai-usagi3/add/tab

add: tab
nippoly · Jul 13, 2019 · ca47d74 · ca47d74
2 parents 410b004 + b2063d6
commit ca47d74
Show file tree

Hide file tree

Showing 9 changed files with 175 additions and 93 deletions.
diff --git a/Podfile b/Podfile
@@ -11,6 +11,7 @@ target 'nippohub-daily' do
   pod 'Firebase/Auth'
   pod 'Firebase/Database'
   pod 'LicensePlist'
+  pod 'XLPagerTabStrip', '~> 9.0'
 
   target 'nippohub-dailyTests' do
     inherit! :search_paths

diff --git a/Podfile.lock b/Podfile.lock
@@ -36,12 +36,14 @@ PODS:
     - nanopb/encode (= 0.3.8)
   - nanopb/decode (0.3.8)
   - nanopb/encode (0.3.8)
+  - XLPagerTabStrip (9.0.0)
 
 DEPENDENCIES:
   - Firebase/Auth
   - Firebase/Core
   - Firebase/Database
   - LicensePlist
+  - XLPagerTabStrip (~> 9.0)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
@@ -56,6 +58,7 @@ SPEC REPOS:
     - leveldb-library
     - LicensePlist
     - nanopb
+    - XLPagerTabStrip
 
 SPEC CHECKSUMS:
   Firebase: d6861c2059d8c32d1e6dd8932e22ada346d90a3a
@@ -69,7 +72,8 @@ SPEC CHECKSUMS:
   leveldb-library: 08cba283675b7ed2d99629a4bc5fd052cd2bb6a5
   LicensePlist: 3fda61ebe060afc8fc6d995df34a91401af5a244
   nanopb: 5601e6bca2dbf1ed831b519092ec110f66982ca3
+  XLPagerTabStrip: 61c57fd61f611ee5f01ff1495ad6fbee8bf496c5
 
-PODFILE CHECKSUM: adc1ddd66988b6f72eb56a6b655ee95824e860e2
+PODFILE CHECKSUM: 3dcddfea3eeb494c837e35f51f7e87acee8b1089
 
 COCOAPODS: 1.5.3
diff --git a/nippohub-daily.xcodeproj/project.pbxproj b/nippohub-daily.xcodeproj/project.pbxproj
@@ -15,7 +15,7 @@
 		54408D45226BC97000DF8F7E /* AgreementsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54408D44226BC97000DF8F7E /* AgreementsViewController.swift */; };
 		54408D47226BD4C000DF8F7E /* PrivacyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54408D46226BD4C000DF8F7E /* PrivacyViewController.swift */; };
 		545159C22246DB80005854CE /* SignUpViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 545159C12246DB80005854CE /* SignUpViewController.swift */; };
-		545159C4224996AB005854CE /* DailyReportIndexViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 545159C3224996AB005854CE /* DailyReportIndexViewController.swift */; };
+		545159C4224996AB005854CE /* DailyReportsTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 545159C3224996AB005854CE /* DailyReportsTableViewController.swift */; };
 		54572997224AE01F001F20CD /* DailyReportListItem.xib in Resources */ = {isa = PBXBuildFile; fileRef = 54572996224AE01F001F20CD /* DailyReportListItem.xib */; };
 		54572999224AE0CF001F20CD /* DailyReportListItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54572998224AE0CF001F20CD /* DailyReportListItem.swift */; };
 		5457299C224AE3B9001F20CD /* DailyReport.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5457299B224AE3B9001F20CD /* DailyReport.swift */; };
@@ -50,6 +50,7 @@
 		54E6487822D01F0B00C20EF6 /* Agreements.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 54E6487722D01F0B00C20EF6 /* Agreements.storyboard */; };
 		54E6487A22D01F3D00C20EF6 /* Privacy.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 54E6487922D01F3D00C20EF6 /* Privacy.storyboard */; };
 		54E6487C22D01F8100C20EF6 /* Setting.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 54E6487B22D01F8100C20EF6 /* Setting.storyboard */; };
+		54E6487E22D7EF6400C20EF6 /* DailyReportIndexViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54E6487D22D7EF6400C20EF6 /* DailyReportIndexViewController.swift */; };
 		5E99E2EDAC11B3134A51A4B2 /* Pods_nippohub_dailyUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7C959E3B09DECB470B0B3AC1 /* Pods_nippohub_dailyUITests.framework */; };
 		68E1A26A7BB64FCEF4C78B4A /* Pods_nippohub_daily.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3763B8884410BDF84668DF2F /* Pods_nippohub_daily.framework */; };
 		BEE4D3ED4041D11317B0C135 /* Pods_nippohub_dailyTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0526FC9D8890CE3F9BD45EC8 /* Pods_nippohub_dailyTests.framework */; };
@@ -84,7 +85,7 @@
 		54408D44226BC97000DF8F7E /* AgreementsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AgreementsViewController.swift; sourceTree = "<group>"; };
 		54408D46226BD4C000DF8F7E /* PrivacyViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrivacyViewController.swift; sourceTree = "<group>"; };
 		545159C12246DB80005854CE /* SignUpViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpViewController.swift; sourceTree = "<group>"; };
-		545159C3224996AB005854CE /* DailyReportIndexViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DailyReportIndexViewController.swift; sourceTree = "<group>"; };
+		545159C3224996AB005854CE /* DailyReportsTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DailyReportsTableViewController.swift; sourceTree = "<group>"; };
 		54572996224AE01F001F20CD /* DailyReportListItem.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DailyReportListItem.xib; sourceTree = "<group>"; };
 		54572998224AE0CF001F20CD /* DailyReportListItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DailyReportListItem.swift; sourceTree = "<group>"; };
 		5457299B224AE3B9001F20CD /* DailyReport.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DailyReport.swift; sourceTree = "<group>"; };
@@ -125,6 +126,7 @@
 		54E6487722D01F0B00C20EF6 /* Agreements.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Agreements.storyboard; sourceTree = "<group>"; };
 		54E6487922D01F3D00C20EF6 /* Privacy.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Privacy.storyboard; sourceTree = "<group>"; };
 		54E6487B22D01F8100C20EF6 /* Setting.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Setting.storyboard; sourceTree = "<group>"; };
+		54E6487D22D7EF6400C20EF6 /* DailyReportIndexViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DailyReportIndexViewController.swift; sourceTree = "<group>"; };
 		6E29FA28320AE5E76C86423E /* Pods-nippohub-dailyUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-nippohub-dailyUITests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-nippohub-dailyUITests/Pods-nippohub-dailyUITests.debug.xcconfig"; sourceTree = "<group>"; };
 		7C959E3B09DECB470B0B3AC1 /* Pods_nippohub_dailyUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_nippohub_dailyUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		83869DF114DC7D4A8F8FE69B /* Pods-nippohub-dailyTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-nippohub-dailyTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-nippohub-dailyTests/Pods-nippohub-dailyTests.debug.xcconfig"; sourceTree = "<group>"; };
@@ -342,7 +344,8 @@
 			isa = PBXGroup;
 			children = (
 				54E6486D22D01DEE00C20EF6 /* DailyReportIndex.storyboard */,
-				545159C3224996AB005854CE /* DailyReportIndexViewController.swift */,
+				545159C3224996AB005854CE /* DailyReportsTableViewController.swift */,
+				54E6487D22D7EF6400C20EF6 /* DailyReportIndexViewController.swift */,
 			);
 			path = DailyReportIndex;
 			sourceTree = "<group>";
@@ -612,13 +615,15 @@
 				"${SRCROOT}/Pods/Target Support Files/Pods-nippohub-daily/Pods-nippohub-daily-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework",
 				"${BUILT_PRODUCTS_DIR}/GoogleToolboxForMac/GoogleToolboxForMac.framework",
+				"${BUILT_PRODUCTS_DIR}/XLPagerTabStrip/XLPagerTabStrip.framework",
 				"${BUILT_PRODUCTS_DIR}/leveldb-library/leveldb.framework",
 				"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleToolboxForMac.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/XLPagerTabStrip.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/leveldb.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
 			);
@@ -672,6 +677,7 @@
 			files = (
 				54CA71CE225C06DB00D09381 /* LaunchViewController.swift in Sources */,
 				54572999224AE0CF001F20CD /* DailyReportListItem.swift in Sources */,
+				54E6487E22D7EF6400C20EF6 /* DailyReportIndexViewController.swift in Sources */,
 				5457299C224AE3B9001F20CD /* DailyReport.swift in Sources */,
 				54408D45226BC97000DF8F7E /* AgreementsViewController.swift in Sources */,
 				545729A2224EDFDA001F20CD /* DailyReportNewViewController.swift in Sources */,
@@ -680,7 +686,7 @@
 				5472CE3722504B38001158E4 /* DateConverter.swift in Sources */,
 				540F069E2263EAD400A9CCA1 /* AlertOnlyOK.swift in Sources */,
 				54E6485E22CABEBC00C20EF6 /* DailyReportRepository.swift in Sources */,
-				545159C4224996AB005854CE /* DailyReportIndexViewController.swift in Sources */,
+				545159C4224996AB005854CE /* DailyReportsTableViewController.swift in Sources */,
 				54C1FCED224444CA00AB4FC8 /* SignInViewController.swift in Sources */,
 				540381792265479B0077F687 /* UIView+.swift in Sources */,
 				5472CE3422504098001158E4 /* DailyReportEditViewController.swift in Sources */,

diff --git a/nippohub-daily/ViewsControllers/DailyReportEdit/DailyReportEditViewController.swift b/nippohub-daily/ViewsControllers/DailyReportEdit/DailyReportEditViewController.swift
@@ -45,7 +45,7 @@ final class DailyReportEditViewController: UIViewController {
         (self.navigationController?.viewControllers[self.navigationController!.viewControllers.count - 2] as! DailyReportShowViewController).dailyReport = dailyReport
         // TODO: nilチェックする
         // TODO: showで処理する
-        (self.navigationController!.viewControllers[self.navigationController!.viewControllers.count - 3] as! DailyReportIndexViewController).updateDailyReports(dailyReport: dailyReport)
+        (self.navigationController!.viewControllers[self.navigationController!.viewControllers.count - 3] as! DailyReportIndexViewController)//.updateDailyReports(dailyReport: dailyReport)
         self.navigationController?.popViewController(animated: true)
     }
 

diff --git a/nippohub-daily/ViewsControllers/DailyReportIndex/DailyReportIndex.storyboard b/nippohub-daily/ViewsControllers/DailyReportIndex/DailyReportIndex.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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="kFG-p2-xan">
+<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="SFo-rE-vKW">
     <device id="retina6_1" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -10,51 +10,85 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
+        <!--Daily Reports Table View Controller-->
+        <scene sceneID="8UP-gJ-uvX">
+            <objects>
+                <tableViewController id="1IF-qL-m2U" customClass="DailyReportsTableViewController" customModule="nippohub_daily" customModuleProvider="target" sceneMemberID="viewController">
+                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="f6Z-Qn-ixA">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <connections>
+                            <outlet property="dataSource" destination="1IF-qL-m2U" id="zVO-Me-Gwn"/>
+                            <outlet property="delegate" destination="1IF-qL-m2U" id="Ipv-2M-5Um"/>
+                        </connections>
+                    </tableView>
+                </tableViewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="1pq-fF-XYz" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="99" y="-644"/>
+        </scene>
         <!--Daily Report Index View Controller-->
-        <scene sceneID="5va-3C-Dc4">
+        <scene sceneID="NKr-Ke-IQc">
             <objects>
-                <viewController id="kFG-p2-xan" customClass="DailyReportIndexViewController" customModule="nippohub_daily" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="UrQ-of-f6s">
+                <viewController id="SFo-rE-vKW" customClass="DailyReportIndexViewController" customModule="nippohub_daily" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="iyz-2R-KeE">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="hCA-Tc-Oqb">
+                            <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aDS-pk-nGd">
                                 <rect key="frame" x="0.0" y="128" width="414" height="734"/>
+                            </scrollView>
+                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="xY6-Me-5Eo" customClass="ButtonBarView" customModule="XLPagerTabStrip">
+                                <rect key="frame" x="0.0" y="88" width="414" height="40"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
-                            </tableView>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="40" id="EZo-w1-Vpu"/>
+                                </constraints>
+                                <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="b4G-7W-Mmf">
+                                    <size key="itemSize" width="50" height="50"/>
+                                    <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                                    <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                                    <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                                </collectionViewFlowLayout>
+                                <cells/>
+                            </collectionView>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
-                            <constraint firstItem="Zmb-wM-B4F" firstAttribute="trailing" secondItem="hCA-Tc-Oqb" secondAttribute="trailing" id="AJI-Yn-vpg"/>
-                            <constraint firstItem="hCA-Tc-Oqb" firstAttribute="top" secondItem="Zmb-wM-B4F" secondAttribute="top" constant="40" id="Bzp-Eg-U4k"/>
-                            <constraint firstItem="hCA-Tc-Oqb" firstAttribute="leading" secondItem="Zmb-wM-B4F" secondAttribute="leading" id="IUm-T6-Qkc"/>
-                            <constraint firstItem="Zmb-wM-B4F" firstAttribute="bottom" secondItem="hCA-Tc-Oqb" secondAttribute="bottom" id="u58-Vl-Osw"/>
+                            <constraint firstItem="xY6-Me-5Eo" firstAttribute="leading" secondItem="COO-wf-Jjo" secondAttribute="leading" id="2kY-9u-ZEm"/>
+                            <constraint firstItem="aDS-pk-nGd" firstAttribute="top" secondItem="xY6-Me-5Eo" secondAttribute="bottom" id="5bf-x6-q7Q"/>
+                            <constraint firstItem="aDS-pk-nGd" firstAttribute="leading" secondItem="COO-wf-Jjo" secondAttribute="leading" id="DvO-aT-0bu"/>
+                            <constraint firstItem="xY6-Me-5Eo" firstAttribute="top" secondItem="COO-wf-Jjo" secondAttribute="top" id="HhZ-E0-4gX"/>
+                            <constraint firstItem="COO-wf-Jjo" firstAttribute="bottom" secondItem="aDS-pk-nGd" secondAttribute="bottom" id="fzR-NE-y6h"/>
+                            <constraint firstItem="xY6-Me-5Eo" firstAttribute="trailing" secondItem="COO-wf-Jjo" secondAttribute="trailing" id="tFC-Aq-9yT"/>
+                            <constraint firstItem="COO-wf-Jjo" firstAttribute="trailing" secondItem="aDS-pk-nGd" secondAttribute="trailing" id="umS-Pq-4CT"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="Zmb-wM-B4F"/>
+                        <viewLayoutGuide key="safeArea" id="COO-wf-Jjo"/>
                     </view>
-                    <navigationItem key="navigationItem" leftItemsSupplementBackButton="YES" id="HtB-Vf-Kul">
+                    <navigationItem key="navigationItem" id="KpV-oe-KJa">
                         <rightBarButtonItems>
-                            <barButtonItem title="新規作成" id="B2l-04-lqG">
+                            <barButtonItem title="新規作成" id="57o-Er-EIV">
                                 <connections>
-                                    <action selector="transitToNewDailyReport" destination="kFG-p2-xan" id="Uc8-Ac-QyB"/>
+                                    <action selector="transitToNewDailyReport" destination="SFo-rE-vKW" id="bta-yl-6OW"/>
                                 </connections>
                             </barButtonItem>
-                            <barButtonItem title="設定" id="g57-qe-8AO">
+                            <barButtonItem title="設定" id="hUm-m0-4QM">
                                 <connections>
-                                    <action selector="transitToSettings" destination="kFG-p2-xan" id="Po6-GE-sav"/>
+                                    <action selector="transitToSettings" destination="SFo-rE-vKW" id="eFf-Sw-IRV"/>
                                 </connections>
                             </barButtonItem>
                         </rightBarButtonItems>
                     </navigationItem>
                     <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
                     <connections>
-                        <outlet property="tableDailyReports" destination="hCA-Tc-Oqb" id="jcu-UN-ITs"/>
+                        <outlet property="buttonBarView" destination="xY6-Me-5Eo" id="6ee-PR-j0c"/>
+                        <outlet property="containerView" destination="aDS-pk-nGd" id="j9j-pv-6LV"/>
                     </connections>
                 </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="A1A-lB-4cF" userLabel="First Responder" sceneMemberID="firstResponder"/>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Inn-D7-DOW" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2024.8" y="27.436281859070466"/>
+            <point key="canvasLocation" x="-900.00000000000011" y="-644.19642857142856"/>
         </scene>
     </scenes>
 </document>