Skip to content

Commit

Permalink
feat: Add color and sty
Browse files Browse the repository at this point in the history
  • Loading branch information
krille-chan committed Aug 30, 2022
1 parent 649dee6 commit 325f621
Show file tree
Hide file tree
Showing 19 changed files with 477 additions and 185 deletions.
7 changes: 6 additions & 1 deletion assets/l10n/intl_de.arb
Original file line number Diff line number Diff line change
Expand Up @@ -271,5 +271,10 @@
"forNewFollowers": "Für neue Follower",
"@forNewFollowers": {},
"forNewLikes": "Für neue Likes",
"@forNewLikes": {}
"@forNewLikes": {},
"color": "Farbe",
"light": "Hell",
"dark": "Dunkel",
"system": "System",
"style": "Style"
}
7 changes: 6 additions & 1 deletion assets/l10n/intl_en.arb
Original file line number Diff line number Diff line change
Expand Up @@ -173,5 +173,10 @@
"month": {},
"day": {}
}
}
},
"color": "Color",
"light": "Light",
"dark": "Dark",
"system": "System",
"style": "Style"
}
142 changes: 74 additions & 68 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
PODS:
- Firebase/CoreOnly (8.6.0):
- FirebaseCore (= 8.6.0)
- Firebase/Messaging (8.6.0):
- Firebase/CoreOnly (8.15.0):
- FirebaseCore (= 8.15.0)
- Firebase/Messaging (8.15.0):
- Firebase/CoreOnly
- FirebaseMessaging (~> 8.6.0)
- firebase_core (1.6.0):
- Firebase/CoreOnly (= 8.6.0)
- FirebaseMessaging (~> 8.15.0)
- firebase_core (1.17.1):
- Firebase/CoreOnly (= 8.15.0)
- Flutter
- firebase_messaging (10.0.6):
- Firebase/Messaging (= 8.6.0)
- firebase_messaging (11.4.1):
- Firebase/Messaging (= 8.15.0)
- firebase_core
- Flutter
- FirebaseCore (8.6.0):
- FirebaseCore (8.15.0):
- FirebaseCoreDiagnostics (~> 8.0)
- GoogleUtilities/Environment (~> 7.4)
- GoogleUtilities/Logger (~> 7.4)
- FirebaseCoreDiagnostics (8.8.0):
- GoogleDataTransport (~> 9.0)
- GoogleUtilities/Environment (~> 7.4)
- GoogleUtilities/Logger (~> 7.4)
- GoogleUtilities/Environment (~> 7.7)
- GoogleUtilities/Logger (~> 7.7)
- FirebaseCoreDiagnostics (8.15.0):
- GoogleDataTransport (~> 9.1)
- GoogleUtilities/Environment (~> 7.7)
- GoogleUtilities/Logger (~> 7.7)
- nanopb (~> 2.30908.0)
- FirebaseInstallations (8.8.0):
- FirebaseInstallations (8.15.0):
- FirebaseCore (~> 8.0)
- GoogleUtilities/Environment (~> 7.4)
- GoogleUtilities/UserDefaults (~> 7.4)
- GoogleUtilities/Environment (~> 7.7)
- GoogleUtilities/UserDefaults (~> 7.7)
- PromisesObjC (< 3.0, >= 1.2)
- FirebaseMessaging (8.6.0):
- FirebaseMessaging (8.15.0):
- FirebaseCore (~> 8.0)
- FirebaseInstallations (~> 8.0)
- GoogleDataTransport (~> 9.0)
- GoogleUtilities/AppDelegateSwizzler (~> 7.4)
- GoogleUtilities/Environment (~> 7.4)
- GoogleUtilities/Reachability (~> 7.4)
- GoogleUtilities/UserDefaults (~> 7.4)
- GoogleDataTransport (~> 9.1)
- GoogleUtilities/AppDelegateSwizzler (~> 7.7)
- GoogleUtilities/Environment (~> 7.7)
- GoogleUtilities/Reachability (~> 7.7)
- GoogleUtilities/UserDefaults (~> 7.7)
- nanopb (~> 2.30908.0)
- Flutter (1.0.0)
- flutter_app_badger (0.0.1):
- flutter_app_badger (1.3.0):
- Flutter
- flutter_inappwebview (0.0.1):
- Flutter
Expand All @@ -49,28 +49,28 @@ PODS:
- FMDB (2.7.5):
- FMDB/standard (= 2.7.5)
- FMDB/standard (2.7.5)
- GoogleDataTransport (9.1.0):
- GoogleUtilities/Environment (~> 7.2)
- nanopb (~> 2.30908.0)
- GoogleDataTransport (9.2.0):
- GoogleUtilities/Environment (~> 7.7)
- nanopb (< 2.30910.0, >= 2.30908.0)
- PromisesObjC (< 3.0, >= 1.2)
- GoogleUtilities/AppDelegateSwizzler (7.5.2):
- GoogleUtilities/AppDelegateSwizzler (7.7.0):
- GoogleUtilities/Environment
- GoogleUtilities/Logger
- GoogleUtilities/Network
- GoogleUtilities/Environment (7.5.2):
- GoogleUtilities/Environment (7.7.0):
- PromisesObjC (< 3.0, >= 1.2)
- GoogleUtilities/Logger (7.5.2):
- GoogleUtilities/Logger (7.7.0):
- GoogleUtilities/Environment
- GoogleUtilities/Network (7.5.2):
- GoogleUtilities/Network (7.7.0):
- GoogleUtilities/Logger
- "GoogleUtilities/NSData+zlib"
- GoogleUtilities/Reachability
- "GoogleUtilities/NSData+zlib (7.5.2)"
- GoogleUtilities/Reachability (7.5.2):
- "GoogleUtilities/NSData+zlib (7.7.0)"
- GoogleUtilities/Reachability (7.7.0):
- GoogleUtilities/Logger
- GoogleUtilities/UserDefaults (7.5.2):
- GoogleUtilities/UserDefaults (7.7.0):
- GoogleUtilities/Logger
- image_picker (0.0.1):
- image_picker_ios (0.0.1):
- Flutter
- nanopb (2.30908.0):
- nanopb/decode (= 2.30908.0)
Expand All @@ -80,21 +80,23 @@ PODS:
- OrderedSet (5.0.0)
- package_info (0.0.1):
- Flutter
- path_provider (0.0.1):
- path_provider_ios (0.0.1):
- Flutter
- PromisesObjC (2.0.0)
- PromisesObjC (2.1.1)
- receive_sharing_intent (0.0.1):
- Flutter
- share (0.0.1):
- Flutter
- shared_preferences_ios (0.0.1):
- Flutter
- sqflite (0.0.2):
- Flutter
- FMDB (>= 2.7.5)
- uni_links (0.0.1):
- Flutter
- url_launcher (0.0.1):
- url_launcher_ios (0.0.1):
- Flutter
- video_player (0.0.1):
- video_player_avfoundation (0.0.1):
- Flutter
- wakelock (0.0.1):
- Flutter
Expand All @@ -106,15 +108,16 @@ DEPENDENCIES:
- flutter_app_badger (from `.symlinks/plugins/flutter_app_badger/ios`)
- flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
- flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
- image_picker (from `.symlinks/plugins/image_picker/ios`)
- image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
- package_info (from `.symlinks/plugins/package_info/ios`)
- path_provider (from `.symlinks/plugins/path_provider/ios`)
- path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
- receive_sharing_intent (from `.symlinks/plugins/receive_sharing_intent/ios`)
- share (from `.symlinks/plugins/share/ios`)
- shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
- sqflite (from `.symlinks/plugins/sqflite/ios`)
- uni_links (from `.symlinks/plugins/uni_links/ios`)
- url_launcher (from `.symlinks/plugins/url_launcher/ios`)
- video_player (from `.symlinks/plugins/video_player/ios`)
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
- video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/ios`)
- wakelock (from `.symlinks/plugins/wakelock/ios`)

SPEC REPOS:
Expand Down Expand Up @@ -144,56 +147,59 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/flutter_inappwebview/ios"
flutter_local_notifications:
:path: ".symlinks/plugins/flutter_local_notifications/ios"
image_picker:
:path: ".symlinks/plugins/image_picker/ios"
image_picker_ios:
:path: ".symlinks/plugins/image_picker_ios/ios"
package_info:
:path: ".symlinks/plugins/package_info/ios"
path_provider:
:path: ".symlinks/plugins/path_provider/ios"
path_provider_ios:
:path: ".symlinks/plugins/path_provider_ios/ios"
receive_sharing_intent:
:path: ".symlinks/plugins/receive_sharing_intent/ios"
share:
:path: ".symlinks/plugins/share/ios"
shared_preferences_ios:
:path: ".symlinks/plugins/shared_preferences_ios/ios"
sqflite:
:path: ".symlinks/plugins/sqflite/ios"
uni_links:
:path: ".symlinks/plugins/uni_links/ios"
url_launcher:
:path: ".symlinks/plugins/url_launcher/ios"
video_player:
:path: ".symlinks/plugins/video_player/ios"
url_launcher_ios:
:path: ".symlinks/plugins/url_launcher_ios/ios"
video_player_avfoundation:
:path: ".symlinks/plugins/video_player_avfoundation/ios"
wakelock:
:path: ".symlinks/plugins/wakelock/ios"

SPEC CHECKSUMS:
Firebase: 21ac9f28b09a8bdfc005f34c984fca84e7e8786d
firebase_core: c21ac09a8d23afd3594b56ed786bad12e5266bba
firebase_messaging: 0da89f644566bce5822fa3a5d47c764c44f1cf1d
FirebaseCore: 620b677f70f5470a8e59cb77f3ddc666f6f09785
FirebaseCoreDiagnostics: fe77f42da6329d6d83d21fd9d621a6b704413bfc
FirebaseInstallations: 2563cb18a723ef9c6ef18318a49519b75dce613c
FirebaseMessaging: ce0a5ee974f7bfe83b6cc5acce88c2d969e37c41
Firebase: 5f8193dff4b5b7c5d5ef72ae54bb76c08e2b841d
firebase_core: 318de541b0e61d3f24262982a3f0b54afe72439b
firebase_messaging: 943cfe65e0b3f457240489ce67655e40da1d270c
FirebaseCore: 5743c5785c074a794d35f2fff7ecc254a91e08b1
FirebaseCoreDiagnostics: 92e07a649aeb66352b319d43bdd2ee3942af84cb
FirebaseInstallations: 40bd9054049b2eae9a2c38ef1c3dd213df3605cd
FirebaseMessaging: 5e5118a2383b3531e730d974680954c679ca0a13
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
flutter_app_badger: 65de4d6f0c34a891df49e6cfb8a1c0496426fa68
flutter_app_badger: b87fc231847b03b92ce1412aa351842e7e97932f
flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721
flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
GoogleDataTransport: 85fd18ff3019bb85d3f2c551d04c481dedf71fc9
GoogleUtilities: 8de2a97a17e15b6b98e38e8770e2d129a57c0040
image_picker: e06f7a68f000bd36f552c1847e33cda96ed31f1f
GoogleDataTransport: 1c8145da7117bd68bbbed00cf304edb6a24de00f
GoogleUtilities: e0913149f6b0625b553d70dae12b49fc62914fd1
image_picker_ios: b786a5dcf033a8336a657191401bfdf12017dabb
nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
PromisesObjC: 68159ce6952d93e17b2dfe273b8c40907db5ba58
path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
PromisesObjC: ab77feca74fa2823e7af4249b8326368e61014cb
receive_sharing_intent: c0d87310754e74c0f9542947e7cbdf3a0335a3b1
share: 0b2c3e82132f5888bccca3351c504d0003b3b410
shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e
url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
video_player_avfoundation: e489aac24ef5cf7af82702979ed16f2a5ef84cff
wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f

PODFILE CHECKSUM: fe0e1ee7f3d1f7d00b11b474b62dd62134535aea

COCOAPODS: 1.11.2
COCOAPODS: 1.11.3
4 changes: 2 additions & 2 deletions ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 1300;
LastUpgradeCheck = 1020;
LastUpgradeCheck = 1300;
ORGANIZATIONNAME = "";
TargetAttributes = {
35BC5D28270B6FA4006AD137 = {
Expand Down Expand Up @@ -799,4 +799,4 @@
/* End XCConfigurationList section */
};
rootObject = 97C146E61CF9000F007C117D /* Project object */;
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1020"
LastUpgradeVersion = "1300"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 2 additions & 0 deletions ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,7 @@
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
<key>CADisableMinimumFrameDurationOnPhone</key>
<true/>
</dict>
</plist>
62 changes: 16 additions & 46 deletions lib/config/app_themes.dart
Original file line number Diff line number Diff line change
@@ -1,58 +1,28 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';

import 'package:fluffypix/config/app_configs.dart';

abstract class AppThemes {
static const double radius = 12;

static ThemeData get light => ThemeData(
visualDensity: VisualDensity.standard,
static ThemeData buildTheme(
ColorScheme? scheme, Color? primaryColor, bool isLight) =>
ThemeData(
brightness: isLight ? Brightness.light : Brightness.dark,
useMaterial3: true,
brightness: Brightness.light,
colorSchemeSeed: AppConfigs.primaryColor,
snackBarTheme:
const SnackBarThemeData(behavior: SnackBarBehavior.floating),
pageTransitionsTheme: const PageTransitionsTheme(
builders: {
TargetPlatform.fuchsia: ZoomPageTransitionsBuilder(),
TargetPlatform.android: ZoomPageTransitionsBuilder(),
TargetPlatform.linux: CupertinoPageTransitionsBuilder(),
TargetPlatform.macOS: CupertinoPageTransitionsBuilder(),
TargetPlatform.windows: CupertinoPageTransitionsBuilder(),
TargetPlatform.iOS: CupertinoPageTransitionsBuilder(),
},
colorScheme: primaryColor != null ? null : scheme,
appBarTheme: AppBarTheme(
systemOverlayStyle: SystemUiOverlayStyle(
statusBarColor: Colors.transparent,
statusBarIconBrightness:
isLight ? Brightness.dark : Brightness.light,
statusBarBrightness: !isLight ? Brightness.dark : Brightness.light,
),
),
inputDecorationTheme: InputDecorationTheme(
border: const UnderlineInputBorder(borderSide: BorderSide(width: 1)),
filled: true,
),
appBarTheme: const AppBarTheme(centerTitle: true),
dividerColor: Colors.grey.shade100,
);

static ThemeData get dark => ThemeData(
visualDensity: VisualDensity.standard,
useMaterial3: true,
brightness: Brightness.dark,
colorSchemeSeed: AppConfigs.primaryColor,
snackBarTheme:
const SnackBarThemeData(behavior: SnackBarBehavior.floating),
pageTransitionsTheme: const PageTransitionsTheme(
builders: {
TargetPlatform.fuchsia: ZoomPageTransitionsBuilder(),
TargetPlatform.android: ZoomPageTransitionsBuilder(),
TargetPlatform.linux: CupertinoPageTransitionsBuilder(),
TargetPlatform.macOS: CupertinoPageTransitionsBuilder(),
TargetPlatform.windows: CupertinoPageTransitionsBuilder(),
TargetPlatform.iOS: CupertinoPageTransitionsBuilder(),
},
),
inputDecorationTheme: InputDecorationTheme(
border: const UnderlineInputBorder(borderSide: BorderSide(width: 1)),
filled: true,
),
appBarTheme: const AppBarTheme(centerTitle: true),
dividerColor: Colors.grey.shade700,
dividerColor: isLight ? Colors.grey.shade200 : Colors.grey.shade700,
colorSchemeSeed:
primaryColor ?? (scheme == null ? AppConfigs.primaryColor : null),
);

static const double columnWidth = 300;
Expand Down
Loading

0 comments on commit 325f621

Please sign in to comment.