Merge pull request #52 from paulnagle/version_5

Version 5

.github/workflows/build-browser-gh-pages.yaml

@@ -0,0 +1,37 @@
+name: Push to https://bmltsearch.bmlt.app
+
+on: [push]
+
+jobs:
+  build:
+    name: Push to gh-pages
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v2
+
+      - name: Setup java
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: 20.x
+
+      - name: Install Ionic
+        run: npm install -g @ionic/cli
+
+      - name: Install app dependencies
+        run: npm install
+
+      - name: Build Script for browser
+        run: ionic build
+
+      - name: Push to https://bmltsearch.bmlt.app
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./www
+          cname: bmltsearch.bmlt.app

.github/workflows/build-debug-android.yaml

@@ -0,0 +1,32 @@
+name: Build Debug Android
+
+on: [push]
+
+jobs:
+  build:
+    name: Build Debug APK
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v2
+
+      - name: Setup java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+
+      - name: Build for android
+        run: ./build.sh -a
+
+      - name: Upload dev APK
+        uses: actions/upload-artifact@v3
+        with:
+          name: app-dev
+          path: platforms/android/app/build/outputs/apk/debug/app-debug.apk
+

.github/workflows/build-release-android.yaml

@@ -0,0 +1,46 @@
+name: Build Release Android
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+    name: Build Release AAB
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout source
+        uses: actions/checkout@v2
+
+      - name: Setup java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 19.x
+
+      - name: Build Script for android
+        run: ./build.sh -r
+
+      - uses: r0adkll/sign-android-release@v1
+        name: Sign Android app AAB
+        id: sign_app
+        with:
+          releaseDirectory: platforms/android/app/build/outputs/bundle/release
+          signingKeyBase64: ${{ secrets.BMLTSEARCH_KEYSTORE }}
+          alias: alias_name
+          keyStorePassword: ${{ secrets.BMLTSEARCH_KEYSTORE_PASSWORD }}
+          keyPassword: ${{ secrets.BMLTSEARCH_KEYSTORE_PASSWORD }}
+        env:
+          # override default build-tools version (29.0.3) -- optional
+          BUILD_TOOLS_VERSION: "30.0.3"
+
+      - name: Upload release bundle
+        uses: actions/upload-artifact@v1
+        with:
+          name: app-release
+          path: platforms/android/app/build/outputs/bundle/release/app-release.aab

android/app/capacitor.build.gradle

@@ -15,6 +15,7 @@ dependencies {
     implementation project(':capacitor-google-maps')
     implementation project(':capacitor-haptics')
     implementation project(':capacitor-keyboard')
+    implementation project(':capacitor-splash-screen')
     implementation project(':capacitor-status-bar')
 
 }

android/capacitor.settings.gradle

@@ -20,5 +20,8 @@ project(':capacitor-haptics').projectDir = new File('../node_modules/@capacitor/
 include ':capacitor-keyboard'
 project(':capacitor-keyboard').projectDir = new File('../node_modules/@capacitor/keyboard/android')
 
+include ':capacitor-splash-screen'
+project(':capacitor-splash-screen').projectDir = new File('../node_modules/@capacitor/splash-screen/android')
+
 include ':capacitor-status-bar'
 project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacitor/status-bar/android')

ios/App/BMLT Search.xcodeproj/project.pbxproj

@@ -373,14 +373,14 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5.1.0;
+				CURRENT_PROJECT_VERSION = 5.1.1;
 				DEVELOPMENT_TEAM = T3V4RRZHWV;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "BMLT Search";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 5.1.0;
+				MARKETING_VERSION = 5.1.1;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = ie.nasouth.bmltsearch;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -398,14 +398,14 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5.1.0;
+				CURRENT_PROJECT_VERSION = 5.1.1;
 				DEVELOPMENT_TEAM = T3V4RRZHWV;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "BMLT Search";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 5.1.0;
+				MARKETING_VERSION = 5.1.1;
 				PRODUCT_BUNDLE_IDENTIFIER = ie.nasouth.bmltsearch;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

ios/App/Podfile

@@ -17,6 +17,7 @@ def capacitor_pods
   pod 'CapacitorGoogleMaps', :path => '../../node_modules/@capacitor/google-maps'
   pod 'CapacitorHaptics', :path => '../../node_modules/@capacitor/haptics'
   pod 'CapacitorKeyboard', :path => '../../node_modules/@capacitor/keyboard'
+  pod 'CapacitorSplashScreen', :path => '../../node_modules/@capacitor/splash-screen'
   pod 'CapacitorStatusBar', :path => '../../node_modules/@capacitor/status-bar'
 end
 

ios/App/Podfile.lock

@@ -16,6 +16,8 @@ PODS:
     - Capacitor
   - CapacitorKeyboard (5.0.7):
     - Capacitor
+  - CapacitorSplashScreen (5.0.6):
+    - Capacitor
   - CapacitorStatusBar (5.0.6):
     - Capacitor
   - Google-Maps-iOS-Utils (4.2.2):
@@ -52,6 +54,7 @@ DEPENDENCIES:
   - "CapacitorGoogleMaps (from `../../node_modules/@capacitor/google-maps`)"
   - "CapacitorHaptics (from `../../node_modules/@capacitor/haptics`)"
   - "CapacitorKeyboard (from `../../node_modules/@capacitor/keyboard`)"
+  - "CapacitorSplashScreen (from `../../node_modules/@capacitor/splash-screen`)"
   - "CapacitorStatusBar (from `../../node_modules/@capacitor/status-bar`)"
 
 SPEC REPOS:
@@ -76,6 +79,8 @@ EXTERNAL SOURCES:
     :path: "../../node_modules/@capacitor/haptics"
   CapacitorKeyboard:
     :path: "../../node_modules/@capacitor/keyboard"
+  CapacitorSplashScreen:
+    :path: "../../node_modules/@capacitor/splash-screen"
   CapacitorStatusBar:
     :path: "../../node_modules/@capacitor/status-bar"
 
@@ -88,10 +93,11 @@ SPEC CHECKSUMS:
   CapacitorGoogleMaps: b45e66a0c819bee7665ea1a50a23cd1fb54ca9cd
   CapacitorHaptics: 1fffc1217c7e64a472d7845be50fb0c2f7d4204c
   CapacitorKeyboard: ce5e01064cf57a2c05b32565310713b7fe6cc6f9
+  CapacitorSplashScreen: 5fa2ab5e46cf5cc530cf16a51c80c7a986579ccd
   CapacitorStatusBar: 565c0a1ebd79bb40d797606a8992b4a105885309
   Google-Maps-iOS-Utils: f77eab4c4326d7e6a277f8e23a0232402731913a
   GoogleMaps: 032f676450ba0779bd8ce16840690915f84e57ac
 
-PODFILE CHECKSUM: a23fe71775aa5e530cff68b8c612edee48a52cf1
+PODFILE CHECKSUM: 5afb0b1afa4d4ab49f25da9fd4ba91a13966d6b6
 
 COCOAPODS: 1.14.3

package.json

@@ -30,6 +30,7 @@
     "@capacitor/haptics": "^5.0.6",
     "@capacitor/ios": "5.6.0",
     "@capacitor/keyboard": "^5.0.7",
+    "@capacitor/splash-screen": "^5.0.6",
     "@capacitor/status-bar": "^5.0.6",
     "@ionic/angular": "^7.6.1",
     "@ionic/storage-angular": "^4.0.0",

src/app/app.component.ts

@@ -3,6 +3,7 @@ import { Component } from '@angular/core';
 import { Platform } from '@ionic/angular';
 import { TranslateService } from '@ngx-translate/core';
 import { StorageService } from './services/storage.service'
+import { SplashScreen } from '@capacitor/splash-screen';
 
 @Component({
   selector: 'app-root',
@@ -64,6 +65,8 @@ export class AppComponent {
   async initializeApp() {
     this.translate.setDefaultLang('en');
 
+    await SplashScreen.hide();
+
     const langValue = await this.storage.get('language');
     if (langValue) {
       this.translate.use(langValue);

src/app/components/meeting-list/meeting-list.component.html

@@ -17,9 +17,10 @@
         step="1" 
         snaps="true" 
         pin="true" 
-        debounce="350">
-        <ion-icon slot="start" name="time-outline"></ion-icon>
-        <ion-icon slot="end" name="time-outline"></ion-icon>
+        debounce="350"
+        [value]="{ lower:0, upper: 23 }">
+        <ion-icon size="small" slot="start" name="time-outline"></ion-icon>
+        <ion-icon size="start" slot="end" name="time-outline"></ion-icon>
       </ion-range>
     </ion-item>
   </ion-list>

src/app/components/meeting-list/meeting-list.component.ts

@@ -71,7 +71,6 @@ export class MeetingListComponent implements OnInit, OnChanges {
     this.meetingList = this.data;
     this.localMeetingType = this.meetingType;
     this.localExpandAll = this.expandAll;
-    console.log("[ngOnInit] Expandall = " + this.localExpandAll)
 
     if (this.localMeetingType === 'virt') {
       // Get the formats

src/app/pages/listfull/listfull.page.html

@@ -5,8 +5,11 @@
     </ion-buttons>
 
     <div *ngIf="areaName != '' ; else BMLT_List">
-      <ion-buttons slot="end">
-        <ion-button color="primary" size="small" (click)="showServiceStructure()">Back</ion-button>
+      <ion-buttons slot="primary">
+        <ion-button fill="solid" color='primary' (click)="showServiceStructure()">
+          <ion-icon slot="start" name="arrow-back-circle-outline"></ion-icon>
+          Back
+        </ion-button>
       </ion-buttons>
     </div>