Skip to content

Commit ae021b6

Browse files
VB10VB10
authored
Merge pull request #7 from VB10/feature/widget
2 parents 146f11b + 8f02385 commit ae021b6

File tree

22 files changed

+481
-16
lines changed

22 files changed

+481
-16
lines changed

‎asset/lang/en_US.json‎ renamed to ‎asset/lang/en-US.json‎

File renamed without changes.

‎ios/Podfile.lock‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
PODS:
2+
- Flutter (1.0.0)
3+
- shared_preferences (0.0.1):
4+
- Flutter
5+
- shared_preferences_macos (0.0.1):
6+
- Flutter
7+
- shared_preferences_web (0.0.1):
8+
- Flutter
9+
10+
DEPENDENCIES:
11+
- Flutter (from `Flutter`)
12+
- shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
13+
- shared_preferences_macos (from `.symlinks/plugins/shared_preferences_macos/ios`)
14+
- shared_preferences_web (from `.symlinks/plugins/shared_preferences_web/ios`)
15+
16+
EXTERNAL SOURCES:
17+
Flutter:
18+
:path: Flutter
19+
shared_preferences:
20+
:path: ".symlinks/plugins/shared_preferences/ios"
21+
shared_preferences_macos:
22+
:path: ".symlinks/plugins/shared_preferences_macos/ios"
23+
shared_preferences_web:
24+
:path: ".symlinks/plugins/shared_preferences_web/ios"
25+
26+
SPEC CHECKSUMS:
27+
Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
28+
shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
29+
shared_preferences_macos: f3f29b71ccbb56bf40c9dd6396c9acf15e214087
30+
shared_preferences_web: 141cce0c3ed1a1c5bf2a0e44f52d31eeb66e5ea9
31+
32+
PODFILE CHECKSUM: c34e2287a9ccaa606aeceab922830efb9a6ff69a
33+
34+
COCOAPODS: 1.9.3

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
1414
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
1515
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
16+
98D03AC8BD0EB475973728E4 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03715CDAED8CFDE3AEA71199 /* Pods_Runner.framework */; };
1617
/* End PBXBuildFile section */
1718

1819
/* Begin PBXCopyFilesBuildPhase section */
@@ -29,32 +30,56 @@
2930
/* End PBXCopyFilesBuildPhase section */
3031

3132
/* Begin PBXFileReference section */
33+
03715CDAED8CFDE3AEA71199 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3234
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
3335
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
36+
171537F7682C238A232F6BCC /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
3437
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
3538
74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
3639
74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
3740
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
41+
7FA0B0E8A3A23E79DE9F2470 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
3842
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
3943
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
4044
97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
4145
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
4246
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
4347
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
4448
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
49+
BA2F0552EA5A958FC7EF6EBA /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
4550
/* End PBXFileReference section */
4651

4752
/* Begin PBXFrameworksBuildPhase section */
4853
97C146EB1CF9000F007C117D /* Frameworks */ = {
4954
isa = PBXFrameworksBuildPhase;
5055
buildActionMask = 2147483647;
5156
files = (
57+
98D03AC8BD0EB475973728E4 /* Pods_Runner.framework in Frameworks */,
5258
);
5359
runOnlyForDeploymentPostprocessing = 0;
5460
};
5561
/* End PBXFrameworksBuildPhase section */
5662

5763
/* Begin PBXGroup section */
64+
601926BF140CCFC1D114815A /* Pods */ = {
65+
isa = PBXGroup;
66+
children = (
67+
7FA0B0E8A3A23E79DE9F2470 /* Pods-Runner.debug.xcconfig */,
68+
BA2F0552EA5A958FC7EF6EBA /* Pods-Runner.release.xcconfig */,
69+
171537F7682C238A232F6BCC /* Pods-Runner.profile.xcconfig */,
70+
);
71+
name = Pods;
72+
path = Pods;
73+
sourceTree = "<group>";
74+
};
75+
6153A895178271A935C4DE89 /* Frameworks */ = {
76+
isa = PBXGroup;
77+
children = (
78+
03715CDAED8CFDE3AEA71199 /* Pods_Runner.framework */,
79+
);
80+
name = Frameworks;
81+
sourceTree = "<group>";
82+
};
5883
9740EEB11CF90186004384FC /* Flutter */ = {
5984
isa = PBXGroup;
6085
children = (
@@ -72,6 +97,8 @@
7297
9740EEB11CF90186004384FC /* Flutter */,
7398
97C146F01CF9000F007C117D /* Runner */,
7499
97C146EF1CF9000F007C117D /* Products */,
100+
601926BF140CCFC1D114815A /* Pods */,
101+
6153A895178271A935C4DE89 /* Frameworks */,
75102
);
76103
sourceTree = "<group>";
77104
};
@@ -105,12 +132,14 @@
105132
isa = PBXNativeTarget;
106133
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
107134
buildPhases = (
135+
CCCA04282C9E58583AA58C1F /* [CP] Check Pods Manifest.lock */,
108136
9740EEB61CF901F6004384FC /* Run Script */,
109137
97C146EA1CF9000F007C117D /* Sources */,
110138
97C146EB1CF9000F007C117D /* Frameworks */,
111139
97C146EC1CF9000F007C117D /* Resources */,
112140
9705A1C41CF9048500538489 /* Embed Frameworks */,
113141
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
142+
8FF5D6EEFEAF7A9CAB609868 /* [CP] Embed Pods Frameworks */,
114143
);
115144
buildRules = (
116145
);
@@ -183,6 +212,26 @@
183212
shellPath = /bin/sh;
184213
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
185214
};
215+
8FF5D6EEFEAF7A9CAB609868 /* [CP] Embed Pods Frameworks */ = {
216+
isa = PBXShellScriptBuildPhase;
217+
buildActionMask = 2147483647;
218+
files = (
219+
);
220+
inputPaths = (
221+
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
222+
"${PODS_ROOT}/../Flutter/Flutter.framework",
223+
"${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework",
224+
);
225+
name = "[CP] Embed Pods Frameworks";
226+
outputPaths = (
227+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Flutter.framework",
228+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework",
229+
);
230+
runOnlyForDeploymentPostprocessing = 0;
231+
shellPath = /bin/sh;
232+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
233+
showEnvVarsInLog = 0;
234+
};
186235
9740EEB61CF901F6004384FC /* Run Script */ = {
187236
isa = PBXShellScriptBuildPhase;
188237
buildActionMask = 2147483647;
@@ -197,6 +246,28 @@
197246
shellPath = /bin/sh;
198247
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
199248
};
249+
CCCA04282C9E58583AA58C1F /* [CP] Check Pods Manifest.lock */ = {
250+
isa = PBXShellScriptBuildPhase;
251+
buildActionMask = 2147483647;
252+
files = (
253+
);
254+
inputFileListPaths = (
255+
);
256+
inputPaths = (
257+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
258+
"${PODS_ROOT}/Manifest.lock",
259+
);
260+
name = "[CP] Check Pods Manifest.lock";
261+
outputFileListPaths = (
262+
);
263+
outputPaths = (
264+
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
265+
);
266+
runOnlyForDeploymentPostprocessing = 0;
267+
shellPath = /bin/sh;
268+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
269+
showEnvVarsInLog = 0;
270+
};
200271
/* End PBXShellScriptBuildPhase section */
201272

202273
/* Begin PBXSourcesBuildPhase section */

‎ios/Runner.xcworkspace/contents.xcworkspacedata‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/core/base/view/base_widget.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class _BaseViewState<T extends Store> extends State<BaseView<T>> {
1818
T model;
1919
@override
2020
void initState() {
21+
model = widget.viewModel;
2122
widget.onModelReady(model);
2223
super.initState();
2324
}

‎lib/core/components/avatar/circle_avatar.dart‎

Whitespace-only changes.

‎lib/core/components/button/icon_button.dart‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import 'package:flutter/material.dart';
2+
3+
import 'normal_button.dart';
4+
5+
class IconNormalButton extends StatelessWidget {
6+
final VoidCallback onPressed;
7+
final IconData icon;
8+
9+
const IconNormalButton({Key key, this.onPressed, @required this.icon}) : super(key: key);
10+
@override
11+
Widget build(BuildContext context) {
12+
return NormalButton(
13+
onPressed: this.onPressed,
14+
child: Center(
15+
child: Icon(icon),
16+
),
17+
);
18+
}
19+
}

‎lib/core/components/button/normal_button.dart‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import 'package:flutter/material.dart';
2+
3+
class NormalButton extends StatelessWidget {
4+
final Widget child;
5+
6+
final VoidCallback onPressed;
7+
8+
const NormalButton({Key key, this.child, this.onPressed}) : super(key: key);
9+
@override
10+
Widget build(BuildContext context) {
11+
return RaisedButton(
12+
padding: EdgeInsets.all(15),
13+
elevation: 10,
14+
onPressed: this.onPressed,
15+
child: child,
16+
);
17+
}
18+
}

‎lib/core/components/button/title_text_button.dart‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import 'package:flutter/material.dart';
2+
3+
import 'normal_button.dart';
4+
5+
class TitleTextButton extends StatelessWidget {
6+
final VoidCallback onPressed;
7+
final String text;
8+
9+
const TitleTextButton({Key key, this.onPressed, @required this.text}) : super(key: key);
10+
@override
11+
Widget build(BuildContext context) {
12+
return NormalButton(
13+
onPressed: this.onPressed,
14+
child: Center(
15+
child: Text(text),
16+
),
17+
);
18+
}
19+
}

‎lib/core/components/column/form_column.dart‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import 'package:flutter/material.dart';
2+
3+
class FormColumn extends StatelessWidget {
4+
final List<Widget> children;
5+
6+
const FormColumn({Key key, this.children}) : super(key: key);
7+
@override
8+
Widget build(BuildContext context) {
9+
return Row(
10+
children: <Widget>[
11+
Spacer(flex: 1),
12+
Expanded(
13+
flex: 8,
14+
child: Column(
15+
children: this.children,
16+
),
17+
),
18+
Spacer(flex: 1),
19+
],
20+
);
21+
}
22+
}

0 commit comments

Comments
 (0)