diff --git a/.gradle/5.6.4/executionHistory/executionHistory.bin b/.gradle/5.6.4/executionHistory/executionHistory.bin index b56d472..ef4b32e 100644 Binary files a/.gradle/5.6.4/executionHistory/executionHistory.bin and b/.gradle/5.6.4/executionHistory/executionHistory.bin differ diff --git a/.gradle/5.6.4/executionHistory/executionHistory.lock b/.gradle/5.6.4/executionHistory/executionHistory.lock index 60db769..fb084a8 100644 Binary files a/.gradle/5.6.4/executionHistory/executionHistory.lock and b/.gradle/5.6.4/executionHistory/executionHistory.lock differ diff --git a/.gradle/5.6.4/fileHashes/fileHashes.bin b/.gradle/5.6.4/fileHashes/fileHashes.bin index 8544eca..8a14523 100644 Binary files a/.gradle/5.6.4/fileHashes/fileHashes.bin and b/.gradle/5.6.4/fileHashes/fileHashes.bin differ diff --git a/.gradle/5.6.4/fileHashes/fileHashes.lock b/.gradle/5.6.4/fileHashes/fileHashes.lock index 50309b8..f35975b 100644 Binary files a/.gradle/5.6.4/fileHashes/fileHashes.lock and b/.gradle/5.6.4/fileHashes/fileHashes.lock differ diff --git a/.gradle/5.6.4/fileHashes/resourceHashesCache.bin b/.gradle/5.6.4/fileHashes/resourceHashesCache.bin index 3215b8d..c4ea0bb 100644 Binary files a/.gradle/5.6.4/fileHashes/resourceHashesCache.bin and b/.gradle/5.6.4/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/5.6.4/javaCompile/classAnalysis.bin b/.gradle/5.6.4/javaCompile/classAnalysis.bin index 5d3f0ba..6af6316 100644 Binary files a/.gradle/5.6.4/javaCompile/classAnalysis.bin and b/.gradle/5.6.4/javaCompile/classAnalysis.bin differ diff --git a/.gradle/5.6.4/javaCompile/jarAnalysis.bin b/.gradle/5.6.4/javaCompile/jarAnalysis.bin index e36bf35..4e6cf1d 100644 Binary files a/.gradle/5.6.4/javaCompile/jarAnalysis.bin and b/.gradle/5.6.4/javaCompile/jarAnalysis.bin differ diff --git a/.gradle/5.6.4/javaCompile/javaCompile.lock b/.gradle/5.6.4/javaCompile/javaCompile.lock index c6d5e9f..786ca71 100644 Binary files a/.gradle/5.6.4/javaCompile/javaCompile.lock and b/.gradle/5.6.4/javaCompile/javaCompile.lock differ diff --git a/.gradle/5.6.4/javaCompile/taskHistory.bin b/.gradle/5.6.4/javaCompile/taskHistory.bin index 519f431..3cc9733 100644 Binary files a/.gradle/5.6.4/javaCompile/taskHistory.bin and b/.gradle/5.6.4/javaCompile/taskHistory.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index d552886..61386bd 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/app/src/main/java/com/josh/trackcovid19v2/SettingsFragment.java b/app/src/main/java/com/josh/trackcovid19v2/SettingsFragment.java index 60a60d8..7f3535f 100644 --- a/app/src/main/java/com/josh/trackcovid19v2/SettingsFragment.java +++ b/app/src/main/java/com/josh/trackcovid19v2/SettingsFragment.java @@ -1,13 +1,12 @@ package com.josh.trackcovid19v2; import android.os.Bundle; - -import androidx.fragment.app.Fragment; - import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.fragment.app.Fragment; + /** * A simple {@link Fragment} subclass. diff --git a/app/src/main/java/com/josh/trackcovid19v2/ui/yourcountries/YourcountriesViewModel.java b/app/src/main/java/com/josh/trackcovid19v2/ui/yourcountries/YourcountriesViewModel.java deleted file mode 100644 index a702cbf..0000000 --- a/app/src/main/java/com/josh/trackcovid19v2/ui/yourcountries/YourcountriesViewModel.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.josh.trackcovid19v2.ui.yourcountries; - -import androidx.lifecycle.LiveData; -import androidx.lifecycle.ViewModel; - -import com.josh.trackcovid19v2.data.CountriesRepository; -import com.josh.trackcovid19v2.data.database.entity.Countries; -import com.josh.trackcovid19v2.model.ServiceRequest; - -import java.util.List; - -public class YourcountriesViewModel extends ViewModel { - - private final CountriesRepository mRepository; - private final LiveData> mCountriesData; - - public YourcountriesViewModel(CountriesRepository mRepository) { - this.mRepository = mRepository; - this.mCountriesData = mRepository.getCountriesList(); - } - - public LiveData> getCountriesList() { - return mCountriesData; - } - - public void postRequest(ServiceRequest serviceRequest) { - mRepository.postServiceRequest(serviceRequest); - } -} diff --git a/app/src/main/java/com/josh/trackcovid19v2/ui/yourrealcountry/YourrealcountryFragment.java b/app/src/main/java/com/josh/trackcovid19v2/ui/yourrealcountry/YourrealcountryFragment.java index 20f2837..e6451e2 100644 --- a/app/src/main/java/com/josh/trackcovid19v2/ui/yourrealcountry/YourrealcountryFragment.java +++ b/app/src/main/java/com/josh/trackcovid19v2/ui/yourrealcountry/YourrealcountryFragment.java @@ -28,9 +28,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.josh.trackcovid19v2.R; import com.josh.trackcovid19v2.model.ServiceRequest; -import com.josh.trackcovid19v2.ui.viewmodel.YourcountriesViewModel; import com.josh.trackcovid19v2.ui.viewmodel.YourrealcountryViewModel; -import com.josh.trackcovid19v2.ui.viewmodel.yourCountriesViewModelFactory; import com.josh.trackcovid19v2.ui.viewmodel.yourrealcountryViewModelFactory; import com.josh.trackcovid19v2.utility.InjectorUtils; import com.squareup.picasso.Picasso; @@ -64,7 +62,8 @@ public class YourrealcountryFragment extends Fragment { postRequest(); new Handler().postDelayed(new Runnable() { - @Override public void run() { + @Override + public void run() { // Stop animation (This will be after 3 seconds) mSwipeRefreshLayout.setRefreshing(false); } @@ -132,6 +131,7 @@ public class YourrealcountryFragment extends Fragment { spin.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override public void onItemSelected(AdapterView parent, View view, int position, long id) { + //Created by Josh Patra or souravp12 on Github.. This comment has been added to prevent people from stealing my work and publishing asdf it as their own. rememberLocation[0] = position; j[0] = 0; Picasso.get().load(countries.get(position).flag).into(imageView); @@ -163,7 +163,7 @@ public class YourrealcountryFragment extends Fragment { String testsWithCommas = numberFormat.format(countries.get(position).tests); String testsMilWithcommas = numberFormat.format(countries.get(position).testsPerMillion); Date date = new Date(countries.get(position).updated); - textView13.setText(Html.fromHtml("Updated on "+ date)); + textView13.setText(Html.fromHtml("Updated on " + date)); textView.setText(Html.fromHtml("
" + totalCasesWithCommas + "
")); textView3.setText(Html.fromHtml("" + deathWithCommas + "")); textView2.setText(Html.fromHtml("" + recoveredWithCommas + "")); @@ -227,16 +227,14 @@ public class YourrealcountryFragment extends Fragment { } }); - } - else{ - Log.d("lol", "didn't work something broken inside one." + ", name: "+"not found at all"); + } else { + Log.d("lol", "didn't work something broken inside one." + ", name: " + "not found at all"); } }); - } - else{ - Log.d("lol", "didn't work something broken outside one." + ", name: "+"not found at all"); + } else { + Log.d("lol", "didn't work something broken outside one." + ", name: " + "not found at all"); } }); postRequest(); diff --git a/app/src/main/java/com/josh/trackcovid19v2/ui/yourrealcountry/YourrealcountryViewModel.java b/app/src/main/java/com/josh/trackcovid19v2/ui/yourrealcountry/YourrealcountryViewModel.java deleted file mode 100755 index c68be95..0000000 --- a/app/src/main/java/com/josh/trackcovid19v2/ui/yourrealcountry/YourrealcountryViewModel.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.josh.trackcovid19v2.ui.yourrealcountry; - -import androidx.lifecycle.LiveData; -import androidx.lifecycle.ViewModel; - -import com.josh.trackcovid19v2.data.CountriesRepository; -import com.josh.trackcovid19v2.data.database.entity.Countries; -import com.josh.trackcovid19v2.model.ServiceRequest; - -import java.util.List; - -public class YourrealcountryViewModel extends ViewModel { - - private final CountriesRepository mRepository; - private final LiveData> mCountriesData; - - public YourrealcountryViewModel(CountriesRepository mRepository) { - this.mRepository = mRepository; - this.mCountriesData = mRepository.getCountriesList(); - } - - public LiveData> getCountriesList() { - return mCountriesData; - } - - public void postRequest(ServiceRequest serviceRequest) { - mRepository.postServiceRequest(serviceRequest); - } -} diff --git a/app/src/main/java/com/josh/trackcovid19v2/ui/yourstate/YourstateViewModel.java b/app/src/main/java/com/josh/trackcovid19v2/ui/yourstate/YourstateViewModel.java deleted file mode 100755 index 79c4a33..0000000 --- a/app/src/main/java/com/josh/trackcovid19v2/ui/yourstate/YourstateViewModel.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.josh.trackcovid19v2.ui.yourstate; - -import androidx.lifecycle.LiveData; -import androidx.lifecycle.ViewModel; - -import com.josh.trackcovid19v2.data.StateRepository; -import com.josh.trackcovid19v2.data.database.entity.States; -import com.josh.trackcovid19v2.model.ServiceRequest; - -import java.util.List; - -public class YourstateViewModel extends ViewModel { - - private final StateRepository mRepository; - private final LiveData> mStatesData; - - public YourstateViewModel(StateRepository mRepository) { - this.mRepository = mRepository; - this.mStatesData = mRepository.getStatesList(); - } - - public LiveData> getStatesList() { - return mStatesData; - } - - public void postRequest(ServiceRequest serviceRequest) { - mRepository.postServiceRequest(serviceRequest); - } -} diff --git a/app/src/main/java/com/josh/trackcovid19v2/ui/yourworld/YourworldFragment.java b/app/src/main/java/com/josh/trackcovid19v2/ui/yourworld/YourworldFragment.java index 67e245a..7133a76 100755 --- a/app/src/main/java/com/josh/trackcovid19v2/ui/yourworld/YourworldFragment.java +++ b/app/src/main/java/com/josh/trackcovid19v2/ui/yourworld/YourworldFragment.java @@ -34,8 +34,6 @@ import java.util.Locale; public class YourworldFragment extends Fragment { - private static YourworldFragment BdTimeUtils; - private YourworldViewModel yourworldViewModel; private com.josh.trackcovid19v2.ui.viewmodel.YourworldViewModel vYourworldViewModel; private static DecimalFormat df = new DecimalFormat("0.00"); diff --git a/app/src/main/java/com/josh/trackcovid19v2/ui/yourworld/YourworldViewModel.java b/app/src/main/java/com/josh/trackcovid19v2/ui/yourworld/YourworldViewModel.java deleted file mode 100755 index 10e6b80..0000000 --- a/app/src/main/java/com/josh/trackcovid19v2/ui/yourworld/YourworldViewModel.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.josh.trackcovid19v2.ui.yourworld; - -import androidx.lifecycle.LiveData; -import androidx.lifecycle.MutableLiveData; -import androidx.lifecycle.ViewModel; - -public class YourworldViewModel extends ViewModel { - - private MutableLiveData mText; - - public YourworldViewModel() { - mText = new MutableLiveData<>(); - mText.setValue("World Fragment"); - } - - public LiveData getText() { - return mText; - } - - public void setText(String str) { - mText.setValue(str); - } - -} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index a1c2f08..b3de999 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -43,17 +43,31 @@ android:layout_width="0dp" android:layout_height="0dp" android:background="@drawable/virus" + app:layout_constraintHeight_percent=".12" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintHeight_percent=".12" - app:layout_constraintWidth_percent=".20"/> + app:layout_constraintWidth_percent=".20" /> + app:layout_constraintTop_toTopOf="@+id/imageView3" + app:layout_constraintWidth_percent=".20" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4f8559b..11aaf48 100755 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -21,7 +21,9 @@ android:fitsSystemWindows="true" app:headerLayout="@layout/nav_header_main" app:menu="@menu/activity_main_drawer"> - + - + - + - + + - + - + - + - + - + - + - +