Skip to content

liberty-tunnel-ios
liberty-tunnel-ios
Commit 27217948 authored by Thomas Markiewicz's avatar Thomas Markiewicz
Browse files
Options

Updated with branded splash screen image and navigation bar image

parent caa525a0
Pipeline #34361 passed with stage
    in 3 minutes and 53 seconds
    Expand all Hide whitespace changes
    Inline Side-by-side
    Showing with 74 additions and 35 deletions
    PIA VPN.xcodeproj/project.pbxproj
    View file @ 27217948
    ......@@ -257,6 +257,7 @@
    DDFCFA9521E892130081F235 /* RegionTile.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDFCFA9321E892130081F235 /* RegionTile.swift */; };
    DDFCFA9721E8921F0081F235 /* RegionTile.xib in Resources */ = {isa = PBXBuildFile; fileRef = DDFCFA9621E8921F0081F235 /* RegionTile.xib */; };
    DDFCFA9821E8921F0081F235 /* RegionTile.xib in Resources */ = {isa = PBXBuildFile; fileRef = DDFCFA9621E8921F0081F235 /* RegionTile.xib */; };
    E24954AD2333054700C106E8 /* Theme+LightPalette.swift in Sources */ = {isa = PBXBuildFile; fileRef = E24954AC2333054700C106E8 /* Theme+LightPalette.swift */; };
    E25A426022357DCF008D587B /* LibremOneWelcomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E25A425F22357DCF008D587B /* LibremOneWelcomeViewController.swift */; };
    E25A426122357DCF008D587B /* LibremOneWelcomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E25A425F22357DCF008D587B /* LibremOneWelcomeViewController.swift */; };
    E25A426322358350008D587B /* LibremOne.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E25A426222358350008D587B /* LibremOne.storyboard */; };
    ......@@ -568,6 +569,7 @@
    DDFCFA8E21E892070081F235 /* RegionTileCollectionViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RegionTileCollectionViewCell.xib; sourceTree = "<group>"; };
    DDFCFA9321E892130081F235 /* RegionTile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegionTile.swift; sourceTree = "<group>"; };
    DDFCFA9621E8921F0081F235 /* RegionTile.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RegionTile.xib; sourceTree = "<group>"; };
    E24954AC2333054700C106E8 /* Theme+LightPalette.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Theme+LightPalette.swift"; sourceTree = "<group>"; };
    E25A425F22357DCF008D587B /* LibremOneWelcomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LibremOneWelcomeViewController.swift; sourceTree = "<group>"; };
    E25A426222358350008D587B /* LibremOne.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LibremOne.storyboard; sourceTree = "<group>"; };
    E28943562238371A009FABA0 /* LibremOneUser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LibremOneUser.swift; sourceTree = "<group>"; };
    ......@@ -736,6 +738,7 @@
    0EE14D141FF15626008D9AC2 /* UINavigationController+StatusBar.swift */,
    0E9452AA1FDB5EF600891948 /* UINavigationItem+Shortcuts.swift */,
    DDD271E021D6262100B6D20F /* PropertyStoring.swift */,
    E24954AC2333054700C106E8 /* Theme+LightPalette.swift */,
    );
    name = Extensions;
    sourceTree = "<group>";
    ......@@ -911,7 +914,6 @@
    0E98BB6D1FD5BC6200B41D6B /* Bootstrapper.swift */,
    0E492C661FE60907007F23DF /* Flags.swift */,
    DD746959217F07AC00B7BD73 /* DNSList.swift */,
    E25A426222358350008D587B /* LibremOne.storyboard */,
    0E0715E5201CBB7100D6F666 /* Flags-dev.plist */,
    DD746956217F070700B7BD73 /* DNS.plist */,
    291C6397183EBC210039EC03 /* Images.xcassets */,
    ......@@ -1019,6 +1021,7 @@
    children = (
    DD4368A4224A73F1005D373B /* Core */,
    0ECB081F1D61D2A900043852 /* Launch Screen.storyboard */,
    E25A426222358350008D587B /* LibremOne.storyboard */,
    291C6391183EBC210039EC03 /* Main.storyboard */,
    );
    path = UI;
    ......@@ -1996,6 +1999,7 @@
    0E1F318620176A5F00FC1000 /* Theme+DarkPalette.swift in Sources */,
    0ECC1E3E1FDB3F2F0039891D /* RegionsViewController.swift in Sources */,
    0EB9ED1A1FDA1C4D00D1214D /* SettingsViewController.swift in Sources */,
    E24954AD2333054700C106E8 /* Theme+LightPalette.swift in Sources */,
    0EB966741FDF0D6E0086ABC2 /* ServerProvider+UI.swift in Sources */,
    DD76291121ECBD8B0092DF50 /* SubscriptionTileCollectionViewCell.swift in Sources */,
    DD40197E221FEF650041EB30 /* NetworkManagementToolTileCollectionViewCell.swift in Sources */,
    ......
    PIA VPN/Images.xcassets/nav-logo-white.imageset/Contents.json
    View file @ 27217948
    ......@@ -2,7 +2,7 @@
    "images" : [
    {
    "idiom" : "universal",
    "filename" : "piaWhiteCopy.pdf"
    "filename" : "nav-logo-white@3x.png"
    }
    ],
    "info" : {
    ......
    PIA VPN/Images.xcassets/nav-logo.imageset/Contents.json
    View file @ 27217948
    ......@@ -2,7 +2,7 @@
    "images" : [
    {
    "idiom" : "universal",
    "filename" : "piaDark2Copy2.pdf"
    "filename" : "nav-logo@3x.png"
    }
    ],
    "info" : {
    ......
    PIA VPN/SwiftGen+Assets.swift
    View file @ 27217948
    ......@@ -449,7 +449,7 @@ enum Asset {
    static let imageWalkthrough3 = ImageAsset(name: "image-walkthrough-3")
    static let itemMenu = ImageAsset(name: "item-menu")
    static let navLogoWhite = ImageAsset(name: "nav-logo-white")
    static let navLogo = ImageAsset(name: "nav-logo")
    static let navLogoDark = ImageAsset(name: "nav-logo")
    static let tunnelNameBlack = ImageAsset(name: "tunnel-name-black")
    // swiftlint:disable trailing_comma
    ......@@ -843,7 +843,7 @@ enum Asset {
    imageWalkthrough3,
    itemMenu,
    navLogoWhite,
    navLogo,
    navLogoDark,
    tunnelNameBlack,
    ]
    // swiftlint:enable trailing_comma
    ......
    PIA VPN/Theme+LightPalette.swift 0 → 100644
    View file @ 27217948
    //
    // Theme+LightPalette.swift
    // PIA VPN
    //
    // Created by tom on 9/18/19.
    // Copyright © 2019 London Trust Media. All rights reserved.
    //
    import Foundation
    import PIALibrary
    extension Theme.Palette {
    /// Light theme.
    public static var light: Theme.Palette {
    let palette = Theme.Palette()
    palette.appearance = Theme.Appearance.light
    palette.logo = Asset.navLogoDark.image
    palette.secondaryColor = .white
    palette.textfieldButtonBackgroundColor = .white
    palette.navigationBarBackIcon = Asset.Piax.Global.iconBack.image
    palette.brandBackground = Macros.color(hex: 0x009a18, alpha: 0xff)
    palette.secondaryBackground = .white
    palette.principalBackground = .piaGrey1
    palette.lineColor = .piaGreenDark20
    palette.emphasis = Macros.color(hex: 0x29cc41, alpha: 0xff)
    palette.accent1 = UIColor.piaOrange
    palette.accent2 = Macros.color(hex: 0xe60924, alpha: 0xff)
    palette.divider = UIColor(white: 0.0, alpha: 0.2)
    palette.overlayAlpha = 0.3
    return palette
    }
    }
    Resources/UI/Launch Screen.storyboard
    View file @ 27217948
    <?xml version="1.0" encoding="UTF-8"?>
    <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
    <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
    <device id="retina5_9" orientation="portrait">
    <adaptation id="fullscreen"/>
    </device>
    <dependencies>
    <deployment identifier="iOS"/>
    <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
    <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>
    ......@@ -18,8 +18,8 @@
    <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
    <subviews>
    <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="light-splash" translatesAutoresizingMaskIntoConstraints="NO" id="9aw-V9-Ip8">
    <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
    <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="tunnel-name-black" translatesAutoresizingMaskIntoConstraints="NO" id="9aw-V9-Ip8">
    <rect key="frame" x="0.0" y="34" width="375" height="778"/>
    </imageView>
    </subviews>
    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
    ......@@ -34,10 +34,10 @@
    </viewController>
    <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
    </objects>
    <point key="canvasLocation" x="52.5" y="375"/>
    <point key="canvasLocation" x="52" y="374.6305418719212"/>
    </scene>
    </scenes>
    <resources>
    <image name="light-splash" width="750" height="1334"/>
    <image name="tunnel-name-black" width="354" height="354"/>
    </resources>
    </document>
    PIA VPN/LibremOne.storyboard → Resources/UI/LibremOne.storyboard
    View file @ 27217948
    ......@@ -29,9 +29,9 @@
    </constraints>
    </imageView>
    <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Librem One address" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Eab-Sl-k4r">
    <rect key="frame" x="77" y="300" width="260" height="30"/>
    <rect key="frame" x="27" y="300" width="360" height="30"/>
    <constraints>
    <constraint firstAttribute="width" constant="260" id="8Wx-BE-735"/>
    <constraint firstAttribute="width" constant="360" id="8Wx-BE-735"/>
    </constraints>
    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
    <fontDescription key="fontDescription" type="system" pointSize="16"/>
    ......@@ -41,9 +41,9 @@
    </connections>
    </textField>
    <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Passphrase" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="nLc-E9-Aur">
    <rect key="frame" x="77" y="338" width="260" height="30"/>
    <rect key="frame" x="27" y="338" width="360" height="30"/>
    <constraints>
    <constraint firstAttribute="width" constant="260" id="Y9n-xx-Hi1"/>
    <constraint firstAttribute="width" constant="360" id="Y9n-xx-Hi1"/>
    </constraints>
    <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
    <fontDescription key="fontDescription" type="system" pointSize="16"/>
    ......@@ -53,10 +53,10 @@
    </connections>
    </textField>
    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" reversesTitleShadowWhenHighlighted="YES" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="b34-Oc-YCz">
    <rect key="frame" x="77" y="376" width="260" height="34"/>
    <rect key="frame" x="27" y="376" width="360" height="34"/>
    <color key="backgroundColor" red="0.42920023202896118" green="0.78971284627914429" blue="0.55290800333023071" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
    <constraints>
    <constraint firstAttribute="width" constant="260" id="Jft-4U-PWi"/>
    <constraint firstAttribute="width" constant="360" id="Jft-4U-PWi"/>
    </constraints>
    <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
    <state key="normal" title="LOG IN"/>
    ......
    Resources/UI/en.lproj/Main.storyboard
    View file @ 27217948
    This diff is collapsed.
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment