diff --git a/Foodify/app/build.gradle b/Foodify/app/build.gradle
index 6b0a72d..24bde7d 100644
--- a/Foodify/app/build.gradle
+++ b/Foodify/app/build.gradle
@@ -10,7 +10,7 @@ android {
minSdk 23
targetSdk 30
versionCode 1
- versionName "88.0"
+ versionName "87.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
diff --git a/Foodify/app/src/main/AndroidManifest.xml b/Foodify/app/src/main/AndroidManifest.xml
index 859a753..45764a2 100644
--- a/Foodify/app/src/main/AndroidManifest.xml
+++ b/Foodify/app/src/main/AndroidManifest.xml
@@ -22,6 +22,7 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
+ android:requestLegacyExternalStorage="true"
android:theme="@style/Theme.Foodify"
tools:replace="android:theme"
tools:targetApi="31">
diff --git a/Foodify/app/src/main/java/com/waterbase/foodify/Home.java b/Foodify/app/src/main/java/com/waterbase/foodify/Home.java
index 19ea99f..b1e587f 100644
--- a/Foodify/app/src/main/java/com/waterbase/foodify/Home.java
+++ b/Foodify/app/src/main/java/com/waterbase/foodify/Home.java
@@ -182,6 +182,8 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati
if(Double.parseDouble(versionNameApp) < Double.parseDouble(Common.versionAppNewest)){
alertDialogUpdate();
+ } else {
+ alertDialogNewest();
}
@@ -271,6 +273,15 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati
alertDialog.show();
}
+ private void alertDialogNewest() {
+ AlertDialog alertDialog = new AlertDialog.Builder(Home.this)
+ .setTitle("Thông báo!")
+ .setMessage("Hiện tại đã có phiên bản mới hơn! Vui lòng cập nhật ứng dụng để mang đến những trải nghiệm tốt nhất!")
+ .setPositiveButton("Tôi biết rồi", null)
+ .create();
+ alertDialog.show();
+ }
+
private void checkWriteExternalStoragePermission() {
if (ActivityCompat.checkSelfPermission(Home.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
@@ -306,7 +317,7 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati
String url = "https://github.com/Nezumi2711/PRM392/raw/main/app-debug.apk";
DownloadApk downloadApk = new DownloadApk(Home.this);
- downloadApk.startDownloadingApk(url);
+ downloadApk.startDownloadingApk(url, "Update 2.0");
}
private void showNotificationAlertDialog(String msg) {
@@ -469,6 +480,12 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati
showSettingDialog();
} else if (id == R.id.nav_favorites) {
startActivity(new Intent(Home.this, FavoritesActivity.class));
+ } else if (id == R.id.nav_update) {
+ if(Double.parseDouble(versionNameApp) < Double.parseDouble(Common.versionAppNewest)){
+ alertDialogUpdate();
+ } else {
+ alertDialogNewest();
+ }
} else if (id == R.id.nav_log_out) {
//Delete Remember user & password
diff --git a/Foodify/app/src/main/res/drawable/ic_baseline_download_24.xml b/Foodify/app/src/main/res/drawable/ic_baseline_download_24.xml
new file mode 100644
index 0000000..1fc8106
--- /dev/null
+++ b/Foodify/app/src/main/res/drawable/ic_baseline_download_24.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/Foodify/app/src/main/res/menu/activity_main_drawer.xml b/Foodify/app/src/main/res/menu/activity_main_drawer.xml
index f56cf3e..f60459c 100644
--- a/Foodify/app/src/main/res/menu/activity_main_drawer.xml
+++ b/Foodify/app/src/main/res/menu/activity_main_drawer.xml
@@ -37,6 +37,12 @@
android:title="Cài đặt"
android:iconTint="@color/white"
/>
+