Redesign and bug fixes

harta-banilor-publici.xcodeproj/project.pbxproj

@@ -129,9 +129,9 @@
 				3A6925541F8374B800EABAC7 /* LicitatieViewController.swift */,
 				3A87A6131F7BF5D400F79F1B /* SearchViewController.swift */,
 				3A5580D91F594178009661D9 /* ApiHelper.swift */,
-				3AC21DC71F90F6830016BE04 /* CustomInfoWindow.swift */,
 				3AE335A7201348C200CF0169 /* LaunchScreenViewController.swift */,
 				3AE5295A201381ED0087BB3A /* InfoViewController.swift */,
+				3AC21DC71F90F6830016BE04 /* CustomInfoWindow.swift */,
 				3AC21DC61F90F6830016BE04 /* CustomInfoWindow.xib */,
 				3AA402EA1F447CDD009490EB /* Main.storyboard */,
 				3AE529582013730C0087BB3A /* LaunchScreen.storyboard */,
@@ -250,7 +250,7 @@
 				TargetAttributes = {
 					3AA402E01F447CDD009490EB = {
 						CreatedOnToolsVersion = 8.3.3;
-						DevelopmentTeam = 56RHDVP96M;
+						DevelopmentTeam = A9PHH27GH3;
 						LastSwiftMigration = 0900;
 						ProvisioningStyle = Automatic;
 					};
@@ -486,7 +486,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.4;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -537,7 +537,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.4;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -551,11 +551,11 @@
 			baseConfigurationReference = F15980CF94420178A3E5FD29 /* Pods-harta-banilor-publici.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = 56RHDVP96M;
+				DEVELOPMENT_TEAM = A9PHH27GH3;
 				INFOPLIST_FILE = "harta-banilor-publici/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = "ro.initiativaromania.harta-banilor-publici";
+				PRODUCT_BUNDLE_IDENTIFIER = ro.initiativaromania.hartabanilorpublici;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "harta-banilor-publici/harta-banilor-publici-Bridging-Header.h";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
@@ -568,11 +568,11 @@
 			baseConfigurationReference = 3CD957435C76157D936104F4 /* Pods-harta-banilor-publici.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = 56RHDVP96M;
+				DEVELOPMENT_TEAM = A9PHH27GH3;
 				INFOPLIST_FILE = "harta-banilor-publici/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = "ro.initiativaromania.harta-banilor-publici";
+				PRODUCT_BUNDLE_IDENTIFIER = ro.initiativaromania.hartabanilorpublici;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "harta-banilor-publici/harta-banilor-publici-Bridging-Header.h";
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;

harta-banilor-publici.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

harta-banilor-publici/ApiHelper.swift

@@ -1,14 +1,14 @@
 import Foundation
 
 struct Institution: Codable {
-    let id: Int
+    let id, version: Int
     let cui, nume, adresa, judet, uat: String
     let longitude, latitude: Double
 
     private enum CodingKeys: String, CodingKey {
         case id = "InstitutiePublicaId", cui = "CUI", nume = "Nume"
         case adresa = "Adresa", judet = "Judet", uat = "UAT"
-        case longitude = "long", latitude = "lat"
+        case longitude = "long", latitude = "lat", version = "version"
     }
 }
 
@@ -23,8 +23,7 @@ struct InstitutionSummary: Codable {
 
 struct InstitutionContract: Codable {
     let id: Int
-    let titluContract, numarContract: String
-    let valoareRON: Double
+    let titluContract, numarContract, valoareRON: String
 
     private enum CodingKeys: String, CodingKey {
         case id = "ContracteId", numarContract = "NumarContract"
@@ -35,7 +34,7 @@ struct InstitutionContract: Codable {
 struct InstitutionLicitatie: Codable {
     let id: Int
     let titluContract, numarContract: String
-    let valoareRON: Double
+    let valoareRON: String
 
     private enum CodingKeys: String, CodingKey {
         case id = "LicitatieID", numarContract = "NumarContract"
@@ -48,7 +47,7 @@ struct Contract: Codable {
     let companieCUI, tipProcedura, institutiePublicaCUI, numarAnuntParticipare: String
     let dataAnuntParticipare, tipIncheiereContract, numarContract, dataContract: String
     let titluContract, cpvCode: String
-    let valoareRON, valoareEUR: Double
+    let valoareRON, valoareEUR: String
 
     private enum CodingKeys: String, CodingKey {
         case id = "ContracteId", institutiePublicaID = "InstitutiePublicaID", companieId = "CompanieId"
@@ -66,7 +65,7 @@ struct Licitatie: Codable {
     let subcontractat, numarContract, dataContract: String
     let titluContract, cpvCodeID, cpvCode, numarAnuntParticipare, dataAnuntParticipare: String
     let valoareEstimataParticipare, monedaValoareEstimataParticipare, depoziteGarantii, modalitatiFinantare: String
-    let valoareRON, valoareEUR: Double
+    let valoareRON, valoareEUR: String
 
     private enum CodingKeys: String, CodingKey {
         case id = "LicitatiiId", institutiePublicaID = "InstitutiePublicaID"
@@ -134,7 +133,7 @@ extension String {
 }
 
 class ApiHelper {
-    private let apiURL = "https://hbp-api.azurewebsites.net/api/"
+    private let apiURL = "https://hbp-api2.azurewebsites.net/api/"
 
     func getInstitutionByID(id: Int, handler: @escaping (Institution, URLResponse?, Error?) -> Void) {
         var institution: Institution!
@@ -526,7 +525,7 @@ class ApiHelper {
     func searchInstitution(pattern: String, handler: @escaping ([Institution], URLResponse?, Error?) -> Void) {
         var institutionResults: [Institution] = []
 
-        let url = self.apiURL + "SearchInstitution/" + pattern.folding(options: .diacriticInsensitive, locale: .current).trailingTrim(.whitespaces).addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)!
+        let url = self.apiURL + "SearchInstitution/" + pattern.folding(options: .diacriticInsensitive, locale: .current).trimmingCharacters(in: .whitespacesAndNewlines).addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)!
         print("Searching Institutions: " + url)
 
         let task = URLSession.shared.dataTask(with: URL(string: url)!) { data, response, error in
@@ -552,7 +551,7 @@ class ApiHelper {
     func searchADCompanies(pattern: String, handler: @escaping ([CompanieByInstitution], URLResponse?, Error?) -> Void) {
         var companieResults: [CompanieByInstitution] = []
 
-        let url = self.apiURL + "SearchADCompany/" + pattern.folding(options: .diacriticInsensitive, locale: .current).trailingTrim(.whitespaces).addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)!
+        let url = self.apiURL + "SearchADCompany/" + pattern.folding(options: .diacriticInsensitive, locale: .current).trimmingCharacters(in: .whitespacesAndNewlines).addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)!
         print("Searching AD Companies: " + url)
 
         let task = URLSession.shared.dataTask(with: URL(string: url)!) { data, response, error in
@@ -581,7 +580,7 @@ class ApiHelper {
     func searchTenderCompanies(pattern: String, handler: @escaping ([CompanieByInstitution], URLResponse?, Error?) -> Void) {
         var companieResults: [CompanieByInstitution] = []
 
-        let url = self.apiURL + "SearchTenderCompany/" + pattern.folding(options: .diacriticInsensitive, locale: .current).trailingTrim(.whitespaces).addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)!
+        let url = self.apiURL + "SearchTenderCompany/" + pattern.folding(options: .diacriticInsensitive, locale: .current).trimmingCharacters(in: .whitespacesAndNewlines).addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)!
         print("Searching Tender Companies: " + url)
 
         let task = URLSession.shared.dataTask(with: URL(string: url)!) { data, response, error in
@@ -610,7 +609,7 @@ class ApiHelper {
 
     func searchContracts(pattern: String, handler: @escaping ([InstitutionContract], URLResponse?, Error?) -> Void) {
         var contractResults: [InstitutionContract] = []
-        let url = self.apiURL + "SearchContract/" + pattern.folding(options: .diacriticInsensitive, locale: .current).trailingTrim(.whitespaces).addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)!
+        let url = self.apiURL + "SearchContract/" + pattern.folding(options: .diacriticInsensitive, locale: .current).trimmingCharacters(in: .whitespacesAndNewlines).addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)!
         print("Searching Contracts: " + url)
 
         let task = URLSession.shared.dataTask(with: URL(string: url)!) { data, response, error in
@@ -636,7 +635,7 @@ class ApiHelper {
     func searchLicitatii(pattern: String, handler: @escaping ([InstitutionLicitatie], URLResponse?, Error?) -> Void) {
         var licitatieResults: [InstitutionLicitatie] = []
 
-        let url = self.apiURL + "SearchTenters/" + pattern.folding(options: .diacriticInsensitive, locale: .current).trailingTrim(.whitespaces).addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)!
+        let url = self.apiURL + "SearchTenters/" + pattern.folding(options: .diacriticInsensitive, locale: .current).trimmingCharacters(in: .whitespacesAndNewlines).addingPercentEncoding(withAllowedCharacters: CharacterSet.urlQueryAllowed)!
         print("Searching Licitatii for " + url)
 
         let task = URLSession.shared.dataTask(with: URL(string: url)!) { data, response, error in

harta-banilor-publici/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -15,13 +15,19 @@
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "Icon-Small-29@2x.png",
+      "filename" : "Icon-Small.png",
+      "scale" : "1x"
+    },
+    {
+      "size" : "29x29",
+      "idiom" : "iphone",
+      "filename" : "Icon-Small@2x.png",
       "scale" : "2x"
     },
     {
       "size" : "29x29",
       "idiom" : "iphone",
-      "filename" : "Icon-Small-29@3x.png",
+      "filename" : "Icon-Small@3x.png",
       "scale" : "3x"
     },
     {
@@ -96,7 +102,7 @@
     {
       "size" : "1024x1024",
       "idiom" : "ios-marketing",
-      "filename" : "iTunesArtwork@2x.png",
+      "filename" : "iTunesArtwork@1x.png",
       "scale" : "1x"
     }
   ],

harta-banilor-publici/Assets.xcassets/searchArt.imageset/Contents.json → harta-banilor-publici/Assets.xcassets/pin.imageset/Contents.json

@@ -2,17 +2,15 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "searchAsset 1.png",
+      "filename" : "pin.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "searchAsset 1@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "searchAsset 1@3x.png",
       "scale" : "3x"
     }
   ],

harta-banilor-publici/Assets.xcassets/splash/splash_0.imageset/Contents.json

@@ -4,6 +4,14 @@
       "idiom" : "universal",
       "filename" : "splash_0.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

harta-banilor-publici/Assets.xcassets/splash/splash_1.imageset/Contents.json

@@ -4,6 +4,14 @@
       "idiom" : "universal",
       "filename" : "splash_1.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

harta-banilor-publici/Assets.xcassets/splash/splash_10.imageset/Contents.json

@@ -4,6 +4,14 @@
       "idiom" : "universal",
       "filename" : "splash_10.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

harta-banilor-publici/Assets.xcassets/splash/splash_100.imageset/Contents.json

@@ -4,6 +4,14 @@
       "idiom" : "universal",
       "filename" : "splash_100.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

harta-banilor-publici/Assets.xcassets/splash/splash_101.imageset/Contents.json

@@ -4,6 +4,14 @@
       "idiom" : "universal",
       "filename" : "splash_101.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

harta-banilor-publici/Assets.xcassets/splash/splash_102.imageset/Contents.json

@@ -4,6 +4,14 @@
       "idiom" : "universal",
       "filename" : "splash_102.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

harta-banilor-publici/Assets.xcassets/splash/splash_103.imageset/Contents.json

@@ -4,6 +4,14 @@
       "idiom" : "universal",
       "filename" : "splash_103.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

harta-banilor-publici/Assets.xcassets/splash/splash_104.imageset/Contents.json

@@ -4,6 +4,14 @@
       "idiom" : "universal",
       "filename" : "splash_104.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

harta-banilor-publici/Assets.xcassets/splash/splash_105.imageset/Contents.json

@@ -4,6 +4,14 @@
       "idiom" : "universal",
       "filename" : "splash_105.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

harta-banilor-publici/Assets.xcassets/splash/splash_106.imageset/Contents.json

@@ -4,6 +4,14 @@
       "idiom" : "universal",
       "filename" : "splash_106.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {

harta-banilor-publici/Assets.xcassets/splash/splash_107.imageset/Contents.json

@@ -4,6 +4,14 @@
       "idiom" : "universal",
       "filename" : "splash_107.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {