diff --git a/app/app/src/main/AndroidManifest.xml b/app/app/src/main/AndroidManifest.xml
index 02e94e6..279e19b 100644
--- a/app/app/src/main/AndroidManifest.xml
+++ b/app/app/src/main/AndroidManifest.xml
@@ -11,11 +11,10 @@
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/app/src/main/java/com/eriknakamura/skinsense/AutoSymptom.java b/app/app/src/main/java/com/eriknakamura/skinsense/AutoSymptom.java
new file mode 100644
index 0000000..30e0c3f
--- /dev/null
+++ b/app/app/src/main/java/com/eriknakamura/skinsense/AutoSymptom.java
@@ -0,0 +1,37 @@
+package com.eriknakamura.skinsense;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.CheckBox;
+
+public class AutoSymptom extends AppCompatActivity {
+ CheckBox autoy;
+ CheckBox auton;
+ private Handler handler;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.auto_symptom);
+ autoy = (CheckBox) findViewById(R.id.autoy);
+ auton = (CheckBox) findViewById(R.id.auton);
+ handler = new Handler();
+ }
+
+ public void onCheckboxClicked(View view){
+ handler.postDelayed(changeSymptom, 500);
+ }
+
+ private Runnable changeSymptom = new Runnable() {
+ @Override
+ public void run() {
+ Intent intent = new Intent(getApplicationContext(), ResultsActivity.class);
+ intent.putExtra("autoy", autoy.isChecked());
+ intent.putExtra("auton", auton.isChecked());
+ startActivity(intent);
+ }
+ };
+}
diff --git a/app/app/src/main/java/com/eriknakamura/skinsense/BumpsSymptom.java b/app/app/src/main/java/com/eriknakamura/skinsense/BumpsSymptom.java
new file mode 100644
index 0000000..64db674
--- /dev/null
+++ b/app/app/src/main/java/com/eriknakamura/skinsense/BumpsSymptom.java
@@ -0,0 +1,37 @@
+package com.eriknakamura.skinsense;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.CheckBox;
+
+public class BumpsSymptom extends AppCompatActivity {
+ CheckBox bumpsy;
+ CheckBox bumpsn;
+ private Handler handler;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.bumps_symptom);
+ bumpsy = (CheckBox) findViewById(R.id.bumpsy);
+ bumpsn = (CheckBox) findViewById(R.id.bumpsn);
+ handler = new Handler();
+ }
+
+ public void onCheckboxClicked(View view){
+ handler.postDelayed(changeSymptom, 500);
+ }
+
+ private Runnable changeSymptom = new Runnable() {
+ @Override
+ public void run() {
+ Intent intent = new Intent(getApplicationContext(), RednessSymptom.class);
+ intent.putExtra("bumpsy", bumpsy.isChecked());
+ intent.putExtra("bumpsn", bumpsn.isChecked());
+ startActivity(intent);
+ }
+ };
+}
diff --git a/app/app/src/main/java/com/eriknakamura/skinsense/CameraActivity.java b/app/app/src/main/java/com/eriknakamura/skinsense/CameraActivity.java
index 1635d8e..c3a1cf7 100644
--- a/app/app/src/main/java/com/eriknakamura/skinsense/CameraActivity.java
+++ b/app/app/src/main/java/com/eriknakamura/skinsense/CameraActivity.java
@@ -5,39 +5,36 @@
import android.graphics.BitmapFactory;
import android.net.Uri;
import android.os.Environment;
+import android.os.Handler;
import android.provider.MediaStore;
import android.support.v4.content.FileProvider;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
-import android.widget.CheckBox;
import android.widget.ImageView;
import java.io.File;
import java.text.DateFormat;
import java.util.Date;
+import java.util.Timer;
+import java.util.TimerTask;
public class CameraActivity extends AppCompatActivity {
static final int REQUEST_TAKE_PHOTO = 1;
ImageView imageView;
Button submitInfo;
Button takePicture;
- Button test;
- CheckBox itchiness;
- CheckBox burning;
- CheckBox pain;
String currentPhotoPath;
+ Handler handler;
+ Timer timer;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_camera);
imageView = (ImageView) findViewById(R.id.imageView);
-
- itchiness = (CheckBox) findViewById(R.id.itchiness);
- burning = (CheckBox) findViewById(R.id.burning);
- pain = (CheckBox) findViewById(R.id.pain);
+ handler = new Handler();
takePicture = (Button) findViewById(R.id.picture_button);
takePicture.setOnClickListener(new View.OnClickListener() {
@@ -49,23 +46,14 @@ public void onClick(View v) {
submitInfo = (Button) findViewById(R.id.submit_button);
submitInfo.setOnClickListener(new View.OnClickListener() {
- Intent intent = new Intent(CameraActivity.this, ResultsActivity.class);
+ Intent intent = new Intent(CameraActivity.this, RashSymptom.class);
@Override
public void onClick(View v) {
- intent.putExtra("itchiness", itchiness.isChecked());
intent.putExtra("stringPath", currentPhotoPath);
startActivity(intent);
}
});
-
- test = (Button) findViewById(R.id.button);
- test.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- setThumbnail(currentPhotoPath);
- }
- });
}
private void dispatchTakePictureIntent() {
@@ -99,7 +87,6 @@ private File createImageFile() throws Exception {
currentPhotoPath = image.getAbsolutePath();
- System.out.println(currentPhotoPath);
return image;
}
diff --git a/app/app/src/main/java/com/eriknakamura/skinsense/DrynessSymptom.java b/app/app/src/main/java/com/eriknakamura/skinsense/DrynessSymptom.java
new file mode 100644
index 0000000..c8ea7b0
--- /dev/null
+++ b/app/app/src/main/java/com/eriknakamura/skinsense/DrynessSymptom.java
@@ -0,0 +1,37 @@
+package com.eriknakamura.skinsense;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.CheckBox;
+
+public class DrynessSymptom extends AppCompatActivity {
+ CheckBox dryy;
+ CheckBox dryn;
+ private Handler handler;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_dryness_symptom);
+ dryy = (CheckBox) findViewById(R.id.dryy);
+ dryn = (CheckBox) findViewById(R.id.dryn);
+ handler = new Handler();
+ }
+
+ public void onCheckboxClicked(View view){
+ handler.postDelayed(changeSymptom, 500);
+ }
+
+ private Runnable changeSymptom = new Runnable() {
+ @Override
+ public void run() {
+ Intent intent = new Intent(getApplicationContext(), BumpsSymptom.class);
+ intent.putExtra("dryy", dryy.isChecked());
+ intent.putExtra("dryn", dryn.isChecked());
+ startActivity(intent);
+ }
+ };
+}
diff --git a/app/app/src/main/java/com/eriknakamura/skinsense/ItchSymptom.java b/app/app/src/main/java/com/eriknakamura/skinsense/ItchSymptom.java
new file mode 100644
index 0000000..9d90b1b
--- /dev/null
+++ b/app/app/src/main/java/com/eriknakamura/skinsense/ItchSymptom.java
@@ -0,0 +1,37 @@
+package com.eriknakamura.skinsense;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.CheckBox;
+
+public class ItchSymptom extends AppCompatActivity {
+ CheckBox itchy;
+ CheckBox itchn;
+ private Handler handler;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.itch_symptom);
+ itchy = (CheckBox) findViewById(R.id.itchy);
+ itchn = (CheckBox) findViewById(R.id.itchn);
+ handler = new Handler();
+ }
+
+ public void onCheckboxClicked(View view){
+ handler.postDelayed(changeSymptom, 500);
+ }
+
+ private Runnable changeSymptom = new Runnable() {
+ @Override
+ public void run() {
+ Intent intent = new Intent(getApplicationContext(), PainSymptom.class);
+ intent.putExtra("itchy", itchy.isChecked());
+ intent.putExtra("itchn", itchn.isChecked());
+ startActivity(intent);
+ }
+ };
+}
diff --git a/app/app/src/main/java/com/eriknakamura/skinsense/PainSymptom.java b/app/app/src/main/java/com/eriknakamura/skinsense/PainSymptom.java
new file mode 100644
index 0000000..91546a3
--- /dev/null
+++ b/app/app/src/main/java/com/eriknakamura/skinsense/PainSymptom.java
@@ -0,0 +1,37 @@
+package com.eriknakamura.skinsense;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.CheckBox;
+
+public class PainSymptom extends AppCompatActivity {
+ CheckBox painy;
+ CheckBox painn;
+ private Handler handler;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.pain_symptom);
+ painy = (CheckBox) findViewById(R.id.painy);
+ painn = (CheckBox) findViewById(R.id.painn);
+ handler = new Handler();
+ }
+
+ public void onCheckboxClicked(View view){
+ handler.postDelayed(changeSymptom, 500);
+ }
+
+ private Runnable changeSymptom = new Runnable() {
+ @Override
+ public void run() {
+ Intent intent = new Intent(getApplicationContext(), AutoSymptom.class);
+ intent.putExtra("painy", painy.isChecked());
+ intent.putExtra("painn", painn.isChecked());
+ startActivity(intent);
+ }
+ };
+}
diff --git a/app/app/src/main/java/com/eriknakamura/skinsense/RashSymptom.java b/app/app/src/main/java/com/eriknakamura/skinsense/RashSymptom.java
new file mode 100644
index 0000000..c9cc48c
--- /dev/null
+++ b/app/app/src/main/java/com/eriknakamura/skinsense/RashSymptom.java
@@ -0,0 +1,37 @@
+package com.eriknakamura.skinsense;
+
+import android.content.Intent;
+import android.os.Handler;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.CheckBox;
+
+public class RashSymptom extends AppCompatActivity {
+ CheckBox rashy;
+ CheckBox rashn;
+ private Handler handler;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_rash_symptom);
+ rashy = (CheckBox) findViewById(R.id.rashy);
+ rashn = (CheckBox) findViewById(R.id.rashn);
+ handler = new Handler();
+ }
+
+ public void onCheckboxClicked(View view){
+ handler.postDelayed(changeSymptom, 500);
+ }
+
+ private Runnable changeSymptom = new Runnable() {
+ @Override
+ public void run() {
+ Intent intent = new Intent(getApplicationContext(), DrynessSymptom.class);
+ intent.putExtra("rashy", rashy.isChecked());
+ intent.putExtra("rashn", rashn.isChecked());
+ startActivity(intent);
+ }
+ };
+}
diff --git a/app/app/src/main/java/com/eriknakamura/skinsense/RednessSymptom.java b/app/app/src/main/java/com/eriknakamura/skinsense/RednessSymptom.java
new file mode 100644
index 0000000..a9cb565
--- /dev/null
+++ b/app/app/src/main/java/com/eriknakamura/skinsense/RednessSymptom.java
@@ -0,0 +1,37 @@
+package com.eriknakamura.skinsense;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.CheckBox;
+
+public class RednessSymptom extends AppCompatActivity {
+ CheckBox redy;
+ CheckBox redn;
+ private Handler handler;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.redness_symptom);
+ redy = (CheckBox) findViewById(R.id.rednessy);
+ redn = (CheckBox) findViewById(R.id.rednessn);
+ handler = new Handler();
+ }
+
+ public void onCheckboxClicked(View view){
+ handler.postDelayed(changeSymptom, 500);
+ }
+
+ private Runnable changeSymptom = new Runnable() {
+ @Override
+ public void run() {
+ Intent intent = new Intent(getApplicationContext(), StiffSymptom.class);
+ intent.putExtra("redy", redy.isChecked());
+ intent.putExtra("redn", redn.isChecked());
+ startActivity(intent);
+ }
+ };
+}
diff --git a/app/app/src/main/java/com/eriknakamura/skinsense/ResultsActivity.java b/app/app/src/main/java/com/eriknakamura/skinsense/ResultsActivity.java
index 56244fa..75d0620 100644
--- a/app/app/src/main/java/com/eriknakamura/skinsense/ResultsActivity.java
+++ b/app/app/src/main/java/com/eriknakamura/skinsense/ResultsActivity.java
@@ -9,7 +9,6 @@ public class ResultsActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
Intent intent = getIntent();
-
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_results);
}
diff --git a/app/app/src/main/java/com/eriknakamura/skinsense/StiffSymptom.java b/app/app/src/main/java/com/eriknakamura/skinsense/StiffSymptom.java
new file mode 100644
index 0000000..a9a1921
--- /dev/null
+++ b/app/app/src/main/java/com/eriknakamura/skinsense/StiffSymptom.java
@@ -0,0 +1,37 @@
+package com.eriknakamura.skinsense;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.CheckBox;
+
+public class StiffSymptom extends AppCompatActivity {
+ CheckBox stiffy;
+ CheckBox stiffn;
+ private Handler handler;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.stiff_symptom);
+ stiffy = (CheckBox) findViewById(R.id.stiffy);
+ stiffn = (CheckBox) findViewById(R.id.stiffn);
+ handler = new Handler();
+ }
+
+ public void onCheckboxClicked(View view){
+ handler.postDelayed(changeSymptom, 500);
+ }
+
+ private Runnable changeSymptom = new Runnable() {
+ @Override
+ public void run() {
+ Intent intent = new Intent(getApplicationContext(), ItchSymptom.class);
+ intent.putExtra("stiffy", stiffy.isChecked());
+ intent.putExtra("stiffn", stiffn.isChecked());
+ startActivity(intent);
+ }
+ };
+}
diff --git a/app/app/src/main/res/layout/activity_camera.xml b/app/app/src/main/res/layout/activity_camera.xml
index ec3c4d6..f89ad3d 100644
--- a/app/app/src/main/res/layout/activity_camera.xml
+++ b/app/app/src/main/res/layout/activity_camera.xml
@@ -11,40 +11,6 @@
android:paddingTop="@dimen/activity_vertical_margin"
tools:context="com.eriknakamura.skinsense.CameraActivity">
-
-
-
-
-
-
-
-
-
-
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true" />
-
-
-
+ app:srcCompat="@mipmap/ic_launcher"
+ android:layout_below="@+id/picture_button"
+ android:layout_centerHorizontal="true"/>
diff --git a/app/app/src/main/res/layout/activity_dryness_symptom.xml b/app/app/src/main/res/layout/activity_dryness_symptom.xml
new file mode 100644
index 0000000..5c3aaa9
--- /dev/null
+++ b/app/app/src/main/res/layout/activity_dryness_symptom.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/app/src/main/res/layout/activity_rash_symptom.xml b/app/app/src/main/res/layout/activity_rash_symptom.xml
new file mode 100644
index 0000000..c6bbe32
--- /dev/null
+++ b/app/app/src/main/res/layout/activity_rash_symptom.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/app/src/main/res/layout/auto_symptom.xml b/app/app/src/main/res/layout/auto_symptom.xml
new file mode 100644
index 0000000..5745fe7
--- /dev/null
+++ b/app/app/src/main/res/layout/auto_symptom.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/app/src/main/res/layout/bumps_symptom.xml b/app/app/src/main/res/layout/bumps_symptom.xml
new file mode 100644
index 0000000..038da6a
--- /dev/null
+++ b/app/app/src/main/res/layout/bumps_symptom.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/app/src/main/res/layout/itch_symptom.xml b/app/app/src/main/res/layout/itch_symptom.xml
new file mode 100644
index 0000000..6626b79
--- /dev/null
+++ b/app/app/src/main/res/layout/itch_symptom.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/app/src/main/res/layout/pain_symptom.xml b/app/app/src/main/res/layout/pain_symptom.xml
new file mode 100644
index 0000000..78c7e01
--- /dev/null
+++ b/app/app/src/main/res/layout/pain_symptom.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/app/src/main/res/layout/redness_symptom.xml b/app/app/src/main/res/layout/redness_symptom.xml
new file mode 100644
index 0000000..a14b1db
--- /dev/null
+++ b/app/app/src/main/res/layout/redness_symptom.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/app/src/main/res/layout/stiff_symptom.xml b/app/app/src/main/res/layout/stiff_symptom.xml
new file mode 100644
index 0000000..9af5237
--- /dev/null
+++ b/app/app/src/main/res/layout/stiff_symptom.xml
@@ -0,0 +1,39 @@
+
+
+
+
+
+
+
+
+