Fix layout, language!

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"
     }

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)
+//        AlertDialog alertDialog = new AlertDialog.Builder(Home.this)
-                .setTitle("Thông báo!")
+//                .setTitle("Thông báo!")
-                .setMessage("Bạn đã cập nhật phiên bản mới nhất!")
+//                .setMessage("Bạn đã cập nhật phiên bản mới nhất!")
-                .setPositiveButton("Tôi biết rồi", null)
+//                .setPositiveButton("Tôi biết rồi", null)
-                .create();
+//                .create();
-        alertDialog.show();
+//        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) {

Foodify/app/src/main/res/layout/dialog_newest.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@android:color/transparent"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/iv_bg"
+        android:layout_width="match_parent"
+        android:layout_height="140dp"
+        android:background="@drawable/ic_dialog_default" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/bg_white_radius_6"
+        android:orientation="vertical">
+
+        <TextView
+            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="18sp"
+            android:layout_gravity="center"
+            android:textAlignment="center"
+            tools:text="发现新版v2.0.1可以下载啦！" />
+
+        <TextView
+            android:id="@+id/tv_content"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:fontFamily="@font/italic"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            android:textColor="@android:color/black"
+            android:textSize="15sp"
+            android:layout_gravity="center"
+            tools:text="发现新版v2.0.1可以下载啦！" />
+
+        <Button
+            android:id="@+id/btn_close"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginRight="16dp"
+            android:layout_marginBottom="16dp"
+            android:fontFamily="@font/bold"
+            android:background="@drawable/bg_button"
+            android:text="Tôi biết rồi!"
+            android:textAllCaps="false"
+            android:textColor="@android:color/white" />
+    </LinearLayout>
+</LinearLayout>

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<View>(R.id.ib_close)
-        val vLine = findViewById<View>(R.id.line)
         val ivBg = findViewById<ImageView>(R.id.iv_bg)
         val tvTitle = findViewById<TextView>(R.id.tv_title)
         val tvSize = findViewById<TextView>(R.id.tv_size)

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可以下载啦！" />
 
         <TextView
@@ -34,6 +35,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="16dp"
             android:layout_marginTop="8dp"
+            android:fontFamily="@font/italic"
             android:layout_marginRight="16dp"
             android:textColor="#757575"
             android:textSize="14sp"
@@ -52,6 +54,7 @@
                 android:id="@+id/tv_description"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:fontFamily="@font/regular"
                 android:lineSpacingMultiplier="1.1"
                 android:textColor="#757575"
                 android:textSize="14sp"
@@ -72,6 +75,7 @@
             android:layout_height="40dp"
             android:layout_marginLeft="16dp"
             android:layout_marginTop="8dp"
+            android:fontFamily="@font/bold"
             android:layout_marginRight="16dp"
             android:layout_marginBottom="16dp"
             android:background="@drawable/bg_button"

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

@@ -7,8 +7,8 @@
     <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 ở dưới nền!</string>
+    <string name="background_downloading">Ứng dụng đang được tải ...</string>
-    <string name="dialog_new">Phiên bản v%s đã ra mắt! Hãy cập nhật ngay!</string>
+    <string name="dialog_new">Phiên bản v%sđã ra mắt! Hãy cập nhật ngay!</string>
     <string name="dialog_new_size">Dung lượng tệp：%sMB</string>
     <string name="update">Cập nhật</string>