Skip to content

Commit

Permalink
Merge pull request #23 from yoshitaka26/hotfix-fix-UI-bug
Browse files Browse the repository at this point in the history 
Hotfix fix UI bug
  • Loading branch information
@yoshitaka26
yoshitaka26 authored Mar 26, 2023
2 parents 75157d8 + 595dc54 commit 5bc1f52
Show file tree
Hide file tree
Showing 8 changed files with 93 additions and 172 deletions.
24 changes: 0 additions & 24 deletions PadelLessonLog.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
E422AB1A26F55E8A008F395B /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = E422AB1C26F55E8A008F395B /* Localizable.strings */; };
E422AB2926F571A1008F395B /* NewLesson.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E422AB2B26F571A1008F395B /* NewLesson.storyboard */; };
E422AB4226F57AEE008F395B /* ImageCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E422AB4426F57AEE008F395B /* ImageCollectionViewCell.xib */; };
E422AB4E26F57B9E008F395B /* DataTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E422AB5026F57B9E008F395B /* DataTableViewCell.xib */; };
E422AB5826F57EF6008F395B /* Detail.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E422AB5A26F57EF6008F395B /* Detail.storyboard */; };
E422AB6226F586E9008F395B /* Setting.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E422AB6426F586E9008F395B /* Setting.storyboard */; };
E422AB7226F58FFB008F395B /* CloudKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E422AB7126F58FFB008F395B /* CloudKit.framework */; };
Expand All @@ -58,7 +57,6 @@
E465FC30274E7C3D00503FC8 /* AR+Common.swift in Sources */ = {isa = PBXBuildFile; fileRef = E465FC2E274E7C3D00503FC8 /* AR+Common.swift */; };
E465FC31274E7C3D00503FC8 /* ARPlaneAnchor+Visualize.swift in Sources */ = {isa = PBXBuildFile; fileRef = E465FC2F274E7C3D00503FC8 /* ARPlaneAnchor+Visualize.swift */; };
E465FC33274E820100503FC8 /* BallLineGeometry.swift in Sources */ = {isa = PBXBuildFile; fileRef = E465FC32274E820100503FC8 /* BallLineGeometry.swift */; };
E465FEA726E1143900785BB7 /* DataTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E465FEA526E1143900785BB7 /* DataTableViewCell.swift */; };
E465FEAD26E119D800785BB7 /* NSManagedObject+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = E465FEAC26E119D800785BB7 /* NSManagedObject+Extensions.swift */; };
E46B665926E3884B008247DC /* ImageView.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E46B665826E3884B008247DC /* ImageView.storyboard */; };
E46B665E26E38865008247DC /* ImageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E46B665D26E38865008247DC /* ImageViewController.swift */; };
Expand Down Expand Up @@ -153,7 +151,6 @@
E422AB1B26F55E8A008F395B /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
E422AB2C26F571CA008F395B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/NewLesson.storyboard; sourceTree = "<group>"; };
E422AB4326F57AEE008F395B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/ImageCollectionViewCell.xib; sourceTree = "<group>"; };
E422AB5426F57BA3008F395B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DataTableViewCell.xib; sourceTree = "<group>"; };
E422AB5E26F57EFB008F395B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Detail.storyboard; sourceTree = "<group>"; };
E422AB6526F586EE008F395B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Setting.storyboard; sourceTree = "<group>"; };
E422AB6926F58FE3008F395B /* PadelLessonLogDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = PadelLessonLogDebug.entitlements; sourceTree = "<group>"; };
Expand All @@ -176,7 +173,6 @@
E465FC2E274E7C3D00503FC8 /* AR+Common.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "AR+Common.swift"; sourceTree = "<group>"; };
E465FC2F274E7C3D00503FC8 /* ARPlaneAnchor+Visualize.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "ARPlaneAnchor+Visualize.swift"; sourceTree = "<group>"; };
E465FC32274E820100503FC8 /* BallLineGeometry.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BallLineGeometry.swift; sourceTree = "<group>"; };
E465FEA526E1143900785BB7 /* DataTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataTableViewCell.swift; sourceTree = "<group>"; };
E465FEAC26E119D800785BB7 /* NSManagedObject+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSManagedObject+Extensions.swift"; sourceTree = "<group>"; };
E46B665826E3884B008247DC /* ImageView.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = ImageView.storyboard; sourceTree = "<group>"; };
E46B665D26E38865008247DC /* ImageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -532,7 +528,6 @@
isa = PBXGroup;
children = (
E445D0DB26E33BD7005B6FCB /* Step Cell */,
E465FE9E26E1140C00785BB7 /* DataTable Cell */,
E4536BF126C3ABBE000A308C /* Image Cell */,
);
path = LessonViewCell;
Expand All @@ -557,15 +552,6 @@
path = Base;
sourceTree = "<group>";
};
E465FE9E26E1140C00785BB7 /* DataTable Cell */ = {
isa = PBXGroup;
children = (
E422AB5026F57B9E008F395B /* DataTableViewCell.xib */,
E465FEA526E1143900785BB7 /* DataTableViewCell.swift */,
);
path = "DataTable Cell";
sourceTree = "<group>";
};
E46B665726E3882C008247DC /* ImageView */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -712,7 +698,6 @@
E41F34C526BF9862001B24A2 /* AddNewImage.storyboard in Resources */,
E422AB6226F586E9008F395B /* Setting.storyboard in Resources */,
E445D0DF26E33C03005B6FCB /* StepTableViewCell.xib in Resources */,
E422AB4E26F57B9E008F395B /* DataTableViewCell.xib in Resources */,
E48E65B526C216E600A88860 /* ObjectTable.storyboard in Resources */,
E46B665926E3884B008247DC /* ImageView.storyboard in Resources */,
E48E65BA26C216F500A88860 /* ColorTable.storyboard in Resources */,
Expand Down Expand Up @@ -940,7 +925,6 @@
E4D0F4F92783D46900690B99 /* LessonDataViewModel.swift in Sources */,
E41F34CF26BF9FFF001B24A2 /* AddNewImageViewModel.swift in Sources */,
E46F651527D350EB00E30284 /* LessonStep+CoreDataClass.swift in Sources */,
E465FEA726E1143900785BB7 /* DataTableViewCell.swift in Sources */,
E465FC33274E820100503FC8 /* BallLineGeometry.swift in Sources */,
E46F651127D350EB00E30284 /* BaseLesson+CoreDataClass.swift in Sources */,
E4AF75E027796DC90088110A /* CharacterCountValidation.swift in Sources */,
Expand Down Expand Up @@ -1064,14 +1048,6 @@
name = ImageCollectionViewCell.xib;
sourceTree = "<group>";
};
E422AB5026F57B9E008F395B /* DataTableViewCell.xib */ = {
isa = PBXVariantGroup;
children = (
E422AB5426F57BA3008F395B /* Base */,
);
name = DataTableViewCell.xib;
sourceTree = "<group>";
};
E422AB5A26F57EF6008F395B /* Detail.storyboard */ = {
isa = PBXVariantGroup;
children = (
Expand Down
1 change: 1 addition & 0 deletions PadelLessonLog/Extensions/UIImageExtension.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import UIKit
extension UIImage {
static let gearshape = UIImage.named("gearshape")
static let plusCircle = UIImage.named("plus.circle")
static let folderPlus = UIImage.named("folder.badge.plus")
static let trashCircle = UIImage.named("trash.circle")
static let checkmarkCircle = UIImage.named("checkmark.circle")
static let chevronBackwardCircle = UIImage.named("chevron.backward.circle")
Expand Down
25 changes: 18 additions & 7 deletions PadelLessonLog/Screen/LessonData/Base.lproj/LessonData.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="d3b-jK-jJw">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="d3b-jK-jJw">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
<capability name="Image references" minToolsVersion="12.0"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
Expand All @@ -20,15 +20,21 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="XiI-mJ-F9q" userLabel="Top Stack View">
<rect key="frame" x="0.0" y="44" width="414" height="95"/>
<rect key="frame" x="0.0" y="48" width="414" height="100"/>
<subviews>
<toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1Mn-7U-oSg">
<rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="Dj4-pI-lJr"/>
</constraints>
<items>
<barButtonItem width="42" style="plain" systemItem="fixedSpace" id="bCC-27-0Af"/>
<barButtonItem id="3KM-Hv-ytK">
<imageReference key="image" image="folder.badge.plus" catalog="system" symbolScale="medium"/>
<color key="tintColor" name="colorNavBarButton"/>
<connections>
<action selector="addFolderButtonPressed:" destination="d3b-jK-jJw" id="Usy-vr-S4G"/>
</connections>
</barButtonItem>
<barButtonItem style="plain" systemItem="flexibleSpace" id="VLX-Jb-zKN"/>
<barButtonItem title="All" id="6Fb-dn-Bvp">
<connections>
Expand All @@ -52,14 +58,14 @@
</items>
</toolbar>
<searchBar contentMode="redraw" id="tVC-HG-XyV">
<rect key="frame" x="0.0" y="44" width="414" height="51"/>
<rect key="frame" x="0.0" y="44" width="414" height="56"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<textInputTraits key="textInputTraits"/>
</searchBar>
</subviews>
</stackView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZAd-5C-cDh">
<rect key="frame" x="0.0" y="139" width="414" height="674"/>
<rect key="frame" x="0.0" y="148" width="414" height="665"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view>
</subviews>
Expand All @@ -78,6 +84,7 @@
<tabBarItem key="tabBarItem" title="Title Table" image="chart.bar.doc.horizontal" catalog="system" id="HXV-oH-obI"/>
<simulatedTabBarMetrics key="simulatedBottomBarMetrics"/>
<connections>
<outlet property="addFolder" destination="3KM-Hv-ytK" id="DqY-s2-zUn"/>
<outlet property="allBarButton" destination="6Fb-dn-Bvp" id="Fnz-du-ZSe"/>
<outlet property="customToolbar" destination="1Mn-7U-oSg" id="kLy-2m-oX5"/>
<outlet property="favoriteBarButton" destination="CXB-V5-YXq" id="P1F-fn-oqw"/>
Expand All @@ -93,10 +100,14 @@
</scenes>
<resources>
<image name="chart.bar.doc.horizontal" catalog="system" width="115" height="128"/>
<image name="rectangle.and.text.magnifyingglass" catalog="system" width="128" height="101"/>
<image name="folder.badge.plus" catalog="system" width="128" height="92"/>
<image name="rectangle.and.text.magnifyingglass" catalog="system" width="128" height="102"/>
<namedColor name="colorButtonOff">
<color red="0.68199998140335083" green="0.68199998140335083" blue="0.69700002670288086" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
</namedColor>
<namedColor name="colorNavBarButton">
<color red="0.3880000114440918" green="0.3880000114440918" blue="0.39899998903274536" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
Expand Down
Loading

0 comments on commit 5bc1f52

Please sign in to comment.