diff --git a/.gradle/5.6.4/executionHistory/executionHistory.bin b/.gradle/5.6.4/executionHistory/executionHistory.bin
index 9d60397..86ba3dd 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 93fbe82..30850dd 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 dff573d..2ca1c35 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 3168bef..38262ba 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 664ae5c..25df958 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 ff980e1..bba2503 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 57b346c..64b91c7 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 e6b806e..6c1a277 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 8599585..df861ae 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 85993f6..9000fec 100644
Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index a38c666..2e3e10f 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/src/main/java/com/josh/trackcovid19v2/LogsUtil.java b/app/src/main/java/com/josh/trackcovid19v2/LogsUtil.java
new file mode 100644
index 0000000..ec7a155
--- /dev/null
+++ b/app/src/main/java/com/josh/trackcovid19v2/LogsUtil.java
@@ -0,0 +1,30 @@
+package com.josh.trackcovid19v2;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+/**
+ * This class will provide utility to read logs.
+ *
+ * @author Chintan Rathod (http://chintanrathod.com)
+ */
+public class LogsUtil {
+
+ public static StringBuilder readLogs() {
+ StringBuilder logBuilder = new StringBuilder();
+ try {
+ Process process = Runtime.getRuntime().exec("logcat -d");
+ BufferedReader bufferedReader = new BufferedReader(
+ new InputStreamReader(process.getInputStream()));
+
+ String line;
+ while ((line = bufferedReader.readLine()) != null) {
+ logBuilder.append(line + "\n");
+ }
+ } catch (IOException e) {
+ }
+ return logBuilder;
+ }
+}
+
diff --git a/app/src/main/java/com/josh/trackcovid19v2/SendFeedbackFragment.java b/app/src/main/java/com/josh/trackcovid19v2/SendFeedbackFragment.java
index 02d9820..d848000 100644
--- a/app/src/main/java/com/josh/trackcovid19v2/SendFeedbackFragment.java
+++ b/app/src/main/java/com/josh/trackcovid19v2/SendFeedbackFragment.java
@@ -4,6 +4,7 @@ import android.app.Activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
+import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
@@ -87,10 +88,6 @@ public class SendFeedbackFragment extends Fragment {
builder.setPositiveButton("YES", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
-
- String toS = "joshpatra12@protonmail.com";
- String subS = subject.getText().toString();
- String mesS = message.getText().toString();
String system = System.getProperty("os.version");
Integer API = Build.VERSION.SDK_INT;
String device = Build.DEVICE;
@@ -105,17 +102,44 @@ public class SendFeedbackFragment extends Fragment {
.getMetrics(displayMetrics);
int height = displayMetrics.heightPixels + getNavigationBarHeight();
int width = displayMetrics.widthPixels;
+ String toS = "joshpatra12@protonmail.com";
+ String subS = subject.getText().toString();
+ String mesS = message.getText().toString() + "\n\n\n\n\n\n" + "\nAPI: " + API + "\nDevice: "
+ + device + "\nModel: "+ model +"\nType:" + type +"\nUser:" + user +
+ "\nDisplay height: " + height + "\nDisplay width: " + width;
+
+
+
+ /*
+ Intent emailIntent = new Intent(Intent.ACTION_SENDTO);
+ emailIntent.putExtra(Intent.EXTRA_EMAIL, toS);
+ emailIntent.putExtra(Intent.EXTRA_SUBJECT, subS);
+ emailIntent.putExtra(Intent.EXTRA_TEXT, mesS + "\n\n\n\n\n\n" + "\nAPI: " + API + "\nDevice: "
+ + device + "\nModel: " + model + "\nType:" + type + "\nUser:" + user +
+ "\nDisplay height: " + height + "\nDisplay width: " + width);
+ startActivity(Intent.createChooser(emailIntent, "Choose an app to sdend the email with ⬇️"));
+
+ */
+ /*
Intent email = new Intent(Intent.ACTION_SEND);
email.putExtra(Intent.EXTRA_EMAIL , new String [] {toS});
- email.putExtra(Intent.EXTRA_SUBJECT , subS);
- email.putExtra(Intent.EXTRA_TEXT , mesS + "\n\n\n\n\n\n" + "\nAPI: " + API + "\nDevice: "
- + device + "\nModel: "+ model +"\nType:" + type +"\nUser:" + user +
- "\nDisplay height: " + height + "\nDisplay width: " + width);
+ email.putExtra(Intent.EXTRA_SUBJECT , subS);
+ email.putExtra(Intent.EXTRA_TEXT , mesS);
email.setType("message/rfc822");
- startActivity(Intent.createChooser(email, "Choose an app to send the email with"));
+ startActivity(Intent.createChooser(email, "Choose an app to send the email with ⬇"));
+ *
+
+ */
+ Intent intent = new Intent(Intent.ACTION_SENDTO);
+ intent.setData(Uri.parse("mailto:")); // only email apps should handle this
+ intent.putExtra(Intent.EXTRA_EMAIL, new String [] {toS});
+ intent.putExtra(Intent.EXTRA_SUBJECT, subS);
+ intent.putExtra(Intent.EXTRA_TEXT, mesS);
+ startActivity(Intent.createChooser(intent, "Choose an app to send the email with ⬇"));
dialog.dismiss();
+
}
});
@@ -135,6 +159,7 @@ public class SendFeedbackFragment extends Fragment {
});
return view;
}
+
private int getNavigationBarHeight() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
DisplayMetrics metrics = new DisplayMetrics();
diff --git a/app/src/main/res/drawable-mdpi/btn_rounded_darker.xml b/app/src/main/res/drawable-mdpi/btn_rounded_darker.xml
new file mode 100644
index 0000000..ab68be2
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/btn_rounded_darker.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/app/src/main/res/drawable/btn_rounded.xml b/app/src/main/res/drawable/btn_rounded.xml
new file mode 100644
index 0000000..02df046
--- /dev/null
+++ b/app/src/main/res/drawable/btn_rounded.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index b3de999..0086d62 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -31,8 +31,9 @@