Merge branches 'master' and 'withoutbit' of...

Merge branches 'master' and 'withoutbit' of https://github.com/georgemuresan/Internship into withoutbit

# Conflicts:
#	app/src/main/res/values/strings.xml

app/build.gradle

@@ -17,6 +17,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    lintOptions {
+
+        checkReleaseBuilds false
+
+    }
 }
 
 dependencies {

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);
 

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);

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();
 

app/src/main/java/com/example/admin/sleepbetter/Noise.java

-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

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();