Skip to content

Show certificates in profile #504

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

Merged
ivan-magda merged 12 commits into from
Aug 1, 2019
Merged

Show certificates in profile #504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4941cac
Remove checks for tvOS
ivan-magda Aug 1, 2019
5518d12
Remove empty group
ivan-magda Aug 1, 2019
80fe3ab
Format code
ivan-magda Aug 1, 2019
b44c19f
Remove Certificates from tab bar
ivan-magda Aug 1, 2019
abe02a3
Update positions
ivan-magda Aug 1, 2019
9d8cc5f
Display certificates in profile menu
ivan-magda Aug 1, 2019
793a54b
Display certificates of the different users
ivan-magda Aug 1, 2019
37d977c
Update empty certificates state placeholders
ivan-magda Aug 1, 2019
a5af46f
Create CertificatesLegacyAssembly
ivan-magda Aug 1, 2019
073f52b
Dispalay loading firstly
ivan-magda Aug 1, 2019
0ed4c24
Add is_organization field
ivan-magda Aug 1, 2019
384b169
Hide certificates for organizations
ivan-magda Aug 1, 2019
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
12 changes: 3 additions & 9 deletions Stepic.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1741,6 +1741,7 @@
2CF4252C2024C10D002D7305 /* ru */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ru; path = ru.lproj/overlay_simple.png; sourceTree = "<group>"; };
2CF4252F2024C111002D7305 /* en */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = en; path = en.lproj/overlay_hard.png; sourceTree = "<group>"; };
2CF425302024C114002D7305 /* en */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = en; path = en.lproj/overlay_simple.png; sourceTree = "<group>"; };
2CF6649122F307A500F2A899 /* Model_user_ is_organization.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Model_user_ is_organization.xcdatamodel"; sourceTree = "<group>"; };
2CFC5ABB228ADFC400B5248A /* StepsPersistenceService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StepsPersistenceService.swift; sourceTree = "<group>"; };
2CFC5ABD228AF0B400B5248A /* NewLessonViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewLessonViewModel.swift; sourceTree = "<group>"; };
2CFDA8181FBB3CFD0098A441 /* Model_sections_with_course_id_v21.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = Model_sections_with_course_id_v21.xcdatamodel; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2234,13 +2235,6 @@
name = Certificates;
sourceTree = "<group>";
};
081058331E9FDD1800FAC30A /* Tests */ = {
isa = PBXGroup;
children = (
);
name = Tests;
sourceTree = "<group>";
};
08195A041FA00FE300E6D6CD /* Course List */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -2434,7 +2428,6 @@
083F2B0F1E9D8E2A00714173 /* Certificates */ = {
isa = PBXGroup;
children = (
081058331E9FDD1800FAC30A /* Tests */,
083F2B101E9D8E8F00714173 /* CertificatesStoryboard.storyboard */,
083F2B131E9D8EF800714173 /* CertificatesViewController.swift */,
083F2B161E9D8F1D00714173 /* CertificatesView.swift */,
Expand Down Expand Up @@ -7231,6 +7224,7 @@
08D1EF6E1BB5618700BE84E6 /* Model.xcdatamodeld */ = {
isa = XCVersionGroup;
children = (
2CF6649122F307A500F2A899 /* Model_user_ is_organization.xcdatamodel */,
2C22F3E2226E2A7100467F54 /* Model_course_paid.xcdatamodel */,
2C8C17282260EA94008DC7EA /* Model_course_is_certificate_auto_issued.xcdatamodel */,
2C06E09E2241434100AF4DA2 /* Model_profile_fields_v33.xcdatamodel */,
Expand Down Expand Up @@ -7268,7 +7262,7 @@
0802AC531C7222B200C4F3E6 /* Model_v2.xcdatamodel */,
08D1EF6F1BB5618700BE84E6 /* Model.xcdatamodel */,
);
currentVersion = 2C22F3E2226E2A7100467F54 /* Model_course_paid.xcdatamodel */;
currentVersion = 2CF6649122F307A500F2A899 /* Model_user_ is_organization.xcdatamodel */;
path = Model.xcdatamodeld;
sourceTree = "<group>";
versionGroupType = wrapper.xcdatamodel;
Expand Down
4 changes: 1 addition & 3 deletions Stepic/AuthInfo.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,7 @@ class AuthInfo: NSObject {
Progress.deleteAllStoredProgresses()
Notification.deleteAll()
AnalyticsUserProperties.shared.clearUserDependentProperties()
#if !os(tvOS)
NotificationsBadgesManager.shared.set(number: 0)
#endif
NotificationsBadgesManager.shared.set(number: 0)
CoreDataHelper.instance.save()

AuthInfo.shared.user = nil
Expand Down
50 changes: 25 additions & 25 deletions Stepic/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="0uJ-IX-W04">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="0uJ-IX-W04">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--Downloads-->
<scene sceneID="B6E-0I-IzT">
<objects>
<viewController storyboardIdentifier="DownloadsViewController" id="g7w-5Y-f4V" customClass="DownloadsViewController" customModule="Adaptive_1838" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="DownloadsViewController" id="g7w-5Y-f4V" customClass="DownloadsViewController" customModule="Stepic" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="VVz-oY-EAd">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
Expand Down Expand Up @@ -50,12 +50,12 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="7a5-ET-4lH" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="2024.8" y="2162.9685157421291"/>
<point key="canvasLocation" x="1670" y="2641"/>
</scene>
<!--Lesson-->
<scene sceneID="LMh-2U-yNH">
<objects>
<viewController storyboardIdentifier="LessonViewController" id="7LO-Mv-R4f" customClass="LessonViewController" customModule="Adaptive_1838" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="LessonViewController" id="7LO-Mv-R4f" customClass="LessonViewController" customModule="Stepic" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="18x-Lc-xSo">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
Expand All @@ -66,12 +66,12 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Sog-TK-f5r" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="2788" y="2163"/>
<point key="canvasLocation" x="2433" y="2641"/>
</scene>
<!--Video Step View Controller-->
<scene sceneID="LFg-le-xVl">
<objects>
<viewController storyboardIdentifier="VideoStepViewController" id="3W9-IK-cIE" customClass="VideoStepViewController" customModule="Adaptive_1838" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="VideoStepViewController" id="3W9-IK-cIE" customClass="VideoStepViewController" customModule="Stepic" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="eOu-jp-hBO">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
Expand All @@ -90,7 +90,7 @@
<action selector="playButtonPressed:" destination="3W9-IK-cIE" eventType="touchUpInside" id="kVm-QE-2Cq"/>
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="68N-yM-TOn" customClass="DiscussionCountView" customModule="Adaptive_1838" customModuleProvider="target">
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="68N-yM-TOn" customClass="DiscussionCountView" customModule="Stepic" customModuleProvider="target">
<rect key="frame" x="0.0" y="559" width="375" height="46"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
Expand Down Expand Up @@ -168,12 +168,12 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="qo3-wV-bhM" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="6116" y="1928.1859070464768"/>
<point key="canvasLocation" x="900" y="3471"/>
</scene>
<!--Web Step View Controller-->
<scene sceneID="bJt-5m-7H3">
<objects>
<viewController storyboardIdentifier="WebStepViewController" id="OsI-th-C1R" customClass="WebStepViewController" customModule="Adaptive_1838" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="WebStepViewController" id="OsI-th-C1R" customClass="WebStepViewController" customModule="Stepic" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="Gz8-wq-89z">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
Expand All @@ -197,7 +197,7 @@
<constraint firstAttribute="height" constant="32" placeholder="YES" id="fD4-kU-l4I"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BE9-jp-jJZ" customClass="DiscussionCountView" customModule="Adaptive_1838" customModuleProvider="target">
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BE9-jp-jJZ" customClass="DiscussionCountView" customModule="Stepic" customModuleProvider="target">
<rect key="frame" x="0.0" y="32" width="375" height="46"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
Expand Down Expand Up @@ -285,7 +285,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="RLq-xB-Eqy" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="5779" y="2607"/>
<point key="canvasLocation" x="900" y="4247"/>
</scene>
<!--Styled Tab Bar View Controller-->
<scene sceneID="h7W-ra-FMl">
Expand All @@ -301,7 +301,7 @@
</tabBarController>
<placeholder placeholderIdentifier="IBFirstResponder" id="emr-b4-LSX" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-108" y="1442"/>
<point key="canvasLocation" x="-108" y="1330"/>
</scene>
<!--Notifications-->
<scene sceneID="YvC-9R-2bs">
Expand All @@ -311,12 +311,12 @@
</viewControllerPlaceholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="XvM-lw-vUU" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="190" y="2591"/>
<point key="canvasLocation" x="1458" y="842"/>
</scene>
<!--Downloads-->
<scene sceneID="Laj-7g-BZD">
<objects>
<navigationController storyboardIdentifier="DownloadsNavigation" automaticallyAdjustsScrollViewInsets="NO" id="MT9-2h-A7A" customClass="StyledNavigationController" customModule="Adaptive_1838" customModuleProvider="target" sceneMemberID="viewController">
<navigationController storyboardIdentifier="DownloadsNavigation" automaticallyAdjustsScrollViewInsets="NO" id="MT9-2h-A7A" customClass="StyledNavigationController" customModule="Stepic" customModuleProvider="target" sceneMemberID="viewController">
<tabBarItem key="tabBarItem" title="Downloads" image="tab-downloads" selectedImage="tab-downloads" id="Wmp-3r-xny"/>
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" id="W60-es-dLX">
Expand All @@ -330,12 +330,12 @@
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="KcB-yW-iiN" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1255.2" y="2162.9685157421291"/>
<point key="canvasLocation" x="900" y="2641"/>
</scene>
<!--Styled Navigation Controller-->
<scene sceneID="dHl-Iz-Z0Q">
<objects>
<navigationController storyboardIdentifier="ProfileNavigation" id="usg-zh-puE" customClass="StyledNavigationController" customModule="Adaptive_1838" customModuleProvider="target" sceneMemberID="viewController">
<navigationController storyboardIdentifier="ProfileNavigation" id="usg-zh-puE" customClass="StyledNavigationController" customModule="Stepic" customModuleProvider="target" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="9Hg-Ye-byR">
<rect key="frame" x="0.0" y="20" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
Expand All @@ -346,12 +346,12 @@
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="FiZ-KX-0MA" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="901" y="3575"/>
<point key="canvasLocation" x="900" y="1823"/>
</scene>
<!--Styled Navigation Controller-->
<scene sceneID="tUu-h6-Dfw">
<objects>
<navigationController storyboardIdentifier="HomeNavigation" id="l1A-DI-noi" customClass="StyledNavigationController" customModule="Adaptive_1838" customModuleProvider="target" sceneMemberID="viewController">
<navigationController storyboardIdentifier="HomeNavigation" id="l1A-DI-noi" customClass="StyledNavigationController" customModule="Stepic" customModuleProvider="target" sceneMemberID="viewController">
<navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="aYP-ew-qV1">
<rect key="frame" x="0.0" y="20" width="375" height="44"/>
<autoresizingMask key="autoresizingMask"/>
Expand All @@ -362,12 +362,12 @@
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Ybu-TT-vbm" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="916" y="4304"/>
<point key="canvasLocation" x="1670" y="1330"/>
</scene>
<!--Home Screen View Controller-->
<scene sceneID="9Lh-fb-0BR">
<objects>
<viewController id="Abp-QW-0uC" customClass="HomeScreenViewController" customModule="Adaptive_1838" customModuleProvider="target" sceneMemberID="viewController">
<viewController id="Abp-QW-0uC" customClass="HomeScreenViewController" customModule="Stepic" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="6dy-mI-USE">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
Expand All @@ -378,7 +378,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="eyX-UA-2Rd" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1644" y="4304"/>
<point key="canvasLocation" x="2398" y="1330"/>
</scene>
<!--Profile-->
<scene sceneID="eaY-rL-sMF">
Expand All @@ -388,12 +388,12 @@
</viewControllerPlaceholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="Z3a-ey-gSQ" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1443" y="3314"/>
<point key="canvasLocation" x="1427" y="1822"/>
</scene>
<!--Styled Navigation Controller-->
<scene sceneID="r2H-fY-2yw">
<objects>
<navigationController storyboardIdentifier="NotificationsNavigation" id="v16-1y-UuB" customClass="StyledNavigationController" customModule="Adaptive_1838" customModuleProvider="target" sceneMemberID="viewController">
<navigationController storyboardIdentifier="NotificationsNavigation" id="v16-1y-UuB" customClass="StyledNavigationController" customModule="Stepic" customModuleProvider="target" sceneMemberID="viewController">
<toolbarItems/>
<navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="UK7-tx-bfD">
<rect key="frame" x="0.0" y="20" width="375" height="44"/>
Expand All @@ -406,7 +406,7 @@
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Vad-ZM-NEj" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="-382" y="2877"/>
<point key="canvasLocation" x="857" y="843"/>
</scene>
</scenes>
<resources>
Expand Down
Loading