Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sprint 04 #759

Open
wants to merge 2 commits into
base: project_sprint_3_start
Choose a base branch
from
Open

Sprint 04 #759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13aed96
0.1
eriksoyan Oct 4, 2024
6f8c1a9
fixed
eriksoyan Oct 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions MovieQuiz.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
0497A8FD2CB272CE008E9D26 /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = AD1ABABF2831907F00B3E448 /* Info.plist */; };
AD1ABAB22831907B00B3E448 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD1ABAB12831907B00B3E448 /* AppDelegate.swift */; };
AD1ABAB42831907B00B3E448 /* SceneDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD1ABAB32831907B00B3E448 /* SceneDelegate.swift */; };
AD1ABAB62831907B00B3E448 /* MovieQuizViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD1ABAB52831907B00B3E448 /* MovieQuizViewController.swift */; };
Expand Down Expand Up @@ -128,7 +129,7 @@
attributes = {
BuildIndependentTargetsInParallel = 1;
LastSwiftUpdateCheck = 1330;
LastUpgradeCheck = 1330;
LastUpgradeCheck = 1600;
ORGANIZATIONNAME = "";
TargetAttributes = {
AD1ABAAD2831907B00B3E448 = {
Expand Down Expand Up @@ -159,6 +160,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
0497A8FD2CB272CE008E9D26 /* Info.plist in Resources */,
AD1ABABE2831907F00B3E448 /* LaunchScreen.storyboard in Resources */,
AD1ABABB2831907F00B3E448 /* Assets.xcassets in Resources */,
AD1ABAB92831907B00B3E448 /* Main.storyboard in Resources */,
Expand Down Expand Up @@ -239,6 +241,7 @@
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
Expand Down Expand Up @@ -299,6 +302,7 @@
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
Expand All @@ -323,7 +327,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = N29P9VDV4Y;
DEVELOPMENT_TEAM = ZLJ6ZS4TMD;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = MovieQuiz/Resources/Info.plist;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
Expand All @@ -339,7 +343,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = ru.yandex.practicum.MovieQuiz;
PRODUCT_BUNDLE_IDENTIFIER = YP04;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
Expand All @@ -353,7 +357,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = N29P9VDV4Y;
DEVELOPMENT_TEAM = ZLJ6ZS4TMD;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = MovieQuiz/Resources/Info.plist;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
Expand All @@ -369,7 +373,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = ru.yandex.practicum.MovieQuiz;
PRODUCT_BUNDLE_IDENTIFIER = YP04;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
Expand Down
117 changes: 112 additions & 5 deletions MovieQuiz/Presentation/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
<device id="retina6_1" orientation="portrait" appearance="dark"/>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
<device id="retina6_3" orientation="portrait" appearance="dark"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
Expand All @@ -13,15 +14,121 @@
<objects>
<viewController id="BYZ-38-t0r" customClass="MovieQuizViewController" customModule="MovieQuiz" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<rect key="frame" x="0.0" y="0.0" width="402" height="874"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" spacing="220" translatesAutoresizingMaskIntoConstraints="NO" id="4YA-b6-6Aq">
<rect key="frame" x="20" y="72" width="362" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Вопрос:" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="08o-5y-cLj">
<rect key="frame" x="0.0" y="0.0" width="76" height="50"/>
<fontDescription key="fontDescription" name="YSDisplay-Medium" family="YS Display" pointSize="20"/>
<color key="textColor" name="YP white"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HGl-8k-9lg">
<rect key="frame" x="296" y="0.0" width="66" height="50"/>
<fontDescription key="fontDescription" name="YSDisplay-Medium" family="YS Display" pointSize="20"/>
<color key="textColor" name="YP white"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</stackView>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="MUf-gM-9zE">
<rect key="frame" x="20" y="142" width="362" height="520"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="20"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aUG-k3-CLr">
<rect key="frame" x="20" y="682" width="362" height="78"/>
<fontDescription key="fontDescription" name="YSDisplay-Bold" family="YS Display" pointSize="23"/>
<color key="textColor" name="YP white"/>
<nil key="highlightedColor"/>
</label>
<stackView opaque="NO" contentMode="scaleToFill" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="VGe-0u-ToM">
<rect key="frame" x="20" y="780" width="362" height="60"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ncj-qZ-vUh">
<rect key="frame" x="0.0" y="0.0" width="171" height="60"/>
<color key="backgroundColor" name="YP white"/>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="plain" title="Нет">
<fontDescription key="titleFontDescription" name="YSDisplay-Medium" family="YS Display" pointSize="20"/>
<color key="baseForegroundColor" name="YP black"/>
</buttonConfiguration>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="15"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="noButton:" destination="BYZ-38-t0r" eventType="touchUpInside" id="ORN-fG-4vt"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uE1-5f-tB4">
<rect key="frame" x="191" y="0.0" width="171" height="60"/>
<color key="backgroundColor" name="YP white"/>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="plain" title="Да">
<fontDescription key="titleFontDescription" name="YSDisplay-Medium" family="YS Display" pointSize="20"/>
<color key="baseForegroundColor" name="YP black"/>
</buttonConfiguration>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="15"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
<connections>
<action selector="yesButton:" destination="BYZ-38-t0r" eventType="touchUpInside" id="7Dc-1C-VAz"/>
</connections>
</button>
</subviews>
</stackView>
</subviews>
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="backgroundColor" name="YP darkGrey"/>
<constraints>
<constraint firstItem="6Tk-OE-BBY" firstAttribute="trailing" secondItem="aUG-k3-CLr" secondAttribute="trailing" constant="20" id="DTY-0q-7nH"/>
<constraint firstItem="VGe-0u-ToM" firstAttribute="top" secondItem="aUG-k3-CLr" secondAttribute="bottom" constant="20" id="Eae-eb-gBN"/>
<constraint firstItem="6Tk-OE-BBY" firstAttribute="trailing" secondItem="4YA-b6-6Aq" secondAttribute="trailing" constant="20" id="IHQ-xf-UMh"/>
<constraint firstItem="MUf-gM-9zE" firstAttribute="top" secondItem="4YA-b6-6Aq" secondAttribute="bottom" constant="20" id="JJK-Rj-CNB"/>
<constraint firstItem="6Tk-OE-BBY" firstAttribute="bottom" secondItem="VGe-0u-ToM" secondAttribute="bottom" id="LHY-XE-7UA"/>
<constraint firstItem="6Tk-OE-BBY" firstAttribute="trailing" secondItem="VGe-0u-ToM" secondAttribute="trailing" constant="20" id="P4t-iy-BuF"/>
<constraint firstItem="VGe-0u-ToM" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" constant="20" id="QjP-dC-QLZ"/>
<constraint firstItem="4YA-b6-6Aq" firstAttribute="top" secondItem="6Tk-OE-BBY" secondAttribute="top" constant="10" id="UsU-oH-18K"/>
<constraint firstItem="6Tk-OE-BBY" firstAttribute="trailing" secondItem="MUf-gM-9zE" secondAttribute="trailing" constant="20" id="Xur-8c-fcV"/>
<constraint firstItem="6Tk-OE-BBY" firstAttribute="bottom" secondItem="MUf-gM-9zE" secondAttribute="bottom" constant="178" id="YJU-Zm-jNg"/>
<constraint firstItem="aUG-k3-CLr" firstAttribute="top" secondItem="MUf-gM-9zE" secondAttribute="bottom" constant="20" id="dW1-zC-5eu"/>
<constraint firstItem="MUf-gM-9zE" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" constant="20" id="kyt-uY-6PM"/>
<constraint firstItem="4YA-b6-6Aq" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" constant="20" id="tjt-CR-fc8"/>
<constraint firstItem="6Tk-OE-BBY" firstAttribute="bottom" secondItem="aUG-k3-CLr" secondAttribute="bottom" constant="80" id="ty0-2L-RmJ"/>
<constraint firstItem="aUG-k3-CLr" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" constant="20" id="yVX-Gd-YBT"/>
</constraints>
</view>
<connections>
<outlet property="image" destination="MUf-gM-9zE" id="eOz-B2-VOQ"/>
<outlet property="questionCountLabel" destination="HGl-8k-9lg" id="oox-A0-LiH"/>
<outlet property="questionLabel" destination="08o-5y-cLj" id="wmE-eS-Oop"/>
<outlet property="quizQuestion" destination="aUG-k3-CLr" id="Z4N-bZ-2ns"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-55.072463768115945" y="55.580357142857139"/>
</scene>
</scenes>
<resources>
<namedColor name="YP black">
<color red="0.10196078431372549" green="0.10588235294117647" blue="0.13333333333333333" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="YP darkGrey">
<color red="0.10196078431372549" green="0.10588235294117647" blue="0.13333333333333333" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="YP white">
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
Loading