Skip to content

Commit

Permalink
Fix #2
Browse files Browse the repository at this point in the history
  • Loading branch information
@JideGuru
JideGuru committed Apr 24, 2020
1 parent cab43af commit 867f8b8
Show file tree
Hide file tree
Showing 8 changed files with 79 additions and 90 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Expand Up @@ -22,6 +22,7 @@
**/doc/api/
.dart_tool/
.flutter-plugins
.flutter-plugins-dependencies
.packages
.pub-cache/
.pub/
Expand Down Expand Up @@ -59,6 +60,7 @@
**/ios/Flutter/app.flx
**/ios/Flutter/app.zip
**/ios/Flutter/flutter_assets/
**/ios/Flutter/flutter_export_environment.sh
**/ios/ServiceDefinitions.json
**/ios/Runner/GeneratedPluginRegistrant.*

Expand Down
4 changes: 2 additions & 2 deletions ios/Podfile.lock
View file
Expand Up @@ -25,10 +25,10 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
shared_preferences: 430726339841afefe5142b9c1f50cb6bd7793e01
shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087
shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9

PODFILE CHECKSUM: 1b66dae606f75376c5f2135a8290850eeb09ae83

COCOAPODS: 1.7.5
COCOAPODS: 1.8.4
9 changes: 6 additions & 3 deletions ios/Runner.xcodeproj/project.pbxproj
View file
Expand Up @@ -87,7 +87,6 @@
FB5CC819F3DABD3EBFD99D7D /* Pods-Runner.release.xcconfig */,
C9F152C7A5B77AD5DC2900BF /* Pods-Runner.profile.xcconfig */,
);
name = Pods;
path = Pods;
sourceTree = "<group>";
};
Expand Down Expand Up @@ -182,6 +181,7 @@
TargetAttributes = {
97C146ED1CF9000F007C117D = {
CreatedOnToolsVersion = 7.3.1;
DevelopmentTeam = 3DDPAAW5W3;
LastSwiftMigration = 0910;
};
};
Expand All @@ -191,6 +191,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -502,6 +503,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = 3DDPAAW5W3;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -513,7 +515,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
PRODUCT_BUNDLE_IDENTIFIER = com.jideguru.restaurantUiKit;
PRODUCT_BUNDLE_IDENTIFIER = com.jideguru.restaurantUiKit1;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
Expand All @@ -530,6 +532,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = 3DDPAAW5W3;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -541,7 +544,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
PRODUCT_BUNDLE_IDENTIFIER = com.jideguru.restaurantUiKit;
PRODUCT_BUNDLE_IDENTIFIER = com.jideguru.restaurantUiKit1;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_SWIFT3_OBJC_INFERENCE = On;
Expand Down
3 changes: 3 additions & 0 deletions lib/main.dart
View file
Expand Up @@ -4,6 +4,8 @@ import 'package:restaurant_ui_kit/providers/app_provider.dart';
import 'package:restaurant_ui_kit/screens/splash.dart';
import 'package:restaurant_ui_kit/util/const.dart';

import 'util/const.dart';

void main() {
runApp(
MultiProvider(
Expand All @@ -26,6 +28,7 @@ class MyApp extends StatelessWidget {
navigatorKey: appProvider.navigatorKey,
title: Constants.appName,
theme: appProvider.theme,
darkTheme: Constants.darkTheme,
home: SplashScreen(),
);
},
Expand Down
4 changes: 3 additions & 1 deletion lib/screens/profile.dart
View file
Expand Up @@ -205,7 +205,9 @@ class _ProfileState extends State<Profile> {
),
),

ListTile(
MediaQuery.of(context).platformBrightness == Brightness.dark
? SizedBox()
: ListTile(
title: Text(
"Dark Theme",
style: TextStyle(
Expand Down
121 changes: 50 additions & 71 deletions lib/screens/walkthrough.dart
View file
Expand Up @@ -9,80 +9,35 @@ class Walkthrough extends StatefulWidget {
}

class _WalkthroughState extends State<Walkthrough> {

List pageInfos = [
{
"title": "Fresh Food",
"body": "Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus."
" Vestibulum ac diam sit amet quam vehicula elementum sed sit amet "
"dui. Nulla porttitor accumsan tincidunt.",
"img": "assets/on1.png",
},
{
"title": "Fast Delivery",
"body": "Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus."
" Vestibulum ac diam sit amet quam vehicula elementum sed sit amet "
"dui. Nulla porttitor accumsan tincidunt.",
"img": "assets/on2.png",
},
{
"title": "Easy Payment",
"body": "Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus."
" Vestibulum ac diam sit amet quam vehicula elementum sed sit amet "
"dui. Nulla porttitor accumsan tincidunt.",
"img": "assets/on3.png",
},
];
@override
Widget build(BuildContext context) {
List<PageViewModel> pages = [
PageViewModel(
"Fresh Food",
"Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus."
" Vestibulum ac diam sit amet quam vehicula elementum sed sit amet "
"dui. Nulla porttitor accumsan tincidunt.",
image: Image.asset(
"assets/on1.png",
height: 175.0,
),
decoration: PageDecoration(
titleTextStyle: TextStyle(
fontSize: 28.0,
fontWeight: FontWeight.w600,
color: Theme.of(context).accentColor,
),
bodyTextStyle: TextStyle(fontSize: 15.0),
dotsDecorator: DotsDecorator(
activeColor: Theme.of(context).accentColor,
activeSize: Size.fromRadius(8),
),
pageColor: Theme.of(context).primaryColor,
),
),

PageViewModel(
"Fast Delivery",
"Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus."
" Vestibulum ac diam sit amet quam vehicula elementum sed sit amet "
"dui. Nulla porttitor accumsan tincidunt.",
image: Image.asset(
"assets/on2.png",
height: 185.0,
),
decoration: PageDecoration(
titleTextStyle: TextStyle(
fontSize: 28.0,
fontWeight: FontWeight.w600,
color: Theme.of(context).accentColor,
),
bodyTextStyle: TextStyle(fontSize: 15.0),
dotsDecorator: DotsDecorator(
activeColor: Theme.of(context).accentColor,
activeSize: Size.fromRadius(8),
),
pageColor: Theme.of(context).primaryColor,
),
),

PageViewModel(
"Easy Payment",
"Vivamus magna justo, lacinia eget consectetur sed, convallis at tellus."
" Vestibulum ac diam sit amet quam vehicula elementum sed sit amet "
"dui. Nulla porttitor accumsan tincidunt.",
image: Image.asset(
"assets/on3.png",
height: 175.0,
),
decoration: PageDecoration(
titleTextStyle: TextStyle(
fontSize: 28.0,
fontWeight: FontWeight.w600,
color: Theme.of(context).accentColor,
),
bodyTextStyle: TextStyle(fontSize: 15.0),
dotsDecorator: DotsDecorator(
activeColor: Theme.of(context).accentColor,
activeSize: Size.fromRadius(8),
),
pageColor: Theme.of(context).primaryColor,
),
),
for(int i = 0; i<pageInfos.length; i++)
_buildPageModel(pageInfos[i])
];

return WillPopScope(
Expand Down Expand Up @@ -132,4 +87,28 @@ class _WalkthroughState extends State<Walkthrough> {
),
);
}

_buildPageModel(Map item){
return PageViewModel(
title: item['title'],
body: item['body'],
image: Image.asset(
item['img'],
height: 185.0,
),
decoration: PageDecoration(
titleTextStyle: TextStyle(
fontSize: 28.0,
fontWeight: FontWeight.w600,
color: Theme.of(context).accentColor,
),
bodyTextStyle: TextStyle(fontSize: 15.0),
// dotsDecorator: DotsDecorator(
// activeColor: Theme.of(context).accentColor,
// activeSize: Size.fromRadius(8),
// ),
pageColor: Theme.of(context).primaryColor,
),
);
}
}
20 changes: 10 additions & 10 deletions pubspec.lock
View file
Expand Up @@ -70,14 +70,14 @@ packages:
name: cupertino_icons
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.2"
version: "0.1.3"
dots_indicator:
dependency: transitive
description:
name: dots_indicator
url: "https://pub.dartlang.org"
source: hosted
version: "0.0.5+1"
version: "1.1.0"
flutter:
dependency: "direct main"
description: flutter
Expand All @@ -99,7 +99,7 @@ packages:
name: font_awesome_flutter
url: "https://pub.dartlang.org"
source: hosted
version: "8.5.0"
version: "8.8.1"
image:
dependency: transitive
description:
Expand All @@ -113,7 +113,7 @@ packages:
name: introduction_screen
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.5+2"
version: "1.0.8"
matcher:
dependency: transitive
description:
Expand Down Expand Up @@ -162,7 +162,7 @@ packages:
name: provider
url: "https://pub.dartlang.org"
source: hosted
version: "4.0.2"
version: "4.0.5"
quiver:
dependency: transitive
description:
Expand All @@ -176,28 +176,28 @@ packages:
name: shared_preferences
url: "https://pub.dartlang.org"
source: hosted
version: "0.5.6"
version: "0.5.7"
shared_preferences_macos:
dependency: transitive
description:
name: shared_preferences_macos
url: "https://pub.dartlang.org"
source: hosted
version: "0.0.1+4"
version: "0.0.1+7"
shared_preferences_platform_interface:
dependency: transitive
description:
name: shared_preferences_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.1"
version: "1.0.3"
shared_preferences_web:
dependency: transitive
description:
name: shared_preferences_web
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.2+3"
version: "0.1.2+4"
sky_engine:
dependency: transitive
description: flutter
Expand Down Expand Up @@ -268,4 +268,4 @@ packages:
version: "3.5.0"
sdks:
dart: ">=2.4.0 <3.0.0"
flutter: ">=1.12.13+hotfix.4 <2.0.0"
flutter: ">=1.12.13+hotfix.5 <2.0.0"
6 changes: 3 additions & 3 deletions pubspec.yaml
View file
Expand Up @@ -14,14 +14,14 @@ description: A new Flutter application.
version: 5.0+50

environment:
sdk: ">=2.1.0 <3.0.0"
sdk: ">=2.3.0 <3.0.0"

dependencies:
flutter:
sdk: flutter
cupertino_icons: ^0.1.2
introduction_screen: ^1.0.5+2
shared_preferences: ^0.5.6
introduction_screen: ^1.0.8
shared_preferences: ^0.5.4+5
font_awesome_flutter: ^8.5.0
carousel_slider: ^1.4.1
provider: ^4.0.1
Expand Down

0 comments on commit 867f8b8

Please sign in to comment.