From abf1c97704d758dc43826753f9e6bb1c457c8bc5 Mon Sep 17 00:00:00 2001
From: Toshiki Ikda <b1013001@fun.ac.jp>
Date: Tue, 9 Aug 2016 22:25:38 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=B9=E3=82=AF=E3=83=AD=E3=83=BC=E3=83=AB?=
 =?UTF-8?q?=E3=83=90=E3=83=BC=E8=A1=A8=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DB/Base.lproj/Main.storyboard                             | 7 ++++---
 DB/PhotoSelectViewController.swift                        | 8 ++++++++
 DB/cardList.swift                                         | 5 +++++
 DB/cardList2.swift                                        | 5 +++++
 information.swift                                         | 5 +++++
 .../project.pbxproj"                                      | 1 -
 6 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/DB/Base.lproj/Main.storyboard b/DB/Base.lproj/Main.storyboard
index 83c9aac..89ce079 100755
--- a/DB/Base.lproj/Main.storyboard
+++ b/DB/Base.lproj/Main.storyboard
@@ -161,7 +161,7 @@
                                     </navigationItem>
                                 </items>
                             </navigationBar>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="1480E8D1-5EA3-4ED4-9F66-76C13089E9C7" translatesAutoresizingMaskIntoConstraints="NO" id="ltv-RK-fmw">
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="796EFD2E-2286-482B-9FB3-18D4D5B6D2E8" translatesAutoresizingMaskIntoConstraints="NO" id="ltv-RK-fmw">
                                 <rect key="frame" x="317" y="491" width="25" height="36"/>
                             </imageView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zOo-rN-wYP">
@@ -1820,6 +1820,7 @@ Copyright(c) Future University Hakodate. All Rights Reserved.
                         <outlet property="pic5" destination="JxF-T1-tAm" id="Zbh-1N-IiP"/>
                         <outlet property="pic6" destination="7dZ-cn-WxH" id="QRs-Vy-ukl"/>
                         <outlet property="pic7" destination="K9J-5Q-7az" id="LA4-Ds-Reg"/>
+                        <outlet property="scroll" destination="PML-vD-YNu" id="woT-2R-7o9"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="9H3-kX-eYn" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -1828,7 +1829,7 @@ Copyright(c) Future University Hakodate. All Rights Reserved.
         </scene>
     </scenes>
     <resources>
-        <image name="1480E8D1-5EA3-4ED4-9F66-76C13089E9C7" width="25" height="25">
+        <image name="796EFD2E-2286-482B-9FB3-18D4D5B6D2E8" width="25" height="25">
             <mutableData key="keyedArchiveRepresentation">
 YnBsaXN0MDDUAQIDBAUGOjtYJHZlcnNpb25YJG9iamVjdHNZJGFyY2hpdmVyVCR0b3ASAAGGoK0HCBEW
 GxwgISgrLjQ3VSRudWxs1AkKCwwNDg8QViRjbGFzc1xOU0ltYWdlRmxhZ3NWTlNSZXBzV05TQ29sb3KA
@@ -1956,7 +1957,7 @@ PBg/GEQYTBhPGGEYZBhpAAAAAAAAAgEAAAAAAAAAPgAAAAAAAAAAAAAAAAAAGGs
         <image name="s_title.png" width="242" height="64"/>
     </resources>
     <inferredMetricsTieBreakers>
-        <segue reference="Z7K-Zp-5B5"/>
+        <segue reference="5xk-44-Lcj"/>
         <segue reference="dNd-oi-ntL"/>
     </inferredMetricsTieBreakers>
 </document>
diff --git a/DB/PhotoSelectViewController.swift b/DB/PhotoSelectViewController.swift
index f6b7ed9..bd60d68 100755
--- a/DB/PhotoSelectViewController.swift
+++ b/DB/PhotoSelectViewController.swift
@@ -10,6 +10,8 @@ import UIKit
 
 class PhotoSelectViewController: UIViewController {
 
+    @IBOutlet weak var scroll: UIScrollView!
+    
     @IBOutlet weak var navigation: UINavigationBar!
     @IBOutlet weak var backimage: UIImageView!
     @IBOutlet weak var pic1: UIImageView!
@@ -29,10 +31,16 @@ class PhotoSelectViewController: UIViewController {
         
         backimage.image=UIImage(named:"haikei.jpg")
         
+        
 //        NSTimer.scheduledTimerWithTimeInterval(0.5,target:self,selector:Selector("pic_show"),
 //            userInfo: nil, repeats: true);
     }
     
+    override func viewDidAppear(animated: Bool) {
+        //UIScrollBar表示時にスクロールバーをフラッシュ表示
+        scroll.flashScrollIndicators()
+    }
+    
     override func viewWillAppear(animated: Bool) {
         self.pic_show()
     }
diff --git a/DB/cardList.swift b/DB/cardList.swift
index a38bc31..59f8069 100755
--- a/DB/cardList.swift
+++ b/DB/cardList.swift
@@ -42,6 +42,11 @@ class cardList: UIViewController, UITableViewDelegate, UITableViewDataSource{
         //NSTimer.scheduledTimerWithTimeInterval(0.5,target:self,selector:Selector("reload"), userInfo: nil, repeats: true);
     }
     
+    override func viewDidAppear(animated: Bool) {
+        //UIScrollBar表示時にスクロールバーをフラッシュ表示
+        tableView.flashScrollIndicators()
+    }
+    
     override func viewWillAppear(animated: Bool) {
         self.reload()
     }
diff --git a/DB/cardList2.swift b/DB/cardList2.swift
index ab95ecb..84810ad 100755
--- a/DB/cardList2.swift
+++ b/DB/cardList2.swift
@@ -37,6 +37,11 @@ class cardList2: UIViewController, UITableViewDelegate, UITableViewDataSource{
         self.tableView2.backgroundView = imageView
     }
     
+    override func viewDidAppear(animated: Bool) {
+        //UIScrollBar表示時にスクロールバーをフラッシュ表示
+        tableView2.flashScrollIndicators()
+    }
+    
     override func didReceiveMemoryWarning() {
         super.didReceiveMemoryWarning()
         // Dispose of any resources that can be recreated.
diff --git a/information.swift b/information.swift
index fcd9d53..51b33b1 100755
--- a/information.swift
+++ b/information.swift
@@ -24,6 +24,11 @@ class information: UIViewController {
     
     }
     
+    override func viewDidAppear(animated: Bool) {
+        //UIScrollBar表示時にスクロールバーをフラッシュ表示
+        uitext.flashScrollIndicators()
+    }
+    
     @IBAction func backbutton(sender: AnyObject) {
         self.dismissViewControllerAnimated(true, completion: nil)
     }
diff --git "a/\343\202\255\343\203\274\343\202\263\347\264\200\350\241\214.xcodeproj/project.pbxproj" "b/\343\202\255\343\203\274\343\202\263\347\264\200\350\241\214.xcodeproj/project.pbxproj"
index 2c099ed..afb88f9 100755
--- "a/\343\202\255\343\203\274\343\202\263\347\264\200\350\241\214.xcodeproj/project.pbxproj"
+++ "b/\343\202\255\343\203\274\343\202\263\347\264\200\350\241\214.xcodeproj/project.pbxproj"
@@ -398,7 +398,6 @@
 				TargetAttributes = {
 					DC23C0071BD7826B000B2465 = {
 						CreatedOnToolsVersion = 7.0.1;
-						DevelopmentTeam = 8NQFAUAAWM;
 					};
 					DC23C01B1BD7826C000B2465 = {
 						CreatedOnToolsVersion = 7.0.1;