Skip to content

Commit bb34030

Browse files
SandipkakadiyaSandipkakadiya
authored
Merge pull request #42 from Sandipkakadiya/review
Review
2 parents 585bacf + 097ed9e commit bb34030

File tree

11 files changed

+92
-92
lines changed

11 files changed

+92
-92
lines changed

‎example/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# ui_kit_example
1+
# getflutter_example
22

33
A new Flutter project.
44

‎example/android/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ android {
3838

3939
defaultConfig {
4040
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
41-
applicationId "com.example.ui_kit_example"
41+
applicationId "com.example.getflutter_example"
4242
minSdkVersion 16
4343
targetSdkVersion 28
4444
versionCode flutterVersionCode.toInteger()

‎example/android/app/src/debug/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.example.ui_kit_example">
2+
package="com.example.getflutter_example">
33
<!-- Flutter needs it to communicate with the running application
44
to allow setting breakpoints, to provide hot reload, etc.
55
-->

‎example/android/app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.example.ui_kit_example">
2+
package="com.example.getflutter_example">
33
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
44
calls FlutterMain.startInitialization(this); in its onCreate method.
55
In most cases you can leave this as-is, but you if you want to provide
66
additional functionality it is fine to subclass or reimplement
77
FlutterApplication and put your custom class here. -->
88
<application
99
android:name="io.flutter.app.FlutterApplication"
10-
android:label="ui_kit_example"
10+
android:label="getflutter_example"
1111
android:icon="@mipmap/ic_launcher">
1212
<activity
1313
android:name=".MainActivity"

‎example/android/app/src/main/kotlin/com/example/ui_kit_example/MainActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.ui_kit_example
1+
package com.example.getflutter_example
22

33
import androidx.annotation.NonNull;
44
import io.flutter.embedding.android.FlutterActivity

‎example/android/app/src/profile/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.example.ui_kit_example">
2+
package="com.example.getflutter_example">
33
<!-- Flutter needs it to communicate with the running application
44
to allow setting breakpoints, to provide hot reload, etc.
55
-->

‎example/ios/Runner/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<key>CFBundleInfoDictionaryVersion</key>
1212
<string>6.0</string>
1313
<key>CFBundleName</key>
14-
<string>ui_kit_example</string>
14+
<string>getflutter_example</string>
1515
<key>CFBundlePackageType</key>
1616
<string>APPL</string>
1717
<key>CFBundleShortVersionString</key>

‎example/lib/main.dart‎

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
import 'package:flutter/material.dart';
2-
import 'package:ui_kit/colors/gf_color.dart';
3-
import 'package:ui_kit/components/button/gf_button.dart';
4-
import 'package:ui_kit/components/badge/gf_button_badge.dart';
5-
import 'package:ui_kit/components/avatar/gf_avatar.dart';
6-
import 'package:ui_kit/components/badge/gf_badge.dart';
7-
import 'package:ui_kit/components/list/gf_list.dart';
8-
import 'package:ui_kit/components/tabs/gf_segment_tabs.dart';
9-
import 'package:ui_kit/size/gf_size.dart';
10-
import 'package:ui_kit/types/gf_type.dart';
11-
import 'package:ui_kit/shape/gf_button_shape.dart';
12-
import 'package:ui_kit/shape/gf_badge_shape.dart';
2+
import 'package:getflutter/colors/gf_color.dart';
3+
import 'package:getflutter/components/button/gf_button.dart';
4+
import 'package:getflutter/components/badge/gf_button_badge.dart';
5+
import 'package:getflutter/components/avatar/gf_avatar.dart';
6+
import 'package:getflutter/components/badge/gf_badge.dart';
7+
// import 'package:getflutter/components/list/gf_list.dart';
8+
import 'package:getflutter/components/tabs/gf_segment_tabs.dart';
9+
import 'package:getflutter/size/gf_size.dart';
10+
import 'package:getflutter/types/gf_type.dart';
11+
import 'package:getflutter/shape/gf_button_shape.dart';
12+
import 'package:getflutter/shape/gf_badge_shape.dart';
1313
import 'package:flutter/cupertino.dart';
14-
import 'package:ui_kit/components/tabs/gf_tabs.dart';
15-
import 'package:ui_kit/components/drawer/gf_drawer.dart';
16-
import 'package:ui_kit/components/drawer/gf_drawer_header.dart';
17-
import 'package:ui_kit/components/toast/gf_toast.dart';
18-
import 'package:ui_kit/components/appbar/gf_appbar.dart';
19-
import 'package:ui_kit/components/tabs/gf_tabBarView.dart';
20-
import 'package:ui_kit/components/button/gf_icon_button.dart';
21-
import 'package:ui_kit/components/button/gf_social_button.dart';
22-
import 'package:ui_kit/components/carousel/gf_carousel.dart';
23-
import 'package:ui_kit/components/carousel/gf_items_carousel.dart';
24-
import 'package:ui_kit/shape/gf_avatar_shape.dart';
25-
import 'package:ui_kit/components/card/gf_card.dart';
26-
import 'package:ui_kit/components/image/gf_image_overlay.dart';
27-
import 'package:ui_kit/components/list_tile/gf_list_tile.dart';
28-
import 'package:ui_kit/position/gf_position.dart';
29-
import 'package:ui_kit/components/button/gf_button_bar.dart';
30-
import 'package:ui_kit/components/badge/gf_icon_badge.dart';
31-
import 'package:ui_kit/shape/gf_icon_button_shape.dart';
32-
import 'package:ui_kit/components/tabs/gf_tabBar.dart';
33-
import 'package:ui_kit/components/typography/gf_typography.dart';
34-
import 'package:ui_kit/types/gf_typography_type.dart';
35-
import 'package:ui_kit/components/toast/gf_floating_widget.dart';
36-
import 'package:ui_kit/components/toggle/gf_toggle.dart';
37-
import 'package:ui_kit/types/gf_toggle_type.dart';
14+
import 'package:getflutter/components/tabs/gf_tabs.dart';
15+
import 'package:getflutter/components/drawer/gf_drawer.dart';
16+
import 'package:getflutter/components/drawer/gf_drawer_header.dart';
17+
import 'package:getflutter/components/toast/gf_toast.dart';
18+
import 'package:getflutter/components/appbar/gf_appbar.dart';
19+
import 'package:getflutter/components/tabs/gf_tabBarView.dart';
20+
import 'package:getflutter/components/button/gf_icon_button.dart';
21+
import 'package:getflutter/components/button/gf_social_button.dart';
22+
import 'package:getflutter/components/carousel/gf_carousel.dart';
23+
import 'package:getflutter/components/carousel/gf_items_carousel.dart';
24+
import 'package:getflutter/shape/gf_avatar_shape.dart';
25+
import 'package:getflutter/components/card/gf_card.dart';
26+
import 'package:getflutter/components/image/gf_image_overlay.dart';
27+
import 'package:getflutter/components/list_tile/gf_list_tile.dart';
28+
import 'package:getflutter/position/gf_position.dart';
29+
import 'package:getflutter/components/button/gf_button_bar.dart';
30+
import 'package:getflutter/components/badge/gf_icon_badge.dart';
31+
import 'package:getflutter/shape/gf_icon_button_shape.dart';
32+
import 'package:getflutter/components/tabs/gf_tabBar.dart';
33+
import 'package:getflutter/components/typography/gf_typography.dart';
34+
import 'package:getflutter/types/gf_typography_type.dart';
35+
import 'package:getflutter/components/toast/gf_floating_widget.dart';
36+
import 'package:getflutter/components/toggle/gf_toggle.dart';
37+
import 'package:getflutter/types/gf_toggle_type.dart';
3838

3939
final List<String> imageList = [
4040
"https://cdn.pixabay.com/photo/2017/12/03/18/04/christmas-balls-2995437_960_720.jpg",
@@ -51,12 +51,12 @@ class MyApp extends StatelessWidget {
5151
@override
5252
Widget build(BuildContext context) {
5353
return MaterialApp(
54-
title: 'UI_KIT_EXAMPLE',
54+
title: 'getflutter_EXAMPLE',
5555
theme: ThemeData(
5656
primarySwatch: Colors.blue,
5757
),
5858
debugShowCheckedModeBanner: false,
59-
home: MyHomePage(title: 'UI_KIT_EXAMPLE'),
59+
home: MyHomePage(title: 'getflutter_EXAMPLE'),
6060
);
6161
}
6262
}
@@ -173,21 +173,18 @@ class _MyHomePageState extends State<MyHomePage>
173173
mainAxisAlignment: MainAxisAlignment.center,
174174
crossAxisAlignment: CrossAxisAlignment.center,
175175
children: <Widget>[
176-
177176
Container(
178177
height: 130.0,
179178
width: 105.0,
180179
decoration: BoxDecoration(
181-
borderRadius: BorderRadius.circular(8.0),
182-
gradient: LinearGradient(
183-
begin: FractionalOffset.bottomLeft,
184-
end: FractionalOffset.topRight,
185-
colors: [
186-
const Color(0x5a0b486b),
187-
const Color(0xFFF56217),
188-
]
189-
)
190-
),
180+
borderRadius: BorderRadius.circular(8.0),
181+
gradient: LinearGradient(
182+
begin: FractionalOffset.bottomLeft,
183+
end: FractionalOffset.topRight,
184+
colors: [
185+
const Color(0x5a0b486b),
186+
const Color(0xFFF56217),
187+
])),
191188
),
192189

193190
GFCard(
@@ -200,7 +197,9 @@ class _MyHomePageState extends State<MyHomePage>
200197
SizedBox(
201198
height: 10,
202199
),
203-
GFToggle(onChanged: null, value: null,
200+
GFToggle(
201+
onChanged: null,
202+
value: null,
204203
type: GFToggleType.ios,
205204
)
206205
],
@@ -215,11 +214,11 @@ class _MyHomePageState extends State<MyHomePage>
215214
// children: <Widget>[
216215
// Column(
217216
// children: <Widget>[
218-
GFTypography(
219-
text: 'GF Header Typo1',
220-
type: GFTypographyType.typo1,
217+
GFTypography(
218+
text: 'GF Header Typo1',
219+
type: GFTypographyType.typo1,
221220
// showDivider: false,
222-
),
221+
),
223222
// GFTypography(
224223
// text: 'GF Header Typo2',
225224
// type: GFTypographyType.typo2,
@@ -409,7 +408,8 @@ class _MyHomePageState extends State<MyHomePage>
409408
width: 200.0,
410409
image: AssetImage("lib/assets/food.jpeg"),
411410
boxFit: BoxFit.fill,
412-
colorFilter: new ColorFilter.mode(Colors.black.withOpacity(0.67), BlendMode.darken),
411+
colorFilter: new ColorFilter.mode(
412+
Colors.black.withOpacity(0.67), BlendMode.darken),
413413
shape: BoxShape.circle,
414414
),
415415
),
@@ -428,7 +428,6 @@ class _MyHomePageState extends State<MyHomePage>
428428
// ))),
429429
// ),
430430

431-
432431
GFButtonBadge(
433432
// boxShadow: BoxShadow(
434433
// color: Colors.pink,
@@ -595,24 +594,20 @@ class _MyHomePageState extends State<MyHomePage>
595594
// ]
596595
// ),
597596

598-
599597
GFItemsCarousel(
600-
rowCount: 3,
601-
children: imageList.map(
602-
(url) {
603-
return Container(
604-
margin: EdgeInsets.all(5.0),
605-
child: ClipRRect(
606-
borderRadius: BorderRadius.all(Radius.circular(5.0)),
607-
child: Image.network(
608-
url,
609-
fit: BoxFit.cover,
610-
width: 1000.0
611-
),
612-
),
613-
);
614-
},
615-
).toList(),
598+
rowCount: 3,
599+
children: imageList.map(
600+
(url) {
601+
return Container(
602+
margin: EdgeInsets.all(5.0),
603+
child: ClipRRect(
604+
borderRadius: BorderRadius.all(Radius.circular(5.0)),
605+
child:
606+
Image.network(url, fit: BoxFit.cover, width: 1000.0),
607+
),
608+
);
609+
},
610+
).toList(),
616611
),
617612
//
618613
// GFCarousel(
@@ -756,8 +751,13 @@ class _MyHomePageState extends State<MyHomePage>
756751

757752
GFCard(
758753
boxFit: BoxFit.fill,
759-
colorFilter: new ColorFilter.mode(Colors.black.withOpacity(0.67), BlendMode.darken),
760-
image: Image.asset("lib/assets/img.png", fit: BoxFit.fitWidth, width: 400.0,),
754+
colorFilter: new ColorFilter.mode(
755+
Colors.black.withOpacity(0.67), BlendMode.darken),
756+
image: Image.asset(
757+
"lib/assets/img.png",
758+
fit: BoxFit.fitWidth,
759+
width: 400.0,
760+
),
761761
// imageOverlay: AssetImage("lib/assets/food.jpeg"),
762762
titlePosition: GFPosition.end,
763763
title: GFListTile(

‎example/pubspec.lock‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,13 @@ packages:
7474
description: flutter
7575
source: sdk
7676
version: "0.0.0"
77+
getflutter:
78+
dependency: "direct main"
79+
description:
80+
path: ".."
81+
relative: true
82+
source: path
83+
version: "0.0.1-pre.3"
7784
image:
7885
dependency: transitive
7986
description:
@@ -177,13 +184,6 @@ packages:
177184
url: "https://pub.dartlang.org"
178185
source: hosted
179186
version: "1.1.6"
180-
ui_kit:
181-
dependency: "direct main"
182-
description:
183-
path: ".."
184-
relative: true
185-
source: path
186-
version: "0.0.1"
187187
vector_math:
188188
dependency: transitive
189189
description:

‎example/pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ environment:
99
dependencies:
1010
flutter:
1111
sdk: flutter
12-
ui_kit:
12+
getflutter:
1313
path: ../
1414

1515
cupertino_icons: ^0.1.2
@@ -22,4 +22,4 @@ flutter:
2222
uses-material-design: true
2323
assets:
2424
- lib/assets/food.jpeg
25-
- lib/assets/img.png
25+
- lib/assets/img.png

0 commit comments

Comments
 (0)