From ffba16cffbdfa351331270ec7b31e2f51e8fa8f4 Mon Sep 17 00:00:00 2001 From: Robert Flaherty Date: Thu, 7 May 2020 17:21:54 -0400 Subject: [PATCH] Add Robert Flaherty to contributors list --- .../covidvirus/app/ui/home/MainActivity.java | 29 +++++++++++++++++-- .../countries_fragment/CountriesFragment.java | 12 ++++++++ .../app/ui/home/profile/ProfileFragment.java | 15 ++++++++++ app/src/main/res/layout/activity_main.xml | 22 +++++++------- app/src/main/res/layout/death_item.xml | 10 ++++--- app/src/main/res/layout/detail_dialog.xml | 2 +- app/src/main/res/layout/fragment_profile.xml | 2 +- app/src/main/res/values/strings.xml | 11 +++---- 8 files changed, 78 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/com/covidvirus/app/ui/home/MainActivity.java b/app/src/main/java/com/covidvirus/app/ui/home/MainActivity.java index e0c8727..618923a 100644 --- a/app/src/main/java/com/covidvirus/app/ui/home/MainActivity.java +++ b/app/src/main/java/com/covidvirus/app/ui/home/MainActivity.java @@ -8,6 +8,7 @@ import android.os.Bundle; import android.util.Log; import android.view.View; +import android.widget.TextView; import com.covidvirus.app.R; import com.covidvirus.app.data.network.model.Location; @@ -26,6 +27,9 @@ import com.covidvirus.app.ui.home.profile.ProfileFragment; import java.util.ArrayList; +import java.util.Date; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import butterknife.BindView; import butterknife.ButterKnife; @@ -46,6 +50,9 @@ public class MainActivity extends BaseActivity { private InterstitialAd mInterstitialAd; + + + @Override public MainViewModel createViewModel() { MainViewModelFactory factory = new MainViewModelFactory(DataManager.getInstance().getLocationService()); @@ -64,10 +71,13 @@ protected void onCreate(Bundle savedInstanceState) { if (DataManager.getInstance().getDefaultCountry() == null) { viewModel.loadLocationData(); viewModel.getLocationData().observe(this, new LocationDataObserver()); - } else + } else { loadFragment(R.id.profileContainer, new ProfileFragment()); - setMainPagerAdapter(); - mainTabLayout.setupWithViewPager(mainPager, true); + setMainPagerAdapter(); + mainTabLayout.setupWithViewPager(mainPager, true); + } + + } private void initAdMob(){ @@ -123,6 +133,7 @@ private void setMainPagerAdapter() { titles.add(this.getResources().getString(R.string.countries_fragment)); mainAdapter.addTitles(titles); mainPager.setAdapter(mainAdapter); + } private void loadFragment(int viewId, Fragment fragment) { @@ -134,6 +145,16 @@ private void loadFragment(int viewId, Fragment fragment) { } } + private void changeText() + { + Date date = new Date(); + DateFormat df = new SimpleDateFormat("dd/MM/yyyy"); + //format() method Formats a Date into a date/time string. + String testDateString = df.format(date); + TextView textView = (TextView) findViewById(R.id.deathText); + textView.setText("AAA"); + } + private class LocationDataObserver implements Observer { @Override public void onChanged(Location location) { @@ -144,4 +165,6 @@ public void onChanged(Location location) { } } + + } diff --git a/app/src/main/java/com/covidvirus/app/ui/home/main/countries_fragment/CountriesFragment.java b/app/src/main/java/com/covidvirus/app/ui/home/main/countries_fragment/CountriesFragment.java index f6b1348..511da3d 100644 --- a/app/src/main/java/com/covidvirus/app/ui/home/main/countries_fragment/CountriesFragment.java +++ b/app/src/main/java/com/covidvirus/app/ui/home/main/countries_fragment/CountriesFragment.java @@ -20,6 +20,9 @@ import com.covidvirus.app.data.DataManager; import com.covidvirus.app.data.network.model.CountryDataModel; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; import butterknife.BindView; import butterknife.ButterKnife; @@ -125,6 +128,7 @@ private void setupDialogView(View dialogView, CountryDataModel country){ ((ProgressBar)dialogView.findViewById(R.id.progressBarDetail)).setVisibility(View.GONE); } + private void cleanDialogView(View dialogView){ Glide.with(this).load("").into((ImageView)dialogView.findViewById(R.id.flag_img)); ((TextView)dialogView.findViewById(R.id.countryTitle)).setText(""); @@ -134,6 +138,14 @@ private void cleanDialogView(View dialogView){ ((TextView)dialogView.findViewById(R.id.totalDeathValue)).setText(""); ((TextView)dialogView.findViewById(R.id.todayDeathValue)).setText(""); ((TextView)dialogView.findViewById(R.id.recoverValue)).setText(""); + + Date date = new Date(); + DateFormat df = new SimpleDateFormat("MM/dd/yyyy"); + //format() method Formats a Date into a date/time string. + String testDateString = df.format(date); + ((TextView)dialogView.findViewById(R.id.deathText)).setText("Deaths Today \n (" + testDateString + ")"); + + ((ProgressBar)dialogView.findViewById(R.id.progressBarDetail)).setVisibility(View.VISIBLE); } diff --git a/app/src/main/java/com/covidvirus/app/ui/home/profile/ProfileFragment.java b/app/src/main/java/com/covidvirus/app/ui/home/profile/ProfileFragment.java index 843290d..e3e4373 100644 --- a/app/src/main/java/com/covidvirus/app/ui/home/profile/ProfileFragment.java +++ b/app/src/main/java/com/covidvirus/app/ui/home/profile/ProfileFragment.java @@ -23,6 +23,12 @@ import com.covidvirus.app.ui.base.BaseFragment; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; + +import static com.covidvirus.app.R.id.deathText; + public class ProfileFragment extends BaseFragment { private static final String TAG = "ProfileFragment"; private ProfileViewModel viewModel; @@ -111,6 +117,7 @@ public void onChanged(CountryDataModel country) { setTotalDeathCases(String.valueOf(country.getNbrDeath())); setTodayDeathCases(String.valueOf(country.getTodayDeaths())); setRecoverCases(String.valueOf(country.getNbrRecovered())); + setTodayDeathdate(); setProfileVisibility(View.VISIBLE); progressBar.setVisibility(View.GONE); @@ -146,6 +153,14 @@ private void setTodayDeathCases(String deathCases) { ( (TextView) this.deathItem.findViewById(R.id.todayDeathValue)).setText(deathCases); } + private void setTodayDeathdate() { + Date date = new Date(); + DateFormat df = new SimpleDateFormat("MM/dd/yyyy"); + //format() method Formats a Date into a date/time string. + String testDateString = df.format(date); + ( (TextView) this.deathItem.findViewById(R.id.deathText)).setText("Deaths today \n (" + testDateString + ")"); + } + private void setRecoverCases(String recoverCases) { ( (TextView) this.recoverItem.findViewById(R.id.recoverValue)).setText(recoverCases); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index c21ab7a..67fff75 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -37,18 +37,18 @@ android:layout_height="match_parent" android:orientation="vertical"> - + - + android:textStyle="italic" /> + + diff --git a/app/src/main/res/layout/detail_dialog.xml b/app/src/main/res/layout/detail_dialog.xml index c3efc6b..e78ce30 100644 --- a/app/src/main/res/layout/detail_dialog.xml +++ b/app/src/main/res/layout/detail_dialog.xml @@ -75,7 +75,7 @@ android:id="@+id/deathItem" layout="@layout/death_item" android:layout_width="match_parent" - android:layout_height="50dp" /> + android:layout_height="wrap_content" /> + android:layout_height="wrap_content" /> Covid-19 Total cases Active cases - Today cases + Todays cases Total deaths - Today deaths - Total recovers - Global State - Countries State + Todays death count + Total recoveries + Global Cases + Cases By Country Algeria Details + About v1.0.2