UI Changes + Service Timer : 5min

gauravxdhingra · May 25, 2021 · e17300f · e17300f
1 parent 60ca02c
commit e17300f
Show file tree

Hide file tree

Showing 9 changed files with 460 additions and 222 deletions.
diff --git a/android/app/src/main/kotlin/com/example/cowintrackerindia/service/MyService.kt b/android/app/src/main/kotlin/com/example/cowintrackerindia/service/MyService.kt
@@ -76,7 +76,8 @@ class MyService : Service() {
                 check()
             }
         }
-        timer!!.schedule(timerTask, 20 * 1000, 1 * 60 * 1000)
+//        TODO: TIMER -> RELEASE
+        timer!!.schedule(timerTask, 5 * 60 * 1000, 5 * 60 * 1000)
     }
 
     private fun stopTimerTask() {
@@ -124,6 +125,7 @@ class MyService : Service() {
             override fun onResponse(call: Call<Model>, response: Response<Model>) {
                 if (response.isSuccessful) {
                     Log.d("myCHECK", "response successful --> ")
+
                     val model = response.body()!!
                     if(model.centers == null) {
                         Log.d("myCHECK", "centers null")
@@ -145,6 +147,11 @@ class MyService : Service() {
                         if(flag) {
                             break
                         }
+//                        else{
+////                            TODO: REMOVE THIS ELSE IN RELEASE
+//                            notifyUser("Vaccines Not Available!", "We'll notify you once vaccines are available!")
+//                            break
+//                        }
                     }
                 } else {
                     Log.d("myCHECK", "response not successful --> " + response.raw())
@@ -176,6 +183,11 @@ class MyService : Service() {
                         if(flag) {
                             break
                         }
+//                        else{
+////                            TODO: REMOVE THIS ELSE IN RELEASE
+//                            notifyUser("Vaccines Not Available!", "We'll notify you once vaccines are available!")
+//                            break
+//                        }
                     }
                 } else {
                     Log.d("myCHECK", "response not successful --> " + response.raw())
@@ -315,7 +327,7 @@ class MyService : Service() {
         return NotificationCompat.Builder(this, "101")
             .setOngoing(true)
             .setContentTitle("Vaccine Alert Set")
-            .setContentText("We will notify you as soon as the slots get available!")
+            .setContentText("We will notify you as soon as vaccines are available!")
             .setSmallIcon(R.drawable.launch_background)
             .build()
     }

diff --git a/assets/images/notification_animation.gif b/assets/images/notification_animation.gif
diff --git a/assets/images/phone-notification.gif b/assets/images/phone-notification.gif
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,6 +1,5 @@
 import 'package:cowintrackerindia/provider/api_provider.dart';
 import 'package:cowintrackerindia/provider/platform_channel_provider.dart';
-import 'package:cowintrackerindia/ui/alert_set_confimation.dart';
 import 'package:cowintrackerindia/ui/input_details.dart';
 import 'package:cowintrackerindia/ui/service_running.dart';
 import 'package:cowintrackerindia/ui/splash_screen.dart';
@@ -35,8 +34,6 @@ class MyApp extends StatelessWidget {
           '/': (context) =>
               // ServiceAlreadyRunningPage(),
               SplashScreen(),
-          AlertSetConfirmationPage.routeName: (context) =>
-              AlertSetConfirmationPage(),
           InputDetails.routeName: (context) => InputDetails(),
           ServiceAlreadyRunningPage.routeName: (context) =>
               ServiceAlreadyRunningPage(),

diff --git a/lib/provider/platform_channel_provider.dart b/lib/provider/platform_channel_provider.dart
@@ -72,10 +72,10 @@ class PlatformChannelProvider with ChangeNotifier {
       await setServiceRunning(true);
       await setAge(age);
       await setDistCode(getDistrictCodeProv!);
-      await setDistName("");
+      await setDistName(getStateNameProv!);
       await setPincode(000000);
       await setStateCode(0);
-      await setStateName("");
+      await setStateName(getStateNameProv!);
       await setVaccine(vaccine);
       await setDose(dose);
       await setCost(cost);