From 97479cb203b0a353aa7a693b72b2487a1b3d4eac Mon Sep 17 00:00:00 2001
From: George Muresan <georgecatalinmuresan@gmail.com>
Date: Sat, 11 Aug 2018 19:53:02 +0100
Subject: [PATCH] Merge branches 'master' and 'withoutbit' of
https://github.com/georgemuresan/Internship into withoutbit
# Conflicts:
# app/src/main/res/values/strings.xml
---
.idea/caches/build_file_checksums.ser | Bin 537 -> 537 bytes
app/build.gradle | 5 +
.../com/example/admin/sleepbetter/Data.java | 28 ++--
.../example/admin/sleepbetter/Factors.java | 8 +-
.../example/admin/sleepbetter/MainMenu.java | 4 +-
.../com/example/admin/sleepbetter/Noise.java | 121 ------------------
.../admin/sleepbetter/Questionnaire4.java | 2 +-
7 files changed, 26 insertions(+), 142 deletions(-)
delete mode 100644 app/src/main/java/com/example/admin/sleepbetter/Noise.java
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index e38e9c1396e698e2fca07321c3e69ae22e51d949..6231d7004841f28159d1426d13a5d6f002286fd8 100644
GIT binary patch
delta 35
rcmbQqGLvP(3>GbSQ@e?C$^}BDE|_fF^r|r0aEqLz+<S}3%8cIt>6s0l
delta 35
rcmbQqGLvP(3>Ha_H(w{tDHmXk3JY=T4dPh+jW1fJ_>|scWyWs+@B|H!
diff --git a/app/build.gradle b/app/build.gradle
index 8e01569..5c88681 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 f35c2a7..0d7f18c 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/Data.java
+++ b/app/src/main/java/com/example/admin/sleepbetter/Data.java
@@ -111,8 +111,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);
@@ -136,10 +136,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;
}
@@ -156,10 +156,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);
@@ -168,9 +168,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) {
@@ -203,8 +203,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);
@@ -402,8 +402,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 7b8fb50..5c73417 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 842ac02..3110ae0 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/MainMenu.java
+++ b/app/src/main/java/com/example/admin/sleepbetter/MainMenu.java
@@ -522,7 +522,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)
@@ -609,7 +609,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 f26edbf..0000000
--- 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 1563cfe..f1e9311 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/Questionnaire4.java
+++ b/app/src/main/java/com/example/admin/sleepbetter/Questionnaire4.java
@@ -278,7 +278,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();
--
GitLab