Skip to content

Commit

Permalink
second commit
Browse files Browse the repository at this point in the history
  • Loading branch information
@sparcscasio
sparcscasio committed Jan 12, 2025
2 parents 16060fa + 636ae0f commit fbc80b8
Show file tree
Hide file tree
Showing 8 changed files with 116 additions and 107 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
env:
FLUTTER_VERSION: "3.27.x"
JAVA_VERSION: "17"
XCODE_VERSION: "Xcode_16"
XCODE_VERSION: "Xcode_16.2"

jobs:
build-android:
Expand Down Expand Up @@ -40,7 +40,7 @@ jobs:

build-ios:
name: Build iOS
runs-on: macos-14
runs-on: macos-15
steps:
- uses: actions/checkout@v4
- name: Select Xcode version
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ env:
FLUTTER_VERSION: "3.27.x"
JAVA_VERSION: "17"
ANDROID_API_LEVEL: "34"
XCODE_VERSION: "Xcode_16"
IOS_DEVICE: "iPhone 15 Pro"
XCODE_VERSION: "Xcode_16.2"
IOS_DEVICE: "iPhone 16 Pro"

jobs:
unit:
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:

integration-ios:
name: Integration Test on iOS
runs-on: macos-14
runs-on: macos-15
steps:
- uses: actions/checkout@v4
- name: Select Xcode version
Expand Down
130 changes: 65 additions & 65 deletions ios/Podfile.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,76 +3,76 @@ PODS:
- ChannelIOSDK (= 11.7.3)
- Flutter
- ChannelIOSDK (11.7.3)
- Firebase/Analytics (11.4.0):
- Firebase/Analytics (11.6.0):
- Firebase/Core
- Firebase/Core (11.4.0):
- Firebase/Core (11.6.0):
- Firebase/CoreOnly
- FirebaseAnalytics (~> 11.4.0)
- Firebase/CoreOnly (11.4.0):
- FirebaseCore (= 11.4.0)
- Firebase/Crashlytics (11.4.0):
- FirebaseAnalytics (~> 11.6.0)
- Firebase/CoreOnly (11.6.0):
- FirebaseCore (~> 11.6.0)
- Firebase/Crashlytics (11.6.0):
- Firebase/CoreOnly
- FirebaseCrashlytics (~> 11.4.0)
- Firebase/Messaging (11.4.0):
- FirebaseCrashlytics (~> 11.6.0)
- Firebase/Messaging (11.6.0):
- Firebase/CoreOnly
- FirebaseMessaging (~> 11.4.0)
- firebase_analytics (11.3.6):
- Firebase/Analytics (= 11.4.0)
- FirebaseMessaging (~> 11.6.0)
- firebase_analytics (11.4.0):
- Firebase/Analytics (= 11.6.0)
- firebase_core
- Flutter
- firebase_core (3.9.0):
- Firebase/CoreOnly (= 11.4.0)
- firebase_core (3.10.0):
- Firebase/CoreOnly (= 11.6.0)
- Flutter
- firebase_crashlytics (4.2.0):
- Firebase/Crashlytics (= 11.4.0)
- firebase_crashlytics (4.3.0):
- Firebase/Crashlytics (= 11.6.0)
- firebase_core
- Flutter
- firebase_messaging (15.1.6):
- Firebase/Messaging (= 11.4.0)
- firebase_messaging (15.2.0):
- Firebase/Messaging (= 11.6.0)
- firebase_core
- Flutter
- FirebaseAnalytics (11.4.0):
- FirebaseAnalytics/AdIdSupport (= 11.4.0)
- FirebaseCore (~> 11.0)
- FirebaseAnalytics (11.6.0):
- FirebaseAnalytics/AdIdSupport (= 11.6.0)
- FirebaseCore (~> 11.6.0)
- FirebaseInstallations (~> 11.0)
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
- GoogleUtilities/MethodSwizzler (~> 8.0)
- GoogleUtilities/Network (~> 8.0)
- "GoogleUtilities/NSData+zlib (~> 8.0)"
- nanopb (~> 3.30910.0)
- FirebaseAnalytics/AdIdSupport (11.4.0):
- FirebaseCore (~> 11.0)
- FirebaseAnalytics/AdIdSupport (11.6.0):
- FirebaseCore (~> 11.6.0)
- FirebaseInstallations (~> 11.0)
- GoogleAppMeasurement (= 11.4.0)
- GoogleAppMeasurement (= 11.6.0)
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
- GoogleUtilities/MethodSwizzler (~> 8.0)
- GoogleUtilities/Network (~> 8.0)
- "GoogleUtilities/NSData+zlib (~> 8.0)"
- nanopb (~> 3.30910.0)
- FirebaseCore (11.4.0):
- FirebaseCoreInternal (~> 11.0)
- FirebaseCore (11.6.0):
- FirebaseCoreInternal (~> 11.6.0)
- GoogleUtilities/Environment (~> 8.0)
- GoogleUtilities/Logger (~> 8.0)
- FirebaseCoreExtension (11.4.1):
- FirebaseCore (~> 11.0)
- FirebaseCoreExtension (11.6.0):
- FirebaseCore (~> 11.6.0)
- FirebaseCoreInternal (11.6.0):
- "GoogleUtilities/NSData+zlib (~> 8.0)"
- FirebaseCrashlytics (11.4.0):
- FirebaseCore (~> 11.4)
- FirebaseCrashlytics (11.6.0):
- FirebaseCore (~> 11.6.0)
- FirebaseInstallations (~> 11.0)
- FirebaseRemoteConfigInterop (~> 11.0)
- FirebaseSessions (~> 11.0)
- GoogleDataTransport (~> 10.0)
- GoogleUtilities/Environment (~> 8.0)
- nanopb (~> 3.30910.0)
- PromisesObjC (~> 2.4)
- FirebaseInstallations (11.4.0):
- FirebaseCore (~> 11.0)
- FirebaseInstallations (11.6.0):
- FirebaseCore (~> 11.6.0)
- GoogleUtilities/Environment (~> 8.0)
- GoogleUtilities/UserDefaults (~> 8.0)
- PromisesObjC (~> 2.4)
- FirebaseMessaging (11.4.0):
- FirebaseCore (~> 11.0)
- FirebaseMessaging (11.6.0):
- FirebaseCore (~> 11.6.0)
- FirebaseInstallations (~> 11.0)
- GoogleDataTransport (~> 10.0)
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
Expand All @@ -81,9 +81,9 @@ PODS:
- GoogleUtilities/UserDefaults (~> 8.0)
- nanopb (~> 3.30910.0)
- FirebaseRemoteConfigInterop (11.6.0)
- FirebaseSessions (11.4.0):
- FirebaseCore (~> 11.4)
- FirebaseCoreExtension (~> 11.4)
- FirebaseSessions (11.6.0):
- FirebaseCore (~> 11.6.0)
- FirebaseCoreExtension (~> 11.6.0)
- FirebaseInstallations (~> 11.0)
- GoogleDataTransport (~> 10.0)
- GoogleUtilities/Environment (~> 8.0)
Expand All @@ -97,21 +97,21 @@ PODS:
- Flutter
- flutter_widgetkit (0.0.1):
- Flutter
- GoogleAppMeasurement (11.4.0):
- GoogleAppMeasurement/AdIdSupport (= 11.4.0)
- GoogleAppMeasurement (11.6.0):
- GoogleAppMeasurement/AdIdSupport (= 11.6.0)
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
- GoogleUtilities/MethodSwizzler (~> 8.0)
- GoogleUtilities/Network (~> 8.0)
- "GoogleUtilities/NSData+zlib (~> 8.0)"
- nanopb (~> 3.30910.0)
- GoogleAppMeasurement/AdIdSupport (11.4.0):
- GoogleAppMeasurement/WithoutAdIdSupport (= 11.4.0)
- GoogleAppMeasurement/AdIdSupport (11.6.0):
- GoogleAppMeasurement/WithoutAdIdSupport (= 11.6.0)
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
- GoogleUtilities/MethodSwizzler (~> 8.0)
- GoogleUtilities/Network (~> 8.0)
- "GoogleUtilities/NSData+zlib (~> 8.0)"
- nanopb (~> 3.30910.0)
- GoogleAppMeasurement/WithoutAdIdSupport (11.4.0):
- GoogleAppMeasurement/WithoutAdIdSupport (11.6.0):
- GoogleUtilities/AppDelegateSwizzler (~> 8.0)
- GoogleUtilities/MethodSwizzler (~> 8.0)
- GoogleUtilities/Network (~> 8.0)
Expand Down Expand Up @@ -248,39 +248,39 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/webview_flutter_wkwebview/darwin"

SPEC CHECKSUMS:
channel_talk_flutter: 62d078feeddfa94b03dfa72f39ecf26f2731c2ee
channel_talk_flutter: c479a334a8383bcf7e6ca9ce0384d616673249a3
ChannelIOSDK: 3d4bee1e1a077cf60394b439801e5078bb69a3b1
Firebase: cf1b19f21410b029b6786a54e9764a0cacad3c99
firebase_analytics: 2815af29d49c1a994652abd37a5b001a88bc7b75
firebase_core: b62a5080210edad3f2934314a8b2c6f5124e8e10
firebase_crashlytics: 757e252772ed3dd37c07638f9fcd4dceb5f101c8
firebase_messaging: 98619a0572d82cfb3668e78859ba9f1110e268c9
FirebaseAnalytics: 3feef9ae8733c567866342a1000691baaa7cad49
FirebaseCore: e0510f1523bc0eb21653cac00792e1e2bd6f1771
FirebaseCoreExtension: f1bc67a4702931a7caa097d8e4ac0a1b0d16720e
Firebase: 374a441a91ead896215703a674d58cdb3e9d772b
firebase_analytics: a5c6ef5a435d22870fe3cfdcb424f390f56ff752
firebase_core: 2337982fb78ee4d8d91e608b0a3d4f44346a93c8
firebase_crashlytics: 3b6a9a9cbdc5ab92afaf9b206e52c79c2321a0d4
firebase_messaging: f3bddfa28c2cad70b3341bf461e987a24efd28d6
FirebaseAnalytics: 7114c698cac995602e3b1b96663473e50d54d6e7
FirebaseCore: 48b0dd707581cf9c1a1220da68223fb0a562afaa
FirebaseCoreExtension: 2d77d6430c16cf43ca2b04608302ed02b3598361
FirebaseCoreInternal: d98ab91e2d80a56d7b246856a8885443b302c0c2
FirebaseCrashlytics: 41bbdd2b514a8523cede0c217aee6ef7ecf38401
FirebaseInstallations: 6ef4a1c7eb2a61ee1f74727d7f6ce2e72acf1414
FirebaseMessaging: f8a160d99c2c2e5babbbcc90c4a3e15db036aee2
FirebaseCrashlytics: b21c665fb50138766480bce73ebdb1aa30f7f300
FirebaseInstallations: efc0946fc756e4d22d8113f7c761948120322e8c
FirebaseMessaging: e1aca1fcc23e8b9eddb0e33f375ff90944623021
FirebaseRemoteConfigInterop: e75e348953352a000331eb77caf01e424248e176
FirebaseSessions: 3f56f177d9e53a85021d16b31f9a111849d1dd8b
FirebaseSessions: 9529d14180868e29a8da164b3a729c036204918b
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
flutter_native_splash: e8a1e01082d97a8099d973f919f57904c925008a
flutter_web_browser: 7bccaafbb0c5b8862afe7bcd158f15557109f61f
flutter_widgetkit: a0e9b0d50ee9bec366dad36c639509daaafc397a
GoogleAppMeasurement: 987769c4ca6b968f2479fbcc9fe3ce34af454b8e
flutter_native_splash: 6cad9122ea0fad137d23137dd14b937f3e90b145
flutter_web_browser: 8fe4d18e7b1328ab3fbec6e67029d6996c2335d9
flutter_widgetkit: 21fcf04a99462110a8c855b614b97532d7d759b7
GoogleAppMeasurement: 6a9e6317b6a6d810ad03d4a66564ca6c4c5818a3
GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
open_app_file: 205f73051668bfbd68356005fef8a62e620f0a77
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
open_app_file: ba67d2bf6cdddfb654b13b713d66bea4974a5adb
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
webview_cookie_manager: eaf920722b493bd0f7611b5484771ca53fed03f7
webview_flutter_wkwebview: 0982481e3d9c78fd5c6f62a002fcd24fc791f1e4
shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
webview_cookie_manager: d63a76cabdf42a7ea3d92768ac67d4853a1367f8
webview_flutter_wkwebview: 44d4dee7d7056d5ad185d25b38404436d56c547c

PODFILE CHECKSUM: 0fdf571ddfc7dc97ad81e49c7b3704bc467d5918

Expand Down
8 changes: 8 additions & 0 deletions lib/providers/settings_model.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,25 @@ final _kSendCrashlytics = 'sendCrashlytics';
final _kSendCrashlyticsAnonymously = 'sendCrashlyticsAnonymously';
final _kShowsChannelTalkButton = 'showsChannelTalkButton';
final _kReceivePromotion = 'receivePromoiton';

final _kReceiveInfo = 'receiveInformation';
final _kReceiveSubjectSuggestion = 'receiveSubjectSuggestion';
final _kReceiveAlarm = 'receiveAlarm';
final _kDialog = 'dialog';


class SettingsModel extends ChangeNotifier {
late bool _sendCrashlytics;
late bool _sendCrashlyticsAnonymously;
late bool _showsChannelTalkButton;
late bool _receivePromotion;

late bool _receiveInfo;
late bool _receiveSubjectSuggestion;
late bool _receiveAlarm;
late bool _dialog;


bool getSendCrashlytics() => _sendCrashlytics;
void setSendCrashlytics(bool newValue) {
_sendCrashlytics = newValue;
Expand Down Expand Up @@ -111,6 +115,7 @@ class SettingsModel extends ChangeNotifier {
.then((instance) => instance.setBool(_kDialog, newValue));

Check warning on line 115 in lib/providers/settings_model.dart

View check run for this annotation

Codecov / codecov/patch

lib/providers/settings_model.dart#L110-L115 

Added lines #L110 - L115 were not covered by tests
}


SettingsModel({bool forTest = false}) {
SharedPreferences.getInstance().then((instance) {
getAllValues(instance);
Expand All @@ -125,6 +130,7 @@ class SettingsModel extends ChangeNotifier {
_receiveInfo = true;
_receiveSubjectSuggestion = true;
_dialog = true;

}
}

Expand All @@ -135,12 +141,14 @@ class SettingsModel extends ChangeNotifier {
_showsChannelTalkButton =
instance.getBool(_kShowsChannelTalkButton) ?? true;
_receivePromotion = instance.getBool(_kReceivePromotion) ?? false;

_receiveAlarm = instance.getBool(_kReceiveAlarm) ?? true;
_receiveInfo = instance.getBool(_kReceiveInfo) ?? true;
_receiveSubjectSuggestion =
instance.getBool(_kReceiveSubjectSuggestion) ?? true;
_dialog = instance.getBool(_kDialog) ?? true;


notifyListeners();
}

Expand Down
4 changes: 2 additions & 2 deletions lib/widgets/otl_dialog.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ class OTLDialog extends StatelessWidget {
Text(
'${'settings.dialog.date'.tr(namedArgs: namedArgs)} : ${DateFormat('yyyy-MM-dd').format(DateTime.now())}'),
Text(
'${'settings.dialog.user_name'.tr(namedArgs: namedArgs)} : ${user!.firstName} ${user.lastName}'),
'${'settings.dialog.user_name'.tr(namedArgs: namedArgs)} : ${user?.firstName} ${user?.lastName}'),
Text(
'${'settings.dialog.detail'.tr(namedArgs: namedArgs)} : ${'settings.dialog.disable'.tr(namedArgs: namedArgs)}'),

Check warning on line 317 in lib/widgets/otl_dialog.dart

View check run for this annotation

Codecov / codecov/patch

lib/widgets/otl_dialog.dart#L310-L317 

Added lines #L310 - L317 were not covered by tests
],
Expand All @@ -337,7 +337,7 @@ class OTLDialog extends StatelessWidget {
Text(
'${'settings.dialog.date'.tr(namedArgs: namedArgs)} : ${DateFormat('yyyy-MM-dd').format(DateTime.now())}'),
Text(
'${'settings.dialog.user_name'.tr(namedArgs: namedArgs)} : ${user!.firstName} ${user.lastName}'),
'${'settings.dialog.user_name'.tr(namedArgs: namedArgs)} : ${user?.firstName} ${user?.lastName}'),
Text(
'${'settings.dialog.detail'.tr(namedArgs: namedArgs)} : ${'settings.dialog.enable'.tr(namedArgs: namedArgs)}'),

Check warning on line 342 in lib/widgets/otl_dialog.dart

View check run for this annotation

Codecov / codecov/patch

lib/widgets/otl_dialog.dart#L335-L342 

Added lines #L335 - L342 were not covered by tests
],
Expand Down
Loading

0 comments on commit fbc80b8

Please sign in to comment.