Skip to content

Commit

Permalink
V2.0 Beta 4
Browse files Browse the repository at this point in the history
  • Loading branch information
@ctdewaters
ctdewaters committed Aug 27, 2019
1 parent 5bb216b commit 9e0ac6e
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 13 deletions.
24 changes: 12 additions & 12 deletions Music Memories.xcodeproj/project.pbxproj
View file
Expand Up @@ -1417,7 +1417,7 @@
buildSettings = {
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_TEAM = AP48SCT3J2;
ENABLE_BITCODE = YES;
INFOPLIST_FILE = "$(SRCROOT)/iOS/Notifications/Memory Reminder Notification/Info.plist";
Expand All @@ -1444,7 +1444,7 @@
buildSettings = {
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_TEAM = AP48SCT3J2;
ENABLE_BITCODE = YES;
INFOPLIST_FILE = "$(SRCROOT)/iOS/Notifications/Memory Reminder Notification/Info.plist";
Expand Down Expand Up @@ -1595,7 +1595,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 5;
DERIVE_UIKITFORMAC_PRODUCT_BUNDLE_IDENTIFIER = YES;
DEVELOPMENT_TEAM = AP48SCT3J2;
ENABLE_BITCODE = YES;
Expand Down Expand Up @@ -1631,7 +1631,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 5;
DERIVE_UIKITFORMAC_PRODUCT_BUNDLE_IDENTIFIER = YES;
DEVELOPMENT_TEAM = AP48SCT3J2;
ENABLE_BITCODE = YES;
Expand Down Expand Up @@ -1661,7 +1661,7 @@
buildSettings = {
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_TEAM = AP48SCT3J2;
ENABLE_BITCODE = YES;
INFOPLIST_FILE = "$(SRCROOT)/iOS/Notifications/Dynamic Memory Notification/Info.plist";
Expand All @@ -1688,7 +1688,7 @@
buildSettings = {
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_TEAM = AP48SCT3J2;
ENABLE_BITCODE = YES;
INFOPLIST_FILE = "$(SRCROOT)/iOS/Notifications/Dynamic Memory Notification/Info.plist";
Expand Down Expand Up @@ -1716,7 +1716,7 @@
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Launch Image";
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_TEAM = AP48SCT3J2;
ENABLE_BITCODE = YES;
INFOPLIST_FILE = "$(SRCROOT)/tvOS/Music Memories TV/Info.plist";
Expand All @@ -1743,7 +1743,7 @@
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Launch Image";
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_TEAM = AP48SCT3J2;
ENABLE_BITCODE = YES;
INFOPLIST_FILE = "$(SRCROOT)/tvOS/Music Memories TV/Info.plist";
Expand All @@ -1770,7 +1770,7 @@
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_TEAM = AP48SCT3J2;
ENABLE_BITCODE = YES;
INFOPLIST_FILE = "$(SRCROOT)/iOS/watchOS/Music Memories-watchOS Extension/Info.plist";
Expand Down Expand Up @@ -1798,7 +1798,7 @@
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_TEAM = AP48SCT3J2;
ENABLE_BITCODE = YES;
INFOPLIST_FILE = "$(SRCROOT)/iOS/watchOS/Music Memories-watchOS Extension/Info.plist";
Expand Down Expand Up @@ -1827,7 +1827,7 @@
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_TEAM = AP48SCT3J2;
ENABLE_BITCODE = YES;
IBSC_MODULE = Music_Memories_watchOS_Extension;
Expand All @@ -1852,7 +1852,7 @@
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 4;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_TEAM = AP48SCT3J2;
ENABLE_BITCODE = YES;
IBSC_MODULE = Music_Memories_watchOS_Extension;
Expand Down
Binary file modified Music Memories.xcworkspace/xcuserdata/ctdewaters.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
6 changes: 6 additions & 0 deletions iOS/Memories/Memory/Editing/EditMemoryViewController.swift
View file
Expand Up @@ -74,6 +74,12 @@ class EditMemoryViewController: UITableViewController {
self.startDateField.text = self.memory?.startDate?.shortString
self.endDateField.text = self.memory?.endDate?.shortString
self.songCountLabel.text = "\(self.memory?.items?.count ?? 0)"

//Set height of cells.
let titleHeight = (self.memory?.title ?? "").height(withConstrainedWidth: self.titleTextView.frame.width, font: UIFont(name: "SFProRounded-Bold", size: 22) ?? UIFont.systemFont(ofSize: 22))
self.titleCell.frame.size.height = titleHeight
let descHeight = (self.memory?.desc ?? "").height(withConstrainedWidth: self.descriptionTextView.frame.width, font: UIFont(name: "SFProRounded-Semibold", size: 16) ?? UIFont.systemFont(ofSize: 16))
self.descriptionTextView.frame.size.height = descHeight

//Setup the images display view.
self.setupImagesDisplayView()
Expand Down
3 changes: 2 additions & 1 deletion iOS/UI/Storyboards/EditMemory.storyboard
View file
Expand Up @@ -216,7 +216,7 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="Ihl-Pd-EmG">
<rect key="frame" x="20" y="4.5" width="334" height="35.5"/>
<rect key="frame" x="20" y="4" width="334" height="36"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="xOz-hq-ug3"/>
Expand All @@ -232,6 +232,7 @@
<constraints>
<constraint firstItem="Ihl-Pd-EmG" firstAttribute="leading" secondItem="jlL-3i-mLp" secondAttribute="leadingMargin" id="5Nd-mM-7AX"/>
<constraint firstAttribute="trailingMargin" secondItem="Ihl-Pd-EmG" secondAttribute="trailing" id="fql-ta-WmZ"/>
<constraint firstItem="Ihl-Pd-EmG" firstAttribute="top" secondItem="jlL-3i-mLp" secondAttribute="top" constant="4" id="xG5-g3-q1t"/>
<constraint firstAttribute="bottom" secondItem="Ihl-Pd-EmG" secondAttribute="bottom" constant="4" id="z7x-La-g5g"/>
</constraints>
</tableViewCellContentView>
Expand Down

0 comments on commit 9e0ac6e

Please sign in to comment.