Skip to content

Commit

Permalink
🚑 Patch issue #6
Browse files Browse the repository at this point in the history
💄 Few changes
  • Loading branch information
iqfareez committed Aug 30, 2020
1 parent bba8d82 commit c48820c
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 12 deletions.
11 changes: 5 additions & 6 deletions lib/views/GetPrayerTime.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import 'package:intl/date_symbol_data_local.dart';
import 'package:waktusolatmalaysia/CONSTANTS.dart';
import 'package:waktusolatmalaysia/blocs/azan_times_today_bloc.dart';
import 'package:waktusolatmalaysia/models/azanproapi.dart';
import 'package:waktusolatmalaysia/utils/sizeconfig.dart';

import '../networking/Response.dart';

Expand All @@ -25,10 +26,6 @@ class _GetPrayerTimeState extends State<GetPrayerTime> {
void initState() {
super.initState();
initializeDateFormatting('en_US', null);
GetStorage().writeIfNull(kStoredLocationKey, "sgr01");
GetStorage().writeIfNull(kStoredKawasanKey,
"Gombak, Hulu Selangor, Rawang, Hulu Langat, Sepang, Petaling, Shah Alam");
GetStorage().writeIfNull(kStoredNegeriKey, "Selangor");
_timeBloc = PrayTimeBloc(location, timeFormat);
}

Expand Down Expand Up @@ -78,7 +75,8 @@ class PrayTimeList extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
mainAxisSize: MainAxisSize.max,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[
solatCard(prayerTime.prayerTimes.subuh, 'Subuh'),
Expand All @@ -101,11 +99,12 @@ class PrayTimeList extends StatelessWidget {

Widget solatCard(String time, String name) {
return Container(
margin: EdgeInsets.symmetric(vertical: SizeConfig.screenHeight / 500),
width: 300,
height: 80,
child: Card(
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10.0)),
elevation: 6.0,
elevation: 4.0,
child: InkWell(
borderRadius: BorderRadius.circular(10.0),
splashColor: Colors.teal.withAlpha(30),
Expand Down
11 changes: 8 additions & 3 deletions lib/views/ZoneChooser.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:waktusolatmalaysia/models/groupedzoneapi.dart';

String locationShortCode = GetStorage().read(kStoredLocationKey);
String currentlySetNegeri = '';
String currentlySetKawasan = '';
String locationShortCode;
String currentlySetNegeri;
String currentlySetKawasan;

class LocationChooser extends StatefulWidget {
final GroupedZones zone;
Expand All @@ -24,8 +24,13 @@ class _LocationChooserState extends State<LocationChooser> {
@override
void initState() {
super.initState();
GetStorage().writeIfNull(kStoredLocationKey, "sgr01");
GetStorage().writeIfNull(kStoredKawasanKey,
"Gombak, Hulu Selangor, Rawang, Hulu Langat, Sepang, Petaling, Shah Alam");
GetStorage().writeIfNull(kStoredNegeriKey, "Selangor");
currentlySetNegeri = GetStorage().read(kStoredNegeriKey);
currentlySetKawasan = GetStorage().read(kStoredKawasanKey);
locationShortCode = GetStorage().read(kStoredLocationKey);
}

@override
Expand Down
3 changes: 1 addition & 2 deletions lib/views/bottomAppBar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,7 @@ void myAboutDialog(BuildContext context) {
onPressed: () {
LaunchUrl.customTabsUrl('test url ');
},
child: Text(
'Changelogs history'), //TODO: Change to 'Release notes' in later releases
child: Text('Release notes'),
)
]);
}
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: App waktu solat seluruh Malaysia

publish_to: "none" # Remove this line if you wish to publish to pub.dev

version: 1.0.0-beta.3+4
version: 1.0.0-beta.3.hotfix+5

environment:
sdk: ">=2.7.0 <3.0.0"
Expand Down

0 comments on commit c48820c

Please sign in to comment.