From c48820cbd084aec09de5db9d4ab2244d2e4e3ef4 Mon Sep 17 00:00:00 2001
From: iqFareez <60868965+fareezMaple@users.noreply.github.com>
Date: Sun, 30 Aug 2020 17:53:27 +0800
Subject: [PATCH] :ambulance: Patch issue #6 :lipstick: Few changes

---
 lib/views/GetPrayerTime.dart | 11 +++++------
 lib/views/ZoneChooser.dart   | 11 ++++++++---
 lib/views/bottomAppBar.dart  |  3 +--
 pubspec.yaml                 |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/lib/views/GetPrayerTime.dart b/lib/views/GetPrayerTime.dart
index db70c2a..7199704 100644
--- a/lib/views/GetPrayerTime.dart
+++ b/lib/views/GetPrayerTime.dart
@@ -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';
 
@@ -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);
   }
 
@@ -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'),
@@ -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),
diff --git a/lib/views/ZoneChooser.dart b/lib/views/ZoneChooser.dart
index 36887cb..b7e3684 100644
--- a/lib/views/ZoneChooser.dart
+++ b/lib/views/ZoneChooser.dart
@@ -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;
@@ -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
diff --git a/lib/views/bottomAppBar.dart b/lib/views/bottomAppBar.dart
index 3d5e011..8969969 100644
--- a/lib/views/bottomAppBar.dart
+++ b/lib/views/bottomAppBar.dart
@@ -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'),
         )
       ]);
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index bc2e2cc..692c71f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -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"