From f6f6d6fc6d301d1db15cdb58256ccc2ceab78383 Mon Sep 17 00:00:00 2001 From: phanhuuloi27 <73208452+Nezumi2711@users.noreply.github.com> Date: Tue, 19 Jul 2022 16:38:37 +0700 Subject: [PATCH] Fix layout, language! --- Foodify/app/build.gradle | 2 +- .../main/java/com/waterbase/foodify/Home.java | 49 +++++++++++--- .../app/src/main/res/layout/dialog_newest.xml | 60 ++++++++++++++++++ .../appupdate/view/UpdateDialogActivity.kt | 1 - Foodify/appupdate/src/main/res/font/bold.ttf | Bin 0 -> 192548 bytes .../appupdate/src/main/res/font/italic.ttf | Bin 0 -> 175724 bytes .../appupdate/src/main/res/font/nabila.ttf | Bin 0 -> 144472 bytes .../appupdate/src/main/res/font/regular.ttf | Bin 0 -> 192140 bytes .../src/main/res/layout/dialog_update.xml | 6 +- .../appupdate/src/main/res/values/strings.xml | 4 +- app-debug.apk | Bin 27064316 -> 27066031 bytes 11 files changed, 108 insertions(+), 14 deletions(-) create mode 100644 Foodify/app/src/main/res/layout/dialog_newest.xml create mode 100644 Foodify/appupdate/src/main/res/font/bold.ttf create mode 100644 Foodify/appupdate/src/main/res/font/italic.ttf create mode 100644 Foodify/appupdate/src/main/res/font/nabila.ttf create mode 100644 Foodify/appupdate/src/main/res/font/regular.ttf 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 @@ + + + + + + + + + + + +