diff --git a/app/build.gradle b/app/build.gradle index 8e01569ff7b24d2d49982794bcaf24da1a010705..5c886817384479ec3bf3f19ced4d449387810d88 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,6 +17,11 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + lintOptions { + + checkReleaseBuilds false + + } } dependencies { diff --git a/app/src/main/java/com/example/admin/sleepbetter/Data.java b/app/src/main/java/com/example/admin/sleepbetter/Data.java index 7076790977c5694191ee35d729405a0e19c5e5f7..5d1b6a0d0a4250e458d2bc1835728bcb0beed79d 100644 --- a/app/src/main/java/com/example/admin/sleepbetter/Data.java +++ b/app/src/main/java/com/example/admin/sleepbetter/Data.java @@ -105,8 +105,8 @@ public class Data extends Fragment implements AdapterView.OnItemSelectedListener graph.setTitleColor(blackValue); // graph.setTitleTextSize(13); graph.getViewport().setMinX(0); - graph.getViewport().setMaxX(30); - graph.getViewport().setMaxXAxisSize(30); + graph.getViewport().setMaxX(20); + graph.getViewport().setMaxXAxisSize(20); graph.getViewport().setMinY(1); graph.getViewport().setMaxY(5); @@ -130,10 +130,10 @@ public class Data extends Fragment implements AdapterView.OnItemSelectedListener System.out.println("nr" + numberOfGoodMoods.size()); int beginning; - if ((numberOfGoodMoods.size() -1) % 2 == 0){ - beginning = numberOfGoodMoods.size() - 2; + if ((numberOfGoodMoods.size() -1) % 5 == 0){ + beginning = numberOfGoodMoods.size() - 5; } else { - beginning = ((numberOfGoodMoods.size() - 1) / 2) * 2 + 1; + beginning = ((numberOfGoodMoods.size() - 1) / 5) * 5 + 1; } @@ -150,10 +150,10 @@ public class Data extends Fragment implements AdapterView.OnItemSelectedListener i=0; int k=0; Iterator it = numberOfGoodMoods.iterator(); - if ((numberOfGoodMoods.size() - 1) % 2 == 0){ - while (it.hasNext() && k < 2) { + if ((numberOfGoodMoods.size() - 1) % 5 == 0){ + while (it.hasNext() && k < 5) { it.next(); - Integer moodToSee = userDatabase.daoAccess().fetchMoods().get(((userDatabase.daoAccess().fetchMoods().size() - 1) / 2) * 2 - 2 + k + 1); + Integer moodToSee = userDatabase.daoAccess().fetchMoods().get(((userDatabase.daoAccess().fetchMoods().size() - 1) / 5) * 5 - 5 + k + 1); if (moodToSee != -1) { dp2[i] = new DataPoint(k + 1, moodToSee); @@ -162,9 +162,9 @@ public class Data extends Fragment implements AdapterView.OnItemSelectedListener k++; } } else { - while (it.hasNext() && k < (numberOfGoodMoods.size() - 1) % 2) { + while (it.hasNext() && k < (numberOfGoodMoods.size() - 1) % 5) { it.next(); - Integer moodToSee = userDatabase.daoAccess().fetchMoods().get(((userDatabase.daoAccess().fetchMoods().size() - 1) / 2) * 2 + k + 1); + Integer moodToSee = userDatabase.daoAccess().fetchMoods().get(((userDatabase.daoAccess().fetchMoods().size() - 1) / 5) * 5 + k + 1); if (moodToSee != -1) { @@ -197,8 +197,8 @@ public class Data extends Fragment implements AdapterView.OnItemSelectedListener // graph2.setTitleTextSize(13); graph2.getViewport().setMinX(1); - graph2.getViewport().setMaxX(2); - graph2.getViewport().setMaxXAxisSize(2); + graph2.getViewport().setMaxX(5); + graph2.getViewport().setMaxXAxisSize(5); graph2.getViewport().setMinY(1); graph2.getViewport().setMaxY(5); @@ -396,8 +396,8 @@ public class Data extends Fragment implements AdapterView.OnItemSelectedListener graph.setTitleColor(blackValue); // graph.setTitleTextSize(13); graph.getViewport().setMinX(0); - graph.getViewport().setMaxX(30); - graph.getViewport().setMaxXAxisSize(30); + graph.getViewport().setMaxX(20); + graph.getViewport().setMaxXAxisSize(20); graph.getViewport().setMinY(1); graph.getViewport().setMaxY(5); diff --git a/app/src/main/java/com/example/admin/sleepbetter/Factors.java b/app/src/main/java/com/example/admin/sleepbetter/Factors.java index 7b8fb50f9021450b070a111db879787ef795efa6..5c73417b4f9684648c859e5379104f6987509eb4 100644 --- a/app/src/main/java/com/example/admin/sleepbetter/Factors.java +++ b/app/src/main/java/com/example/admin/sleepbetter/Factors.java @@ -134,7 +134,7 @@ public class Factors extends Fragment { System.out.println(fiveDays + " IS DAYS"); System.out.println(isLocked + " IS LOCKED"); - if (isLocked && fiveDays % 2 == 0 && currentDate.compareTo("18:59")>0){ + if (isLocked && fiveDays % 5 == 0 && currentDate.compareTo("18:59")>0){ //daca e blocat si a venit momentul sa se schimbe experimentul for (int i = 0; i < radioGroup.getChildCount(); i++) { radioGroup.getChildAt(i).setEnabled(true); @@ -143,19 +143,19 @@ public class Factors extends Fragment { getActivity().getApplicationContext().getSharedPreferences("MY_SHARED_PREF", MODE_PRIVATE).edit().putBoolean("locked", false).apply(); //Amm schimbat in plus - } else if (isLocked && (fiveDays + 1) % 2 == 0 && currentDate.compareTo("18:59")<0){ + } else if (isLocked && (fiveDays + 1) % 5 == 0 && currentDate.compareTo("18:59")<0){ for (int i = 0; i < radioGroup.getChildCount(); i++) { radioGroup.getChildAt(i).setEnabled(false); } Toast.makeText(getActivity().getApplicationContext(), "You will be able to change the experiment, after you complete today's questionnaire.", Toast.LENGTH_SHORT).show(); - } else if (isLocked && (fiveDays + 1) % 2 == 0 && currentDate.compareTo("18:59")>0){ + } else if (isLocked && (fiveDays + 1) % 5 == 0 && currentDate.compareTo("18:59")>0){ for (int i = 0; i < radioGroup.getChildCount(); i++) { radioGroup.getChildAt(i).setEnabled(false); } Toast.makeText(getActivity().getApplicationContext(), "You will be able to change the experiment, after you complete today's questionnaire.", Toast.LENGTH_SHORT).show(); - } else if (isLocked && fiveDays % 2 != 0){ + } else if (isLocked && fiveDays % 5 != 0){ //daca e blocat si e na din zilele cand nu are voie sa schimbe for (int i = 0; i < radioGroup.getChildCount(); i++) { radioGroup.getChildAt(i).setEnabled(false); diff --git a/app/src/main/java/com/example/admin/sleepbetter/MainMenu.java b/app/src/main/java/com/example/admin/sleepbetter/MainMenu.java index f4a8bb03cf1f31b33ae02148ba57e848c5365a45..4964c6295be86aa54d645515d7f3267db932a8d0 100644 --- a/app/src/main/java/com/example/admin/sleepbetter/MainMenu.java +++ b/app/src/main/java/com/example/admin/sleepbetter/MainMenu.java @@ -520,7 +520,7 @@ public class MainMenu extends AppCompatActivity implements NavigationView.OnNavi boolean isLocked = context.getSharedPreferences("MY_SHARED_PREF", MODE_PRIVATE).getBoolean("locked", false); int fiveDays = context.getSharedPreferences("MY_SHARED_PREF", MODE_PRIVATE).getInt("days", 0); - if (isLocked && fiveDays % 2 == 0) { + if (isLocked && fiveDays % 5 == 0) { //daca e blocat si a venit momentul sa se schimbe experimentul NotificationCompat.Builder mNotifyBuilder = new NotificationCompat.Builder(context, "13") .setSmallIcon(R.drawable.pill) @@ -607,7 +607,7 @@ public class MainMenu extends AppCompatActivity implements NavigationView.OnNavi //daca nu a facut chestionarul //1 updatam ce se intampla in questionnaire 4 - if (fiveDays % 2 == 1 && wasRightAfterChangeOfExperiment) { + if (fiveDays % 5 == 1 && wasRightAfterChangeOfExperiment) { context.getSharedPreferences("MY_SHARED_PREF", MODE_PRIVATE).edit().putInt("days", fiveDays).apply(); context.getApplicationContext().getSharedPreferences("MY_SHARED_PREF", MODE_PRIVATE).edit().putBoolean("afterExperiment", false).apply(); diff --git a/app/src/main/java/com/example/admin/sleepbetter/Noise.java b/app/src/main/java/com/example/admin/sleepbetter/Noise.java deleted file mode 100644 index f26edbfeb7611773310ec2914b08d519cf7542e9..0000000000000000000000000000000000000000 --- a/app/src/main/java/com/example/admin/sleepbetter/Noise.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.example.admin.sleepbetter; - -import android.app.Activity; -import android.media.MediaRecorder; -import android.os.Bundle; -import android.os.Handler; -import android.util.Log; -import android.widget.TextView; - -public class Noise extends Activity { - - TextView mStatusView; - MediaRecorder mRecorder; - Thread runner; - private static double mEMA = 0.0; - static final private double EMA_FILTER = 0.6; - - final Runnable updater = new Runnable(){ - - public void run(){ - updateTv(); - }; - }; - final Handler mHandler = new Handler(); - - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - //setContentView(R.layout.noiselevel); - // mStatusView = (TextView) findViewById(R.id.status); - - - if (runner == null) - { - runner = new Thread(){ - public void run() - { - while (runner != null) - { - try - { - Thread.sleep(1000); - Log.i("Noise", "Tock"); - } catch (InterruptedException e) { }; - mHandler.post(updater); - } - } - }; - runner.start(); - Log.d("Noise", "start runner()"); - } - } - - public void onResume() - { - super.onResume(); - startRecorder(); - } - - public void onPause() - { - super.onPause(); - stopRecorder(); - } - - public void startRecorder(){ - if (mRecorder == null) - { - mRecorder = new MediaRecorder(); - mRecorder.setAudioSource(MediaRecorder.AudioSource.MIC); - mRecorder.setOutputFormat(MediaRecorder.OutputFormat.THREE_GPP); - mRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB); - mRecorder.setOutputFile("/dev/null"); - try - { - mRecorder.prepare(); - }catch (java.io.IOException ioe) { - android.util.Log.e("[Monkey]", "IOException: " + android.util.Log.getStackTraceString(ioe)); - - }catch (java.lang.SecurityException e) { - android.util.Log.e("[Monkey]", "SecurityException: " + android.util.Log.getStackTraceString(e)); - } - try - { - mRecorder.start(); - }catch (java.lang.SecurityException e) { - android.util.Log.e("[Monkey]", "SecurityException: " + android.util.Log.getStackTraceString(e)); - } - - //mEMA = 0.0; - } - - } - public void stopRecorder() { - if (mRecorder != null) { - mRecorder.stop(); - mRecorder.release(); - mRecorder = null; - } - } - - public void updateTv(){ - mStatusView.setText(Double.toString((getAmplitudeEMA())) + " dB"); - } - public double soundDb(double ampl){ - return 20 * Math.log10(getAmplitudeEMA() / ampl); - } - public double getAmplitude() { - if (mRecorder != null) - return (mRecorder.getMaxAmplitude()); - else - return 0; - - } - public double getAmplitudeEMA() { - double amp = getAmplitude(); - mEMA = EMA_FILTER * amp + (1.0 - EMA_FILTER) * mEMA; - return mEMA; - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/example/admin/sleepbetter/Questionnaire4.java b/app/src/main/java/com/example/admin/sleepbetter/Questionnaire4.java index a5a6655ab89c944a95b82c7a928d86e5dbacecde..f73def92e10ffc6a2b400b62538aea14d49cb8b6 100644 --- a/app/src/main/java/com/example/admin/sleepbetter/Questionnaire4.java +++ b/app/src/main/java/com/example/admin/sleepbetter/Questionnaire4.java @@ -277,7 +277,7 @@ public class Questionnaire4 extends Fragment { int days = getActivity().getApplicationContext().getSharedPreferences("MY_SHARED_PREF", MODE_PRIVATE).getInt("days", 0); Boolean wasRightAfterChangeOfExperiment = getActivity().getApplicationContext().getSharedPreferences("MY_SHARED_PREF", MODE_PRIVATE).getBoolean("afterExperiment", true);; - if (days % 2 == 1 && wasRightAfterChangeOfExperiment){ + if (days % 5 == 1 && wasRightAfterChangeOfExperiment){ getActivity().getApplicationContext().getSharedPreferences("MY_SHARED_PREF", MODE_PRIVATE).edit().putInt("days", days).apply(); getActivity().getApplicationContext().getSharedPreferences("MY_SHARED_PREF", MODE_PRIVATE).edit().putBoolean("afterExperiment", false).apply();