Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
a5a8ed4
Set the Android Backbutton to return to the dashboard on successful q…
janoliver20 Dec 2, 2024
ef5bb16
#269: Fixed the clickable text in the notification to apply the read …
janoliver20 Dec 2, 2024
d11589e
#277: Fixed a bug where the body of a notification would be remembere…
janoliver20 Dec 2, 2024
671a11f
Merge pull request #281 from MORE-Platform/278-users-can-resubmit-ans…
janoliver20 Dec 2, 2024
d005c84
Merge pull request #282 from MORE-Platform/269-messages-change-to-rea…
janoliver20 Dec 2, 2024
42508a7
Merge pull request #283 from MORE-Platform/277-notifications-display-…
janoliver20 Dec 2, 2024
0e20c7f
Merge remote-tracking branch 'origin/main' into develop
janoliver20 Dec 3, 2024
7f0bb11
Updated to version 4.0.19
janoliver20 Dec 3, 2024
0bd8428
Added a new state which stops the UI until the study has fully updated
janoliver20 Jan 8, 2025
29375c8
Added the new state for iOS and fixed the issue on iOS as well
janoliver20 Jan 9, 2025
4fea114
Reset app badge when logging out
janoliver20 Jan 21, 2025
339ed0b
Version 4.0.22
janoliver20 Jan 21, 2025
97469fb
Merge pull request #287 from MORE-Platform/275-deep-link-issue
janoliver20 Jan 21, 2025
d957162
MORE-225: add completed option to notification-item to be able to dif…
iaigner Jun 2, 2025
64cd082
MORE-225: delete forgotten println
iaigner Jun 2, 2025
917408b
MORE-225: add logic for completed to ios screen
iaigner Jun 3, 2025
c3a2ffe
MORE-248: extend Login screen for Android with QR Code Option (Google…
iaigner Jun 3, 2025
ddc77ef
MORE-248: add native views logic for qr code scan in ios (qr code but…
iaigner Jun 4, 2025
747a286
MORE-225: Move logic to NotificationManager to handled completed/read…
iaigner Jun 4, 2025
42174f8
MORE-225: Set notification to completed when question or lime survey …
iaigner Jun 5, 2025
aaa4fef
Merge pull request #289 from MORE-Platform/MORE-225-fix-marking-for-n…
iaigner Jun 5, 2025
2936f0f
Updated to version 4.0.24
janoliver20 Jun 5, 2025
7c93f4e
MORE-248: implement QRCode Scan for ios (new view, handling of camera…
iaigner Jun 6, 2025
9ba94d2
MORE-248: move all func in ScanQRCodeView into it's model and adapt l…
iaigner Jun 6, 2025
6ae0cc3
MORE-248: delete forgotten comment
iaigner Jun 6, 2025
f26e550
MORE-248: refactor - add some localizations & correct typos
iaigner Jun 6, 2025
1c10a60
MORE-248: match fix login & match designs between ios and android
iaigner Jun 10, 2025
0cdc5a1
MORE-248: fix depricated function in kotlin + PR adaptations
iaigner Jun 10, 2025
932af95
MORE-248: show error when error occurs
iaigner Jun 10, 2025
be50553
MORE-248: readme update for android local development
iaigner Jun 11, 2025
a8105a7
MORE-248: pr adaptions
iaigner Jun 11, 2025
0065a85
MORE-248: fix reactivity of permissionGiven in QRScannerActivity
iaigner Jun 11, 2025
d4fd6fb
Merge pull request #291 from MORE-Platform/248-allow-signup-using-an-…
iaigner Jun 11, 2025
1505023
Updated to version 4.0.25
janoliver20 Jun 11, 2025
d96a495
Hotfix for the app crash
janoliver20 Jun 12, 2025
992e4be
238 automatic deployment (#295)
janoliver20 Jul 22, 2025
be7bf82
Update deploy-beta workflow: trigger on pushes to `develop` and `main…
janoliver20 Jul 22, 2025
2162c83
Simplify `deploy-beta` workflow trigger to only check for tag references
janoliver20 Jul 22, 2025
1c7d413
293 android api 36 upgrade (#296)
janoliver20 Jul 23, 2025
94f936b
Prehab2rehab develop (#325)
janoliver20 Sep 22, 2025
1db1ed0
P2r 319 refactor registration workflow and services (#324)
janoliver20 Sep 22, 2025
f0e3b69
#331: Fixed a bug where the app would get stuck in "Study loading" vi…
janoliver20 Sep 25, 2025
1cc7844
Version Update
janoliver20 Sep 25, 2025
4777fdb
#341: Removed an inner Coroutine that blocked the sending process on …
janoliver20 Oct 1, 2025
cf86729
Version Upgrade
janoliver20 Oct 1, 2025
063e5fa
#333: Fixed an issue, where Bluetooth would crash the iOS app. This f…
janoliver20 Oct 6, 2025
1434cbc
#349: Added a fallback method to upload databulks, if the Workmanager…
janoliver20 Oct 6, 2025
fa7a64b
Version update 4.1.6
janoliver20 Oct 6, 2025
bdfe5c8
#336: (#352)
janoliver20 Oct 7, 2025
81b497f
V4.1.7
janoliver20 Oct 7, 2025
7bb59f2
#356: Implemented a Garmin Connect OAuth Workflow in iOS and Android …
janoliver20 Nov 14, 2025
0277350
Updated to versio 4.1.7
janoliver20 Nov 14, 2025
bc7b9ad
Merge umm to more 25 02 (#367)
janoliver20 Mar 11, 2026
9107ba5
291 implement shared unit tests (#370)
janoliver20 Mar 11, 2026
2f13289
fix: localization for inputfields
FlorentinPosch Mar 24, 2026
f5081e9
fix: localization for navigation screen
FlorentinPosch Mar 24, 2026
621633e
fix: localization observation type
FlorentinPosch Mar 25, 2026
3e35a90
fix: screen observation filter
FlorentinPosch Mar 25, 2026
94a4fde
fix: add missing localization nachrichten filter
FlorentinPosch Mar 25, 2026
952774c
fix: localization of unread + important notification filter
FlorentinPosch Mar 25, 2026
c2889b3
draft: share some string resources between android and ios
FlorentinPosch Mar 26, 2026
36ca9a7
draft: revert NotificationFilterTypeModel.kt localization changes to …
FlorentinPosch Apr 1, 2026
d36e8ad
fix: revert shared localization changes to get a working state again;
FlorentinPosch Apr 1, 2026
ab983eb
Merge pull request #385 from MORE-Platform/384-small-bugfixes-collection
FlorentinPosch Apr 13, 2026
1c151aa
fix: observation type + notification filter localization
FlorentinPosch May 4, 2026
f0e93cb
Merge pull request #400 from MORE-Platform/384-small-filter-localizat…
FlorentinPosch May 5, 2026
681a3bb
fix: remove duplicate Ktor JSON configuration in HttpClient setup
FlorentinPosch May 6, 2026
d546603
Merge pull request #402 from MORE-Platform/p2r-398-fix-duplicate-ktor…
FlorentinPosch May 7, 2026
d8edac6
#369: Implemented App Usage observation (#383)
janoliver20 May 7, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
93 changes: 0 additions & 93 deletions .github/workflows/build-release.yml

This file was deleted.

75 changes: 75 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
name: Build apps
on:
pull_request:
branches:
- main
- develop
- prehab2rehab_develop

jobs:
ios:
name: iOS
runs-on: macos-26
environment: AppStore
env:
FASTLANE_TEAM_ID: ${{ secrets.FASTLANE_TEAM_ID }}
APPLE_CONNECT_KEY_ID: ${{ secrets.APPLE_CONNECT_KEY_ID }}
APPLE_CONNECT_ISSUER_ID: ${{ secrets.APPLE_CONNECT_ISSUER_ID }}
APPLE_CONNECT_KEY_CONTENT: ${{ secrets.APPLE_CONNECT_KEY_CONTENT }}
FASTLANE_KEYCHAIN_PASSWORD: ${{ secrets.FASTLANE_KEYCHAIN_PASSWORD }}
APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
FASTLANE_MATCH_SECRET: ${{ secrets.FASTLANE_MATCH_SECRET }}
MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_AUTH }}
GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}

FASTLANE_XCODEBUILD_SETTINGS_RETRIES: ${{ vars.FASTLANE_XCODEBUILD_SETTINGS_RETRIES }}
APP_IDENTIFIERS: ${{ vars.APP_IDENTIFIERS }}
FASTLANE_IOS_SCHEME: ${{ vars.FASTLANE_IOS_BUILD_SCHEME }}
FASTLANE_BUILD_NUMBER: ${{ vars.FASTLANE_BUILD_NUMBER }}
APPLE_CONNECT_KEY_IS_BASE64: ${{ vars.APPLE_CONNECT_KEY_IS_BASE64 }}
CODE_SIGN_IDENTITY: ${{ vars.CODE_SIGN_IDENTITY }}
TARGETS: ${{ vars.TARGETS }}
XCODE_VERSION: ${{ vars.XCODE_VERSION || '26.2' }}
defaults:
run:
working-directory: iosApp
steps:
- name: Checkout repo
uses: actions/checkout@v3

- name: Setup Google Services
run: chmod +x ../setup_google_services.sh && ../setup_google_services.sh

- name: Set Xcode Version
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: ${{ env.XCODE_VERSION }}

- name: Build iOS app
run: fastlane build

android:
name: Android
runs-on: ubuntu-latest
environment: PlayStore
env:
GOOGLE_PLAY_KEY_FILE: ${{ secrets.GOOGLE_PLAY_KEY_FILE }}
GOOGLE_PLAY_KEY_IN_BASE64: ${{ secrets.GOOGLE_PLAY_KEY_IN_BASE64 }}
ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
FASTLANE_BUILD_NUMBER: ${{ vars.FASTLANE_BUILD_NUMBER }}
GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
defaults:
run:
working-directory: androidApp
steps:
- name: Checkout repo
uses: actions/checkout@v3

- name: Setup Google Services
run: chmod +x ../setup_google_services.sh && ../setup_google_services.sh

- name: Build Android app
run: fastlane build
86 changes: 86 additions & 0 deletions .github/workflows/deploy-beta.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
name: Deploy beta release
on:
push:
branches:
- develop
- main
- prehab2rehab_develop
tags:
- '[0-9]+.[0-9]+.[0-9]+'

jobs:
ios:
name: iOS
runs-on: macos-26
environment: AppStore
if: startsWith(github.ref, 'refs/tags/')
env:
FASTLANE_TEAM_ID: ${{ secrets.FASTLANE_TEAM_ID }}
APPLE_CONNECT_KEY_ID: ${{ secrets.APPLE_CONNECT_KEY_ID }}
APPLE_CONNECT_ISSUER_ID: ${{ secrets.APPLE_CONNECT_ISSUER_ID }}
APPLE_CONNECT_KEY_CONTENT: ${{ secrets.APPLE_CONNECT_KEY_CONTENT }}
FASTLANE_KEYCHAIN_PASSWORD: ${{ secrets.FASTLANE_KEYCHAIN_PASSWORD }}
APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
FASTLANE_MATCH_SECRET: ${{ secrets.FASTLANE_MATCH_SECRET }}
MATCH_GIT_BASIC_AUTHORIZATION: ${{ secrets.MATCH_AUTH }}
GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}

FASTLANE_XCODEBUILD_SETTINGS_RETRIES: ${{ vars.FASTLANE_XCODEBUILD_SETTINGS_RETRIES }}
APP_IDENTIFIERS: ${{ vars.APP_IDENTIFIERS }}
FASTLANE_IOS_SCHEME: ${{ vars.FASTLANE_IOS_BUILD_SCHEME }}
FASTLANE_BUILD_NUMBER: ${{ vars.FASTLANE_BUILD_NUMBER }}
APPLE_CONNECT_KEY_IS_BASE64: ${{ vars.APPLE_CONNECT_KEY_IS_BASE64 }}
CODE_SIGN_IDENTITY: ${{ vars.CODE_SIGN_IDENTITY }}
TARGETS: ${{ vars.TARGETS }}
XCODE_VERSION: ${{ vars.XCODE_VERSION || '26.2' }}
defaults:
run:
working-directory: iosApp
steps:
- name: Checkout repo
uses: actions/checkout@v3

- name: Setup Google Services
run: chmod +x ../setup_google_services.sh && ../setup_google_services.sh

- name: Set Xcode Version
uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: ${{ env.XCODE_VERSION }}

- name: Set FASTLANE_BUILD_NUMBER from tag
run: echo "FASTLANE_BUILD_NUMBER=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV

- name: Deploy to TestFlight
run: fastlane deploy_beta


android:
name: Android
runs-on: ubuntu-latest
environment: PlayStore
if: startsWith(github.ref, 'refs/tags/')
env:
GOOGLE_PLAY_KEY_FILE: ${{ secrets.GOOGLE_PLAY_KEY_FILE }}
GOOGLE_PLAY_KEY_IN_BASE64: ${{ secrets.GOOGLE_PLAY_KEY_IN_BASE64 }}
ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
FASTLANE_BUILD_NUMBER: ${{ vars.FASTLANE_BUILD_NUMBER }}
GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
defaults:
run:
working-directory: androidApp
steps:
- name: Checkout repo
uses: actions/checkout@v3

- name: Setup Google Services
run: chmod +x ../setup_google_services.sh && ../setup_google_services.sh

- name: Set FASTLANE_BUILD_NUMBER from tag
run: echo "FASTLANE_BUILD_NUMBER=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV

- name: Deploy to Google Play Beta
run: fastlane deploy_beta
46 changes: 0 additions & 46 deletions .github/workflows/deploy-release.yml

This file was deleted.

20 changes: 19 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,23 @@ captures
.cxx
local.properties
xcuserdata
shared/src/commonMain/kotlin/generated
/shared/src/commonMain/kotlin/generated
/androidApp/release/
*.ipa
.env
*.mobileprovision
*.cer*
*.p12
*.zip
*.p8
.kotlin
*.db
*.apk
*.aab
/androidApp/debug
/shared/schemas
/shared/schemas/

google-services.json
GoogleService-Info.plist
report.xml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ whose value derives, entirely or substantially, from the functionality of the
Software. Any license notice or attribution required by the License must also
include this Commons Clause License Condition notice.

Software: MORE Smartphone Companion Applications for Android and iOS
Software: MORE Smartphone Applications for Android and iOS
(currently at https://github.com/MORE-Platform/more-app-multiplatform/).
See more-health.at for further information.

Expand Down
Loading
Loading