Skip to content

Commit f68d291

Browse files
authored
Release 2.0.2 (#3)
2 parents 51716a3 + 2616f6e commit f68d291

File tree

18 files changed

+470
-116
lines changed

18 files changed

+470
-116
lines changed

.github/workflows/publish.yml

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
name: Publish to TestFlight
2+
on:
3+
push:
4+
branches:
5+
- main
6+
- develop
7+
8+
jobs:
9+
publish:
10+
runs-on: macos-latest
11+
steps:
12+
- name: Checkout repo
13+
uses: actions/checkout@v3
14+
15+
- name: Setup Ruby 2.7.4
16+
uses: ruby/setup-ruby@v1
17+
with:
18+
ruby-version: '2.7.4'
19+
bundler-cache: true
20+
21+
- name: Extract secrets
22+
run: |
23+
cd fastlane
24+
echo "${{ secrets.KEYS_TAR_ASC }}" > .keys.tar.gz.asc
25+
gpg -d --passphrase "${{ secrets.KEYS_PASSPHRASE }}" --batch .keys.tar.gz.asc > .keys.tar.gz
26+
tar xzf .keys.tar.gz
27+
chmod 600 .keys/github-deploy-key
28+
cd ..
29+
30+
- name: Netrc github.com
31+
uses: extractions/netrc@v1
32+
with:
33+
machine: github.com
34+
username: ${{ secrets.NETRC_USERNAME }}
35+
password: ${{ secrets.NETRC_TOKEN }}
36+
37+
- name: Netrc api.github.com
38+
uses: extractions/netrc@v1
39+
with:
40+
machine: api.github.com
41+
username: ${{ secrets.NETRC_USERNAME }}
42+
password: ${{ secrets.NETRC_TOKEN }}
43+
44+
- name: Setup xcodegen and init xcode project
45+
uses: xavierLowmiller/[email protected]
46+
with:
47+
spec: project.yml
48+
use-cache: true
49+
50+
- name: Publish to TestFlight
51+
run: bundle exec fastlane releaseWaiterRobot_${{ github.ref_name }}
52+
env:
53+
FASTLANE_APPLE_ID: ${{ secrets.FASTLANE_APPLE_ID }}
54+
FASTLANE_CERTIFICATES_GIT_URL: ${{ secrets.FASTLANE_CERTIFICATES_GIT_URL }}
55+
FASTLANE_KEY_ID: ${{ secrets.FASTLANE_KEY_ID }}
56+
FASTLANE_ISSUER_ID: ${{ secrets.FASTLANE_ISSUER_ID }}
57+
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
58+
KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,3 +255,9 @@ xcuserdata/
255255
*.dSYM
256256

257257
# End of https://www.toptal.com/developers/gitignore/api/fastlane,xcode,intellij,appcode,macos
258+
259+
.keys*
260+
.env.*
261+
!.env.example
262+
263+
.idea

.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.7.4

Gemfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
source 'https://rubygems.org'
2+
3+
gem 'fastlane'

WaiterRobot/AppDelegate.swift

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,15 @@ class AppDelegate: NSObject, UIApplicationDelegate {
55
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
66

77
// Init CommonApp right at the start as e.g. koin might depend on some properties of it
8+
var appVersion = readFromInfoPlist(withKey: "CFBundleShortVersionString")
9+
let versionSuffix = readFromInfoPlist(withKey: "VERSION_SUFFIX")
10+
if !versionSuffix.isEmpty {
11+
appVersion += "-\(versionSuffix)"
12+
}
13+
14+
815
CommonApp.shared.doInit(
9-
appVersion: readFromInfoPlist(withKey: "CFBundleShortVersionString"),
16+
appVersion: appVersion,
1017
appBuild: Int32(readFromInfoPlist(withKey: "CFBundleVersion"))!,
1118
phoneModel: UIDevice.current.deviceType,
1219
os: OS.Ios(version: UIDevice.current.systemVersion),

WaiterRobot/Ui/Billing/BillingScreen.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ struct BillingScreen: View {
2424
if vm.state.billItems.isEmpty {
2525
Text(S.billing.noOpenBill(value0: table.number.description))
2626
.multilineTextAlignment(.center)
27+
.frame(maxWidth: .infinity)
28+
.padding()
2729
} else {
2830
Section {
2931
ForEach(vm.state.billItems, id: \.self) { item in

WaiterRobot/Ui/Login/LoginScannerScreen.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ struct LoginScannerScreen: View {
77
@EnvironmentObject var navigator: UIPilot<Screen>
88

99
@StateObject private var strongVM = ObservableViewModel(vm: koin.loginScannerVM())
10-
10+
1111
var body: some View {
1212
unowned let vm = strongVM
1313

1414
ScreenContainer(vm.state) {
1515
VStack {
1616
CodeScannerView(
1717
codeTypes: [.qr],
18-
simulatedData: "https://lava.kellner.team/ml/signIn?token=sONDq4mMVVAwUY2AvkmBDAfI5DM&purpose=CREATE"
18+
simulatedData: ""
1919
) { result in
2020
switch result {
2121
case .success(let result):

WaiterRobot/Ui/Order/OrderScreen.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ struct OrderScreen: View {
2424
if(vm.state.currentOrder.isEmpty) {
2525
Text(S.order.addProduct())
2626
.multilineTextAlignment(.center)
27+
.frame(maxWidth: .infinity)
2728
.padding()
2829
} else {
2930
List {

WaiterRobot/Ui/SwitchEvent/SwitchEventScreen.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ struct SwitchEventScreen: View {
2222

2323
Text(S.switchEvent.desc())
2424
.multilineTextAlignment(.center)
25+
.frame(maxWidth: .infinity)
2526
.padding()
2627

2728
Divider()
@@ -30,6 +31,7 @@ struct SwitchEventScreen: View {
3031
if vm.state.events.isEmpty {
3132
Text(S.switchEvent.noEventFound())
3233
.multilineTextAlignment(.center)
34+
.frame(maxWidth: .infinity)
3335
.padding()
3436
} else {
3537
LazyVStack {

WaiterRobot/Ui/TableDetail/TableDetailScreen.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ struct TableDetailScreen: View {
2222
if vm.state.orderedItems.isEmpty {
2323
Text(S.tableDetail.noOrder(value0: table.number.description))
2424
.multilineTextAlignment(.center)
25+
.frame(maxWidth: .infinity)
26+
.padding()
2527
} else {
2628
ForEach(vm.state.orderedItems, id: \.id) { item in
2729
OrderedItemView(item: item) {

0 commit comments

Comments
 (0)