Skip to content

Commit

Permalink
[#21] Rename UI model
Browse files Browse the repository at this point in the history
  • Loading branch information
@blyscuit
blyscuit committed Nov 14, 2022
1 parent 9729cd0 commit cb1d18c
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 64 deletions.
58 changes: 29 additions & 29 deletions iosApp/Gemfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@ GEM
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.2.0)
aws-partitions (1.629.0)
aws-sdk-core (3.146.0)
aws-partitions (1.659.0)
aws-sdk-core (3.167.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.58.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sdk-kms (1.59.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.114.0)
aws-sdk-core (~> 3, >= 3.127.0)
aws-sdk-s3 (1.117.1)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
aws-sigv4 (1.5.1)
aws-sigv4 (1.5.2)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
claide (1.1.0)
Expand Down Expand Up @@ -82,7 +82,7 @@ GEM
concurrent-ruby (1.1.10)
cork (0.3.0)
colored2 (~> 3.1)
danger (9.0.0)
danger (9.1.0)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
colored2 (~> 3.1)
Expand Down Expand Up @@ -117,9 +117,9 @@ GEM
dotenv (2.8.1)
emoji_regex (3.2.3)
escape (0.0.4)
ethon (0.15.0)
ethon (0.16.0)
ffi (>= 1.15.0)
excon (0.92.4)
excon (0.94.0)
faraday (1.10.2)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
Expand Down Expand Up @@ -151,7 +151,7 @@ GEM
faraday_middleware (1.2.0)
faraday (~> 1.0)
fastimage (2.2.6)
fastlane (2.209.1)
fastlane (2.210.1)
CFPropertyList (>= 2.3, < 4.0.0)
addressable (>= 2.8, < 3.0.0)
artifactory (~> 3.0)
Expand Down Expand Up @@ -190,17 +190,17 @@ GEM
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
fastlane-plugin-firebase_app_distribution (0.3.6)
fastlane-plugin-firebase_app_distribution (0.3.7)
ffi (1.15.5)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
git (1.12.0)
addressable (~> 2.8)
rchardet (~> 1.8)
google-apis-androidpublisher_v3 (0.26.0)
google-apis-core (>= 0.7, < 2.a)
google-apis-core (0.7.0)
google-apis-androidpublisher_v3 (0.31.0)
google-apis-core (>= 0.9.1, < 2.a)
google-apis-core (0.9.1)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
Expand All @@ -209,27 +209,27 @@ GEM
retriable (>= 2.0, < 4.a)
rexml
webrick
google-apis-iamcredentials_v1 (0.13.0)
google-apis-core (>= 0.7, < 2.a)
google-apis-playcustomapp_v1 (0.10.0)
google-apis-core (>= 0.7, < 2.a)
google-apis-storage_v1 (0.17.0)
google-apis-core (>= 0.7, < 2.a)
google-apis-iamcredentials_v1 (0.16.0)
google-apis-core (>= 0.9.1, < 2.a)
google-apis-playcustomapp_v1 (0.12.0)
google-apis-core (>= 0.9.1, < 2.a)
google-apis-storage_v1 (0.19.0)
google-apis-core (>= 0.9.0, < 2.a)
google-cloud-core (1.6.0)
google-cloud-env (~> 1.0)
google-cloud-errors (~> 1.0)
google-cloud-env (1.6.0)
faraday (>= 0.17.3, < 3.0)
google-cloud-errors (1.3.0)
google-cloud-storage (1.39.0)
google-cloud-storage (1.44.0)
addressable (~> 2.8)
digest-crc (~> 0.4)
google-apis-iamcredentials_v1 (~> 0.1)
google-apis-storage_v1 (~> 0.17.0)
google-apis-storage_v1 (~> 0.19.0)
google-cloud-core (~> 1.6)
googleauth (>= 0.16.2, < 2.a)
mini_mime (~> 1.0)
googleauth (1.2.0)
googleauth (1.3.0)
faraday (>= 0.17.3, < 3.a)
jwt (>= 1.4, < 3.0)
memoist (~> 0.16)
Expand Down Expand Up @@ -261,7 +261,7 @@ GEM
naturally (2.2.1)
netrc (0.11.0)
no_proxy_fix (0.1.2)
octokit (5.5.0)
octokit (5.6.1)
faraday (>= 1, < 3)
sawyer (~> 0.9)
open4 (1.3.4)
Expand Down Expand Up @@ -333,7 +333,7 @@ GEM
xcpretty-travis-formatter (1.0.1)
xcpretty (~> 0.2, >= 0.0.7)
xcresult (0.2.1)
zeitwerk (2.6.0)
zeitwerk (2.6.6)

PLATFORMS
x86_64-darwin-21
Expand All @@ -350,4 +350,4 @@ DEPENDENCIES
xcov

BUNDLED WITH
2.3.20
2.3.25
61 changes: 32 additions & 29 deletions iosApp/Survey.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
09495F7F2900017E0036BDFB /* ViewId+SurveySelection.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09495F7728FFF2D50036BDFB /* ViewId+SurveySelection.swift */; };
09495FA0290A82290036BDFB /* LoginFlow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09495F9F290A82290036BDFB /* LoginFlow.swift */; };
09495FA3290A823C0036BDFB /* SurveySelectionScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09495FA2290A823C0036BDFB /* SurveySelectionScreen.swift */; };
09495FA6290A82590036BDFB /* SurveySelectionSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09495FA5290A82590036BDFB /* SurveySelectionSpec.swift */; };
09495FCF29110E820036BDFB /* String+URL.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09495FCE29110E820036BDFB /* String+URL.swift */; };
09636AF228D4779400A5CB97 /* NeuzeitSLTStd-Book.otf in Resources */ = {isa = PBXBuildFile; fileRef = 09636AF028D4779400A5CB97 /* NeuzeitSLTStd-Book.otf */; };
09636AF328D4779400A5CB97 /* NeuzeitSLTStd-BookHeavy.otf in Resources */ = {isa = PBXBuildFile; fileRef = 09636AF128D4779400A5CB97 /* NeuzeitSLTStd-BookHeavy.otf */; };
Expand All @@ -43,6 +42,8 @@
09636B3228D8272200A5CB97 /* ScreenProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09636B2A28D8255D00A5CB97 /* ScreenProtocol.swift */; };
09636B3328D8272E00A5CB97 /* ViewId+General.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09636B2F28D8267D00A5CB97 /* ViewId+General.swift */; };
09636B3628D8285700A5CB97 /* KeyboardScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09636B3428D8284600A5CB97 /* KeyboardScreen.swift */; };
0982A79E2921DF7E00FC1976 /* SurveySelectionSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0982A7982921DE6700FC1976 /* SurveySelectionSpec.swift */; };
0982A79F2921DF8300FC1976 /* LoginSpec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0982A79A2921DE6700FC1976 /* LoginSpec.swift */; };
09CE770C28E191B400EAA9EE /* AppCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09CE770B28E191B400EAA9EE /* AppCoordinator.swift */; };
09CE770F28E1922000EAA9EE /* Screen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09CE770E28E1922000EAA9EE /* Screen.swift */; };
09CE773228E2ED2300EAA9EE /* LazyKoin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 09CE772F28E2ED2300EAA9EE /* LazyKoin.swift */; };
Expand Down Expand Up @@ -125,7 +126,6 @@
09495F7D28FFF47F0036BDFB /* GestureVelocity.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GestureVelocity.swift; sourceTree = "<group>"; };
09495F9F290A82290036BDFB /* LoginFlow.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginFlow.swift; sourceTree = "<group>"; };
09495FA2290A823C0036BDFB /* SurveySelectionScreen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SurveySelectionScreen.swift; sourceTree = "<group>"; };
09495FA5290A82590036BDFB /* SurveySelectionSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SurveySelectionSpec.swift; sourceTree = "<group>"; };
09495FCE29110E820036BDFB /* String+URL.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+URL.swift"; sourceTree = "<group>"; };
09636AF028D4779400A5CB97 /* NeuzeitSLTStd-Book.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NeuzeitSLTStd-Book.otf"; sourceTree = "<group>"; };
09636AF128D4779400A5CB97 /* NeuzeitSLTStd-BookHeavy.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "NeuzeitSLTStd-BookHeavy.otf"; sourceTree = "<group>"; };
Expand All @@ -144,6 +144,8 @@
09636B2A28D8255D00A5CB97 /* ScreenProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScreenProtocol.swift; sourceTree = "<group>"; };
09636B2F28D8267D00A5CB97 /* ViewId+General.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ViewId+General.swift"; sourceTree = "<group>"; };
09636B3428D8284600A5CB97 /* KeyboardScreen.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyboardScreen.swift; sourceTree = "<group>"; };
0982A7982921DE6700FC1976 /* SurveySelectionSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SurveySelectionSpec.swift; sourceTree = "<group>"; };
0982A79A2921DE6700FC1976 /* LoginSpec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginSpec.swift; sourceTree = "<group>"; };
09CE770B28E191B400EAA9EE /* AppCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCoordinator.swift; sourceTree = "<group>"; };
09CE770E28E1922000EAA9EE /* Screen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Screen.swift; sourceTree = "<group>"; };
09CE772F28E2ED2300EAA9EE /* LazyKoin.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LazyKoin.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -264,14 +266,6 @@
path = SurveySelection;
sourceTree = "<group>";
};
09495FA4290A82590036BDFB /* SurveySelection */ = {
isa = PBXGroup;
children = (
09495FA5290A82590036BDFB /* SurveySelectionSpec.swift */,
);
path = SurveySelection;
sourceTree = "<group>";
};
09636AEF28D4777E00A5CB97 /* Fonts */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -329,27 +323,11 @@
09636B1028D80FA400A5CB97 /* Presentation */ = {
isa = PBXGroup;
children = (
0982A7962921DE6600FC1976 /* Modules */,
);
path = Presentation;
sourceTree = "<group>";
};
09636B1128D80FB000A5CB97 /* Modules */ = {
isa = PBXGroup;
children = (
09636B1228D80FC100A5CB97 /* Login */,
09495FA4290A82590036BDFB /* SurveySelection */,
);
path = Modules;
sourceTree = "<group>";
};
09636B1228D80FC100A5CB97 /* Login */ = {
isa = PBXGroup;
children = (
09636B1A28D8215C00A5CB97 /* LoginSpec.swift */,
);
path = Login;
sourceTree = "<group>";
};
09636B1328D8146500A5CB97 /* ViewId */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -389,6 +367,31 @@
path = General;
sourceTree = "<group>";
};
0982A7962921DE6600FC1976 /* Modules */ = {
isa = PBXGroup;
children = (
0982A7972921DE6700FC1976 /* SurveySelection */,
0982A7992921DE6700FC1976 /* Login */,
);
path = Modules;
sourceTree = "<group>";
};
0982A7972921DE6700FC1976 /* SurveySelection */ = {
isa = PBXGroup;
children = (
0982A7982921DE6700FC1976 /* SurveySelectionSpec.swift */,
);
path = SurveySelection;
sourceTree = "<group>";
};
0982A7992921DE6700FC1976 /* Login */ = {
isa = PBXGroup;
children = (
0982A79A2921DE6700FC1976 /* LoginSpec.swift */,
);
path = Login;
sourceTree = "<group>";
};
09CE770A28E191A500EAA9EE /* Coordinator */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1206,7 +1209,6 @@
09495F7B28FFF4340036BDFB /* FadePaginationView.swift in Sources */,
09636AF928D47A4D00A5CB97 /* Font+Extensions.swift in Sources */,
09495F7828FFF2D50036BDFB /* ViewId+SurveySelection.swift in Sources */,
8BCA1398DA19EF4389A3E41A /* LoginView.swift in Sources */,
09CE773228E2ED2300EAA9EE /* LazyKoin.swift in Sources */,
09636B1528D8148C00A5CB97 /* ViewId.swift in Sources */,
09CE770F28E1922000EAA9EE /* Screen.swift in Sources */,
Expand All @@ -1226,14 +1228,15 @@
files = (
09636B3328D8272E00A5CB97 /* ViewId+General.swift in Sources */,
09636B3228D8272200A5CB97 /* ScreenProtocol.swift in Sources */,
09495FA6290A82590036BDFB /* SurveySelectionSpec.swift in Sources */,
0982A79E2921DF7E00FC1976 /* SurveySelectionSpec.swift in Sources */,
09636B2128D821EA00A5CB97 /* ViewId.swift in Sources */,
09495F6A28FFAFA20036BDFB /* ViewId+Splash.swift in Sources */,
09495FA0290A82290036BDFB /* LoginFlow.swift in Sources */,
09495F7F2900017E0036BDFB /* ViewId+SurveySelection.swift in Sources */,
09636B3628D8285700A5CB97 /* KeyboardScreen.swift in Sources */,
09636B2228D821ED00A5CB97 /* ViewId+Login.swift in Sources */,
09636B3128D8271D00A5CB97 /* LoginScreen.swift in Sources */,
0982A79F2921DF8300FC1976 /* LoginSpec.swift in Sources */,
09495FA3290A823C0036BDFB /* SurveySelectionScreen.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
2 changes: 1 addition & 1 deletion iosApp/Survey/Sources/Presentation/Modules/SurveySelection/SurveyItemView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import SwiftUI

struct SurveyItemView: View {

let survey: SurveyUI
let survey: SurveyUiModel

var body: some View {
ZStack {
Expand Down
8 changes: 4 additions & 4 deletions iosApp/Survey/Sources/Presentation/Modules/SurveySelection/SurveySelectionView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@ struct SurveySelectionView: View {

@State private var currentPage = 0
// TODO: Replace Example data
@State private var surveys: [SurveyUI] = [
SurveyUI(
@State private var surveys: [SurveyUiModel] = [
SurveyUiModel(
id: "1",
imageUrl: "https://dhdbhh0jsld0o.cloudfront.net/m/1ea51560991bcb7d00d0_",
title: "Scarlett Bangkok",
description: "We'd love ot hear from you!"
),
SurveyUI(
SurveyUiModel(
id: "2",
imageUrl: "https://dhdbhh0jsld0o.cloudfront.net/m/287db81c5e4242412cc0_",
title: "ibis Bangkok Riverside",
description: "We'd love ot hear from you!"
),
SurveyUI(
SurveyUiModel(
id: "3",
imageUrl: "https://dhdbhh0jsld0o.cloudfront.net/m/1ea51560991bcb7d00d0_",
title: "Scarlett Bangkok",
Expand Down
2 changes: 1 addition & 1 deletion ...blisskmmic/presentation/model/SurveyUI.kt → ...kmmic/presentation/model/SurveyUiModel.kt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package co.nimblehq.blisskmmic.presentation.model

data class SurveyUI (
data class SurveyUiModel (
val id: String,
val imageUrl: String,
val title: String,
Expand Down

0 comments on commit cb1d18c

Please sign in to comment.