Release 2.0.2 (#3)

.github/workflows/publish.yml

@@ -0,0 +1,58 @@
+name: Publish to TestFlight
+on:
+  push:
+    branches:
+      - main
+      - develop
+
+jobs:
+  publish:
+    runs-on: macos-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+
+      - name: Setup Ruby 2.7.4
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '2.7.4'
+          bundler-cache: true
+
+      - name: Extract secrets
+        run: |
+          cd fastlane
+          echo "${{ secrets.KEYS_TAR_ASC }}" > .keys.tar.gz.asc
+          gpg -d --passphrase "${{ secrets.KEYS_PASSPHRASE }}" --batch .keys.tar.gz.asc > .keys.tar.gz
+          tar xzf .keys.tar.gz
+          chmod 600 .keys/github-deploy-key
+          cd ..
+
+      - name: Netrc github.com
+        uses: extractions/netrc@v1
+        with:
+          machine: github.com
+          username: ${{ secrets.NETRC_USERNAME }}
+          password: ${{ secrets.NETRC_TOKEN }}
+
+      - name: Netrc api.github.com
+        uses: extractions/netrc@v1
+        with:
+          machine: api.github.com
+          username: ${{ secrets.NETRC_USERNAME }}
+          password: ${{ secrets.NETRC_TOKEN }}
+
+      - name: Setup xcodegen and init xcode project
+        uses: xavierLowmiller/xcodegen-action@1.1.2
+        with:
+          spec: project.yml
+          use-cache: true
+
+      - name: Publish to TestFlight
+        run: bundle exec fastlane releaseWaiterRobot_${{ github.ref_name }}
+        env:
+          FASTLANE_APPLE_ID: ${{ secrets.FASTLANE_APPLE_ID }}
+          FASTLANE_CERTIFICATES_GIT_URL: ${{ secrets.FASTLANE_CERTIFICATES_GIT_URL }}
+          FASTLANE_KEY_ID: ${{ secrets.FASTLANE_KEY_ID }}
+          FASTLANE_ISSUER_ID: ${{ secrets.FASTLANE_ISSUER_ID }}
+          MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}

.gitignore

@@ -255,3 +255,9 @@ xcuserdata/
 *.dSYM
 
 # End of https://www.toptal.com/developers/gitignore/api/fastlane,xcode,intellij,appcode,macos
+
+.keys*
+.env.*
+!.env.example
+
+.idea

.ruby-version

@@ -0,0 +1 @@
+2.7.4

Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'fastlane'

WaiterRobot/AppDelegate.swift

@@ -5,8 +5,15 @@ class AppDelegate: NSObject, UIApplicationDelegate {
   func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
 
     // Init CommonApp right at the start as e.g. koin might depend on some properties of it
+    var appVersion = readFromInfoPlist(withKey: "CFBundleShortVersionString")
+    let versionSuffix = readFromInfoPlist(withKey: "VERSION_SUFFIX")
+    if !versionSuffix.isEmpty {
+      appVersion += "-\(versionSuffix)"
+    }
+
+
     CommonApp.shared.doInit(
-      appVersion: readFromInfoPlist(withKey: "CFBundleShortVersionString"),
+      appVersion: appVersion,
       appBuild: Int32(readFromInfoPlist(withKey: "CFBundleVersion"))!,
       phoneModel: UIDevice.current.deviceType,
       os: OS.Ios(version: UIDevice.current.systemVersion),

WaiterRobot/Ui/Billing/BillingScreen.swift

@@ -24,6 +24,8 @@ struct BillingScreen: View {
           if vm.state.billItems.isEmpty {
             Text(S.billing.noOpenBill(value0: table.number.description))
               .multilineTextAlignment(.center)
+              .frame(maxWidth: .infinity)
+              .padding()
           } else {
             Section {
               ForEach(vm.state.billItems, id: \.self) { item in

WaiterRobot/Ui/Login/LoginScannerScreen.swift

@@ -7,15 +7,15 @@ struct LoginScannerScreen: View {
   @EnvironmentObject var navigator: UIPilot<Screen>
 
   @StateObject private var strongVM = ObservableViewModel(vm: koin.loginScannerVM())
-  
+
   var body: some View {
     unowned let vm = strongVM
 
     ScreenContainer(vm.state) {
       VStack {
         CodeScannerView(
           codeTypes: [.qr],
-          simulatedData: "https://lava.kellner.team/ml/signIn?token=sONDq4mMVVAwUY2AvkmBDAfI5DM&purpose=CREATE"
+          simulatedData: ""
         ) { result in
           switch result {
           case .success(let result):

WaiterRobot/Ui/Order/OrderScreen.swift

@@ -24,6 +24,7 @@ struct OrderScreen: View {
       if(vm.state.currentOrder.isEmpty) {
         Text(S.order.addProduct())
           .multilineTextAlignment(.center)
+          .frame(maxWidth: .infinity)
           .padding()
       } else {
         List {

WaiterRobot/Ui/SwitchEvent/SwitchEventScreen.swift

@@ -22,6 +22,7 @@ struct SwitchEventScreen: View {
 
         Text(S.switchEvent.desc())
           .multilineTextAlignment(.center)
+          .frame(maxWidth: .infinity)
           .padding()
 
         Divider()
@@ -30,6 +31,7 @@ struct SwitchEventScreen: View {
           if vm.state.events.isEmpty {
             Text(S.switchEvent.noEventFound())
               .multilineTextAlignment(.center)
+              .frame(maxWidth: .infinity)
               .padding()
           } else {
             LazyVStack {

WaiterRobot/Ui/TableDetail/TableDetailScreen.swift

@@ -22,6 +22,8 @@ struct TableDetailScreen: View {
         if vm.state.orderedItems.isEmpty {
           Text(S.tableDetail.noOrder(value0: table.number.description))
             .multilineTextAlignment(.center)
+            .frame(maxWidth: .infinity)
+            .padding()
         } else {
           ForEach(vm.state.orderedItems, id: \.id) { item in
             OrderedItemView(item: item) {

WaiterRobot/Ui/TableList/TableListScreen.swift

@@ -31,6 +31,7 @@ struct TableListScreen: View {
         if vm.state.tables.isEmpty {
           Text(S.tableList.noTableFound())
             .multilineTextAlignment(.center)
+            .frame(maxWidth: .infinity)
             .padding()
         } else {
           LazyVGrid(columns: layout, spacing: 30) {