Skip to content

Migration to only have a main branch - #411

Merged
mikaelacaron merged 329 commits into
mainfrom
dev
Jul 17, 2026
Merged

Migration to only have a main branch#411
mikaelacaron merged 329 commits into
mainfrom
dev

Conversation

@mikaelacaron

Copy link
Copy Markdown
Owner

I wanted to change it up and ONLY have a main branch

Going further main will be the default branch that all PRs will merge into

I'll use tags to tag when versions are released to the App Store.

dev is going to be deleted

appfrosch and others added 30 commits October 9, 2023 10:21
…r's Profile Picture (#128)

Used the ScaledMetric modifer to adjust the user's profile picture size when enabling
dynamic type
More info about the issue labels
Specifically mention when to open Xcode
mikaelacaron and others added 28 commits December 22, 2024 17:00
Remove SwiftLint install, because it's now a build plugin
* feat: Add vehicle-based filtering to DashboardView

* PR suggestions

mainly renaming variables

---------

Co-authored-by: Mikaela Caron <mikaelacaron@gmail.com>
* The line chart for the odometer is ready.
* PR suggestion

---------

Co-authored-by: Mikaela Caron <mikaelacaron@gmail.com>
* Implimented "Rate App" Button in SettingsView

* Implimented "Rate App" Button in SettingsView

* Fix whitespace

* Call to the app store page

this isn't fully implemented because we don't have the app store ID yet

* Put rating button behind a flag for now

* Update Localizable.xcstrings

* Remove StoreKit import

---------

Co-authored-by: Mikaela Caron <mikaelacaron@gmail.com>
* Update README.md

---------

Co-authored-by: Mikaela Caron <mikaelacaron@gmail.com>
Now able to read write all the fields as expected
* Added skipPackagePluginValidation for DocC
* Added skipPackagePluginValidation for Unit Tests
* Added the --strict comment to the swiftlint.yml
* Make iOS 26.0 the minimum version
* Removed Mac platform
* feat: add small total maintenance events count widget

* fix: restore sign in anonymously

* feat: add unexpected fetch error type

* Fix the configuration

It wasn't properly using the xcconfig file for the development team

* add SwiftLint disable

because this line is fine being that long

* Update some comments

* add line breaks

* fix line breaks and comment

* remove line breaks

* Fix indentation

* Fix development team

it's removing the empty string because it resolves to use the xcconfig file

* Bump back to iOS26

* fix: address CR

* Remove some line breaks

* Fix comment

Which fixes a SwiftLint warning

* MAYBE properly set the keychain group identifier

Not really sure if this works, we'll see

* Remove code_sign_identity

Which I dont' think was needed, we'll see

---------

Co-authored-by: Mikaela Caron <mikaelacaron@gmail.com>
to add page and value to query parameters to facilitate getting all contributors not just the first page. (#400)
* update the welcomeView with Liquid Glass desgin

* update the welcomeViewAddVehicle with Liquid Glass desgin

* only glass buttons

* Fix spacing

---------

Co-authored-by: Mikaela Caron <mikaelacaron@gmail.com>
* Add Changelog doc (v1.0)
* Update Changelog and move to right location

---------

Co-authored-by: Nithya <youremail@example.com>
Co-authored-by: Mikaela Caron <mikaelacaron@gmail.com>
* Added a filter in OdometerView which shows the readings of either all the vehicles(default) or any one selected vehicle

* PR updates

make computed property vs function and remove unused variable

* Fix word in Localizable.xcstrings

because the word filter is already used

---------

Co-authored-by: Mikaela Caron <mikaelacaron@gmail.com>
* 392-odometer-liquid-glass

* Make button into an icon

* Add back icons

* Add back comments

* Update EditOdometerReadingView

* Fix previews

* Update OdometerRowView

* Update OdometerView

* Update Localizable.xcstrings

* Remove Glass modifiers

---------

Co-authored-by: Mikaela Caron <mikaelacaron@gmail.com>
Fix unit test badge
* Create FirebaseService to handle vehicle fetch and CRUD operations for odometer readings

* Refactor OdometerViewModel to utilize FirebaseService

* Add FirebaseServiceProtocol for mocking Firebase interactions in tests

* Add MockFirebaseService for tests

* Add test coverage for OdometerViewModel

* Utilize protocol-based dependency injection for Firebase service

* Rename reading to odometerReading

* Remove singleton pattern from FirebaseService

* Remove redundant documentId argument

* Remove redundant userId argument

* Rename uid to userId

* Consolidate userId instances into userUID

* Remove function declarations in #Preview

* Remove unnecessary MockFirebaseService

* Add Equatable conformance to enable comparison

* Add test coverage for OdometerViewModel

* Fix Preview issue on OdometerView

* Cleanup

* Disable for now

disable because the CI needs to be properly set up to run the Firebase emulator

---------

Co-authored-by: Mikaela Caron <mikaelacaron@gmail.com>
The OSPO actions have moved from github/ to github-community-projects/.
Update workflow references to use the canonical org path.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@mikaelacaron
mikaelacaron merged commit fb986b5 into main Jul 17, 2026
2 of 5 checks passed
@mikaelacaron
mikaelacaron deleted the dev branch July 17, 2026 20:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.