Release candidate 1.5.29-beta+13

Fixed #17 maybe
mptwaktusolat · Oct 7, 2020 · 2e75f89 · 2e75f89
1 parent 545b6d3
commit 2e75f89
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 37 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -4,6 +4,7 @@ import 'package:get_storage/get_storage.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:share/share.dart';
 import 'package:waktusolatmalaysia/utils/LocationData.dart';
+import 'package:waktusolatmalaysia/utils/cachedPrayerData.dart';
 import 'package:waktusolatmalaysia/utils/copyAndShare.dart';
 import 'package:waktusolatmalaysia/utils/restartWidget.dart';
 import 'package:waktusolatmalaysia/views/Settings%20part/ThemeController.dart';
@@ -33,10 +34,11 @@ class MyApp extends StatelessWidget {
     return GetMaterialApp(
       title: 'My Prayer Time',
       theme: ThemeData.light().copyWith(
-          primaryColor: _primaryColour,
-          bottomAppBarColor: Colors.teal.shade50,
-          visualDensity: VisualDensity.adaptivePlatformDensity,
-          appBarTheme: AppBarTheme(color: _primaryColour)),
+        primaryColor: _primaryColour,
+        bottomAppBarColor: Colors.teal.shade50,
+        visualDensity: VisualDensity.adaptivePlatformDensity,
+        appBarTheme: AppBarTheme(color: _primaryColour),
+      ),
       darkTheme: ThemeData.dark().copyWith(
           primaryColor: _primaryColour,
           bottomAppBarColor: Colors.teal.withOpacity(0.4),
@@ -70,6 +72,7 @@ class MyHomePage extends StatelessWidget {
           mini: true,
           tooltip: 'Share',
           onPressed: () {
+            print(CachedPrayerTimeData.allPrayerTime().toString());
             copyAndShare.updateMessage();
             Share.share(copyAndShare.getMessage());
           }),

diff --git a/lib/views/GetPrayerTime.dart b/lib/views/GetPrayerTime.dart
@@ -138,7 +138,7 @@ class PrayTimeList extends StatelessWidget {
 
 Widget solatCard(String time, String name) {
   return Container(
-    margin: EdgeInsets.symmetric(vertical: SizeConfig.screenHeight / 500),
+    margin: EdgeInsets.symmetric(vertical: SizeConfig.screenHeight / 320),
     width: 300,
     height: 80,
     child: Card(

diff --git a/lib/views/ZoneChooser.dart b/lib/views/ZoneChooser.dart
@@ -334,7 +334,6 @@ class Completed extends StatelessWidget {
                 TextButton(
                   child: Text(
                     'Set manually',
-                    style: TextStyle(color: Colors.teal.shade800),
                   ),
                   onPressed: () {
                     Navigator.pop(context);
@@ -344,7 +343,6 @@ class Completed extends StatelessWidget {
                 TextButton(
                   child: Text(
                     'Accept this location',
-                    style: TextStyle(color: Colors.teal.shade800),
                   ),
                   onPressed: () {
                     GetStorage().write(kStoredGlobalIndex, index);
@@ -472,13 +470,13 @@ class Error extends StatelessWidget {
                     },
                     child: Text(
                       'Set manually',
-                      style: TextStyle(color: Colors.teal.shade800),
+                      // style: TextStyle(color: Colors.teal.shade800),
                     )),
                 TextButton(
                   onPressed: onRetryPressed,
                   child: Text(
                     'Retry',
-                    style: TextStyle(color: Colors.teal.shade800),
+                    // style: TextStyle(color: Colors.teal.shade800),
                   ),
                 )
               ],

diff --git a/lib/views/bottomAppBar.dart b/lib/views/bottomAppBar.dart
@@ -131,25 +131,25 @@ void myAboutDialog(BuildContext context) {
           if (isFirstTry) {
             Fluttertoast.showToast(msg: '(⌐■_■)');
             isFirstTry = false;
+          } else {
+            Fluttertoast.showToast(msg: '(❁´◡`❁)');
+            //   print('Show debug dialog');
+            //   showDialog(
+            //     //TODO: Enable when i made about dialog in full screen
+            //     context: context,
+            //     builder: (context) => Dialog(
+            //       backgroundColor: Colors.white,
+            //       child: ListView(
+            //         children: [
+            //           ListTile(
+            //             title: Text('Prayer time API calls'),
+            //             subtitle: Text('example link'),
+            //           )
+            //         ],
+            //       ),
+            //     ),
+            //   );
           }
-          //  else {
-          //   print('Show debug dialog');
-          //   showDialog(
-          //     //TODO: Enable when i made about dialog in full screen
-          //     context: context,
-          //     builder: (context) => Dialog(
-          //       backgroundColor: Colors.white,
-          //       child: ListView(
-          //         children: [
-          //           ListTile(
-          //             title: Text('Prayer time API calls'),
-          //             subtitle: Text('example link'),
-          //           )
-          //         ],
-          //       ),
-          //     ),
-          //   );
-          // }
         },
         child: CachedNetworkImage(
           width: 45,
@@ -176,18 +176,18 @@ void myAboutDialog(BuildContext context) {
           height: 6,
         ),
         FlatButton(
-            color: Colors.teal.shade50,
+            color: Theme.of(context).bottomAppBarColor,
             onPressed: () {
               LaunchUrl.normalLaunchUrl(url: kPrivacyPolicyLink);
             },
             child: Text('Privacy Policy')),
         FlatButton(
-          color: Colors.teal.shade50,
+          color: Theme.of(context).bottomAppBarColor,
           onPressed: () {
             // LaunchUrl.customTabsUrl();
             LaunchUrl.normalLaunchUrl(url: kReleaseNotesLink);
           },
-          child: Text('Release notes'),
+          child: Text('Release Notes'),
         ),
       ]);
 }

diff --git a/lib/views/contributionPage.dart b/lib/views/contributionPage.dart
@@ -44,10 +44,10 @@ class ContributionPage extends StatelessWidget {
                     'One cup of nescafe usually enough for me to code all night.\n\n${Constants.kBuyMeACoffeeLink.substring(12)}', //substring will remove 'https://www' stuffs.
                 buttonContent: [
                   ButtonContent(
-                    'Copy link',
+                    'Copy',
                     () => copyClipboard(Constants.kBuyMeACoffeeLink),
                   ),
-                  ButtonContent('Open link', () {
+                  ButtonContent('Open', () {
                     LaunchUrl.normalLaunchUrl(url: Constants.kBuyMeACoffeeLink);
                   })
                 ],
@@ -57,17 +57,22 @@ class ContributionPage extends StatelessWidget {
                 description: '${Constants.kPaypalDonateShortLink}',
                 buttonContent: [
                   ButtonContent(
-                    'Copy link',
+                    'Copy',
                     () => copyClipboard(Constants.kPaypalDonateFullLink),
                   ),
                   ButtonContent(
-                    'Open link',
+                    'Open',
                     () => LaunchUrl.normalLaunchUrl(
                         url: Constants.kPaypalDonateFullLink),
-                  )
-                  //TODO: Remove word link (repetition??)
+                  ),
+
                   //TODO: Add any illustrattion
                 ],
+              ),
+              MyCard(
+                title: 'Contribute to source',
+                description: 'MPT will become open source soon. Stay tuned.\n',
+                buttonContent: [],
               )
             ],
           ),

diff --git 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.5.23-beta+12
+version: 1.5.29-beta+13
 
 environment:
   sdk: ">=2.7.0 <3.0.0"