Skip to content

Commit 10ffb44

Browse files
jorre127jorre127
authored
Merge pull request #352 from icapps/feature/#334-text-theme
Feature/#334 text theme
2 parents 6060e80 + 70a889d commit 10ffb44

File tree

101 files changed

+2130
-1020
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+2130
-1020
lines changed

‎ios/Podfile.lock

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ PODS:
1717
- Firebase/RemoteConfig (10.25.0):
1818
- Firebase/CoreOnly
1919
- FirebaseRemoteConfig (~> 10.25.0)
20+
- Firebase/Storage (10.25.0):
21+
- Firebase/CoreOnly
22+
- FirebaseStorage (~> 10.25.0)
2023
- firebase_analytics (10.10.7):
2124
- Firebase/Analytics (= 10.25.0)
2225
- firebase_core
@@ -32,6 +35,10 @@ PODS:
3235
- Firebase/RemoteConfig (= 10.25.0)
3336
- firebase_core
3437
- Flutter
38+
- firebase_storage (11.7.7):
39+
- Firebase/Storage (= 10.25.0)
40+
- firebase_core
41+
- Flutter
3542
- FirebaseABTesting (10.29.0):
3643
- FirebaseCore (~> 10.0)
3744
- FirebaseAnalytics (10.25.0):
@@ -52,6 +59,8 @@ PODS:
5259
- GoogleUtilities/Network (~> 7.11)
5360
- "GoogleUtilities/NSData+zlib (~> 7.11)"
5461
- nanopb (< 2.30911.0, >= 2.30908.0)
62+
- FirebaseAppCheckInterop (10.29.0)
63+
- FirebaseAuthInterop (10.29.0)
5564
- FirebaseCore (10.25.0):
5665
- FirebaseCoreInternal (~> 10.0)
5766
- GoogleUtilities/Environment (~> 7.12)
@@ -93,7 +102,18 @@ PODS:
93102
- nanopb (< 2.30911.0, >= 2.30908.0)
94103
- PromisesSwift (~> 2.1)
95104
- FirebaseSharedSwift (10.29.0)
105+
- FirebaseStorage (10.25.0):
106+
- FirebaseAppCheckInterop (~> 10.0)
107+
- FirebaseAuthInterop (~> 10.25)
108+
- FirebaseCore (~> 10.0)
109+
- FirebaseCoreExtension (~> 10.0)
110+
- GoogleUtilities/Environment (~> 7.12)
111+
- GTMSessionFetcher/Core (< 4.0, >= 2.1)
96112
- Flutter (1.0.0)
113+
- flutter_key_value_file_storage (0.0.1):
114+
- Flutter
115+
- flutter_secure_file_storage (0.0.1):
116+
- Flutter
97117
- flutter_secure_storage (6.0.0):
98118
- Flutter
99119
- GoogleAppMeasurement (10.25.0):
@@ -148,6 +168,7 @@ PODS:
148168
- GoogleUtilities/UserDefaults (7.13.3):
149169
- GoogleUtilities/Logger
150170
- GoogleUtilities/Privacy
171+
- GTMSessionFetcher/Core (3.5.0)
151172
- nanopb (2.30910.0):
152173
- nanopb/decode (= 2.30910.0)
153174
- nanopb/encode (= 2.30910.0)
@@ -194,7 +215,10 @@ DEPENDENCIES:
194215
- firebase_core (from `.symlinks/plugins/firebase_core/ios`)
195216
- firebase_crashlytics (from `.symlinks/plugins/firebase_crashlytics/ios`)
196217
- firebase_remote_config (from `.symlinks/plugins/firebase_remote_config/ios`)
218+
- firebase_storage (from `.symlinks/plugins/firebase_storage/ios`)
197219
- Flutter (from `Flutter`)
220+
- flutter_key_value_file_storage (from `.symlinks/plugins/flutter_key_value_file_storage/ios`)
221+
- flutter_secure_file_storage (from `.symlinks/plugins/flutter_secure_file_storage/ios`)
198222
- flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
199223
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
200224
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
@@ -207,6 +231,8 @@ SPEC REPOS:
207231
- Firebase
208232
- FirebaseABTesting
209233
- FirebaseAnalytics
234+
- FirebaseAppCheckInterop
235+
- FirebaseAuthInterop
210236
- FirebaseCore
211237
- FirebaseCoreExtension
212238
- FirebaseCoreInternal
@@ -216,9 +242,11 @@ SPEC REPOS:
216242
- FirebaseRemoteConfigInterop
217243
- FirebaseSessions
218244
- FirebaseSharedSwift
245+
- FirebaseStorage
219246
- GoogleAppMeasurement
220247
- GoogleDataTransport
221248
- GoogleUtilities
249+
- GTMSessionFetcher
222250
- nanopb
223251
- PromisesObjC
224252
- PromisesSwift
@@ -238,8 +266,14 @@ EXTERNAL SOURCES:
238266
:path: ".symlinks/plugins/firebase_crashlytics/ios"
239267
firebase_remote_config:
240268
:path: ".symlinks/plugins/firebase_remote_config/ios"
269+
firebase_storage:
270+
:path: ".symlinks/plugins/firebase_storage/ios"
241271
Flutter:
242272
:path: Flutter
273+
flutter_key_value_file_storage:
274+
:path: ".symlinks/plugins/flutter_key_value_file_storage/ios"
275+
flutter_secure_file_storage:
276+
:path: ".symlinks/plugins/flutter_secure_file_storage/ios"
243277
flutter_secure_storage:
244278
:path: ".symlinks/plugins/flutter_secure_storage/ios"
245279
path_provider_foundation:
@@ -261,8 +295,11 @@ SPEC CHECKSUMS:
261295
firebase_core: a626d00494efa398e7c54f25f1454a64c8abf197
262296
firebase_crashlytics: 17e856fabec68d993662abaf2f6fe2413f0abece
263297
firebase_remote_config: 7b05c80210ab558c80f7a756681022b4ee98eea0
298+
firebase_storage: 5c0f552d6b27d621429d7fd16ebab4be94a3c954
264299
FirebaseABTesting: d87f56707159bae64e269757a6e963d490f2eebe
265300
FirebaseAnalytics: ec00fe8b93b41dc6fe4a28784b8e51da0647a248
301+
FirebaseAppCheckInterop: 6a1757cfd4067d8e00fccd14fcc1b8fd78cfac07
302+
FirebaseAuthInterop: 17db81e9b198afb0f95ce48c133825727eed55d3
266303
FirebaseCore: 7ec4d0484817f12c3373955bc87762d96842d483
267304
FirebaseCoreExtension: 705ca5b14bf71d2564a0ddc677df1fc86ffa600f
268305
FirebaseCoreInternal: df84dd300b561c27d5571684f389bf60b0a5c934
@@ -272,11 +309,15 @@ SPEC CHECKSUMS:
272309
FirebaseRemoteConfigInterop: 6efda51fb5e2f15b16585197e26eaa09574e8a4d
273310
FirebaseSessions: dbd14adac65ce996228652c1fc3a3f576bdf3ecc
274311
FirebaseSharedSwift: 20530f495084b8d840f78a100d8c5ee613375f6e
312+
FirebaseStorage: 44f4e25073f6fa0d4d8c09f5bec299ee9e4eb985
275313
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
314+
flutter_key_value_file_storage: b91fb1747ffa3e36810c752a1763655fda0b9f3d
315+
flutter_secure_file_storage: cdf659810f1849916ea5371ed5df339a3aaa802c
276316
flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
277317
GoogleAppMeasurement: 9abf64b682732fed36da827aa2a68f0221fd2356
278318
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
279319
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
320+
GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
280321
nanopb: 438bc412db1928dac798aa6fd75726007be04262
281322
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
282323
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47

‎ios/Runner.xcodeproj/project.pbxproj

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,8 @@
299299
inputPaths = (
300300
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
301301
"${BUILT_PRODUCTS_DIR}/FirebaseABTesting/FirebaseABTesting.framework",
302+
"${BUILT_PRODUCTS_DIR}/FirebaseAppCheckInterop/FirebaseAppCheckInterop.framework",
303+
"${BUILT_PRODUCTS_DIR}/FirebaseAuthInterop/FirebaseAuthInterop.framework",
302304
"${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework",
303305
"${BUILT_PRODUCTS_DIR}/FirebaseCoreExtension/FirebaseCoreExtension.framework",
304306
"${BUILT_PRODUCTS_DIR}/FirebaseCoreInternal/FirebaseCoreInternal.framework",
@@ -308,13 +310,17 @@
308310
"${BUILT_PRODUCTS_DIR}/FirebaseRemoteConfigInterop/FirebaseRemoteConfigInterop.framework",
309311
"${BUILT_PRODUCTS_DIR}/FirebaseSessions/FirebaseSessions.framework",
310312
"${BUILT_PRODUCTS_DIR}/FirebaseSharedSwift/FirebaseSharedSwift.framework",
313+
"${BUILT_PRODUCTS_DIR}/FirebaseStorage/FirebaseStorage.framework",
314+
"${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework",
311315
"${BUILT_PRODUCTS_DIR}/GoogleDataTransport/GoogleDataTransport.framework",
312316
"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
313317
"${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework",
314318
"${BUILT_PRODUCTS_DIR}/PromisesSwift/Promises.framework",
315319
"${BUILT_PRODUCTS_DIR}/ReachabilitySwift/Reachability.framework",
316320
"${BUILT_PRODUCTS_DIR}/connectivity_plus/connectivity_plus.framework",
317321
"${BUILT_PRODUCTS_DIR}/device_info_plus/device_info_plus.framework",
322+
"${BUILT_PRODUCTS_DIR}/flutter_key_value_file_storage/flutter_key_value_file_storage.framework",
323+
"${BUILT_PRODUCTS_DIR}/flutter_secure_file_storage/flutter_secure_file_storage.framework",
318324
"${BUILT_PRODUCTS_DIR}/flutter_secure_storage/flutter_secure_storage.framework",
319325
"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
320326
"${BUILT_PRODUCTS_DIR}/path_provider_foundation/path_provider_foundation.framework",
@@ -327,6 +333,8 @@
327333
name = "[CP] Embed Pods Frameworks";
328334
outputPaths = (
329335
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseABTesting.framework",
336+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseAppCheckInterop.framework",
337+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseAuthInterop.framework",
330338
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework",
331339
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreExtension.framework",
332340
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreInternal.framework",
@@ -336,13 +344,17 @@
336344
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseRemoteConfigInterop.framework",
337345
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseSessions.framework",
338346
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseSharedSwift.framework",
347+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseStorage.framework",
348+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework",
339349
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleDataTransport.framework",
340350
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
341351
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework",
342352
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Promises.framework",
343353
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
344354
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/connectivity_plus.framework",
345355
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info_plus.framework",
356+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_key_value_file_storage.framework",
357+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_secure_file_storage.framework",
346358
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_secure_storage.framework",
347359
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
348360
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_foundation.framework",

‎lib/app.dart

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import 'package:flutter/services.dart';
33
import 'package:flutter_localizations/flutter_localizations.dart';
44
import 'package:flutter_template/di/injectable.dart';
55
import 'package:flutter_template/navigator/main_navigator.dart';
6+
import 'package:flutter_template/repository/logging/logging_repository.dart';
67
import 'package:flutter_template/styles/theme_data.dart';
78
import 'package:flutter_template/util/locale/localization_fallback_cupertino_delegate.dart';
89
import 'package:flutter_template/viewmodel/global/global_viewmodel.dart';
@@ -23,6 +24,10 @@ class MyApp extends StatelessWidget {
2324
systemNavigationBarColor: Colors.transparent,
2425
));
2526
SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge);
27+
28+
// init logger
29+
getIt.get<LoggingRepository>().startLogging();
30+
2631
return const InternalApp();
2732
}
2833
}

‎lib/di/db/setup_drift_io.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'package:drift/drift.dart';
55
import 'package:drift/isolate.dart';
66
import 'package:drift/native.dart';
77
import 'package:flutter_template/util/env/flavor_config.dart';
8-
import 'package:icapps_architecture/icapps_architecture.dart';
8+
import 'package:flutter_template/util/logging/flutter_template_logger.dart';
99
import 'package:path/path.dart';
1010
import 'package:path_provider/path_provider.dart';
1111

@@ -17,7 +17,7 @@ Future<DatabaseConnection> createDriftDatabaseConnection(String name) async {
1717
final file = File(join(dbFolder.path, '$name.sqlite'));
1818
if ((FlavorConfig.isDev() || FlavorConfig.isDummy()) && file.existsSync()) {
1919
file.deleteSync();
20-
staticLogger.debug('Databasefile `db.sqlite` is deleted');
20+
FlutterTemplateLogger.logDebug('Databasefile `db.sqlite` is deleted');
2121
}
2222
final receivePort = ReceivePort();
2323

‎lib/di/db/setup_drift_web.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:drift/drift.dart';
22
import 'package:drift/wasm.dart';
3-
import 'package:icapps_architecture/icapps_architecture.dart';
3+
import 'package:flutter_template/util/logging/flutter_template_logger.dart';
44

55
// If you want to use web workers, see https://drift.simonbinder.eu/web/
66
Future<DatabaseConnection> createDriftDatabaseConnection(String name) async {
@@ -11,7 +11,7 @@ Future<DatabaseConnection> createDriftDatabaseConnection(String name) async {
1111
);
1212

1313
if (executor.missingFeatures.isNotEmpty) {
14-
staticLogger.d('Using ${executor.chosenImplementation} due to missing browser features: ${executor.missingFeatures}');
14+
FlutterTemplateLogger.logDebug('Using ${executor.chosenImplementation} due to missing browser features: ${executor.missingFeatures}');
1515
}
1616

1717
return DatabaseConnection(executor.resolvedExecutor);

0 commit comments

Comments
 (0)