Update internal release

mptwaktusolat · Oct 6, 2020 · 27c8b5e · 27c8b5e
1 parent b09ceae
commit 27c8b5e
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 22 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -37,7 +37,7 @@ class MyApp extends StatelessWidget {
       ),
       darkTheme: ThemeData.dark().copyWith(
         primaryColor: Colors.teal,
-        bottomAppBarColor: Colors.teal.shade900,
+        bottomAppBarColor: Colors.teal.withOpacity(0.4),
         visualDensity: VisualDensity.adaptivePlatformDensity,
       ),
       themeMode: ThemeController.to.themeMode,

diff --git a/lib/utils/copyAndShare.dart b/lib/utils/copyAndShare.dart
@@ -24,7 +24,7 @@ Solat timetable today
 📆 $dayFormat, $dateFormat
 📆 ${hijriToday}H
 
-  ☁ Subuh: ${CachedPrayerTimeData.allPrayerTime()[0]}
+  ☁ Fajr: ${CachedPrayerTimeData.allPrayerTime()[0]}
   🌞 Zohor: ${CachedPrayerTimeData.allPrayerTime()[1]}
   ☀ Asr: ${CachedPrayerTimeData.allPrayerTime()[2]}
   🌙 Maghrib: ${CachedPrayerTimeData.allPrayerTime()[3]}

diff --git a/lib/views/GetPrayerTime.dart b/lib/views/GetPrayerTime.dart
@@ -115,7 +115,7 @@ class PrayTimeList extends StatelessWidget {
       children: <Widget>[
         // solatCard('$subuhTime', 'Status'),
 
-        solatCard(subuhTime, 'Subuh'),
+        solatCard(subuhTime, 'Fajr'),
         solatCard(zohorTime, 'Zohor'),
         solatCard(asarTime, 'Asr'),
         solatCard(maghribTime, 'Maghrib'),

diff --git a/lib/views/ZoneChooser.dart b/lib/views/ZoneChooser.dart
@@ -131,7 +131,7 @@ Future openshowModalBottomSheet(BuildContext context) async {
                 topLeft: Radius.circular(26.0),
                 topRight: Radius.circular(26.0)),
             child: Container(
-              color: Colors.white,
+              color: Theme.of(context).canvasColor,
               child: ListView.builder(
                 itemCount: locationDatabase.getLocationDatabaseLength(),
                 itemBuilder: (BuildContext context, int index) {
@@ -143,8 +143,8 @@ Future openshowModalBottomSheet(BuildContext context) async {
                     },
                     title: Text(locationDatabase.getDaerah(index)),
                     subtitle: Text(locationDatabase.getNegeri(index)),
-                    trailing:
-                        locationBubble(locationDatabase.getJakimCode(index)),
+                    trailing: locationBubble(
+                        context, locationDatabase.getJakimCode(index)),
                     selected: globalIndex == index ? true : false,
                   );
                 },
@@ -171,11 +171,14 @@ Future openshowModalBottomSheet(BuildContext context) async {
   });
 }
 
-Widget locationBubble(String shortCode) {
+Widget locationBubble(BuildContext context, String shortCode) {
   return Container(
     padding: EdgeInsets.all(4.0),
     decoration: BoxDecoration(
-      border: Border.all(color: Colors.black),
+      border: Border.all(
+          color: Theme.of(context).brightness == Brightness.light
+              ? Colors.black
+              : Colors.white),
       borderRadius: BorderRadius.circular(10.0),
     ),
     child: Text(
@@ -284,13 +287,14 @@ class Completed extends StatelessWidget {
             )),
         Container(
           decoration: BoxDecoration(
-              borderRadius: BorderRadius.circular(16),
-              color: Colors.teal.shade50),
+            borderRadius: BorderRadius.circular(16),
+            color: Theme.of(context).primaryColor.withOpacity(0.45),
+          ),
           child: ListTile(
             trailing: Column(
               mainAxisAlignment: MainAxisAlignment.center,
               children: [
-                locationBubble(jakimCode.toUpperCase()),
+                locationBubble(context, jakimCode.toUpperCase()),
               ],
             ),
             title: Text(
@@ -313,7 +317,7 @@ class Completed extends StatelessWidget {
             child: Row(
               mainAxisSize: MainAxisSize.min,
               children: [
-                FlatButton(
+                TextButton(
                   child: Text(
                     'Set manually',
                     style: TextStyle(color: Colors.teal.shade800),
@@ -322,7 +326,7 @@ class Completed extends StatelessWidget {
                     openshowModalBottomSheet(context);
                   },
                 ),
-                FlatButton(
+                TextButton(
                   child: Text(
                     'Accept this location',
                     style: TextStyle(color: Colors.teal.shade800),
@@ -374,7 +378,7 @@ class Error extends StatelessWidget {
                   text: TextSpan(
                     style: TextStyle(
                       fontSize: 12,
-                      color: Colors.black,
+                      // color: Colors.black,
                     ),
                     children: <TextSpan>[
                       TextSpan(text: 'Tap '),
@@ -391,7 +395,10 @@ class Error extends StatelessWidget {
                 Spacer(),
                 RichText(
                   text: TextSpan(
-                    style: TextStyle(fontSize: 12, color: Colors.black),
+                    style: TextStyle(
+                      fontSize: 12,
+                      // color: Colors.black,
+                    ),
                     children: <TextSpan>[
                       TextSpan(text: 'If it didn\'t work, please '),
                       TextSpan(
@@ -409,7 +416,9 @@ class Error extends StatelessWidget {
                       TextSpan(text: 'Make sure your '),
                       TextSpan(
                         text: 'GPS turned on, ',
-                        style: TextStyle(fontWeight: FontWeight.bold),
+                        style: TextStyle(
+                          fontWeight: FontWeight.bold,
+                        ),
                       ),
                       TextSpan(text: 'then restart this app.'),
                     ],
@@ -437,15 +446,15 @@ class Error extends StatelessWidget {
             child: Row(
               mainAxisAlignment: MainAxisAlignment.end,
               children: [
-                FlatButton(
+                TextButton(
                     onPressed: () {
                       openshowModalBottomSheet(context);
                     },
                     child: Text(
                       'Set manually',
                       style: TextStyle(color: Colors.teal.shade800),
                     )),
-                FlatButton(
+                TextButton(
                   onPressed: onRetryPressed,
                   child: Text(
                     'Retry',
@@ -476,7 +485,6 @@ class Loading extends StatelessWidget {
             loadingMessage,
             textAlign: TextAlign.center,
             style: TextStyle(
-              color: Colors.black,
               fontSize: 24,
             ),
           ),

diff --git a/lib/views/bottomAppBar.dart b/lib/views/bottomAppBar.dart
@@ -28,14 +28,18 @@ class MyBottomAppBar extends StatelessWidget {
           IconButton(
               tooltip: 'Open menu',
               icon: Icon(Icons.menu),
-              color: Colors.grey,
+              color: Theme.of(context).brightness == Brightness.light
+                  ? Colors.grey.shade600
+                  : Colors.white60,
               onPressed: () {
                 menuModalBottomSheet(context);
               }),
           IconButton(
               icon: Icon(Icons.copy),
               tooltip: 'Copy timetable',
-              color: Colors.grey,
+              color: Theme.of(context).brightness == Brightness.light
+                  ? Colors.grey.shade600
+                  : Colors.white60,
               onPressed: () {
                 copyAndShare.updateMessage();
                 Clipboard.setData(

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.4.21-beta+11
+version: 1.5.23-beta+12
 
 environment:
   sdk: ">=2.7.0 <3.0.0"