diff --git a/Foodify/app/build.gradle b/Foodify/app/build.gradle
index 0a03e24..70321a8 100644
--- a/Foodify/app/build.gradle
+++ b/Foodify/app/build.gradle
@@ -10,7 +10,7 @@ android {
minSdk 23
targetSdk 30
versionCode 1
- versionName "89.0"
+ versionName "90.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
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 7688e96..d423423 100644
--- a/Foodify/app/src/main/java/com/waterbase/foodify/Home.java
+++ b/Foodify/app/src/main/java/com/waterbase/foodify/Home.java
@@ -1,10 +1,11 @@
package com.waterbase.foodify;
-import android.Manifest;
+import android.app.Dialog;
import android.content.DialogInterface;
import android.content.Intent;
-import android.content.pm.PackageManager;
+import android.graphics.Color;
import android.graphics.Typeface;
+import android.graphics.drawable.ColorDrawable;
import android.net.Uri;
import android.os.Bundle;
import android.provider.Settings;
@@ -17,6 +18,8 @@ import android.view.MenuItem;
import android.view.SubMenu;
import android.view.View;
import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
import android.view.animation.AnimationUtils;
import android.view.animation.LayoutAnimationController;
import android.widget.Button;
@@ -29,7 +32,6 @@ import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
-import androidx.core.app.ActivityCompat;
import androidx.core.app.NotificationManagerCompat;
import androidx.core.view.GravityCompat;
import androidx.drawerlayout.widget.DrawerLayout;
@@ -268,12 +270,41 @@ public class Home extends AppCompatActivity implements NavigationView.OnNavigati
}
private void alertDialogNewest() {
- AlertDialog alertDialog = new AlertDialog.Builder(Home.this)
- .setTitle("Thông báo!")
- .setMessage("Bạn đã cập nhật phiên bản mới nhất!")
- .setPositiveButton("Tôi biết rồi", null)
- .create();
- alertDialog.show();
+// AlertDialog alertDialog = new AlertDialog.Builder(Home.this)
+// .setTitle("Thông báo!")
+// .setMessage("Bạn đã cập nhật phiên bản mới nhất!")
+// .setPositiveButton("Tôi biết rồi", null)
+// .create();
+// alertDialog.show();
+ final Dialog dialog = new Dialog(Home.this);
+ dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
+
+ dialog.setCancelable(true);
+ dialog.setContentView(R.layout.dialog_newest);
+
+ final TextView dialogTitle = dialog.findViewById(R.id.tv_title);
+ final TextView dialogContent = dialog.findViewById(R.id.tv_content);
+ final Button btnClose = dialog.findViewById(R.id.btn_close);
+
+ dialogTitle.setText("Bạn đã cập nhật phiên bản mới nhất!");
+ dialogContent.setText("Phiên bản hiện tại: v" + Common.versionAppNewest + ".0!");
+
+ btnClose.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ dialog.dismiss();
+ }
+ });
+
+ Window window = dialog.getWindow();
+ if(window == null)
+ return;
+
+ window.setLayout(Math.round(getResources().getDisplayMetrics().widthPixels * 0.75f), WindowManager.LayoutParams.WRAP_CONTENT);
+ window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+
+
+ dialog.show();
}
private void showNotificationAlertDialog(String msg) {
diff --git a/Foodify/app/src/main/res/layout/dialog_newest.xml b/Foodify/app/src/main/res/layout/dialog_newest.xml
new file mode 100644
index 0000000..7f3b775
--- /dev/null
+++ b/Foodify/app/src/main/res/layout/dialog_newest.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Foodify/appupdate/src/main/java/com/azhon/appupdate/view/UpdateDialogActivity.kt b/Foodify/appupdate/src/main/java/com/azhon/appupdate/view/UpdateDialogActivity.kt
index 793b496..c157e24 100644
--- a/Foodify/appupdate/src/main/java/com/azhon/appupdate/view/UpdateDialogActivity.kt
+++ b/Foodify/appupdate/src/main/java/com/azhon/appupdate/view/UpdateDialogActivity.kt
@@ -67,7 +67,6 @@ class UpdateDialogActivity : AppCompatActivity(), View.OnClickListener {
private fun initView() {
val ibClose = findViewById(R.id.ib_close)
- val vLine = findViewById(R.id.line)
val ivBg = findViewById(R.id.iv_bg)
val tvTitle = findViewById(R.id.tv_title)
val tvSize = findViewById(R.id.tv_size)
diff --git a/Foodify/appupdate/src/main/res/font/bold.ttf b/Foodify/appupdate/src/main/res/font/bold.ttf
new file mode 100644
index 0000000..0caaf4d
Binary files /dev/null and b/Foodify/appupdate/src/main/res/font/bold.ttf differ
diff --git a/Foodify/appupdate/src/main/res/font/italic.ttf b/Foodify/appupdate/src/main/res/font/italic.ttf
new file mode 100644
index 0000000..74676b7
Binary files /dev/null and b/Foodify/appupdate/src/main/res/font/italic.ttf differ
diff --git a/Foodify/appupdate/src/main/res/font/nabila.ttf b/Foodify/appupdate/src/main/res/font/nabila.ttf
new file mode 100644
index 0000000..4f74aff
Binary files /dev/null and b/Foodify/appupdate/src/main/res/font/nabila.ttf differ
diff --git a/Foodify/appupdate/src/main/res/font/regular.ttf b/Foodify/appupdate/src/main/res/font/regular.ttf
new file mode 100644
index 0000000..cfd8bfc
Binary files /dev/null and b/Foodify/appupdate/src/main/res/font/regular.ttf differ
diff --git a/Foodify/appupdate/src/main/res/layout/dialog_update.xml b/Foodify/appupdate/src/main/res/layout/dialog_update.xml
index 8ab0e27..9439da1 100644
--- a/Foodify/appupdate/src/main/res/layout/dialog_update.xml
+++ b/Foodify/appupdate/src/main/res/layout/dialog_update.xml
@@ -22,10 +22,11 @@
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:fontFamily="@font/bold"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:textColor="@android:color/black"
- android:textSize="15sp"
+ android:textSize="18sp"
tools:text="发现新版v2.0.1可以下载啦!" />
Nhấn đề cài đặt
Tải bị lỗi
Nhấn để tiếp tục tải
- Ứng dụng đang được tải ở dưới nền!
- Phiên bản v%s đã ra mắt! Hãy cập nhật ngay!
+ Ứng dụng đang được tải ...
+ Phiên bản v%sđã ra mắt! Hãy cập nhật ngay!
Dung lượng tệp:%sMB
Cập nhật
diff --git a/app-debug.apk b/app-debug.apk
index bedfa35..dc1cdf3 100644
Binary files a/app-debug.apk and b/app-debug.apk differ