Merge remote-tracking branch 'origin/pre-release'

Appcircle.xcodeproj/project.pbxproj

@@ -57,6 +57,7 @@
 		C335FD6A2347815C00627CB4 /* AppcircleUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AppcircleUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		C335FD6E2347815C00627CB4 /* AppcircleUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppcircleUITests.m; sourceTree = "<group>"; };
 		C335FD702347815C00627CB4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		C37BF8EA244D930B00D88DBC /* development.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = development.xcconfig; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -120,6 +121,7 @@
 				C335FD552347815C00627CB4 /* LaunchScreen.storyboard */,
 				C335FD582347815C00627CB4 /* Info.plist */,
 				C335FD592347815C00627CB4 /* main.m */,
+				C37BF8EA244D930B00D88DBC /* development.xcconfig */,
 			);
 			path = Appcircle;
 			sourceTree = "<group>";
@@ -333,6 +335,7 @@
 /* Begin XCBuildConfiguration section */
 		C335FD712347815C00627CB4 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = C37BF8EA244D930B00D88DBC /* development.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -391,6 +394,7 @@
 		};
 		C335FD722347815C00627CB4 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = C37BF8EA244D930B00D88DBC /* development.xcconfig */;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
@@ -443,6 +447,7 @@
 		};
 		C335FD742347815C00627CB4 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = C37BF8EA244D930B00D88DBC /* development.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
@@ -463,6 +468,7 @@
 		};
 		C335FD752347815C00627CB4 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = C37BF8EA244D930B00D88DBC /* development.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
@@ -483,6 +489,7 @@
 		};
 		C335FD772347815C00627CB4 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = C37BF8EA244D930B00D88DBC /* development.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -503,6 +510,7 @@
 		};
 		C335FD782347815C00627CB4 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = C37BF8EA244D930B00D88DBC /* development.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
@@ -523,6 +531,7 @@
 		};
 		C335FD7A2347815C00627CB4 /* Debug */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = C37BF8EA244D930B00D88DBC /* development.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = T9P2R7YH4K;
@@ -541,6 +550,7 @@
 		};
 		C335FD7B2347815C00627CB4 /* Release */ = {
 			isa = XCBuildConfiguration;
+			baseConfigurationReference = C37BF8EA244D930B00D88DBC /* development.xcconfig */;
 			buildSettings = {
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = T9P2R7YH4K;

Appcircle/Base.lproj/Main.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14868" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="7aF-YI-2t0">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="7aF-YI-2t0">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14824"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -83,13 +83,22 @@
                                     <constraint firstAttribute="width" constant="80" id="oNl-rM-Q1m"/>
                                 </constraints>
                             </imageView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sVQ-zL-X3b">
+                                <rect key="frame" x="20" y="834" width="374" height="18"/>
+                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <constraints>
                             <constraint firstItem="JHs-nA-rYW" firstAttribute="top" secondItem="8FF-zy-vuc" secondAttribute="bottom" constant="8" id="0ya-9F-KQv"/>
                             <constraint firstItem="JHs-nA-rYW" firstAttribute="leading" secondItem="JoR-XE-yvE" secondAttribute="leading" id="399-U0-d8k"/>
+                            <constraint firstItem="sVQ-zL-X3b" firstAttribute="bottom" secondItem="JoR-XE-yvE" secondAttribute="bottom" constant="-10" id="8kZ-UM-zal"/>
                             <constraint firstItem="DL3-Qa-VWz" firstAttribute="leading" secondItem="JoR-XE-yvE" secondAttribute="leading" id="9H6-BC-MVH"/>
+                            <constraint firstItem="sVQ-zL-X3b" firstAttribute="leading" secondItem="JoR-XE-yvE" secondAttribute="leading" constant="20" id="GUs-f9-TsZ"/>
                             <constraint firstItem="DL3-Qa-VWz" firstAttribute="top" secondItem="JHs-nA-rYW" secondAttribute="bottom" constant="8" id="Leh-rL-jaf"/>
+                            <constraint firstItem="JoR-XE-yvE" firstAttribute="trailing" secondItem="sVQ-zL-X3b" secondAttribute="trailing" constant="20" id="ZQb-Ch-TiO"/>
                             <constraint firstItem="8FF-zy-vuc" firstAttribute="centerX" secondItem="JHs-nA-rYW" secondAttribute="centerX" id="fbv-wS-7t1"/>
                             <constraint firstItem="DL3-Qa-VWz" firstAttribute="trailing" secondItem="JoR-XE-yvE" secondAttribute="trailing" id="hpm-4Y-adh"/>
                             <constraint firstItem="JoR-XE-yvE" firstAttribute="trailing" secondItem="JHs-nA-rYW" secondAttribute="trailing" id="lPI-fN-W8e"/>
@@ -99,6 +108,7 @@
                     </view>
                     <navigationItem key="navigationItem" title="Page 2" id="GN7-V9-c7e"/>
                     <connections>
+                        <outlet property="lblApi" destination="sVQ-zL-X3b" id="K5W-tl-fAZ"/>
                         <outlet property="lblVersion" destination="DL3-Qa-VWz" id="VEF-4v-FJT"/>
                     </connections>
                 </viewController>

Appcircle/Info.plist

@@ -60,5 +60,9 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>API_URL</key>
+	<string>$(API_URL)</string>
+	<key>API_KEY</key>
+	<string>$(API_KEY)</string>
 </dict>
 </plist>

Appcircle/ViewController2.h

@@ -13,6 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface ViewController2 : UIViewController
 
 @property (weak, nonatomic) IBOutlet UILabel *lblVersion;
+@property (weak, nonatomic) IBOutlet UILabel *lblApi;
 
 @end
 

Appcircle/ViewController2.m

@@ -17,7 +17,8 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
    
-    self.lblVersion.text =  [NSString stringWithFormat:@"v%@",[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"]];;
+    self.lblVersion.text =  [NSString stringWithFormat:@"v%@",[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"]];
+    self.lblApi.text = [NSString stringWithFormat:@"Api URL: %@\nApi KEY: %@",[[NSBundle mainBundle] objectForInfoDictionaryKey:@"API_URL"],[[NSBundle mainBundle] objectForInfoDictionaryKey:@"API_KEY"]];
     // Do any additional setup after loading the view.
 }
 

Appcircle/development.xcconfig

@@ -0,0 +1,13 @@
+//
+//  development.xcconfig
+//  Appcircle
+//
+//  Created by Dogan Ekici on 20.04.2020.
+//  Copyright © 2020 Dogan Ekici. All rights reserved.
+//
+
+// Configuration settings file format documentation can be found at:
+// https://help.apple.com/xcode/#/dev745c5c974
+
+API_URL=Development URL
+API_KEY=Development KEY

Appcircle/environment.sh

@@ -0,0 +1,25 @@
+FILE="$1"
+
+if [ ! -f "$FILE" ]; then
+    echo ".xcconfig file not found!"
+    exit 0;
+fi
+
+KEY_ARRAY=()
+while IFS= read -r line; do
+	if [[ $line != //* ]] && [[ $line == *"="* ]]; then
+		IFS=' = ' read -r -a array <<< "$line"
+		KEY_ARRAY+=("${array[0]}")
+	fi
+done < "$FILE"
+
+for i in "${KEY_ARRAY[@]}"
+do
+   if [ -n "${!i}" ]; then
+   	echo "Key : ${i}"
+   	echo "Value : ${!i}"
+    
+   	sed -i '' "s/\(^${i}=\).*/\1$( echo "${!i}" | sed -e 's/[\/&]/\\&/g' )/" "$FILE"
+   fi
+done
+exit 0;