diff --git a/.gitignore b/.gitignore
index 4f6dfa7..5b76f25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,6 @@ hs_err_pid*
### Gradle ###
.gradle
/build/
-.DS_Store
# Ignore Gradle GUI config
gradle-app.setting
diff --git a/.gradle/5.6.4/executionHistory/executionHistory.bin b/.gradle/5.6.4/executionHistory/executionHistory.bin
index e8361b5..6d6c2db 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 3a5b3ff..81a47f6 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 cbef602..a9ae3c0 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 3e9cabd..d8e2b8b 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/javaCompile/classAnalysis.bin b/.gradle/5.6.4/javaCompile/classAnalysis.bin
index bba2503..f56e05a 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/javaCompile.lock b/.gradle/5.6.4/javaCompile/javaCompile.lock
index 33795e3..d5f447b 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/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index 56944ef..80383bb 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/MainActivity.java b/app/src/main/java/com/josh/trackcovid19v2/MainActivity.java
index 78caab1..dbd5683 100755
--- a/app/src/main/java/com/josh/trackcovid19v2/MainActivity.java
+++ b/app/src/main/java/com/josh/trackcovid19v2/MainActivity.java
@@ -1,7 +1,11 @@
package com.josh.trackcovid19v2;
+import android.app.Activity;
+import android.content.Context;
import android.os.Bundle;
import android.view.Menu;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
import android.widget.Toast;
import androidx.appcompat.app.AppCompatActivity;
@@ -24,6 +28,7 @@ public class MainActivity extends AppCompatActivity {
setContentView(R.layout.activity_main);
Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
+ hideKeyboardFrom(this);
DrawerLayout drawer = findViewById(R.id.drawer_layout);
NavigationView navigationView = findViewById(R.id.nav_view);
// Passing each menu ID as a set of Ids because each
@@ -38,6 +43,16 @@ public class MainActivity extends AppCompatActivity {
Toast.makeText(getApplicationContext(), "Data Imported Successfully",Toast.LENGTH_SHORT).show();
}
+ public static void hideKeyboardFrom(Activity activity) {
+ InputMethodManager imm = (InputMethodManager) activity.getSystemService(Activity.INPUT_METHOD_SERVICE);
+ //Find the currently focused view, so we can grab the correct window token from it.
+ View view = activity.getCurrentFocus();
+ //If no view currently has focus, create a new one, just so we can grab a window token from it
+ if (view == null) {
+ view = new View(activity);
+ }
+ imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+ }
@Override
public boolean onCreateOptionsMenu(Menu menu) {
diff --git a/app/src/main/java/com/josh/trackcovid19v2/SendFeedbackFragment.java b/app/src/main/java/com/josh/trackcovid19v2/SendFeedbackFragment.java
index d848000..0d579c3 100644
--- a/app/src/main/java/com/josh/trackcovid19v2/SendFeedbackFragment.java
+++ b/app/src/main/java/com/josh/trackcovid19v2/SendFeedbackFragment.java
@@ -80,6 +80,10 @@ public class SendFeedbackFragment extends Fragment {
sendE.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(android.view.View v) {
+ message.setCursorVisible(false);
+ message.clearFocus();
+ subject.setCursorVisible(false);
+ subject.clearFocus();
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setTitle("Data");
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 3489f55..58a0164 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
@@ -1,6 +1,7 @@
package com.josh.trackcovid19v2.ui.yourworld;
import android.annotation.SuppressLint;
+import android.app.Activity;
import android.graphics.Color;
import android.graphics.drawable.ClipDrawable;
import android.os.Build;
@@ -14,6 +15,7 @@ import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
import android.widget.ImageView;
import android.widget.TextView;
@@ -42,6 +44,7 @@ public class YourworldFragment extends Fragment {
ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_yourworld, container, false);
+ hideKeyboardFrom(getActivity());
SwipeRefreshLayout mSwipeRefreshLayout = view.findViewById(R.id.swiperefresh);
mSwipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@Override
@@ -196,8 +199,16 @@ public class YourworldFragment extends Fragment {
return view;
}
-
-
+ public static void hideKeyboardFrom(Activity activity) {
+ InputMethodManager imm = (InputMethodManager) activity.getSystemService(Activity.INPUT_METHOD_SERVICE);
+ //Find the currently focused view, so we can grab the correct window token from it.
+ View view = activity.getCurrentFocus();
+ //If no view currently has focus, create a new one, just so we can grab a window token from it
+ if (view == null) {
+ view = new View(activity);
+ }
+ imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+ }
private void postRequest() {
int size = 100; // this is the count of the data items.
int page = 1; // Which page do we want to get from the server.
diff --git a/app/src/main/res/drawable-mdpi/btn_rounded_darker.xml b/app/src/main/res/drawable-mdpi/btn_rounded_darker.xml
index ab68be2..6571498 100644
--- a/app/src/main/res/drawable-mdpi/btn_rounded_darker.xml
+++ b/app/src/main/res/drawable-mdpi/btn_rounded_darker.xml
@@ -1,5 +1,5 @@
-
-
+
+
diff --git a/app/src/main/res/drawable/btn_rounded.xml b/app/src/main/res/drawable/btn_rounded.xml
index 02df046..7cde5a3 100644
--- a/app/src/main/res/drawable/btn_rounded.xml
+++ b/app/src/main/res/drawable/btn_rounded.xml
@@ -1,5 +1,5 @@
-
-
+
+
diff --git a/app/src/main/res/layout/fragment_send_feedback.xml b/app/src/main/res/layout/fragment_send_feedback.xml
index e1a447e..14ce54e 100644
--- a/app/src/main/res/layout/fragment_send_feedback.xml
+++ b/app/src/main/res/layout/fragment_send_feedback.xml
@@ -11,8 +11,9 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:ems="10"
+ android:gravity="center"
android:inputType="textEmailAddress"
- android:text="joshpatra12@protonmail.com"
+ android:text="To: joshpatra12@protonmail.com"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
@@ -27,6 +28,8 @@
android:layout_height="wrap_content"
android:ems="10"
android:hint="Enter a subject for the email here"
+ android:gravity="center"
+ android:maxLength="30"
android:inputType="textPersonName"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -41,9 +44,10 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:ems="10"
- android:gravity="start|top"
+ android:gravity="center"
android:hint="Please highlight what the bug was."
android:inputType="textMultiLine"
+ android:maxLength="429"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"