From edfbf305ee247f04f4f474a72b871be4a9337e6c Mon Sep 17 00:00:00 2001 From: Nezumi <123229563+Nez27@users.noreply.github.com> Date: Thu, 27 Apr 2023 11:10:06 +0700 Subject: [PATCH] Release app --- app/build.gradle | 2 +- app/src/main/AndroidManifest.xml | 14 +++--- .../shipper/Activity/MainActivity.java | 4 ++ .../shipper/Activity/WebViewActivity.java | 45 +++++++++++++++++++ .../shipper/Fragment/ProfileFragment.java | 13 +++--- .../drawable/baseline_app_registration_24.xml | 12 +++++ app/src/main/res/layout/fragment_profile.xml | 6 +-- 7 files changed, 77 insertions(+), 19 deletions(-) create mode 100644 app/src/main/java/com/capstone/foodify/shipper/Activity/WebViewActivity.java create mode 100644 app/src/main/res/drawable/baseline_app_registration_24.xml diff --git a/app/build.gradle b/app/build.gradle index 44f049a..cd2dff6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,7 +19,7 @@ android { minSdk 26 targetSdk 30 versionCode 1 - versionName "0.5.2" + versionName "1.0.0" configurations.all { resolutionStrategy { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4a966db..542c653 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,7 +21,9 @@ android:supportsRtl="true" android:theme="@style/Theme.FoodifyShipper" android:usesCleartextTraffic="true"> - + @@ -61,8 +63,7 @@ + android:exported="false" /> - - + \ No newline at end of file diff --git a/app/src/main/java/com/capstone/foodify/shipper/Activity/MainActivity.java b/app/src/main/java/com/capstone/foodify/shipper/Activity/MainActivity.java index 758b755..66cec06 100644 --- a/app/src/main/java/com/capstone/foodify/shipper/Activity/MainActivity.java +++ b/app/src/main/java/com/capstone/foodify/shipper/Activity/MainActivity.java @@ -41,6 +41,7 @@ import com.google.android.gms.tasks.Task; import com.google.android.material.bottomnavigation.BottomNavigationView; import com.google.android.material.navigation.NavigationBarView; import com.google.firebase.appdistribution.AppDistributionRelease; +import com.google.firebase.appdistribution.InterruptionLevel; import com.google.firebase.appdistribution.OnProgressListener; import com.google.firebase.appdistribution.UpdateProgress; import com.google.firebase.messaging.FirebaseMessaging; @@ -69,6 +70,9 @@ public class MainActivity extends AppCompatActivity { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); +// Common.firebaseAppDistribution.showFeedbackNotification("Cảm ơn đóng góp ý kiến của các bạn", +// InterruptionLevel.HIGH); + if(Common.firebaseAppDistribution.isTesterSignedIn()){ //Customise progress dialog diff --git a/app/src/main/java/com/capstone/foodify/shipper/Activity/WebViewActivity.java b/app/src/main/java/com/capstone/foodify/shipper/Activity/WebViewActivity.java new file mode 100644 index 0000000..48f5983 --- /dev/null +++ b/app/src/main/java/com/capstone/foodify/shipper/Activity/WebViewActivity.java @@ -0,0 +1,45 @@ +package com.capstone.foodify.shipper.Activity; + +import androidx.appcompat.app.AppCompatActivity; + +import android.annotation.TargetApi; +import android.app.Activity; +import android.os.Bundle; +import android.webkit.WebResourceError; +import android.webkit.WebResourceRequest; +import android.webkit.WebView; +import android.webkit.WebViewClient; +import android.widget.Toast; + +import com.capstone.foodify.shipper.R; + +public class WebViewActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + WebView mWebview = new WebView(this); + + mWebview.getSettings().setJavaScriptEnabled(true); // enable javascript + + final Activity activity = this; + + mWebview.setWebViewClient(new WebViewClient() { + @SuppressWarnings("deprecation") + @Override + public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) { + Toast.makeText(activity, description, Toast.LENGTH_SHORT).show(); + } + @TargetApi(android.os.Build.VERSION_CODES.M) + @Override + public void onReceivedError(WebView view, WebResourceRequest req, WebResourceError rerr) { + // Redirect to deprecated method, so you can use it in all SDK versions + onReceivedError(view, rerr.getErrorCode(), rerr.getDescription().toString(), req.getUrl().toString()); + } + }); + + mWebview .loadUrl("https://appdistribution.firebase.dev/i/66ad6caf01e38710"); + setContentView(mWebview); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/capstone/foodify/shipper/Fragment/ProfileFragment.java b/app/src/main/java/com/capstone/foodify/shipper/Fragment/ProfileFragment.java index 586c48d..8351763 100644 --- a/app/src/main/java/com/capstone/foodify/shipper/Fragment/ProfileFragment.java +++ b/app/src/main/java/com/capstone/foodify/shipper/Fragment/ProfileFragment.java @@ -1,8 +1,5 @@ package com.capstone.foodify.shipper.Fragment; -import static com.capstone.foodify.shipper.Common.firebaseAppDistribution; - -import android.app.Activity; import android.app.Dialog; import android.content.Intent; import android.os.Bundle; @@ -16,8 +13,8 @@ import androidx.fragment.app.Fragment; import com.capstone.foodify.shipper.Activity.AccountAndProfileActivity; import com.capstone.foodify.shipper.Activity.ChangePasswordActivity; -import com.capstone.foodify.shipper.Activity.MainActivity; import com.capstone.foodify.shipper.Activity.SignInActivity; +import com.capstone.foodify.shipper.Activity.WebViewActivity; import com.capstone.foodify.shipper.Common; import com.capstone.foodify.shipper.R; import com.google.firebase.auth.FirebaseAuth; @@ -29,7 +26,7 @@ import com.squareup.picasso.Picasso; public class ProfileFragment extends Fragment { EditText edt_birthday, edt_phone, edt_fullName, edt_email; - LinearLayout changePasswordLayout, changeInformationLayout, logOutLayout, feed_back; + LinearLayout changePasswordLayout, changeInformationLayout, logOutLayout, register_app_beta; RoundedImageView profile_avatar; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, @@ -59,10 +56,10 @@ public class ProfileFragment extends Fragment { } }); - feed_back.setOnClickListener(new View.OnClickListener() { + register_app_beta.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - firebaseAppDistribution.startFeedback("Cảm ơn vì sự đóng góp ý kiến từ các bạn!"); + startActivity(new Intent(getActivity(), WebViewActivity.class)); } }); @@ -86,7 +83,7 @@ public class ProfileFragment extends Fragment { changePasswordLayout = view.findViewById(R.id.change_password); changeInformationLayout = view.findViewById(R.id.change_information); logOutLayout = view.findViewById(R.id.log_out); - feed_back = view.findViewById(R.id.feedback); + register_app_beta = view.findViewById(R.id.register_beta_app); edt_phone = view.findViewById(R.id.edt_phone); edt_birthday = view.findViewById(R.id.edt_birthDay); diff --git a/app/src/main/res/drawable/baseline_app_registration_24.xml b/app/src/main/res/drawable/baseline_app_registration_24.xml new file mode 100644 index 0000000..6fb1bf4 --- /dev/null +++ b/app/src/main/res/drawable/baseline_app_registration_24.xml @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml index e8cbc4c..819bec4 100644 --- a/app/src/main/res/layout/fragment_profile.xml +++ b/app/src/main/res/layout/fragment_profile.xml @@ -231,7 +231,7 @@ @@ -283,7 +283,7 @@ android:layout_marginEnd="20dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@id/feedback" + app:layout_constraintTop_toBottomOf="@id/register_beta_app" android:orientation="horizontal" >