From 674fd92e30545458a60c69351bb1c4f6064acc89 Mon Sep 17 00:00:00 2001 From: pawangorai Date: Sat, 21 Mar 2020 22:39:30 +0530 Subject: [PATCH] added about page, fixed bugs --- app/src/main/AndroidManifest.xml | 50 ++++++------- .../java/india/coronavirus/fight/About.java | 59 ++++++++++++++++ .../india/coronavirus/fight/MainActivity.java | 24 +++++++ app/src/main/res/drawable/information.xml | 8 +++ app/src/main/res/layout/about.xml | 70 +++++++++++++++++++ app/src/main/res/menu/nav.xml | 7 ++ app/src/main/res/values/strings.xml | 21 +++--- 7 files changed, 207 insertions(+), 32 deletions(-) create mode 100644 app/src/main/java/india/coronavirus/fight/About.java create mode 100644 app/src/main/res/drawable/information.xml create mode 100644 app/src/main/res/layout/about.xml create mode 100644 app/src/main/res/menu/nav.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b3b3583..b126013 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,8 +3,8 @@ package="india.coronavirus.fight"> - - + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/india/coronavirus/fight/About.java b/app/src/main/java/india/coronavirus/fight/About.java new file mode 100644 index 0000000..3acbc1c --- /dev/null +++ b/app/src/main/java/india/coronavirus/fight/About.java @@ -0,0 +1,59 @@ +package india.coronavirus.fight; + +import android.content.Intent; +import android.net.Uri; +import android.os.Bundle; +import android.text.Html; +import android.view.View; + +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; + +import com.google.android.material.textview.MaterialTextView; +import com.google.firebase.firestore.CollectionReference; +import com.google.firebase.firestore.DocumentChange; +import com.google.firebase.firestore.FirebaseFirestore; + +public class About extends AppCompatActivity { + private boolean update; + + @Override + public void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.about); + MaterialTextView check = findViewById(R.id.update_available); + MaterialTextView pawan = findViewById(R.id.pawan); + MaterialTextView sppedx = findViewById(R.id.speedx); + CollectionReference apiCollection = FirebaseFirestore.getInstance().collection("update"); + apiCollection.addSnapshotListener((queryDocumentSnapshots, e) -> { + if (queryDocumentSnapshots != null) { + for (DocumentChange documentChange : queryDocumentSnapshots.getDocumentChanges()) { + update = documentChange.getDocument().getBoolean("available"); + if (update) { + check.setVisibility(View.VISIBLE); + check.setText(Html.fromHtml("Update Available : ")); + } + + } + } + }); + pawan.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Uri uri = Uri.parse("https://pawan0411.github.io/"); + Intent intent = new Intent(Intent.ACTION_VIEW, uri); + startActivity(intent); + } + }); + + sppedx.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Uri uri = Uri.parse("https://github.com/TheSpeedX"); + Intent intent = new Intent(Intent.ACTION_VIEW, uri); + startActivity(intent); + } + }); + + } +} diff --git a/app/src/main/java/india/coronavirus/fight/MainActivity.java b/app/src/main/java/india/coronavirus/fight/MainActivity.java index 4af24c8..0c6ed8e 100644 --- a/app/src/main/java/india/coronavirus/fight/MainActivity.java +++ b/app/src/main/java/india/coronavirus/fight/MainActivity.java @@ -5,9 +5,13 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.provider.Settings; +import android.view.Menu; +import android.view.MenuItem; +import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.core.view.MenuCompat; import androidx.navigation.NavController; import androidx.navigation.Navigation; import androidx.navigation.ui.AppBarConfiguration; @@ -20,6 +24,8 @@ import com.google.firebase.firestore.FirebaseFirestore; import com.onesignal.OneSignal; +import java.util.Objects; + public class MainActivity extends AppCompatActivity { private NavController navController; private String api; @@ -75,6 +81,24 @@ protected void onCreate(Bundle savedInstanceState) { // } } + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.nav, menu); + Objects.requireNonNull(getSupportActionBar()).setElevation(0); + MenuCompat.setGroupDividerEnabled(menu, true); + return true; + } + + @Override + public boolean onOptionsItemSelected(@NonNull MenuItem item) { + if (item.getItemId() == R.id.about_app) { + Intent intent = new Intent(this, About.class); + startActivity(intent); + return (true); + } + return (super.onOptionsItemSelected(item)); + } + @Override public boolean onSupportNavigateUp() { return navController.navigateUp(); diff --git a/app/src/main/res/drawable/information.xml b/app/src/main/res/drawable/information.xml new file mode 100644 index 0000000..dc2c9fb --- /dev/null +++ b/app/src/main/res/drawable/information.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml new file mode 100644 index 0000000..4018e27 --- /dev/null +++ b/app/src/main/res/layout/about.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/nav.xml b/app/src/main/res/menu/nav.xml new file mode 100644 index 0000000..975053d --- /dev/null +++ b/app/src/main/res/menu/nav.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7f65812..82865f5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,10 +1,15 @@ - covid19 India - Home - News - Helpline - Guides - State Stats - Predicted infection rate - The Helpline Number for corona–virus : +91–11–23978046 Toll Free No: 1075 +COVID19 India +Home +News +Helpline +Guides +State Stats +Predicted infection rate +The Helpline Number for corona–virus : +91–11–23978046 Toll Free No: 1075 +About +Pawan0411 +SpeedX +Update Available : +This app is about updates related to coronavirus in India.