Update apk

Foodify/app/build.gradle

@@ -10,7 +10,7 @@ android {
         minSdk 23
         targetSdk 30
         versionCode 1
-        versionName "90.0"
+        versionName "91.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

Foodify/app/src/main/java/com/waterbase/foodify/Welcome.java

@@ -138,4 +138,6 @@ public class Welcome extends AppCompatActivity {
             return;
         }
     }
+
+
 }

Foodify/appupdate/src/main/java/com/azhon/appupdate/view/UpdateDialogActivity.kt

@@ -71,11 +71,13 @@ class UpdateDialogActivity : AppCompatActivity(), View.OnClickListener {
         val tvTitle = findViewById<TextView>(R.id.tv_title)
         val tvSize = findViewById<TextView>(R.id.tv_size)
         val tvDescription = findViewById<TextView>(R.id.tv_description)
+
         progressBar = findViewById(R.id.np_bar)
         btnUpdate = findViewById(R.id.btn_update)
         progressBar.visibility = View.VISIBLE
         btnUpdate.tag = 0
         btnUpdate.setOnClickListener(this)
+        progressBar.visibility = View.GONE
         ibClose.setOnClickListener(this)
         if (manager.dialogImage != -1) {
             ivBg.setBackgroundResource(manager.dialogImage)
@@ -133,6 +135,7 @@ class UpdateDialogActivity : AppCompatActivity(), View.OnClickListener {
                     return
                 }
                 if (!manager.forcedUpgrade) {
+                    progressBar.visibility = View.VISIBLE
                     btnUpdate.isEnabled = false
                     btnUpdate.text = resources.getString(R.string.background_downloading)
                 } else {

Foodify/appupdate/src/main/res/values/strings.xml

@@ -4,7 +4,7 @@
     <string name="start_download_hint">Bạn có thể kiểm tra tiến trình tải sau ít phút!</string>
     <string name="start_downloading">Tải phiên bản mới</string>
     <string name="download_completed">Đã tải xong</string>
-    <string name="click_hint">Nhấn đề cài đặt</string>
+    <string name="click_hint">Nhấn để cài đặt</string>
     <string name="download_error">Tải bị lỗi</string>
     <string name="continue_downloading">Nhấn để tiếp tục tải</string>
     <string name="background_downloading">Ứng dụng đang được tải ...</string>

FoodifyServer/app/src/main/java/com/waterbase/foodifyServer/TrackingOrder.java

@@ -64,11 +64,11 @@ public class TrackingOrder extends FragmentActivity implements OnMapReadyCallbac
     private GoogleApiClient mGoogleApiClient;
     private LocationRequest mLocationRequest;
 
-    private static int UPDATE_INTERVAL = 1000;
-    private static int FATEST_INTERVAL = 5000;
-    private static int DISPLACEMENT = 10;
+    private static final int UPDATE_INTERVAL = 1000;
+    private static final int FATEST_INTERVAL = 5000;
+    private static final int DISPLACEMENT = 10;
 
-    private static String MAP_API = "AIzaSyCqmoLlawoQzmwjZI2_Yo_V33An_nNZADs";
+    private static final String MAP_API = "AIzaSyCqmoLlawoQzmwjZI2_Yo_V33An_nNZADs";
 
     private IGeoCoordinates mService;