Skip to content

Commit 45b5a96

Browse files
nathansdevnathansdev
committed
enabled web
1 parent d693465 commit 45b5a96

25 files changed

+313
-207
lines changed

‎lib/alarm/alarm_list_page.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import 'package:contraflutterkit/custom_widgets/button_round_with_shadow.dart';
44
import 'package:contraflutterkit/custom_widgets/custom_app_bar.dart';
55
import 'package:contraflutterkit/login/contra_text.dart';
66
import 'package:contraflutterkit/utils/colors.dart';
7+
import 'package:flutter/foundation.dart';
78
import 'package:flutter/material.dart';
89

910
import 'alarm.dart';
@@ -49,7 +50,7 @@ class _AlarmListPageState extends State<AlarmListPage> {
4950
child: Row(
5051
crossAxisAlignment: CrossAxisAlignment.end,
5152
children: [
52-
Platform.isIOS
53+
kIsWeb || Platform.isIOS
5354
? ButtonRoundWithShadow(
5455
size: 48,
5556
borderColor: wood_smoke,
@@ -60,7 +61,7 @@ class _AlarmListPageState extends State<AlarmListPage> {
6061
shadowColor: wood_smoke,
6162
iconPath: "assets/icons/arrow_back.svg")
6263
: SizedBox(),
63-
Platform.isIOS
64+
kIsWeb || Platform.isIOS
6465
? SizedBox(
6566
width: 20,
6667
)

‎lib/alarm/clock_list_page.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import 'package:contraflutterkit/custom_widgets/custom_app_bar.dart';
66
import 'package:contraflutterkit/custom_widgets/custom_header.dart';
77
import 'package:contraflutterkit/utils/colors.dart';
88
import 'package:flutter/cupertino.dart';
9+
import 'package:flutter/foundation.dart';
910
import 'package:flutter/material.dart';
1011

1112
import 'clock.dart';
@@ -49,12 +50,12 @@ class _ClockListPageState extends State<ClockListPage> {
4950
height: 200,
5051
child: Row(
5152
children: [
52-
Platform.isIOS
53+
kIsWeb || Platform.isIOS
5354
? SizedBox(
5455
width: 20,
5556
)
5657
: SizedBox(),
57-
Platform.isIOS
58+
kIsWeb || Platform.isIOS
5859
? ButtonRoundWithShadow(
5960
size: 48,
6061
borderColor: wood_smoke,
@@ -65,7 +66,7 @@ class _ClockListPageState extends State<ClockListPage> {
6566
shadowColor: wood_smoke,
6667
iconPath: "assets/icons/arrow_back.svg")
6768
: SizedBox(),
68-
Platform.isIOS
69+
kIsWeb || Platform.isIOS
6970
? SizedBox(
7071
width: 20,
7172
)

‎lib/alarm/weather_detail_page.dart

Lines changed: 106 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import 'package:contraflutterkit/custom_widgets/button_round_with_shadow.dart';
66
import 'package:contraflutterkit/login/contra_text.dart';
77
import 'package:contraflutterkit/utils/colors.dart';
88
import 'package:flutter/cupertino.dart';
9+
import 'package:flutter/foundation.dart';
910
import 'package:flutter/material.dart';
1011

1112
import 'circular_list_view.dart';
@@ -47,50 +48,56 @@ class _WeatherDetailPageState extends State<WeatherDetailPage> {
4748
@override
4849
Widget build(BuildContext context) {
4950
return Scaffold(
50-
body: Stack(
51-
children: [
52-
Column(
53-
mainAxisAlignment: MainAxisAlignment.center,
54-
children: <Widget>[
55-
Platform.isIOS
56-
? Row(
57-
mainAxisAlignment: MainAxisAlignment.start,
58-
children: [
59-
SizedBox(
60-
width: 20,
61-
),
62-
ButtonRoundWithShadow(
63-
size: 48,
64-
borderColor: wood_smoke,
65-
color: white,
66-
callback: () {
67-
Navigator.pop(context);
68-
},
69-
shadowColor: wood_smoke,
70-
iconPath: "assets/icons/arrow_back.svg"),
71-
],
72-
)
73-
: SizedBox(),
74-
SizedBox(
75-
height: 80,
76-
),
77-
ContraText(
78-
text: "11:30 AM, Sunday",
79-
color: black,
80-
size: 17,
81-
weight: FontWeight.bold,
82-
alignment: Alignment.center,
83-
),
84-
ContraText(
85-
text: "New york",
86-
alignment: Alignment.center,
87-
color: black,
88-
size: 36,
89-
weight: FontWeight.w800,
90-
),
91-
SizedBox(
92-
height: 80,
93-
),
51+
body: SingleChildScrollView(
52+
child: Stack(
53+
children: [
54+
Column(
55+
mainAxisAlignment: MainAxisAlignment.center,
56+
children: <Widget>[
57+
kIsWeb || Platform.isIOS
58+
? SizedBox(
59+
width: 20,
60+
)
61+
: SizedBox(),
62+
kIsWeb || Platform.isIOS
63+
? Row(
64+
mainAxisAlignment: MainAxisAlignment.start,
65+
children: [
66+
SizedBox(
67+
width: 20,
68+
),
69+
ButtonRoundWithShadow(
70+
size: 48,
71+
borderColor: wood_smoke,
72+
color: white,
73+
callback: () {
74+
Navigator.pop(context);
75+
},
76+
shadowColor: wood_smoke,
77+
iconPath: "assets/icons/arrow_back.svg"),
78+
],
79+
)
80+
: SizedBox(),
81+
SizedBox(
82+
height: 80,
83+
),
84+
ContraText(
85+
text: "11:30 AM, Sunday",
86+
color: black,
87+
size: 17,
88+
weight: FontWeight.bold,
89+
alignment: Alignment.center,
90+
),
91+
ContraText(
92+
text: "New york",
93+
alignment: Alignment.center,
94+
color: black,
95+
size: 36,
96+
weight: FontWeight.w800,
97+
),
98+
SizedBox(
99+
height: 80,
100+
),
94101
// Padding(
95102
// padding: const EdgeInsets.all(24.0),
96103
// child: Container(
@@ -108,66 +115,71 @@ class _WeatherDetailPageState extends State<WeatherDetailPage> {
108115
// ),
109116
// ),
110117
// ),
111-
SizedBox(
112-
height: 180,
113-
),
114-
Row(
115-
mainAxisAlignment: MainAxisAlignment.center,
116-
crossAxisAlignment: CrossAxisAlignment.end,
117-
children: <Widget>[
118-
ContraText(
119-
text: "85",
120-
alignment: Alignment.center,
121-
color: black,
122-
size: 94,
123-
weight: FontWeight.w800,
124-
),
125-
Padding(
126-
padding: const EdgeInsets.only(bottom: 24.0),
127-
child: ContraText(
128-
text: "\u2109",
118+
SizedBox(
119+
height: kIsWeb ? 250 : 180,
120+
),
121+
Row(
122+
mainAxisAlignment: MainAxisAlignment.center,
123+
crossAxisAlignment: CrossAxisAlignment.end,
124+
children: <Widget>[
125+
ContraText(
126+
text: "85",
129127
alignment: Alignment.center,
130128
color: black,
131-
size: 27,
129+
size: 94,
132130
weight: FontWeight.w800,
133131
),
132+
Padding(
133+
padding: const EdgeInsets.only(bottom: 24.0),
134+
child: ContraText(
135+
text: "\u2109",
136+
alignment: Alignment.center,
137+
color: black,
138+
size: 27,
139+
weight: FontWeight.w800,
140+
),
141+
),
142+
],
143+
),
144+
ContraText(
145+
text: "Sunny",
146+
alignment: Alignment.center,
147+
color: trout,
148+
size: 24,
149+
weight: FontWeight.bold,
150+
),
151+
SizedBox(
152+
height: 40,
153+
),
154+
Align(
155+
alignment: Alignment.center,
156+
child: Padding(
157+
padding: const EdgeInsets.all(8.0),
158+
child: Wrap(
159+
direction: Axis.horizontal,
160+
verticalDirection: VerticalDirection.down,
161+
children:
162+
List<Widget>.generate(days.length, (int index) {
163+
return WeatherWidget(date: days[index]);
164+
})),
134165
),
135-
],
136-
),
137-
ContraText(
138-
text: "Sunny",
139-
alignment: Alignment.center,
140-
color: trout,
141-
size: 24,
142-
weight: FontWeight.bold,
143-
),
144-
SizedBox(
145-
height: 40,
146-
),
147-
Align(
148-
alignment: Alignment.center,
149-
child: Padding(
150-
padding: const EdgeInsets.all(8.0),
151-
child: Wrap(
152-
direction: Axis.horizontal,
153-
verticalDirection: VerticalDirection.down,
154-
children: List<Widget>.generate(days.length, (int index) {
155-
return WeatherWidget(date: days[index]);
156-
})),
157166
),
158-
)
159-
],
160-
),
161-
Container(
162-
child: Align(
163-
alignment: Alignment.topLeft,
167+
SizedBox(
168+
height: 40,
169+
),
170+
],
171+
),
172+
Container(
173+
padding: kIsWeb
174+
? EdgeInsets.only(left: 150)
175+
: EdgeInsets.only(left: 0),
164176
child: CircularListView(
165177
items: items,
166178
radius: 100,
167179
),
168-
),
169-
)
170-
],
180+
)
181+
],
182+
),
171183
),
172184
);
173185
}

‎lib/alarm/weather_list_page.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import 'package:contraflutterkit/custom_widgets/custom_app_bar.dart';
77
import 'package:contraflutterkit/login/contra_text.dart';
88
import 'package:contraflutterkit/utils/colors.dart';
99
import 'package:flutter/cupertino.dart';
10+
import 'package:flutter/foundation.dart';
1011
import 'package:flutter/material.dart';
1112

1213
class WeatherListPage extends StatefulWidget {
@@ -65,7 +66,7 @@ class _WeatherListPageState extends State<WeatherListPage> {
6566
child: Row(
6667
crossAxisAlignment: CrossAxisAlignment.end,
6768
children: [
68-
Platform.isIOS
69+
kIsWeb || Platform.isIOS
6970
? ButtonRoundWithShadow(
7071
size: 48,
7172
borderColor: wood_smoke,
@@ -76,7 +77,7 @@ class _WeatherListPageState extends State<WeatherListPage> {
7677
shadowColor: wood_smoke,
7778
iconPath: "assets/icons/arrow_back.svg")
7879
: SizedBox(),
79-
Platform.isIOS
80+
kIsWeb || Platform.isIOS
8081
? SizedBox(
8182
width: 20,
8283
)

‎lib/blog/blog_list_page_four.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import 'package:contraflutterkit/custom_widgets/custom_app_bar.dart';
55
import 'package:contraflutterkit/login/contra_text.dart';
66
import 'package:contraflutterkit/utils/colors.dart';
77
import 'package:flutter/cupertino.dart';
8+
import 'package:flutter/foundation.dart';
89
import 'package:flutter/material.dart';
910

1011
import 'blog.dart';
@@ -71,7 +72,7 @@ class _BlogListPageFourState extends State<BlogListPageFour> {
7172
child: Row(
7273
mainAxisAlignment: MainAxisAlignment.start,
7374
children: <Widget>[
74-
Platform.isIOS
75+
kIsWeb || Platform.isIOS
7576
? ButtonRoundWithShadow(
7677
size: 48,
7778
borderColor: wood_smoke,
@@ -82,7 +83,7 @@ class _BlogListPageFourState extends State<BlogListPageFour> {
8283
shadowColor: wood_smoke,
8384
iconPath: "assets/icons/arrow_back.svg")
8485
: SizedBox(),
85-
Platform.isIOS
86+
kIsWeb || Platform.isIOS
8687
? SizedBox(
8788
width: 20,
8889
)

‎lib/blog/blog_list_page_one.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import 'package:contraflutterkit/custom_widgets/custom_app_bar.dart';
66
import 'package:contraflutterkit/login/contra_text.dart';
77
import 'package:contraflutterkit/utils/colors.dart';
88
import 'package:flutter/cupertino.dart';
9+
import 'package:flutter/foundation.dart';
910
import 'package:flutter/material.dart';
1011

1112
import 'blog.dart';
@@ -71,7 +72,7 @@ class _BlogListPageOneState extends State<BlogListPageOne> {
7172
child: Row(
7273
mainAxisAlignment: MainAxisAlignment.start,
7374
children: <Widget>[
74-
Platform.isIOS
75+
kIsWeb || Platform.isIOS
7576
? ButtonRoundWithShadow(
7677
size: 48,
7778
borderColor: wood_smoke,
@@ -82,7 +83,7 @@ class _BlogListPageOneState extends State<BlogListPageOne> {
8283
shadowColor: wood_smoke,
8384
iconPath: "assets/icons/arrow_back.svg")
8485
: SizedBox(),
85-
Platform.isIOS
86+
kIsWeb || Platform.isIOS
8687
? SizedBox(
8788
width: 20,
8889
)

‎lib/blog/blog_list_page_three.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import 'package:contraflutterkit/custom_widgets/custom_app_bar.dart';
55
import 'package:contraflutterkit/login/contra_text.dart';
66
import 'package:contraflutterkit/utils/colors.dart';
77
import 'package:flutter/cupertino.dart';
8+
import 'package:flutter/foundation.dart';
89
import 'package:flutter/material.dart';
910

1011
import 'blog.dart';
@@ -71,7 +72,7 @@ class _BlogListPageThreeState extends State<BlogListPageThree> {
7172
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
7273
crossAxisAlignment: CrossAxisAlignment.end,
7374
children: <Widget>[
74-
Platform.isIOS
75+
kIsWeb || Platform.isIOS
7576
? GestureDetector(
7677
onTap: () {
7778
Navigator.of(context).pop();

0 commit comments

Comments
 (0)