Skip to content

Commit 52766ea

Browse files
committed
dark theme
1 parent 424ecf8 commit 52766ea

File tree

3 files changed

+35
-11
lines changed

3 files changed

+35
-11
lines changed

ios/Runner.xcodeproj/project.pbxproj

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@
317317
);
318318
mainGroup = 97C146E51CF9000F007C117D;
319319
packageReferences = (
320-
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
320+
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
321321
CF18B5642D0EDB1A0096872D /* XCRemoteSwiftPackageReference "fmdb" */,
322322
);
323323
productRefGroup = 97C146EF1CF9000F007C117D /* Products */;
@@ -377,10 +377,14 @@
377377
inputFileListPaths = (
378378
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
379379
);
380+
inputPaths = (
381+
);
380382
name = "[CP] Embed Pods Frameworks";
381383
outputFileListPaths = (
382384
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
383385
);
386+
outputPaths = (
387+
);
384388
runOnlyForDeploymentPostprocessing = 0;
385389
shellPath = /bin/sh;
386390
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
@@ -409,10 +413,14 @@
409413
inputFileListPaths = (
410414
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
411415
);
416+
inputPaths = (
417+
);
412418
name = "[CP] Copy Pods Resources";
413419
outputFileListPaths = (
414420
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
415421
);
422+
outputPaths = (
423+
);
416424
runOnlyForDeploymentPostprocessing = 0;
417425
shellPath = /bin/sh;
418426
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
@@ -569,7 +577,7 @@
569577
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
570578
CODE_SIGN_IDENTITY = "Apple Development";
571579
CODE_SIGN_STYLE = Automatic;
572-
CURRENT_PROJECT_VERSION = 491;
580+
CURRENT_PROJECT_VERSION = 492;
573581
DEVELOPMENT_TEAM = L9F8ZWCR8Z;
574582
ENABLE_BITCODE = NO;
575583
FRAMEWORK_SEARCH_PATHS = (
@@ -585,7 +593,7 @@
585593
"$(inherited)",
586594
"$(PROJECT_DIR)/Flutter",
587595
);
588-
MARKETING_VERSION = 1.9.78;
596+
MARKETING_VERSION = 1.9.79;
589597
PRODUCT_BUNDLE_IDENTIFIER = com.perol.pixez;
590598
PRODUCT_NAME = "$(TARGET_NAME)";
591599
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -714,7 +722,7 @@
714722
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
715723
CODE_SIGN_IDENTITY = "Apple Development";
716724
CODE_SIGN_STYLE = Automatic;
717-
CURRENT_PROJECT_VERSION = 491;
725+
CURRENT_PROJECT_VERSION = 492;
718726
DEVELOPMENT_TEAM = L9F8ZWCR8Z;
719727
ENABLE_BITCODE = NO;
720728
FRAMEWORK_SEARCH_PATHS = (
@@ -730,7 +738,7 @@
730738
"$(inherited)",
731739
"$(PROJECT_DIR)/Flutter",
732740
);
733-
MARKETING_VERSION = 1.9.78;
741+
MARKETING_VERSION = 1.9.79;
734742
PRODUCT_BUNDLE_IDENTIFIER = com.perol.pixez;
735743
PRODUCT_NAME = "$(TARGET_NAME)";
736744
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -751,7 +759,7 @@
751759
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
752760
CODE_SIGN_IDENTITY = "Apple Development";
753761
CODE_SIGN_STYLE = Automatic;
754-
CURRENT_PROJECT_VERSION = 491;
762+
CURRENT_PROJECT_VERSION = 492;
755763
DEVELOPMENT_TEAM = L9F8ZWCR8Z;
756764
ENABLE_BITCODE = NO;
757765
FRAMEWORK_SEARCH_PATHS = (
@@ -767,7 +775,7 @@
767775
"$(inherited)",
768776
"$(PROJECT_DIR)/Flutter",
769777
);
770-
MARKETING_VERSION = 1.9.78;
778+
MARKETING_VERSION = 1.9.79;
771779
PRODUCT_BUNDLE_IDENTIFIER = com.perol.pixez;
772780
PRODUCT_NAME = "$(TARGET_NAME)";
773781
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -936,7 +944,7 @@
936944
/* End XCConfigurationList section */
937945

938946
/* Begin XCLocalSwiftPackageReference section */
939-
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
947+
781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
940948
isa = XCLocalSwiftPackageReference;
941949
relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
942950
};

lib/main.dart

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,9 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
202202
return child;
203203
},
204204
themeMode: userSetting.themeMode,
205-
theme: ThemeData.light().copyWith(
205+
theme: ThemeData(
206+
brightness: Brightness.light,
207+
useMaterial3: true,
206208
primaryColor: lightColorScheme.primary,
207209
colorScheme: lightColorScheme,
208210
scaffoldBackgroundColor: lightColorScheme.surface,
@@ -214,11 +216,25 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
214216
dialogTheme: DialogThemeData(
215217
backgroundColor: lightColorScheme.surfaceContainer,
216218
),
219+
pageTransitionsTheme: PageTransitionsTheme(
220+
builders: {
221+
TargetPlatform.android: ZoomPageTransitionsBuilder(),
222+
TargetPlatform.iOS: CupertinoPageTransitionsBuilder(),
223+
},
224+
),
217225
),
218-
darkTheme: ThemeData.dark().copyWith(
226+
darkTheme: ThemeData(
227+
brightness: Brightness.dark,
228+
useMaterial3: true,
219229
scaffoldBackgroundColor: userSetting.isAMOLED
220230
? Colors.black
221231
: null,
232+
pageTransitionsTheme: PageTransitionsTheme(
233+
builders: {
234+
TargetPlatform.android: ZoomPageTransitionsBuilder(),
235+
TargetPlatform.iOS: CupertinoPageTransitionsBuilder(),
236+
},
237+
),
222238
// tabBarTheme: TabBarTheme(dividerColor: Colors.transparent),
223239
tabBarTheme: TabBarThemeData(dividerColor: Colors.transparent),
224240
colorScheme: darkColorScheme,

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ publish_to: none
1313
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
1414
# Read more about iOS versioning at
1515
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
16-
version: 1.9.78+491
16+
version: 1.9.79+492
1717

1818
environment:
1919
sdk: ">=3.10.0"

0 commit comments

Comments
 (0)