Skip to content

Commit

Permalink
Auto route and bloc (#286)
Browse files Browse the repository at this point in the history
* Replace router with AutoRoute

* Inital use of bloc

* Change LoginBloc to LoginCubit

* Fixes for explore bloc

* More WIP migrating to bloc

* Adding basic test (which doesn't work)

* A working test

* Rename model files

* Initial explore on bloc

* Migrate login to bloc

* Add loading progress bar to main button

* Display intro view if not shown

* Convert intro logic to bloc

* Fix filled button disabled colors

* Completely broken app

* Fix explore tab routing

* Update explore section to use paginated data

* Migrate home page to bloc

* Remove stacked - break app

* Some fixes

* Bring back analytics

* More fixes

* Remove some unused files

* Formatting

* Some fixes

* Fix theme and login code dialog (#290)

* Fix dark background in new widgets

* Fix persistent login error code

* Update routing for intro view and login

* Fixes for web

* Subscribe to causes user updates in user progress widget (#293)

* Add header back to action info page

* Don't override causesid provided when routing to explore page

* Fix user tests

* Fix startup logic for token refresh and profile setup

* Fix causes service tests (#294)

* Fix causes service tests

* Update Flutter version in workflows to 3.22.3

* Fix formatting

* install colima in CI

* Run build runner in CI

* Add missing trailing commas

* Fix colima CI

* Stop colima

* Install colima instead of docker

* Install colima instead of docker

* Formatting

* Use npm for openapi generator in setup actions

* Regenerated pod lockfile

* Migrate auth bloc to cubit

* Update default release track to beta

---------

Co-authored-by: Kacper Kogut <kacper.kogut16@gmail.com>
Co-authored-by: James Elgar <jnelgar@amazon.com>
Co-authored-by: JElgar <JElgar@users.noreply.github.com>
  • Loading branch information
4 people authored Jul 29, 2024
1 parent a7f2173 commit 7eb02e9
Show file tree
Hide file tree
Showing 199 changed files with 7,089 additions and 7,772 deletions.
12 changes: 7 additions & 5 deletions .github/actions/setup-app/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,17 @@ runs:
steps:
- uses: actions/checkout@v2

- name: Setup docker
if: runner.os == 'macos'
- name: Install openapi generator
shell: bash
run: |
brew install docker
colima start
npm install @openapitools/openapi-generator-cli -g
# Setup the flutter environment.
- name: Setup flutter
uses: subosito/flutter-action@v2
with:
channel: 'stable' # 'dev', 'alpha', default to: 'stable'
flutter-version: '3.19.2'
flutter-version: '3.22.3'
cache: true

- name: Flutter version
Expand All @@ -35,3 +33,7 @@ runs:
- name: Install dependencies
shell: bash
run: flutter pub get

- name: Run build runner
shell: bash
run: flutter pub run build_runner build --delete-conflicting-outputs
2 changes: 1 addition & 1 deletion .github/workflows/android-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
serviceAccountJsonPlainText: ${{ secrets.ANDROID_SERVICE_ACCOUNT_JSON }}
packageName: com.nowu.app
releaseFiles: /home/runner/work/now-u-app/now-u-app/build/app/outputs/bundle/release/app-release.aab
track: production
track: beta
status: completed
# inAppUpdatePriority: 2
# userFraction: 0.33
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/flutter-ci-cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
uses: subosito/flutter-action@v2
with:
channel: 'stable' # 'dev', 'alpha', default to: 'stable'
flutter-version: '3.19.2'
flutter-version: '3.22.3'
cache: true

- name: Setup cider
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ migrate_working_dir/
openapi/causeApi/
.env
android/app/*.jks*
lib/router.gr.dart
*.freezed.dart

# IntelliJ related
*.iml
Expand Down
1 change: 1 addition & 0 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ analyzer:
exclude:
- "openapi/causeApi/**"
- "lib/generated"
- "lib/**.freezed.dart"

linter:
# The lint rules applied to this project can be customized in the
Expand Down
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ android {
applicationId "com.nowu.app"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
minSdkVersion 19
minSdkVersion 21
targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
Expand Down
9 changes: 9 additions & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,15 @@
android:scheme="com.nowu.app"
android:host="login-callback" />
</intent-filter>

<meta-data android:name="flutter_deeplinking_enabled" android:value="true" />
<intent-filter android:autoVerify="true">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="http" android:host="now-u.com" />
<data android:scheme="https" />
</intent-filter>
</activity>
<!-- Don't delete the meta-data below.
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
Expand Down

This file was deleted.

29 changes: 29 additions & 0 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ PODS:
- AppAuth/Core
- device_info (0.0.1):
- Flutter
- FBAEMKit (17.0.2):
- FBSDKCoreKit_Basics (= 17.0.2)
- FBSDKCoreKit (17.0.2):
- FBAEMKit (= 17.0.2)
- FBSDKCoreKit_Basics (= 17.0.2)
- FBSDKCoreKit_Basics (17.0.2)
- FBSDKLoginKit (17.0.2):
- FBSDKCoreKit (= 17.0.2)
- Firebase/Analytics (10.20.0):
- Firebase/Core
- Firebase/Core (10.20.0):
Expand Down Expand Up @@ -120,6 +128,9 @@ PODS:
- PromisesSwift (~> 2.1)
- FirebaseSharedSwift (10.21.0)
- Flutter (1.0.0)
- flutter_facebook_auth (7.0.0):
- FBSDKLoginKit (~> 17.0.0)
- Flutter
- flutter_inappwebview (0.0.1):
- Flutter
- flutter_inappwebview/Core (= 0.0.1)
Expand Down Expand Up @@ -184,6 +195,8 @@ PODS:
- AppAuth/Core (~> 1.6)
- GTMSessionFetcher/Core (< 4.0, >= 1.5)
- GTMSessionFetcher/Core (3.3.1)
- integration_test (0.0.1):
- Flutter
- nanopb (2.30909.1):
- nanopb/decode (= 2.30909.1)
- nanopb/encode (= 2.30909.1)
Expand Down Expand Up @@ -234,9 +247,11 @@ DEPENDENCIES:
- firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
- firebase_remote_config (from `.symlinks/plugins/firebase_remote_config/ios`)
- Flutter (from `Flutter`)
- flutter_facebook_auth (from `.symlinks/plugins/flutter_facebook_auth/ios`)
- flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
- flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
- google_sign_in_ios (from `.symlinks/plugins/google_sign_in_ios/darwin`)
- integration_test (from `.symlinks/plugins/integration_test/ios`)
- open_mail_app (from `.symlinks/plugins/open_mail_app/ios`)
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
Expand All @@ -252,6 +267,10 @@ DEPENDENCIES:
SPEC REPOS:
trunk:
- AppAuth
- FBAEMKit
- FBSDKCoreKit
- FBSDKCoreKit_Basics
- FBSDKLoginKit
- Firebase
- FirebaseABTesting
- FirebaseAnalytics
Expand Down Expand Up @@ -297,12 +316,16 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/firebase_remote_config/ios"
Flutter:
:path: Flutter
flutter_facebook_auth:
:path: ".symlinks/plugins/flutter_facebook_auth/ios"
flutter_inappwebview:
:path: ".symlinks/plugins/flutter_inappwebview/ios"
flutter_secure_storage:
:path: ".symlinks/plugins/flutter_secure_storage/ios"
google_sign_in_ios:
:path: ".symlinks/plugins/google_sign_in_ios/darwin"
integration_test:
:path: ".symlinks/plugins/integration_test/ios"
open_mail_app:
:path: ".symlinks/plugins/open_mail_app/ios"
package_info_plus:
Expand Down Expand Up @@ -330,6 +353,10 @@ SPEC CHECKSUMS:
app_links: 5ef33d0d295a89d9d16bb81b0e3b0d5f70d6c875
AppAuth: 3bb1d1cd9340bd09f5ed189fb00b1cc28e1e8570
device_info: d7d233b645a32c40dfdc212de5cf646ca482f175
FBAEMKit: 619f96ea65427e8afca240d5b0f4703738dfdf5c
FBSDKCoreKit: a5f384db2e9ee84e98494fed8f983d2bd79accff
FBSDKCoreKit_Basics: d35c775aaf243a2d731dfae7be3a74b1987285ab
FBSDKLoginKit: f8ca5f7ab7c4e5b93e729d94975b0db7fcc511ed
Firebase: 10c8cb12fb7ad2ae0c09ffc86cd9c1ab392a0031
firebase_analytics: 9c600045bfb4d16dd78593d18f32c99bb77e5001
firebase_core: a46c312d8bae4defa3d009b2aa7b5b413aeb394e
Expand All @@ -350,6 +377,7 @@ SPEC CHECKSUMS:
FirebaseSessions: 80c2bbdd28166267b3d132debe5f7531efdb00bc
FirebaseSharedSwift: 19b3f709993d6fa1d84941d41c01e3c4c11eab93
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
flutter_facebook_auth: 03d374669f8a04bd869051ca75c1daf120cb1867
flutter_inappwebview: 3d32228f1304635e7c028b0d4252937730bbc6cf
flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
google_sign_in_ios: 989eea5abe94af62050782714daf920be883d4a2
Expand All @@ -359,6 +387,7 @@ SPEC CHECKSUMS:
GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34
GTMAppAuth: 99fb010047ba3973b7026e45393f51f27ab965ae
GTMSessionFetcher: 8a1b34ad97ebe6f909fb8b9b77fba99943007556
integration_test: ce0a3ffa1de96d1a89ca0ac26fca7ea18a749ef4
nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5
open_mail_app: 794172f6a22cd16319d3ddaf45e945b2f74952b0
OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
Expand Down
25 changes: 0 additions & 25 deletions lib/app/app.bottomsheets.dart

This file was deleted.

117 changes: 0 additions & 117 deletions lib/app/app.dart

This file was deleted.

37 changes: 0 additions & 37 deletions lib/app/app.dialogs.dart

This file was deleted.

Loading

0 comments on commit 7eb02e9

Please sign in to comment.