-
Notifications
You must be signed in to change notification settings - Fork 35
Hide language widget after first session #302
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
358c4e0
Added content language preference & changed content language widget
Ostrenkiy a33382b
Hiding widget & updating explore according to changes
Ostrenkiy f8c6266
Removed empty methods
Ostrenkiy c8afc53
refactored menublocks in settings
Ostrenkiy c06b9ae
removed Equatable from SettingsMenuBlock enum
Ostrenkiy b26dce9
removed string constants
Ostrenkiy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| // | ||
| // ContentLanguagePreferenceTableViewCell.swift | ||
| // Stepic | ||
| // | ||
| // Created by Ostrenkiy on 06.06.2018. | ||
| // Copyright © 2018 Alex Karpov. All rights reserved. | ||
| // | ||
|
|
||
| import UIKit | ||
|
|
||
| class ContentLanguagePreferenceTableViewCell: UITableViewCell { | ||
|
|
||
| @IBOutlet weak var languageLabel: StepikLabel! | ||
|
|
||
| func setup(contentLanguage: ContentLanguage) { | ||
| self.languageLabel.text = contentLanguage.fullString | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> | ||
| <device id="retina4_7" orientation="portrait"> | ||
| <adaptation id="fullscreen"/> | ||
| </device> | ||
| <dependencies> | ||
| <deployment identifier="iOS"/> | ||
| <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/> | ||
| <capability name="Safe area layout guides" minToolsVersion="9.0"/> | ||
| <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> | ||
| </dependencies> | ||
| <objects> | ||
| <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> | ||
| <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> | ||
| <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="61" id="KGk-i7-Jjw" customClass="ContentLanguagePreferenceTableViewCell" customModule="Stepic" customModuleProvider="target"> | ||
| <rect key="frame" x="0.0" y="0.0" width="320" height="61"/> | ||
| <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> | ||
| <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> | ||
| <rect key="frame" x="0.0" y="0.0" width="320" height="60.5"/> | ||
| <autoresizingMask key="autoresizingMask"/> | ||
| <subviews> | ||
| <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xmo-mG-ALB" customClass="StepikLabel" customModule="Stepic" customModuleProvider="target"> | ||
| <rect key="frame" x="20" y="20" width="280" height="20.5"/> | ||
| <fontDescription key="fontDescription" type="system" pointSize="16"/> | ||
| <nil key="textColor"/> | ||
| <nil key="highlightedColor"/> | ||
| </label> | ||
| </subviews> | ||
| <constraints> | ||
| <constraint firstItem="Xmo-mG-ALB" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="20" id="6ag-u3-Bal"/> | ||
| <constraint firstAttribute="bottom" secondItem="Xmo-mG-ALB" secondAttribute="bottom" constant="20" id="Hsk-qg-NQL"/> | ||
| <constraint firstAttribute="trailing" secondItem="Xmo-mG-ALB" secondAttribute="trailing" constant="20" id="mNK-5s-ade"/> | ||
| <constraint firstItem="Xmo-mG-ALB" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="20" id="vLC-bd-7Aa"/> | ||
| </constraints> | ||
| </tableViewCellContentView> | ||
| <viewLayoutGuide key="safeArea" id="njF-e1-oar"/> | ||
| <connections> | ||
| <outlet property="languageLabel" destination="Xmo-mG-ALB" id="uWb-nE-A2N"/> | ||
| </connections> | ||
| <point key="canvasLocation" x="34" y="62.5"/> | ||
| </tableViewCell> | ||
| </objects> | ||
| </document> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Нужно будет подумать, как сделать аккуратно. Потому что плодим какие-то ненужные сущности, внутри которых один и тот же код с точностью до констант с ключами.