diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index 30aa626c23142d59e94cc76327172301f159b618..0000000000000000000000000000000000000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
- <code_scheme name="Project" version="173">
- <Objective-C-extensions>
- <file>
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
- </file>
- <class>
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
- <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
- </class>
- <extensions>
- <pair source="cpp" header="h" fileNamingConvention="NONE" />
- <pair source="c" header="h" fileNamingConvention="NONE" />
- </extensions>
- </Objective-C-extensions>
- </code_scheme>
-</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..15a15b218a29e09c9190992732698d646e4d659a
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2a11ccfdef66c11dc872979280c8fe750f60b1ba..72a436b44bb8278c9cdfc78f5f9659a4b85a413e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,9 +13,9 @@
<application
android:allowBackup="true"
- android:icon="@drawable/pill"
+ android:icon="@drawable/pillow"
android:label="@string/app_name"
- android:roundIcon="@drawable/pill"
+ android:roundIcon="@drawable/pillow"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".FirstPage">
@@ -28,8 +28,8 @@
<!--<receiver android:name=".NotifyService"/>-->
<activity android:name=".FirstPageConsent" />
- <receiver android:name=".MainMenu$Broadcast1" />
- <receiver android:name=".MainMenu$Broadcast2" />
+ <!--receiver android:name=".MainMenu$Broadcast1" />-->
+ <!--receiver android:name=".MainMenu$Broadcast2" />-->
<activity
android:name=".MainMenu"
diff --git a/app/src/main/java/com/uos/admin/sleepbetter/B_MainMenu.java b/app/src/main/java/com/uos/admin/sleepbetter/B_MainMenu.java
index a813a7e23fd6ad2ace8ce82c9526c8cb01da8b82..3605aacda6d2c9d18719f34d0d538ad51115f776 100644
--- a/app/src/main/java/com/uos/admin/sleepbetter/B_MainMenu.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/B_MainMenu.java
@@ -34,7 +34,7 @@ import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
-public class B_MainMenu extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener {
+public class B_MainMenu extends AppCompatActivity {
static Class nextclass = B_MainMenu.class;
private static final String DATABASE_NAME = "user_db";
@@ -42,7 +42,7 @@ public class B_MainMenu extends AppCompatActivity implements NavigationView.OnNa
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.act_b_menu);
+ setContentView(R.layout.act_main_menu);
Date c = Calendar.getInstance().getTime();
SimpleDateFormat df = new SimpleDateFormat("dd-MMM-yyyy");
@@ -108,6 +108,7 @@ public class B_MainMenu extends AppCompatActivity implements NavigationView.OnNa
//scoatem variabila days si verificam: daca se imparte la 5, si nu e locked,
ImageView imageView = findViewById(R.id.imageView2);
+ /*
imageView.setImageResource(R.drawable.sleep);
@@ -129,7 +130,7 @@ public class B_MainMenu extends AppCompatActivity implements NavigationView.OnNa
String name = getSharedPreferences("name", MODE_PRIVATE).getString("username", "nothing");
navUsername.setText(name);
-
+*/
//NOTIFICATION DEMO
this.createNotificationChannel();
this.setNotifications();
@@ -240,7 +241,7 @@ public class B_MainMenu extends AppCompatActivity implements NavigationView.OnNa
startActivity(intent);
}
-
+/*
@Override
public void onBackPressed() {
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
@@ -258,7 +259,7 @@ public class B_MainMenu extends AppCompatActivity implements NavigationView.OnNa
}
}
}
-
+*/
@Override
public boolean onOptionsItemSelected(MenuItem item) {
@@ -271,7 +272,7 @@ public class B_MainMenu extends AppCompatActivity implements NavigationView.OnNa
return super.onOptionsItemSelected(item);
}
-
+/*
@SuppressWarnings("StatementWithEmptyBody")
@Override
public boolean onNavigationItemSelected(MenuItem item) {
@@ -292,7 +293,7 @@ public class B_MainMenu extends AppCompatActivity implements NavigationView.OnNa
drawer.closeDrawer(GravityCompat.START);
return true;
}
-
+*/
private void createNotificationChannel() {
// Create the NotificationChannel, but only on API 26+ because
// the NotificationChannel class is new and not in the support library
@@ -392,7 +393,7 @@ public class B_MainMenu extends AppCompatActivity implements NavigationView.OnNa
// Uri alarmSound = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
NotificationCompat.Builder mNotifyBuilder = new NotificationCompat.Builder(context, "13")
- .setSmallIcon(R.drawable.pill)
+ .setSmallIcon(R.drawable.data)
.setContentTitle(titleM)
.setStyle(new NotificationCompat.BigTextStyle()
.bigText(messageM))
diff --git a/app/src/main/java/com/uos/admin/sleepbetter/B_WhatExperiments.java b/app/src/main/java/com/uos/admin/sleepbetter/B_WhatExperiments.java
index 3adca6ab8389368bc879f12116b280dbb57ce1eb..6253cad67135c5195a2748af6ab685e26149f595 100644
--- a/app/src/main/java/com/uos/admin/sleepbetter/B_WhatExperiments.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/B_WhatExperiments.java
@@ -15,7 +15,7 @@ public class B_WhatExperiments extends AppCompatActivity {
setContentView(R.layout.act_b_what_experiments);
ImageView imageView = findViewById(R.id.imageView23);
- imageView.setImageResource(R.drawable.phone);
+ imageView.setImageResource(R.drawable.data);
Button button = (Button) findViewById(R.id.back);
diff --git a/app/src/main/java/com/uos/admin/sleepbetter/CalendarPage.java b/app/src/main/java/com/uos/admin/sleepbetter/CalendarPage.java
index 9151639de3e5af90680a233c838508135657ee15..2eaa650ced3f07c6d11a20892dd7ed86d3e29704 100644
--- a/app/src/main/java/com/uos/admin/sleepbetter/CalendarPage.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/CalendarPage.java
@@ -1,11 +1,11 @@
package com.uos.admin.sleepbetter;
-import android.app.Fragment;
import android.app.FragmentTransaction;
import android.arch.persistence.room.Room;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/com/uos/admin/sleepbetter/Data.java b/app/src/main/java/com/uos/admin/sleepbetter/Data.java
index cbece7771e3f85c2b7200600d31420270b9b0ae7..3101488cfa2799b05845a9128285ba0b8a734983 100644
--- a/app/src/main/java/com/uos/admin/sleepbetter/Data.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/Data.java
@@ -2,8 +2,6 @@ package com.uos.admin.sleepbetter;
import android.app.AlertDialog;
import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.Fragment;
import android.arch.persistence.room.Room;
import android.content.Context;
import android.content.DialogInterface;
@@ -13,6 +11,8 @@ import android.graphics.Color;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -34,6 +34,7 @@ import java.util.Calendar;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
+import android.support.v4.app.DialogFragment;
import static android.content.Context.MODE_PRIVATE;
@@ -42,20 +43,21 @@ public class Data extends Fragment implements AdapterView.OnItemSelectedListener
private static final String DATABASE_NAME = "user_db";
private Spinner spinner;
View dataView;
+
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
dataView = inflater.inflate(R.layout.act_data, container, false);
ImageView imageView1 = (ImageView) dataView.findViewById(R.id.imageView28);
- imageView1.setImageResource(R.drawable.you);
-
+ imageView1.setImageResource(R.drawable.data);
Button info1 = (Button) dataView.findViewById(R.id.infoRatings);
info1.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
InfoOneDialog dia = new InfoOneDialog();
- dia.show(getFragmentManager(), "dialog");
+
+ dia.show(getFragmentManager(), "dd");
}
});
Button info2 = (Button) dataView.findViewById(R.id.infoImprovements);
diff --git a/app/src/main/java/com/uos/admin/sleepbetter/Factors.java b/app/src/main/java/com/uos/admin/sleepbetter/Factors.java
index 58b2115b9e3fca8bd2d068188c4fa282298fbf91..503a8a73ec06fb778ac578f208c99b0863cfb889 100644
--- a/app/src/main/java/com/uos/admin/sleepbetter/Factors.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/Factors.java
@@ -2,13 +2,13 @@ package com.uos.admin.sleepbetter;
import android.app.AlertDialog;
import android.app.Dialog;
-import android.app.DialogFragment;
-import android.app.Fragment;
import android.arch.persistence.room.Room;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -30,6 +30,7 @@ import static android.content.Context.MODE_PRIVATE;
public class Factors extends Fragment {
View factorsView;
+
private static RadioGroup radioGroup;
private boolean shouldBlockTouches = false;
@@ -42,13 +43,13 @@ public class Factors extends Fragment {
Button button2 = (Button) factorsView.findViewById(R.id.submit);
- button2.setOnClickListener(new View.OnClickListener() {
+ /* button2.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
submitExperiment();
}
});
-
+*/
String experiment = getActivity().getApplicationContext().getSharedPreferences("name", MODE_PRIVATE).getString("experiment", "nothing");
int savedRadioIndex = getActivity().getApplicationContext().getSharedPreferences("MY_SHARED_PREF", MODE_PRIVATE).getInt("KEY_SAVED_RADIO_BUTTON_INDEX", 0);
diff --git a/app/src/main/java/com/uos/admin/sleepbetter/GoalDiary.java b/app/src/main/java/com/uos/admin/sleepbetter/GoalDiary.java
index d097be7a70b96c359e040f8da3c9a6f6382a88a6..a420a8dd999dc002014b6efb092ab13d992850d3 100644
--- a/app/src/main/java/com/uos/admin/sleepbetter/GoalDiary.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/GoalDiary.java
@@ -1,10 +1,10 @@
package com.uos.admin.sleepbetter;
-import android.app.Fragment;
import android.arch.persistence.room.Room;
import android.graphics.Color;
import android.os.Bundle;
import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -37,7 +37,7 @@ public class GoalDiary extends Fragment {
public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, Bundle savedInstanceState) {
goalDiaryView = inflater.inflate(R.layout.act_diary, container, false);
ImageView imageView = (ImageView) goalDiaryView.findViewById(R.id.imageView29);
- imageView.setImageResource(R.drawable.diary);
+ imageView.setImageResource(R.drawable.data);
Button button = (Button) goalDiaryView.findViewById(R.id.button);
button.setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/java/com/uos/admin/sleepbetter/MainMenu.java b/app/src/main/java/com/uos/admin/sleepbetter/MainMenu.java
index fb62b0fd77a689d290eb3eb176acb34b9531a0cf..44c527e6ca0ac80d1add1d6b6dcaa6b113f1516f 100644
--- a/app/src/main/java/com/uos/admin/sleepbetter/MainMenu.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/MainMenu.java
@@ -13,7 +13,9 @@ import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
+import android.support.design.widget.TabLayout;
import android.support.v4.app.NotificationCompat;
+import android.support.v4.view.ViewPager;
import android.view.View;
import android.support.design.widget.NavigationView;
import android.support.v4.view.GravityCompat;
@@ -35,266 +37,52 @@ import java.util.Arrays;
import java.util.Date;
import java.util.Calendar;
-public class MainMenu extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener {
+public class MainMenu extends AppCompatActivity {
static Class nextclass = MainMenu.class;
private static final String DATABASE_NAME = "user_db";
+ Toolbar toolbar;
+ TabLayout tabLayout;
+ ViewPager viewPager;
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.act_menu);
-
-
- Date c = Calendar.getInstance().getTime();
- SimpleDateFormat df = new SimpleDateFormat("dd-MMM-yyyy");
- final String currentDate = df.format(c);
-
- String startingDate = getSharedPreferences("date", MODE_PRIVATE).getString("startingDate", "");
-
- Date date1 = null;
- Date date2 = null;
-
- SimpleDateFormat dates = new SimpleDateFormat("dd-MMM-yyyy");
-
- //Setting dates
- try {
- date1 = dates.parse(currentDate);
- date2 = dates.parse(startingDate);
- } catch (ParseException e) {
- e.printStackTrace();
- }
-
- Calendar c1 = Calendar.getInstance();
- c1.setTime(date1);
-
- Calendar c2 = Calendar.getInstance();
- c2.setTime(date2);
-
- int shouldBe = c1.get(Calendar.DAY_OF_YEAR) - c2.get(Calendar.DAY_OF_YEAR);
-
- final int finalShouldBe = shouldBe;
-
- String expStartDate = getSharedPreferences("date", MODE_PRIVATE).getString("startExperiment", "");
-
- if (shouldBe == 0 && expStartDate.equals("")) {
- Toast.makeText(getApplicationContext(), "Please choose an experiment.", Toast.LENGTH_LONG).show();
- }
-
-
- new Thread(new Runnable() {
- @Override
- public void run() {
- UserDatabase uDatabase = Room.databaseBuilder(getApplicationContext(), UserDatabase.class, DATABASE_NAME).fallbackToDestructiveMigration().build();
- int loggedIn = uDatabase.daoAccess().fetchUserQuestionnaires().size();
-
-
- int misses = finalShouldBe -loggedIn;
-
-
- if (misses >=1){
+ setContentView(R.layout.act_main_menu);
- String moods_string = getApplicationContext().getSharedPreferences("moods", MODE_PRIVATE).getString("moods", "");
- String[] moods = moods_string.split("gcm");
-
- ArrayList<String> moodsArrayList = new ArrayList<String>(Arrays.asList(moods));
-
- for (int i=0; i<misses; i++){
- // adaugam -1 in tabel
-
- UserQuestionnaire user = new UserQuestionnaire();
- String username = getApplicationContext().getSharedPreferences("name", MODE_PRIVATE).getString("participantID", "nothing"); user.setUsername(username);
- user.setDate(currentDate);
- user.setUsername(username);
- user.setHowLong(-1);
- user.setAwake(-1);
- user.setEarlier(-1);
- user.setNightsAWeek(-1);
- user.setQuality(-1);
- user.setImpactMood(-1);
- user.setImpactActivities(-1);
- user.setImpactGeneral(-1);
- user.setProblem(-1);
- user.setMood(-1);
-
- getSharedPreferences("questionnaire", MODE_PRIVATE).edit().putInt("howLong", -1).apply();
- getSharedPreferences("questionnaire", MODE_PRIVATE).edit().putInt("awake", -1).apply();
- getSharedPreferences("questionnaire", MODE_PRIVATE).edit().putInt("earlier", -1).apply();
- getSharedPreferences("questionnaire", MODE_PRIVATE).edit().putInt("quality", -1).apply();
- getSharedPreferences("questionnaire", MODE_PRIVATE).edit().putInt("impactMood", -1).apply();
- getSharedPreferences("questionnaire", MODE_PRIVATE).edit().putInt("impactActivities", -1).apply();
- getSharedPreferences("questionnaire", MODE_PRIVATE).edit().putInt("impactGeneral", -1).apply();
- getSharedPreferences("MOOD", MODE_PRIVATE).edit().putFloat("mood", (float) -1).apply();
-
- //setting mood value to -1 in shared preferences
-
- uDatabase.daoAccess().insertSingleUserQuestionnaire(user);
-
- moodsArrayList.add("-1");
-
- Report rep = new Report(uDatabase, getApplicationContext());
- rep.save(username, false, getSharedPreferences("consent", MODE_PRIVATE).getString("consent", "nothing"));
- }
-
- moods = moodsArrayList.toArray(moods);
-
- StringBuilder sb = new StringBuilder();
- for (int i = 0; i < moods.length; i++) {
- sb.append(moods[i]).append("gcm");
- }
- getApplicationContext().getSharedPreferences("moods", MODE_PRIVATE).edit().putString("moods", sb.toString()).apply();
-
- }
-
-
-
-
-
-
-
- }
-
- //scoatem variabila days si verificam: daca se imparte la 5, si nu e locked,
- }).start();
-
- //update experiments
-
-
- String experiments = getSharedPreferences("experiments", MODE_PRIVATE).getString("experiments", "");
-
- String[] experimentsArray = experiments.split("gcm");
-
- //+1 to include dy 0
- if (shouldBe> experimentsArray.length){
- String currentExperiment = getSharedPreferences("name", MODE_PRIVATE).getString("experiment", "nothing");
-
- ArrayList<String> experimentsArrayList = new ArrayList<String>(Arrays.asList(experimentsArray));
- for (int i=0; i< (shouldBe - experimentsArray.length); i++){
- experimentsArrayList.add(currentExperiment + ".");
- }
-
- experimentsArray = experimentsArrayList.toArray(experimentsArray);
-
- StringBuilder sb = new StringBuilder();
- for (int i = 0; i < experimentsArray.length; i++) {
- sb.append(experimentsArray[i]).append("gcm");
- }
- getSharedPreferences("experiments", MODE_PRIVATE).edit().putString("experiments", sb.toString()).apply();
-
-
- }
-
- //context.getSharedPreferences("questionnaire", MODE_PRIVATE).edit().putBoolean("completed", false).apply();
- //context.getSharedPreferences("MY_SHARED_PREF", MODE_PRIVATE).edit().putBoolean("locked", true).apply();
-
- //scoatem variabila days si verificam: daca se imparte la 5, si nu e locked,
- ImageView imageView = findViewById(R.id.imageView2);
- imageView.setImageResource(R.drawable.sleep);
-
-
- Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+ toolbar = findViewById(R.id.toolbar_id);
setSupportActionBar(toolbar);
- DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
- ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
- this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
- drawer.addDrawerListener(toggle);
- toggle.syncState();
-
- NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
- navigationView.setNavigationItemSelectedListener(this);
-
- View headerView = navigationView.getHeaderView(0);
- TextView navUsername = (TextView) headerView.findViewById(R.id.nameOfUser);
-
- String name = getSharedPreferences("name", MODE_PRIVATE).getString("username", "nothing");
- navUsername.setText(name);
-
- //NOTIFICATION DEMO
- this.createNotificationChannel();
- this.setNotifications();
- this.setFirstSpecialNotification();
-///END NOTIFICATIONs
-
- Button button1 = (Button) findViewById(R.id.whatSleep);
-
- button1.setOnClickListener(new View.OnClickListener() {
-
- public void onClick(View v) {
-
- goToWhatIsSleep();
-
- }
-
- });
-
- Button button3 = (Button) findViewById(R.id.WhatExperiments);
-
- button3.setOnClickListener(new View.OnClickListener() {
-
- public void onClick(View v) {
-
- goToWhatExperiments();
-
- }
-
- });
+ viewPager = (ViewPager) findViewById(R.id.viewPager_id);
+ ViewPageAdapter adapter = new ViewPageAdapter(getSupportFragmentManager());
- TextView remainedDaysText = (TextView) findViewById(R.id.youHave);
+ adapter.addSection(new Menu(), "Menu");
+ adapter.addSection(new Factors(), "Experiments");
+ adapter.addSection(new Data(), "Data");
+ adapter.addSection(new GoalDiary(), "Goal Diary");
+ adapter.addSection(new CalendarPage(), "Calendar");
+ adapter.addSection(new Update(), "Questionnaire");
- if (expStartDate.equals("")){
- remainedDaysText.setText("Please choose your experiment in the Experiments section.");
- } else {
- Date date3 = null;
-
- //Setting dates
- try {
- date3 = dates.parse(expStartDate);
- } catch (ParseException e) {
- e.printStackTrace();
- }
+ viewPager.setAdapter(adapter);
- Calendar c3 = Calendar.getInstance();
- c3.setTime(date3);
-
- int experimentDaysDifference = c1.get(Calendar.DAY_OF_YEAR) - c3.get(Calendar.DAY_OF_YEAR);
-
- int difference = 5 - experimentDaysDifference;
-
-
- remainedDaysText.setText("You have " + difference + " days left of the current experiment.");
-
-
- if (expStartDate.equals(currentDate)) {
- remainedDaysText.setText("You have 5 days left of the current experiment.");
- } else if (difference < 5 && difference != 0){
- remainedDaysText.setText(difference + " days left of the current experiment.");
- } else {
- remainedDaysText.setText(difference + " days left of the current experiment. When available, change your experiment in the Experiments section.");
- }
-
- }
+ tabLayout = (TabLayout) findViewById(R.id.tabLayout_id);
+ tabLayout.setupWithViewPager(viewPager);
+ tabLayout.getTabAt(0).setIcon(R.drawable.imageedit_32_4626940004);
+ tabLayout.getTabAt(1).setIcon(R.drawable.experiments);
+ tabLayout.getTabAt(2).setIcon(R.drawable.data);
+ tabLayout.getTabAt(3).setIcon(R.drawable.diaryic);
+ tabLayout.getTabAt(4).setIcon(R.drawable.calendar);
+ tabLayout.getTabAt(5).setIcon(R.drawable.pen);
}
- private void goToWhatIsSleep() {
- Intent intent = new Intent(this, WhatIsSleep.class);
-
- startActivity(intent);
-
- }
-
- private void goToWhatExperiments() {
- Intent intent = new Intent(this, WhatExperiments.class);
-
- startActivity(intent);
-
- }
+/*
@Override
public void onBackPressed() {
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
@@ -324,8 +112,8 @@ public class MainMenu extends AppCompatActivity implements NavigationView.OnNavi
//noinspection SimplifiableIfStatement
return super.onOptionsItemSelected(item);
- }
-
+ }*/
+/*
@SuppressWarnings("StatementWithEmptyBody")
@Override
public boolean onNavigationItemSelected(MenuItem item) {
@@ -385,217 +173,7 @@ public class MainMenu extends AppCompatActivity implements NavigationView.OnNavi
drawer.closeDrawer(GravityCompat.START);
return true;
}
+*/
- private boolean checkIfAllowsQuestionnaire(){
-
- Calendar calendar1 = Calendar.getInstance();
- SimpleDateFormat formatter1 = new SimpleDateFormat("HH:mm");
- String currentHour = formatter1.format(calendar1.getTime());
-
- SimpleDateFormat formatter2 = new SimpleDateFormat("dd-MMM-yyyy");
- String currentDate = formatter2.format(calendar1.getTime());
-
-
- String startingDate = getSharedPreferences("date", MODE_PRIVATE).getString("startingDate", "");
-
- Date date1 = null;
- Date date2 = null;
-
- SimpleDateFormat dates = new SimpleDateFormat("dd-MMM-yyyy");
-
- //Setting dates
- try {
- date1 = dates.parse(currentDate);
- date2 = dates.parse(startingDate);
- } catch (ParseException e) {
- e.printStackTrace();
- }
-
- Calendar c1 = Calendar.getInstance();
- c1.setTime(date1);
-
- Calendar c2 = Calendar.getInstance();
- c2.setTime(date2);
-
- int shouldBe = c1.get(Calendar.DAY_OF_YEAR) - c2.get(Calendar.DAY_OF_YEAR);
-
-
- String experiments = getSharedPreferences("experiments", MODE_PRIVATE).getString("experiments", "");
-
- String[] experimentsArray = experiments.split("gcm");
-
- System.out.println(experimentsArray.length);
- if (getApplicationContext().getSharedPreferences("experiments", MODE_PRIVATE).getString("experiments", "").equals("No experiment for the initial day.") && shouldBe == 0) {
- Toast.makeText(getApplicationContext(), "You are not allowed to fill in today's questionnaire. Choose an experiment if you haven't.", Toast.LENGTH_LONG).show();
- return false;
- } else if (currentHour.compareTo("18:59") < 0) {
- Toast.makeText(getApplicationContext(), "You are not allowed to fill in today's questionnaire yet. Come back at 19:00.", Toast.LENGTH_LONG).show();
-
- return false;
- } else if (experimentsArray.length - shouldBe >= 1) {
- Toast.makeText(getApplicationContext(), "You are not allowed to fill in today's questionnaire. Come back tomorrow.", Toast.LENGTH_LONG).show();
- return false;
- } else {
- return true;
- }
-
- }
- private void createNotificationChannel() {
- // Create the NotificationChannel, but only on API 26+ because
- // the NotificationChannel class is new and not in the support library
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
- CharSequence name = "reminder";
- int importance = NotificationManager.IMPORTANCE_DEFAULT;
- NotificationChannel channel = new NotificationChannel("13", name, importance);
- // Register the channel with the system; you can't change the importance
- // or other notification behaviors after this
- NotificationManager notificationManager = getSystemService(NotificationManager.class);
- notificationManager.createNotificationChannel(channel);
- }
- }
-
- private void setAlarmManager(int hour, int minute, final String title, final String message) {
-
- getSharedPreferences("notification", MODE_PRIVATE).getString("title", "nothing");
- getSharedPreferences("notification", MODE_PRIVATE).edit().putString("title", title).apply();
- getSharedPreferences("notification", MODE_PRIVATE).getString("message", "nothing");
- getSharedPreferences("notification", MODE_PRIVATE).edit().putString("message", message).apply();
-
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.HOUR_OF_DAY, hour);
- calendar.set(Calendar.MINUTE, minute);
- calendar.set(Calendar.SECOND, 0);
-
- if (Calendar.getInstance().after(calendar)) {
- calendar.add(Calendar.DAY_OF_MONTH, 1);
- }
-
- Intent intent1 = new Intent(MainMenu.this, Broadcast1.class);
- PendingIntent pendingIntent = PendingIntent.getBroadcast(MainMenu.this, 0, intent1, 0);
- AlarmManager am = (AlarmManager) MainMenu.this.getSystemService(MainMenu.this.ALARM_SERVICE);
- am.setRepeating(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), AlarmManager.INTERVAL_DAY, pendingIntent);
- }
-
- private void setFirstSpecialNotification() {
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.HOUR_OF_DAY, 19);
- calendar.set(Calendar.MINUTE, 0);
- calendar.set(Calendar.SECOND, 0);
-
- if (Calendar.getInstance().after(calendar)) {
- calendar.add(Calendar.DAY_OF_MONTH, 1);
- }
- Intent intent1 = new Intent(MainMenu.this, Broadcast2.class);
- PendingIntent pendingIntent = PendingIntent.getBroadcast(MainMenu.this, 0, intent1, 0);
- AlarmManager am1 = (AlarmManager) MainMenu.this.getSystemService(MainMenu.this.ALARM_SERVICE);
- am1.setRepeating(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), AlarmManager.INTERVAL_DAY, pendingIntent);
-
- }
-
- //produce the required notifications
- private void setNotifications() {
- int experiment = getSharedPreferences("MY_SHARED_PREF", MODE_PRIVATE).getInt("KEY_SAVED_RADIO_BUTTON_INDEX", 0);
-
- switch (experiment) {
- case 1: //increase bright light exposure
- setAlarmManager(12, 0, "Remember:", "Stay out in the sun at least half an hour today!");
- break;
- case 2: //wear glasses that block blue light during the night
- setAlarmManager(12, 30, "Remember:", "Use the \"f.lux\" app!");
- break;
- case 3: // turn off any bright lights 2 hours before going to bed
- setAlarmManager(19, 30, "Going to bed soon?", "Do not forget to turn off your light with 2 hours before bed!");
- break;
- case 5: // Do not drink caffeine within 6 hours
- setAlarmManager(15, 0, "Remember:", "Do not drink caffeine with 6 hours before going to sleep!");
- break;
- case 6: // Limit yourself to 4 cups of coffees per day; 10 canss of
- setAlarmManager(16, 24, "Remember:", "Limit yourself to 4 cups of coffee per day/10 cans of soda or 2 energy drinks!");
- break;
- case 7: //Do not drink empty stomach
- setAlarmManager(8, 0, "Remember:", "Try not to drink caffeine on an empty stomach!");
- break;
- case 9://Usually get up at the same time everyday, even on weekends
- setAlarmManager(18, 30, "Remember:", "Do not forget! Go to bed and wake up at the same time as yesterday!");
- break;
- case 10: // Sleep no lesss than 7 hours per night
- setAlarmManager(19, 50, "Remember:", "Sleep no less than 7 hours per night!");
- break;
- case 11: //DO not go to bed unless you are tired. If you are not
- setAlarmManager(20, 00, "Remember", "Do not go to bed unless you are tired. Read a book, take a bath, stretch or drink tea to relax!");
- break;
- case 12: //Go to sleep at 22:30 PM the latest
- setAlarmManager(21, 00, "Remember:", "Go to sleep at 10:30 PM the latest!");
- break;
- }
-
- }
-
- public static class Broadcast1 extends BroadcastReceiver {
- @Override
- public void onReceive(Context context, Intent intent) {
-
- String titleM = context.getSharedPreferences("notification", MODE_PRIVATE).getString("title", "nothing");
- String messageM = context.getSharedPreferences("notification", MODE_PRIVATE).getString("message", "nothing");
-
-
- long when = System.currentTimeMillis();
- NotificationManager notificationManager = (NotificationManager) context
- .getSystemService(Context.NOTIFICATION_SERVICE);
-
- Intent notificationIntent = new Intent(context, nextclass);
- notificationIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-
- PendingIntent pendingIntent = PendingIntent.getActivity(context, 0,
- notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-
-
- // Uri alarmSound = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
-
- NotificationCompat.Builder mNotifyBuilder = new NotificationCompat.Builder(context, "13")
- .setSmallIcon(R.drawable.pill)
- .setContentTitle(titleM)
- .setStyle(new NotificationCompat.BigTextStyle()
- .bigText(messageM))
- .setContentText(messageM)
- .setAutoCancel(true).setWhen(when)
- .setContentIntent(pendingIntent);
- notificationManager.notify(13, mNotifyBuilder.build());
-//
- }
- }
-
- public static class Broadcast2 extends BroadcastReceiver {
-
- //intrebarea este daca, aunci cand va veni momentul a schimbe si experimentul - daca o sa ii dea si alarma veche cu complete questionnaire si cea noua cu both complete the questionnaire and the experiment
- @Override
- public void onReceive(Context context, Intent intent) {
-
- long when = System.currentTimeMillis();
- NotificationManager notificationManager = (NotificationManager) context
- .getSystemService(Context.NOTIFICATION_SERVICE);
-//AICIII
- Intent notificationIntent = new Intent(context, MainMenu.class);
-
- notificationIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-
- PendingIntent pendingIntent = PendingIntent.getActivity(context, 0,
- notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
-
-
- // Uri alarmSound = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
-
- NotificationCompat.Builder mNotifyBuilder = new NotificationCompat.Builder(context, "13")
- .setSmallIcon(R.drawable.pill)
- .setContentTitle("Questionnaire")
- .setContentText("Remember to complete your questionnaire")
- .setAutoCancel(true).setWhen(when)
- .setContentIntent(pendingIntent);
- notificationManager.notify(20, mNotifyBuilder.build());
-
-
- }
- }
-
}
\ No newline at end of file
diff --git a/app/src/main/java/com/uos/admin/sleepbetter/Menu.java b/app/src/main/java/com/uos/admin/sleepbetter/Menu.java
new file mode 100644
index 0000000000000000000000000000000000000000..9c360f317b207967cdc955b376af82a9c51a0f33
--- /dev/null
+++ b/app/src/main/java/com/uos/admin/sleepbetter/Menu.java
@@ -0,0 +1,519 @@
+package com.uos.admin.sleepbetter;
+
+import android.app.AlarmManager;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.arch.persistence.room.Room;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.NotificationCompat;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+
+import static android.content.Context.MODE_PRIVATE;
+
+public class Menu extends Fragment {
+
+ View mainPage;
+
+ public Menu(){
+
+ }
+
+ @Nullable
+ @Override
+ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+
+ mainPage = inflater.inflate(R.layout.act_menu, container, false);
+
+
+
+
+/*
+
+ Date c = Calendar.getInstance().getTime();
+ SimpleDateFormat df = new SimpleDateFormat("dd-MMM-yyyy");
+ final String currentDate = df.format(c);
+
+ String startingDate = getSharedPreferences("date", MODE_PRIVATE).getString("startingDate", "");
+
+ Date date1 = null;
+ Date date2 = null;
+
+ SimpleDateFormat dates = new SimpleDateFormat("dd-MMM-yyyy");
+
+ //Setting dates
+ try {
+ date1 = dates.parse(currentDate);
+ date2 = dates.parse(startingDate);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+
+ Calendar c1 = Calendar.getInstance();
+ c1.setTime(date1);
+
+ Calendar c2 = Calendar.getInstance();
+ c2.setTime(date2);
+
+ int shouldBe = c1.get(Calendar.DAY_OF_YEAR) - c2.get(Calendar.DAY_OF_YEAR);
+
+ final int finalShouldBe = shouldBe;
+
+ String expStartDate = getSharedPreferences("date", MODE_PRIVATE).getString("startExperiment", "");
+
+ if (shouldBe == 0 && expStartDate.equals("")) {
+ Toast.makeText(getApplicationContext(), "Please choose an experiment.", Toast.LENGTH_LONG).show();
+ }
+
+
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ UserDatabase uDatabase = Room.databaseBuilder(getApplicationContext(), UserDatabase.class, DATABASE_NAME).fallbackToDestructiveMigration().build();
+ int loggedIn = uDatabase.daoAccess().fetchUserQuestionnaires().size();
+
+
+ int misses = finalShouldBe -loggedIn;
+
+
+ if (misses >=1){
+
+ String moods_string = getApplicationContext().getSharedPreferences("moods", MODE_PRIVATE).getString("moods", "");
+
+ String[] moods = moods_string.split("gcm");
+
+ ArrayList<String> moodsArrayList = new ArrayList<String>(Arrays.asList(moods));
+
+ for (int i=0; i<misses; i++){
+ // adaugam -1 in tabel
+
+ UserQuestionnaire user = new UserQuestionnaire();
+ String username = getApplicationContext().getSharedPreferences("name", MODE_PRIVATE).getString("participantID", "nothing"); user.setUsername(username);
+ user.setDate(currentDate);
+ user.setUsername(username);
+ user.setHowLong(-1);
+ user.setAwake(-1);
+ user.setEarlier(-1);
+ user.setNightsAWeek(-1);
+ user.setQuality(-1);
+ user.setImpactMood(-1);
+ user.setImpactActivities(-1);
+ user.setImpactGeneral(-1);
+ user.setProblem(-1);
+ user.setMood(-1);
+
+ getSharedPreferences("questionnaire", MODE_PRIVATE).edit().putInt("howLong", -1).apply();
+ getSharedPreferences("questionnaire", MODE_PRIVATE).edit().putInt("awake", -1).apply();
+ getSharedPreferences("questionnaire", MODE_PRIVATE).edit().putInt("earlier", -1).apply();
+ getSharedPreferences("questionnaire", MODE_PRIVATE).edit().putInt("quality", -1).apply();
+ getSharedPreferences("questionnaire", MODE_PRIVATE).edit().putInt("impactMood", -1).apply();
+ getSharedPreferences("questionnaire", MODE_PRIVATE).edit().putInt("impactActivities", -1).apply();
+ getSharedPreferences("questionnaire", MODE_PRIVATE).edit().putInt("impactGeneral", -1).apply();
+ getSharedPreferences("MOOD", MODE_PRIVATE).edit().putFloat("mood", (float) -1).apply();
+
+ //setting mood value to -1 in shared preferences
+
+ uDatabase.daoAccess().insertSingleUserQuestionnaire(user);
+
+ moodsArrayList.add("-1");
+
+ Report rep = new Report(uDatabase, getApplicationContext());
+ rep.save(username, false, getSharedPreferences("consent", MODE_PRIVATE).getString("consent", "nothing"));
+ }
+
+ moods = moodsArrayList.toArray(moods);
+
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < moods.length; i++) {
+ sb.append(moods[i]).append("gcm");
+ }
+ getApplicationContext().getSharedPreferences("moods", MODE_PRIVATE).edit().putString("moods", sb.toString()).apply();
+
+ }
+
+
+
+
+
+
+
+ }
+
+ //scoatem variabila days si verificam: daca se imparte la 5, si nu e locked,
+ }).start();
+
+ //update experiments
+
+
+ String experiments = getSharedPreferences("experiments", MODE_PRIVATE).getString("experiments", "");
+
+ String[] experimentsArray = experiments.split("gcm");
+
+ //+1 to include dy 0
+ if (shouldBe> experimentsArray.length){
+ String currentExperiment = getSharedPreferences("name", MODE_PRIVATE).getString("experiment", "nothing");
+
+ ArrayList<String> experimentsArrayList = new ArrayList<String>(Arrays.asList(experimentsArray));
+ for (int i=0; i< (shouldBe - experimentsArray.length); i++){
+ experimentsArrayList.add(currentExperiment + ".");
+ }
+
+ experimentsArray = experimentsArrayList.toArray(experimentsArray);
+
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < experimentsArray.length; i++) {
+ sb.append(experimentsArray[i]).append("gcm");
+ }
+ getSharedPreferences("experiments", MODE_PRIVATE).edit().putString("experiments", sb.toString()).apply();
+
+
+ }
+
+ //context.getSharedPreferences("questionnaire", MODE_PRIVATE).edit().putBoolean("completed", false).apply();
+ //context.getSharedPreferences("MY_SHARED_PREF", MODE_PRIVATE).edit().putBoolean("locked", true).apply();
+
+ //scoatem variabila days si verificam: daca se imparte la 5, si nu e locked,
+ ImageView imageView = findViewById(R.id.imageView2);
+
+ */
+
+ /* imageView.setImageResource(R.drawable.sleep);
+
+
+ Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+ setSupportActionBar(toolbar);
+
+
+ DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
+ ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
+ this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
+ drawer.addDrawerListener(toggle);
+ toggle.syncState();
+
+ NavigationView navigationView = (NavigationView) findViewById(R.id.nav_view);
+ navigationView.setNavigationItemSelectedListener(this);
+
+ View headerView = navigationView.getHeaderView(0);
+ TextView navUsername = (TextView) headerView.findViewById(R.id.nameOfUser);
+
+ String name = getSharedPreferences("name", MODE_PRIVATE).getString("username", "nothing");
+ navUsername.setText(name);
+*/
+ //NOTIFICATION DEMO
+
+ /*
+ this.createNotificationChannel();
+ this.setNotifications();
+ this.setFirstSpecialNotification();
+///END NOTIFICATIONs
+
+ Button button1 = (Button) findViewById(R.id.whatSleep);
+
+ button1.setOnClickListener(new View.OnClickListener() {
+
+ public void onClick(View v) {
+
+ goToWhatIsSleep();
+
+ }
+
+ });
+
+ Button button3 = (Button) findViewById(R.id.WhatExperiments);
+
+ button3.setOnClickListener(new View.OnClickListener() {
+
+ public void onClick(View v) {
+
+ goToWhatExperiments();
+
+ }
+
+ });
+
+
+ TextView remainedDaysText = (TextView) findViewById(R.id.youHave);
+
+ if (expStartDate.equals("")){
+ remainedDaysText.setText("Please choose your experiment in the Experiments section.");
+ } else {
+ Date date3 = null;
+
+ //Setting dates
+ try {
+ date3 = dates.parse(expStartDate);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+
+ Calendar c3 = Calendar.getInstance();
+ c3.setTime(date3);
+
+ int experimentDaysDifference = c1.get(Calendar.DAY_OF_YEAR) - c3.get(Calendar.DAY_OF_YEAR);
+
+ int difference = 5 - experimentDaysDifference;
+
+
+ remainedDaysText.setText("You have " + difference + " days left of the current experiment.");
+
+
+ if (expStartDate.equals(currentDate)) {
+ remainedDaysText.setText("You have 5 days left of the current experiment.");
+ } else if (difference < 5 && difference != 0){
+ remainedDaysText.setText(difference + " days left of the current experiment.");
+ } else {
+ remainedDaysText.setText(difference + " days left of the current experiment. When available, change your experiment in the Experiments section.");
+ }
+
+ }
+*/
+ return mainPage;
+
+ }
+/*
+ private void goToWhatIsSleep() {
+ Intent intent = new Intent(this, WhatIsSleep.class);
+
+ startActivity(intent);
+
+ }
+
+ private void goToWhatExperiments() {
+ Intent intent = new Intent(this, WhatExperiments.class);
+
+ startActivity(intent);
+
+ }
+
+ private boolean checkIfAllowsQuestionnaire(){
+
+ Calendar calendar1 = Calendar.getInstance();
+ SimpleDateFormat formatter1 = new SimpleDateFormat("HH:mm");
+ String currentHour = formatter1.format(calendar1.getTime());
+
+ SimpleDateFormat formatter2 = new SimpleDateFormat("dd-MMM-yyyy");
+ String currentDate = formatter2.format(calendar1.getTime());
+
+
+ String startingDate = getSharedPreferences("date", MODE_PRIVATE).getString("startingDate", "");
+
+ Date date1 = null;
+ Date date2 = null;
+
+ SimpleDateFormat dates = new SimpleDateFormat("dd-MMM-yyyy");
+
+ //Setting dates
+ try {
+ date1 = dates.parse(currentDate);
+ date2 = dates.parse(startingDate);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+
+ Calendar c1 = Calendar.getInstance();
+ c1.setTime(date1);
+
+ Calendar c2 = Calendar.getInstance();
+ c2.setTime(date2);
+
+ int shouldBe = c1.get(Calendar.DAY_OF_YEAR) - c2.get(Calendar.DAY_OF_YEAR);
+
+
+ String experiments = getSharedPreferences("experiments", MODE_PRIVATE).getString("experiments", "");
+
+ String[] experimentsArray = experiments.split("gcm");
+
+ System.out.println(experimentsArray.length);
+ if (getApplicationContext().getSharedPreferences("experiments", MODE_PRIVATE).getString("experiments", "").equals("No experiment for the initial day.") && shouldBe == 0) {
+ Toast.makeText(getApplicationContext(), "You are not allowed to fill in today's questionnaire. Choose an experiment if you haven't.", Toast.LENGTH_LONG).show();
+ return false;
+ } else if (currentHour.compareTo("18:59") < 0) {
+ Toast.makeText(getApplicationContext(), "You are not allowed to fill in today's questionnaire yet. Come back at 19:00.", Toast.LENGTH_LONG).show();
+
+ return false;
+ } else if (experimentsArray.length - shouldBe >= 1) {
+ Toast.makeText(getApplicationContext(), "You are not allowed to fill in today's questionnaire. Come back tomorrow.", Toast.LENGTH_LONG).show();
+ return false;
+ } else {
+ return true;
+ }
+
+ }
+ private void createNotificationChannel() {
+ // Create the NotificationChannel, but only on API 26+ because
+ // the NotificationChannel class is new and not in the support library
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+ CharSequence name = "reminder";
+ int importance = NotificationManager.IMPORTANCE_DEFAULT;
+ NotificationChannel channel = new NotificationChannel("13", name, importance);
+ // Register the channel with the system; you can't change the importance
+ // or other notification behaviors after this
+ NotificationManager notificationManager = getSystemService(NotificationManager.class);
+ notificationManager.createNotificationChannel(channel);
+ }
+ }
+
+ private void setAlarmManager(int hour, int minute, final String title, final String message) {
+
+ getSharedPreferences("notification", MODE_PRIVATE).getString("title", "nothing");
+ getSharedPreferences("notification", MODE_PRIVATE).edit().putString("title", title).apply();
+ getSharedPreferences("notification", MODE_PRIVATE).getString("message", "nothing");
+ getSharedPreferences("notification", MODE_PRIVATE).edit().putString("message", message).apply();
+
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.HOUR_OF_DAY, hour);
+ calendar.set(Calendar.MINUTE, minute);
+ calendar.set(Calendar.SECOND, 0);
+
+ if (Calendar.getInstance().after(calendar)) {
+ calendar.add(Calendar.DAY_OF_MONTH, 1);
+ }
+
+ Intent intent1 = new Intent(MainMenu.this, Broadcast1.class);
+ PendingIntent pendingIntent = PendingIntent.getBroadcast(MainMenu.this, 0, intent1, 0);
+ AlarmManager am = (AlarmManager) MainMenu.this.getSystemService(MainMenu.this.ALARM_SERVICE);
+ am.setRepeating(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), AlarmManager.INTERVAL_DAY, pendingIntent);
+ }
+
+ private void setFirstSpecialNotification() {
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.HOUR_OF_DAY, 19);
+ calendar.set(Calendar.MINUTE, 0);
+ calendar.set(Calendar.SECOND, 0);
+
+ if (Calendar.getInstance().after(calendar)) {
+ calendar.add(Calendar.DAY_OF_MONTH, 1);
+ }
+ Intent intent1 = new Intent(MainMenu.this, Broadcast2.class);
+ PendingIntent pendingIntent = PendingIntent.getBroadcast(MainMenu.this, 0, intent1, 0);
+ AlarmManager am1 = (AlarmManager) MainMenu.this.getSystemService(MainMenu.this.ALARM_SERVICE);
+ am1.setRepeating(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), AlarmManager.INTERVAL_DAY, pendingIntent);
+
+ }
+
+ //produce the required notifications
+ private void setNotifications() {
+ int experiment = getSharedPreferences("MY_SHARED_PREF", MODE_PRIVATE).getInt("KEY_SAVED_RADIO_BUTTON_INDEX", 0);
+
+ switch (experiment) {
+ case 1: //increase bright light exposure
+ setAlarmManager(12, 0, "Remember:", "Stay out in the sun at least half an hour today!");
+ break;
+ case 2: //wear glasses that block blue light during the night
+ setAlarmManager(12, 30, "Remember:", "Use the \"f.lux\" app!");
+ break;
+ case 3: // turn off any bright lights 2 hours before going to bed
+ setAlarmManager(19, 30, "Going to bed soon?", "Do not forget to turn off your light with 2 hours before bed!");
+ break;
+ case 5: // Do not drink caffeine within 6 hours
+ setAlarmManager(15, 0, "Remember:", "Do not drink caffeine with 6 hours before going to sleep!");
+ break;
+ case 6: // Limit yourself to 4 cups of coffees per day; 10 canss of
+ setAlarmManager(16, 24, "Remember:", "Limit yourself to 4 cups of coffee per day/10 cans of soda or 2 energy drinks!");
+ break;
+ case 7: //Do not drink empty stomach
+ setAlarmManager(8, 0, "Remember:", "Try not to drink caffeine on an empty stomach!");
+ break;
+ case 9://Usually get up at the same time everyday, even on weekends
+ setAlarmManager(18, 30, "Remember:", "Do not forget! Go to bed and wake up at the same time as yesterday!");
+ break;
+ case 10: // Sleep no lesss than 7 hours per night
+ setAlarmManager(19, 50, "Remember:", "Sleep no less than 7 hours per night!");
+ break;
+ case 11: //DO not go to bed unless you are tired. If you are not
+ setAlarmManager(20, 00, "Remember", "Do not go to bed unless you are tired. Read a book, take a bath, stretch or drink tea to relax!");
+ break;
+ case 12: //Go to sleep at 22:30 PM the latest
+ setAlarmManager(21, 00, "Remember:", "Go to sleep at 10:30 PM the latest!");
+ break;
+ }
+
+ }
+
+ public static class Broadcast1 extends BroadcastReceiver {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+
+ String titleM = context.getSharedPreferences("notification", MODE_PRIVATE).getString("title", "nothing");
+ String messageM = context.getSharedPreferences("notification", MODE_PRIVATE).getString("message", "nothing");
+
+
+ long when = System.currentTimeMillis();
+ NotificationManager notificationManager = (NotificationManager) context
+ .getSystemService(Context.NOTIFICATION_SERVICE);
+
+ Intent notificationIntent = new Intent(context, nextclass);
+ notificationIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+
+ PendingIntent pendingIntent = PendingIntent.getActivity(context, 0,
+ notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+
+
+ // Uri alarmSound = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
+
+ NotificationCompat.Builder mNotifyBuilder = new NotificationCompat.Builder(context, "13")
+ .setSmallIcon(R.drawable.pill)
+ .setContentTitle(titleM)
+ .setStyle(new NotificationCompat.BigTextStyle()
+ .bigText(messageM))
+ .setContentText(messageM)
+ .setAutoCancel(true).setWhen(when)
+ .setContentIntent(pendingIntent);
+ notificationManager.notify(13, mNotifyBuilder.build());
+//
+ }
+ }
+
+ public static class Broadcast2 extends BroadcastReceiver {
+
+ //intrebarea este daca, aunci cand va veni momentul a schimbe si experimentul - daca o sa ii dea si alarma veche cu complete questionnaire si cea noua cu both complete the questionnaire and the experiment
+ @Override
+ public void onReceive(Context context, Intent intent) {
+
+ long when = System.currentTimeMillis();
+ NotificationManager notificationManager = (NotificationManager) context
+ .getSystemService(Context.NOTIFICATION_SERVICE);
+//AICIII
+ Intent notificationIntent = new Intent(context, MainMenu.class);
+
+ notificationIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+
+ PendingIntent pendingIntent = PendingIntent.getActivity(context, 0,
+ notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+
+
+ // Uri alarmSound = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
+
+ NotificationCompat.Builder mNotifyBuilder = new NotificationCompat.Builder(context, "13")
+ .setSmallIcon(R.drawable.pill)
+ .setContentTitle("Questionnaire")
+ .setContentText("Remember to complete your questionnaire")
+ .setAutoCancel(true).setWhen(when)
+ .setContentIntent(pendingIntent);
+ notificationManager.notify(20, mNotifyBuilder.build());
+
+
+ }
+ }
+*/
+}
diff --git a/app/src/main/java/com/uos/admin/sleepbetter/Update.java b/app/src/main/java/com/uos/admin/sleepbetter/Update.java
index af032ff4577a2d6975ec2e5d621ef3305151ad5f..6260774de1ce6056345e34d7b5dc0a9fc49af2c4 100644
--- a/app/src/main/java/com/uos/admin/sleepbetter/Update.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/Update.java
@@ -1,8 +1,8 @@
package com.uos.admin.sleepbetter;
-import android.app.Fragment;
import android.os.Bundle;
import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
diff --git a/app/src/main/java/com/uos/admin/sleepbetter/ViewPageAdapter.java b/app/src/main/java/com/uos/admin/sleepbetter/ViewPageAdapter.java
new file mode 100644
index 0000000000000000000000000000000000000000..f33f067972918a1baa5f72f54fa285f1a35bacd3
--- /dev/null
+++ b/app/src/main/java/com/uos/admin/sleepbetter/ViewPageAdapter.java
@@ -0,0 +1,43 @@
+package com.uos.admin.sleepbetter;
+
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ViewPageAdapter extends FragmentPagerAdapter {
+
+ private final List<Fragment> sections = new ArrayList<Fragment>();
+ private final List<String> sectionsTitles = new ArrayList<String>();
+
+
+ public ViewPageAdapter(FragmentManager fm) {
+ super(fm);
+ }
+
+ @Override
+ public Fragment getItem(int position) {
+ return sections.get(position);
+ }
+
+ @Override
+ public int getCount() {
+ return sectionsTitles.size();
+ }
+
+ @Nullable
+ @Override
+ public CharSequence getPageTitle(int position) {
+ return sectionsTitles.get(position);
+ }
+
+ public void addSection(Fragment section, String title){
+
+ sections.add(section);
+ sectionsTitles.add(title);
+
+ }
+}
diff --git a/app/src/main/java/com/uos/admin/sleepbetter/WhatExperiments.java b/app/src/main/java/com/uos/admin/sleepbetter/WhatExperiments.java
index c621f5d8c6264f069de7de5d0db487c98491ad07..a00746dbbae7f58d524b388be327bcd99ea02f6a 100644
--- a/app/src/main/java/com/uos/admin/sleepbetter/WhatExperiments.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/WhatExperiments.java
@@ -15,13 +15,13 @@ public class WhatExperiments extends AppCompatActivity {
setContentView(R.layout.act_what_experiments);
ImageView imageView = findViewById(R.id.imageView23);
- imageView.setImageResource(R.drawable.phone);
+ imageView.setImageResource(R.drawable.data);
imageView = findViewById(R.id.imageView24);
- imageView.setImageResource(R.drawable.moon);
+ imageView.setImageResource(R.drawable.data);
imageView = findViewById(R.id.imageView25);
- imageView.setImageResource(R.drawable.ques);
+ imageView.setImageResource(R.drawable.data);
Button button = (Button) findViewById(R.id.back);
diff --git a/app/src/main/java/com/uos/admin/sleepbetter/WhatIsSleep.java b/app/src/main/java/com/uos/admin/sleepbetter/WhatIsSleep.java
index fbdd753060e7d78262b4c5ff0226f65b52827a00..0b7a23596ddf43f7b5e5c47b0b3a90d1792eb480 100644
--- a/app/src/main/java/com/uos/admin/sleepbetter/WhatIsSleep.java
+++ b/app/src/main/java/com/uos/admin/sleepbetter/WhatIsSleep.java
@@ -15,10 +15,10 @@ public class WhatIsSleep extends AppCompatActivity {
setContentView(R.layout.act_what_is_sleep);
ImageView imageView = findViewById(R.id.imageView4);
- imageView.setImageResource(R.drawable.sleepmoon);
+ imageView.setImageResource(R.drawable.data);
imageView = findViewById(R.id.imageView5);
- imageView.setImageResource(R.drawable.mission);
+ imageView.setImageResource(R.drawable.data);
Button button = (Button) findViewById(R.id.back);
diff --git a/app/src/main/res/drawable-hdpi/actions.png b/app/src/main/res/drawable-hdpi/actions.png
deleted file mode 100644
index a8748b59fe4ddb373000d86dade1b5c2539fa2dc..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-hdpi/actions.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/caffeine.png b/app/src/main/res/drawable-hdpi/caffeine.png
deleted file mode 100644
index 3a48754597d505e03d4bc3a541d577ae65e48054..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-hdpi/caffeine.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/chat.png b/app/src/main/res/drawable-hdpi/chat.png
deleted file mode 100644
index a4327507437b1820b5680d54629ece4ad32aeb08..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-hdpi/chat.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/day_and_night.png b/app/src/main/res/drawable-hdpi/day_and_night.png
deleted file mode 100644
index 08585c4aa240011aa9c9961a11c1e4dedf9dc17a..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-hdpi/day_and_night.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/diary.png b/app/src/main/res/drawable-hdpi/diary.png
deleted file mode 100644
index 3b5b33c1b9ffec0446c605dd518d202b34bd263d..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-hdpi/diary.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/drawer_shadow.9.png b/app/src/main/res/drawable-hdpi/drawer_shadow.9.png
deleted file mode 100644
index 236bff558af07faa3921ba35e2515edf62d04bb9..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-hdpi/drawer_shadow.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/facts.png b/app/src/main/res/drawable-hdpi/facts.png
deleted file mode 100644
index d8d8baf9dda4fde179f6a2d77163a42ea4cd10b3..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-hdpi/facts.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/glasses.png b/app/src/main/res/drawable-hdpi/glasses.png
deleted file mode 100644
index 741712d680b23671833753c1af75d4fab4313a47..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-hdpi/glasses.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_drawer.png b/app/src/main/res/drawable-hdpi/ic_drawer.png
deleted file mode 100644
index c59f601ca31dae344d0dc95912713ce54a8fbefe..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_drawer.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/mission.png b/app/src/main/res/drawable-hdpi/mission.png
deleted file mode 100644
index 3258c60f2dde96186138806bbb156ac2ced9a7de..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-hdpi/mission.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/mood_dice.png b/app/src/main/res/drawable-hdpi/mood_dice.png
deleted file mode 100644
index cb29dd78e3f9ab4fabe2b5b8a845a135c860c2e7..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-hdpi/mood_dice.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/moon.png b/app/src/main/res/drawable-hdpi/moon.png
deleted file mode 100644
index 3d0a6f684e26de8cad18de8e1321e040c1fdd27c..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-hdpi/moon.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/night_emoticon.png b/app/src/main/res/drawable-hdpi/night_emoticon.png
deleted file mode 100644
index bb0316f08b0a03168594004ae9c9c2d939656254..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-hdpi/night_emoticon.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/phone.png b/app/src/main/res/drawable-hdpi/phone.png
deleted file mode 100644
index ad4af33f239fb459b1763f7fa3f1300211de5c2a..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-hdpi/phone.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/pill.png b/app/src/main/res/drawable-hdpi/pill.png
deleted file mode 100644
index 8087d08202886dfc0a28a39df9120a006288b6b3..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-hdpi/pill.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ques.png b/app/src/main/res/drawable-hdpi/ques.png
deleted file mode 100644
index ff9881e8272943e69c482648c0a81a93307d9c44..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-hdpi/ques.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/relax.png b/app/src/main/res/drawable-hdpi/relax.png
deleted file mode 100644
index 52e91534357af17328d3268568b4a02e31fa241a..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-hdpi/relax.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/screen.png b/app/src/main/res/drawable-hdpi/screen.png
deleted file mode 100644
index a2f214f6f55a82d61ddc3ea3f01912ab84a6bfcd..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-hdpi/screen.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/sleeep_clock.png b/app/src/main/res/drawable-hdpi/sleeep_clock.png
deleted file mode 100644
index a501f1b478fd888d184fbba47a9212b04acdcd8e..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-hdpi/sleeep_clock.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/sleep.png b/app/src/main/res/drawable-hdpi/sleep.png
deleted file mode 100644
index 6bba3a991211e377b27c2b4823aaa1438ccbd448..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-hdpi/sleep.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/sleepmoon.png b/app/src/main/res/drawable-hdpi/sleepmoon.png
deleted file mode 100644
index ffec4e578a90791db86b1d5b2418f0498fd1b4e6..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-hdpi/sleepmoon.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/stickman.png b/app/src/main/res/drawable-hdpi/stickman.png
deleted file mode 100644
index 7c379ac768361657c90f889ca3c4f2792c2888a9..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-hdpi/stickman.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/stomach.png b/app/src/main/res/drawable-hdpi/stomach.png
deleted file mode 100644
index e2e6b1317440ac6cbb778333f4f88947407e941a..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-hdpi/stomach.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/sun.png b/app/src/main/res/drawable-hdpi/sun.png
deleted file mode 100644
index 683e33d7311c758d49c1a45367f60ea437193d20..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-hdpi/sun.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/you.png b/app/src/main/res/drawable-hdpi/you.png
deleted file mode 100644
index ecbc02f7e7e89c413b2b3a0a1a86c4fe4b524317..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-hdpi/you.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/actions.png b/app/src/main/res/drawable-mdpi/actions.png
deleted file mode 100644
index 77ac9da76c6c500bf4c2c3cf206a93532c8157e0..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/actions.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/caffeine.png b/app/src/main/res/drawable-mdpi/caffeine.png
deleted file mode 100644
index ed99dd98d134113b562829e8cfc26b1767e1838a..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/caffeine.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/chat.png b/app/src/main/res/drawable-mdpi/chat.png
deleted file mode 100644
index 0ea542758d48351455966c2cce144154a5d3aa5d..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/chat.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/day_and_night.png b/app/src/main/res/drawable-mdpi/day_and_night.png
deleted file mode 100644
index 89dbed60a7d42c2a56db4cea6bcdabfe40e13f30..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/day_and_night.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/diary.png b/app/src/main/res/drawable-mdpi/diary.png
deleted file mode 100644
index 1c39a7444a964bf7d9e2104395de83850baf91d5..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/diary.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/drawer_shadow.9.png b/app/src/main/res/drawable-mdpi/drawer_shadow.9.png
deleted file mode 100644
index ffe3a28d77c72094021013c6442560803b3d344c..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/drawer_shadow.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/facts.png b/app/src/main/res/drawable-mdpi/facts.png
deleted file mode 100644
index fd7cceb83ca83f560af9e609ac1ac59fbfd28b3d..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/facts.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/glasses.png b/app/src/main/res/drawable-mdpi/glasses.png
deleted file mode 100644
index 77b7fff637946f4d2bce5302eeca48826393512d..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/glasses.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_drawer.png b/app/src/main/res/drawable-mdpi/ic_drawer.png
deleted file mode 100644
index 1ed2c56ee4239ff2987568d4fdae10166650b120..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_drawer.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/mission.png b/app/src/main/res/drawable-mdpi/mission.png
deleted file mode 100644
index f510089a8a4c4eef84aa7ff8d489129914543b18..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/mission.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/mood_dice.png b/app/src/main/res/drawable-mdpi/mood_dice.png
deleted file mode 100644
index 9425fe759a11dfa4ff056f755358bd801af75610..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/mood_dice.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/moon.png b/app/src/main/res/drawable-mdpi/moon.png
deleted file mode 100644
index 292975cc7d2d02daa8f3b5018385c3f394bd76fb..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/moon.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/night_emoticon.png b/app/src/main/res/drawable-mdpi/night_emoticon.png
deleted file mode 100644
index f50efe33e55624fbd4398982683fee5e0f35267f..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/night_emoticon.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/phone.png b/app/src/main/res/drawable-mdpi/phone.png
deleted file mode 100644
index 27d836f4add23ee55af602d81b5b984c71c7a871..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/phone.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/pill.png b/app/src/main/res/drawable-mdpi/pill.png
deleted file mode 100644
index 1a9d2592c09516a9c2f42cd134a0aa7af62b2cd8..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/pill.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ques.png b/app/src/main/res/drawable-mdpi/ques.png
deleted file mode 100644
index 05dd76abb30fa085c460e8c40cf62104289baf14..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/ques.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/relax.png b/app/src/main/res/drawable-mdpi/relax.png
deleted file mode 100644
index 048305dfa657c10f2179a6b3cded8bfe7cd9607c..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/relax.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/screen.png b/app/src/main/res/drawable-mdpi/screen.png
deleted file mode 100644
index bc546f16d691576c4057fb4ac6c5a275eb82731f..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/screen.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/sleeep_clock.png b/app/src/main/res/drawable-mdpi/sleeep_clock.png
deleted file mode 100644
index 84c450b18972a46dcdb83d5b4527257142a8f5d5..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/sleeep_clock.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/sleep.png b/app/src/main/res/drawable-mdpi/sleep.png
deleted file mode 100644
index 021d7e119408fa61612f99a3774a224f336e7ef5..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/sleep.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/sleepmoon.png b/app/src/main/res/drawable-mdpi/sleepmoon.png
deleted file mode 100644
index aacd9c11c7257a300c0f3f34e3aaf9c76ff8eaf2..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/sleepmoon.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/stickman.png b/app/src/main/res/drawable-mdpi/stickman.png
deleted file mode 100644
index 1de4e4cfc01ac6d63de1f1865ca71f0da2906f4a..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/stickman.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/stomach.png b/app/src/main/res/drawable-mdpi/stomach.png
deleted file mode 100644
index 4fb97821bb18b164d813e387097bb36d7dbccbd3..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/stomach.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/sun.png b/app/src/main/res/drawable-mdpi/sun.png
deleted file mode 100644
index 6074b6283792506f3fdd99e74961ea30d9d19632..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/sun.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/you.png b/app/src/main/res/drawable-mdpi/you.png
deleted file mode 100644
index 30fbdc2f9e86dbbb9aedecafddb5f58268bae8f4..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/you.png and /dev/null differ
diff --git a/app/src/main/res/drawable-v24/alarm1.png b/app/src/main/res/drawable-v24/alarm1.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5320269171104bd414b82f093f5748bf1bb265e
Binary files /dev/null and b/app/src/main/res/drawable-v24/alarm1.png differ
diff --git a/app/src/main/res/drawable-v24/alarm2.png b/app/src/main/res/drawable-v24/alarm2.png
new file mode 100644
index 0000000000000000000000000000000000000000..671faa661751649cfcbcc69918364bd1b5b843ce
Binary files /dev/null and b/app/src/main/res/drawable-v24/alarm2.png differ
diff --git a/app/src/main/res/drawable-v24/bear.png b/app/src/main/res/drawable-v24/bear.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0f00e0b0e1e67a824fba9c81ff16ffcd16e7989
Binary files /dev/null and b/app/src/main/res/drawable-v24/bear.png differ
diff --git a/app/src/main/res/drawable-v24/bed-1545998_1280.png b/app/src/main/res/drawable-v24/bed-1545998_1280.png
new file mode 100644
index 0000000000000000000000000000000000000000..0030be282d32ae790fb630c296150a01d90bdf15
Binary files /dev/null and b/app/src/main/res/drawable-v24/bed-1545998_1280.png differ
diff --git a/app/src/main/res/drawable-v24/bed1.png b/app/src/main/res/drawable-v24/bed1.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c693a400205d7ba31030597960eb571c979b0e3
Binary files /dev/null and b/app/src/main/res/drawable-v24/bed1.png differ
diff --git a/app/src/main/res/drawable-v24/calendar.png b/app/src/main/res/drawable-v24/calendar.png
new file mode 100755
index 0000000000000000000000000000000000000000..c44acf3b728e95ad84acbe99e7da8e8152958612
Binary files /dev/null and b/app/src/main/res/drawable-v24/calendar.png differ
diff --git a/app/src/main/res/drawable-v24/camouflage.png b/app/src/main/res/drawable-v24/camouflage.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8bbbac264428369aa8c34727e047e89a997ff11
Binary files /dev/null and b/app/src/main/res/drawable-v24/camouflage.png differ
diff --git a/app/src/main/res/drawable-v24/checklist.png b/app/src/main/res/drawable-v24/checklist.png
new file mode 100644
index 0000000000000000000000000000000000000000..0afd50d3d3f1c60eae3df9814b3650982a1ea7aa
Binary files /dev/null and b/app/src/main/res/drawable-v24/checklist.png differ
diff --git a/app/src/main/res/drawable-v24/data.png b/app/src/main/res/drawable-v24/data.png
new file mode 100755
index 0000000000000000000000000000000000000000..eb49237f9d2fd3f091246fb780e0c9eddb460723
Binary files /dev/null and b/app/src/main/res/drawable-v24/data.png differ
diff --git a/app/src/main/res/drawable-v24/diary2.png b/app/src/main/res/drawable-v24/diary2.png
new file mode 100644
index 0000000000000000000000000000000000000000..c549dd2be998d776d1940b3364d85388b0727ef7
Binary files /dev/null and b/app/src/main/res/drawable-v24/diary2.png differ
diff --git a/app/src/main/res/drawable-v24/diaryic.png b/app/src/main/res/drawable-v24/diaryic.png
new file mode 100755
index 0000000000000000000000000000000000000000..cfc98c59eacafc26e7311bbcac84deb0dbdb7b8c
Binary files /dev/null and b/app/src/main/res/drawable-v24/diaryic.png differ
diff --git a/app/src/main/res/drawable-v24/emoji.png b/app/src/main/res/drawable-v24/emoji.png
new file mode 100644
index 0000000000000000000000000000000000000000..4adacccf25c38f7e89bb4de7803b12beea355dfc
Binary files /dev/null and b/app/src/main/res/drawable-v24/emoji.png differ
diff --git a/app/src/main/res/drawable-v24/experiments.png b/app/src/main/res/drawable-v24/experiments.png
new file mode 100755
index 0000000000000000000000000000000000000000..ca21a04598d8e61ee85b8da2329aac62c88c7f05
Binary files /dev/null and b/app/src/main/res/drawable-v24/experiments.png differ
diff --git a/app/src/main/res/drawable-v24/hunger.png b/app/src/main/res/drawable-v24/hunger.png
new file mode 100644
index 0000000000000000000000000000000000000000..64e6bac730ee1cfad970125b67b0b3ef8db6bda0
Binary files /dev/null and b/app/src/main/res/drawable-v24/hunger.png differ
diff --git a/app/src/main/res/drawable-v24/imageedit_32_4626940004.png b/app/src/main/res/drawable-v24/imageedit_32_4626940004.png
new file mode 100644
index 0000000000000000000000000000000000000000..05d2904ea105993f48132adb4036991736e4e2fd
Binary files /dev/null and b/app/src/main/res/drawable-v24/imageedit_32_4626940004.png differ
diff --git a/app/src/main/res/drawable-v24/kitten.png b/app/src/main/res/drawable-v24/kitten.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc1044802a97af02a4b9a46481192ddf422d290a
Binary files /dev/null and b/app/src/main/res/drawable-v24/kitten.png differ
diff --git a/app/src/main/res/drawable-v24/moon.png b/app/src/main/res/drawable-v24/moon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ea7baec19e219cb2d6484839a1b539a8fb99ed2
Binary files /dev/null and b/app/src/main/res/drawable-v24/moon.png differ
diff --git a/app/src/main/res/drawable-v24/owl.jpg b/app/src/main/res/drawable-v24/owl.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..4c781c34fc777dc39ce90b636cd931dd41c8a530
Binary files /dev/null and b/app/src/main/res/drawable-v24/owl.jpg differ
diff --git a/app/src/main/res/drawable-v24/pen.png b/app/src/main/res/drawable-v24/pen.png
new file mode 100755
index 0000000000000000000000000000000000000000..e84418ebee7570319997f4e0b1ac2b4e80151bc5
Binary files /dev/null and b/app/src/main/res/drawable-v24/pen.png differ
diff --git a/app/src/main/res/drawable-v24/pillow.png b/app/src/main/res/drawable-v24/pillow.png
new file mode 100644
index 0000000000000000000000000000000000000000..08b74ce201677bb5830049b66b713ee4b03f896f
Binary files /dev/null and b/app/src/main/res/drawable-v24/pillow.png differ
diff --git a/app/src/main/res/drawable-v24/sky.png b/app/src/main/res/drawable-v24/sky.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ae3bed93f3f15b5e967449675ae4538a1f1f93d
Binary files /dev/null and b/app/src/main/res/drawable-v24/sky.png differ
diff --git a/app/src/main/res/drawable-v24/sleep.png b/app/src/main/res/drawable-v24/sleep.png
new file mode 100644
index 0000000000000000000000000000000000000000..b35fa82b13aaf95d54f6f97c6c758faa48496428
Binary files /dev/null and b/app/src/main/res/drawable-v24/sleep.png differ
diff --git a/app/src/main/res/drawable-v24/soda.png b/app/src/main/res/drawable-v24/soda.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab5b7d6bb269cfaf34cd0fb05c9dca23b5bf9931
Binary files /dev/null and b/app/src/main/res/drawable-v24/soda.png differ
diff --git a/app/src/main/res/drawable-v24/sport.jpg b/app/src/main/res/drawable-v24/sport.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..fe9cdfa11dbd24f715c438f9add93da11dedcc54
Binary files /dev/null and b/app/src/main/res/drawable-v24/sport.jpg differ
diff --git a/app/src/main/res/drawable-v24/sun.png b/app/src/main/res/drawable-v24/sun.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1f465e808908a00f8bbbe647bae10cfcec761b3
Binary files /dev/null and b/app/src/main/res/drawable-v24/sun.png differ
diff --git a/app/src/main/res/drawable-v24/tablet.jpg b/app/src/main/res/drawable-v24/tablet.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..73f7dbfe671833eacdc6ac9abb31a8332cba6a75
Binary files /dev/null and b/app/src/main/res/drawable-v24/tablet.jpg differ
diff --git a/app/src/main/res/drawable-v24/targett.png b/app/src/main/res/drawable-v24/targett.png
new file mode 100644
index 0000000000000000000000000000000000000000..84623c93d7de465b186af4148881acb1b917f93c
Binary files /dev/null and b/app/src/main/res/drawable-v24/targett.png differ
diff --git a/app/src/main/res/drawable-v24/work.jpg b/app/src/main/res/drawable-v24/work.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a4b3d59968206ef94ee831ef6dfcf4223e07c283
Binary files /dev/null and b/app/src/main/res/drawable-v24/work.jpg differ
diff --git a/app/src/main/res/drawable-v24/you.png b/app/src/main/res/drawable-v24/you.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c27fab18c322bd7e5f63249362c0943e2443ff8
Binary files /dev/null and b/app/src/main/res/drawable-v24/you.png differ
diff --git a/app/src/main/res/drawable-xhdpi/actions.png b/app/src/main/res/drawable-xhdpi/actions.png
deleted file mode 100644
index 45eb146bfd13ceb1bfd4f7c5c755c49ce1d46a6c..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xhdpi/actions.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/caffeine.png b/app/src/main/res/drawable-xhdpi/caffeine.png
deleted file mode 100644
index fd1dc2cc873a1dc8f853358027b245544eb9ebbf..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xhdpi/caffeine.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/chat.png b/app/src/main/res/drawable-xhdpi/chat.png
deleted file mode 100644
index 173ef6b58bf4df3c4ef585808905b2f8bb56e784..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xhdpi/chat.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/day_and_night.png b/app/src/main/res/drawable-xhdpi/day_and_night.png
deleted file mode 100644
index 6635a348dbb58c1d55174669566d094e5c53c394..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xhdpi/day_and_night.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/diary.png b/app/src/main/res/drawable-xhdpi/diary.png
deleted file mode 100644
index 5cd8e1652655a1809ed27d93ae3ead0d22c0a7f9..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xhdpi/diary.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png b/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png
deleted file mode 100644
index fabe9d96563785c7d6b008bb3d8da25e816c343c..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/facts.png b/app/src/main/res/drawable-xhdpi/facts.png
deleted file mode 100644
index a768b83c7e969ec050f22d2ab352623598db233a..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xhdpi/facts.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/glasses.png b/app/src/main/res/drawable-xhdpi/glasses.png
deleted file mode 100644
index e8034d68a95e7590c17498ef30d7fc9654311aef..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xhdpi/glasses.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_drawer.png b/app/src/main/res/drawable-xhdpi/ic_drawer.png
deleted file mode 100644
index a5fa74def4b40d7eb6826da05bd5e12b836cb999..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_drawer.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/mission.png b/app/src/main/res/drawable-xhdpi/mission.png
deleted file mode 100644
index 8efd9e6c8ea2245cbe5174a32d73b4845103d4ea..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xhdpi/mission.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/mood_dice.png b/app/src/main/res/drawable-xhdpi/mood_dice.png
deleted file mode 100644
index 1f2df27cf3f20672bd37751d9904d05ea79e68bd..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xhdpi/mood_dice.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/moon.png b/app/src/main/res/drawable-xhdpi/moon.png
deleted file mode 100644
index 443cff92403b6b72216ead4235ce6667c675026f..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xhdpi/moon.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/night_emoticon.png b/app/src/main/res/drawable-xhdpi/night_emoticon.png
deleted file mode 100644
index 055a89da07dd471e619d9dc62f486a84ed34b401..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xhdpi/night_emoticon.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/phone.png b/app/src/main/res/drawable-xhdpi/phone.png
deleted file mode 100644
index 6699b82c51f67c2628fd99faded769c9c6f106ca..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xhdpi/phone.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/pill.png b/app/src/main/res/drawable-xhdpi/pill.png
deleted file mode 100644
index 749218b0018857435578732408dc03cf15330ff8..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xhdpi/pill.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ques.png b/app/src/main/res/drawable-xhdpi/ques.png
deleted file mode 100644
index c1003fb49e84dc4fa8c8958a01a9fac6c9fb8e98..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xhdpi/ques.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/relax.png b/app/src/main/res/drawable-xhdpi/relax.png
deleted file mode 100644
index d6e6e42ca9ca951a0f3e0825cd6500eaddc2148c..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xhdpi/relax.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/screen.png b/app/src/main/res/drawable-xhdpi/screen.png
deleted file mode 100644
index bc7a00f37e0435ace5b3154de1d231050c5775de..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xhdpi/screen.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/sleeep_clock.png b/app/src/main/res/drawable-xhdpi/sleeep_clock.png
deleted file mode 100644
index 3856610e4eab89a266996521aae5a42c9c48c286..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xhdpi/sleeep_clock.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/sleep.png b/app/src/main/res/drawable-xhdpi/sleep.png
deleted file mode 100644
index 93e4f851f7e583b14490d7d07955759ddc9705c2..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xhdpi/sleep.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/sleepmoon.png b/app/src/main/res/drawable-xhdpi/sleepmoon.png
deleted file mode 100644
index d87ce6d7f596692765106c6996299ad6eb0896fe..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xhdpi/sleepmoon.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/stickman.png b/app/src/main/res/drawable-xhdpi/stickman.png
deleted file mode 100644
index 48393b4d4dd86d7160301e908a3edc8584761225..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xhdpi/stickman.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/stomach.png b/app/src/main/res/drawable-xhdpi/stomach.png
deleted file mode 100644
index 537dcbb6751d77d5290b0664396bab918d2dfe2f..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xhdpi/stomach.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/sun.png b/app/src/main/res/drawable-xhdpi/sun.png
deleted file mode 100644
index 9acd1ef84681cb12e6202b6301a16d8d11c39ba9..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xhdpi/sun.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/you.png b/app/src/main/res/drawable-xhdpi/you.png
deleted file mode 100644
index 9dd9e9cd43a803fc969e6bc1fd993c0c8f1d809c..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xhdpi/you.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/actions.png b/app/src/main/res/drawable-xxhdpi/actions.png
deleted file mode 100644
index 9fb5042fe8464a2f27255cbdf0ea9f3c80465215..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxhdpi/actions.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/caffeine.png b/app/src/main/res/drawable-xxhdpi/caffeine.png
deleted file mode 100644
index 4bbe748908a50a680a964b186f47fb34e938267c..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxhdpi/caffeine.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/chat.png b/app/src/main/res/drawable-xxhdpi/chat.png
deleted file mode 100644
index 8743b80307d94f2fc761a2baa715d045ab41fb89..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxhdpi/chat.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/day_and_night.png b/app/src/main/res/drawable-xxhdpi/day_and_night.png
deleted file mode 100644
index 21b58cc8a88533f4ae7d3a941417697493915889..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxhdpi/day_and_night.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/diary.png b/app/src/main/res/drawable-xxhdpi/diary.png
deleted file mode 100644
index 910866b237fcfe49ec21146e10b84ba817073b6b..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxhdpi/diary.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png b/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png
deleted file mode 100644
index b91e9d7f285e8110ba3ba4e72cc6f0416eb3a30a..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/facts.png b/app/src/main/res/drawable-xxhdpi/facts.png
deleted file mode 100644
index ea7e3f2d64da95a524579a5eba4269a1e1dae94d..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxhdpi/facts.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/glasses.png b/app/src/main/res/drawable-xxhdpi/glasses.png
deleted file mode 100644
index 1ad918cef006fd7eb4b3af732460aff5cb85df12..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxhdpi/glasses.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_drawer.png b/app/src/main/res/drawable-xxhdpi/ic_drawer.png
deleted file mode 100644
index 9c4685d6e046ce6c450c19426dce627a88718bfc..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_drawer.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/mission.png b/app/src/main/res/drawable-xxhdpi/mission.png
deleted file mode 100644
index 804058074c3c36e5d95c11312c3d2cac1f231533..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxhdpi/mission.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/mood_dice.png b/app/src/main/res/drawable-xxhdpi/mood_dice.png
deleted file mode 100644
index 921e1db511ab0c18857a2738b90aa3a1a5a60329..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxhdpi/mood_dice.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/moon.png b/app/src/main/res/drawable-xxhdpi/moon.png
deleted file mode 100644
index 54c4545bcf3e00b55b1c715bb25c736cb23dea7d..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxhdpi/moon.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/night_emoticon.png b/app/src/main/res/drawable-xxhdpi/night_emoticon.png
deleted file mode 100644
index 18671a0bf5ded1b490eeb743733b92d3099a793d..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxhdpi/night_emoticon.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/phone.png b/app/src/main/res/drawable-xxhdpi/phone.png
deleted file mode 100644
index 39534b66c1c738e8ea2c406f4a8081670d210d06..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxhdpi/phone.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/pill.png b/app/src/main/res/drawable-xxhdpi/pill.png
deleted file mode 100644
index 853022942c56af520a818d22cf78fa4f4ef1d76c..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxhdpi/pill.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ques.png b/app/src/main/res/drawable-xxhdpi/ques.png
deleted file mode 100644
index 092972150349e4e0a9b69552503a2a4e008f33ca..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ques.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/relax.png b/app/src/main/res/drawable-xxhdpi/relax.png
deleted file mode 100644
index 91d529e6edbaf2d48e6d20be0e0fa3e63e5475f7..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxhdpi/relax.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/screen.png b/app/src/main/res/drawable-xxhdpi/screen.png
deleted file mode 100644
index 3668010966fbf08c7cb8d357cc56bde179742a03..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxhdpi/screen.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/sleeep_clock.png b/app/src/main/res/drawable-xxhdpi/sleeep_clock.png
deleted file mode 100644
index d1bf4e7d66b3365786f350783ce5ae3624651f62..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxhdpi/sleeep_clock.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/sleep.png b/app/src/main/res/drawable-xxhdpi/sleep.png
deleted file mode 100644
index 772420459b5ffe76396175eac6fa9a812245a62d..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxhdpi/sleep.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/sleepmoon.png b/app/src/main/res/drawable-xxhdpi/sleepmoon.png
deleted file mode 100644
index b8d1698d38b2905aa939477ba279828d9c7931f0..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxhdpi/sleepmoon.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/stickman.png b/app/src/main/res/drawable-xxhdpi/stickman.png
deleted file mode 100644
index 7128898db97f2f008a74f8c6c43b433f14ba8c3d..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxhdpi/stickman.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/stomach.png b/app/src/main/res/drawable-xxhdpi/stomach.png
deleted file mode 100644
index 13190f22733c66b4de5f67727f8b4a080a4fd7d7..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxhdpi/stomach.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/sun.png b/app/src/main/res/drawable-xxhdpi/sun.png
deleted file mode 100644
index 54a411a4d64ae9ad7ce72bf0540f5dbaa7912e52..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxhdpi/sun.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/you.png b/app/src/main/res/drawable-xxhdpi/you.png
deleted file mode 100644
index 89845c4dcc3feebb356de2feb38f9cf057643be9..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxhdpi/you.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/actions.png b/app/src/main/res/drawable-xxxhdpi/actions.png
deleted file mode 100644
index 367f0aedda909b050c24a317d58b7f2860fe2f92..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/actions.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/caffeine.png b/app/src/main/res/drawable-xxxhdpi/caffeine.png
deleted file mode 100644
index 887efe20fd5d3073ab693559a50845b39f16453d..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/caffeine.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/chat.png b/app/src/main/res/drawable-xxxhdpi/chat.png
deleted file mode 100644
index fecbc354289245e7d7cde98aa2931a8ab995d04a..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/chat.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/day_and_night.png b/app/src/main/res/drawable-xxxhdpi/day_and_night.png
deleted file mode 100644
index 17a06cb986d5827b1af2de0acc7979ba527c2f88..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/day_and_night.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/diary.png b/app/src/main/res/drawable-xxxhdpi/diary.png
deleted file mode 100644
index 91a47690be516fba6cab2eea477f46aae96a1018..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/diary.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/facts.png b/app/src/main/res/drawable-xxxhdpi/facts.png
deleted file mode 100644
index 7f79beb936bd0e9732b62329efb283ef6a8727a4..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/facts.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/glasses.png b/app/src/main/res/drawable-xxxhdpi/glasses.png
deleted file mode 100644
index 1437b991b40eec357e12161a6c643c16da40025d..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/glasses.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/mission.png b/app/src/main/res/drawable-xxxhdpi/mission.png
deleted file mode 100644
index f86024ef84553c168b7af7983813bf5d1840a115..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/mission.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/mood_dice.png b/app/src/main/res/drawable-xxxhdpi/mood_dice.png
deleted file mode 100644
index 15d20fcec1328392dc50b14383522d2a2173fa79..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/mood_dice.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/moon.png b/app/src/main/res/drawable-xxxhdpi/moon.png
deleted file mode 100644
index 423f36b90f072ce67ab487c4625b8132149be294..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/moon.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/night_emoticon.png b/app/src/main/res/drawable-xxxhdpi/night_emoticon.png
deleted file mode 100644
index 115b1b818d5e15272f18960b832396aa7b74fec7..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/night_emoticon.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/phone.png b/app/src/main/res/drawable-xxxhdpi/phone.png
deleted file mode 100644
index 08b85578a6cf08db445850e21e767bd24a4953d7..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/phone.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/pill.png b/app/src/main/res/drawable-xxxhdpi/pill.png
deleted file mode 100644
index ea9fcb5ba80bcc30c3acc9cc610d48dfae1c1218..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/pill.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ques.png b/app/src/main/res/drawable-xxxhdpi/ques.png
deleted file mode 100644
index ead96f5cd4a0e6b77042f3cb31a0f50ff126a5c3..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ques.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/relax.png b/app/src/main/res/drawable-xxxhdpi/relax.png
deleted file mode 100644
index bb22d1f02ea01ca8c55eea53f0edb2b3100246a0..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/relax.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/screen.png b/app/src/main/res/drawable-xxxhdpi/screen.png
deleted file mode 100644
index e37716327c11051685204af5a8004494f1c0ef37..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/screen.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/sleeep_clock.png b/app/src/main/res/drawable-xxxhdpi/sleeep_clock.png
deleted file mode 100644
index 0b116a65818bddbd9a5955c18d5822f828438e6e..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/sleeep_clock.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/sleep.png b/app/src/main/res/drawable-xxxhdpi/sleep.png
deleted file mode 100644
index c8c76d78c8126ecbebb73ec38b9b355a18fbb35a..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/sleep.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/sleepmoon.png b/app/src/main/res/drawable-xxxhdpi/sleepmoon.png
deleted file mode 100644
index a55b97defe35181593122a0829eb29eab2608392..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/sleepmoon.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/stickman.png b/app/src/main/res/drawable-xxxhdpi/stickman.png
deleted file mode 100644
index 351dfe72683c4c65e05d016fa21a09a75bd80fe9..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/stickman.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/stomach.png b/app/src/main/res/drawable-xxxhdpi/stomach.png
deleted file mode 100644
index f7dc95d916f6f6418b5b1d07ba8a656f21109c4f..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/stomach.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/sun.png b/app/src/main/res/drawable-xxxhdpi/sun.png
deleted file mode 100644
index e18e8768985d576f4003ad32e82c1fee1fa63246..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/sun.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/you.png b/app/src/main/res/drawable-xxxhdpi/you.png
deleted file mode 100644
index d929bfb372e1ab432b409d02fa36c73538af36a0..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/you.png and /dev/null differ
diff --git a/app/src/main/res/drawable/rounded_button_one.xml b/app/src/main/res/drawable/rounded_button_one.xml
index 29a12786cd05cc0bbc3995f05d383cd3d542af63..1c98e7e3bd5671488a7710985924e542fa0db111 100644
--- a/app/src/main/res/drawable/rounded_button_one.xml
+++ b/app/src/main/res/drawable/rounded_button_one.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
- <solid android:color="@android:color/holo_blue_dark" />
+ <solid android:color="@color/colorPrimaryDark" />
<corners android:bottomRightRadius="50dp"
android:bottomLeftRadius="50dp"
android:topRightRadius="50dp"
diff --git a/app/src/main/res/layout/act_b_menu.xml b/app/src/main/res/layout/act_b_menu.xml
deleted file mode 100644
index 0932da064e1807038ac272b6080be9c0e718dda6..0000000000000000000000000000000000000000
--- a/app/src/main/res/layout/act_b_menu.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- android:theme="@style/AppTheme"
- android:id="@+id/drawer_layout"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:fitsSystemWindows="true"
- tools:theme="@style/AppTheme"
- tools:openDrawer="start">
-
- <include
- layout="@layout/extra_bar_main"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
-
- <android.support.design.widget.NavigationView
- android:id="@+id/nav_view"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_gravity="start"
- android:fitsSystemWindows="true"
- app:headerLayout="@layout/extra_nav_header_menu"
- app:menu="@menu/activity_b_menu_drawer" />
-
-</android.support.v4.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/act_b_what_experiments.xml b/app/src/main/res/layout/act_b_what_experiments.xml
index 75e1420ef40f3dc07ca47c1decf3a482fa460129..7038d8e01b0a253a8a3a735cade67d94796c1f24 100644
--- a/app/src/main/res/layout/act_b_what_experiments.xml
+++ b/app/src/main/res/layout/act_b_what_experiments.xml
@@ -106,7 +106,7 @@
app:layout_constraintEnd_toEndOf="@+id/textView6"
app:layout_constraintStart_toStartOf="@+id/textView6"
app:layout_constraintTop_toBottomOf="@+id/textView6"
- app:srcCompat="@drawable/phone" />
+ app:srcCompat="@drawable/data" />
<TextView
android:id="@+id/textView9"
@@ -132,7 +132,6 @@
android:id="@+id/topView"
android:layout_width="match_parent"
android:layout_height="75dp"
- android:background="@color/LightSteelBlue"
tools:ignore="MissingConstraints"
tools:layout_editor_absoluteX="0dp"
tools:layout_editor_absoluteY="0dp" />
@@ -167,6 +166,6 @@
app:layout_constraintBottom_toBottomOf="@+id/topView"
app:layout_constraintEnd_toEndOf="@+id/topView"
app:layout_constraintTop_toTopOf="@+id/topView"
- app:srcCompat="@drawable/pill" />
+ app:srcCompat="@drawable/data" />
</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/act_calendar.xml b/app/src/main/res/layout/act_calendar.xml
index 50b2ffdc412c43ee0462ee82eee3ff5284040e6c..75cd804847f3afee2c37532e2ad4668b69a93aa8 100644
--- a/app/src/main/res/layout/act_calendar.xml
+++ b/app/src/main/res/layout/act_calendar.xml
@@ -10,60 +10,21 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <View
- android:id="@+id/topView"
- android:layout_width="match_parent"
- android:layout_height="75dp"
- android:background="@color/LightSteelBlue"
- tools:ignore="MissingConstraints"
- tools:layout_editor_absoluteX="0dp"
- tools:layout_editor_absoluteY="0dp" />
-
- <TextView
- android:id="@+id/factorsTitle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
- android:layout_marginStart="16dp"
- android:text="@string/calendarTitle"
- android:textAllCaps="false"
- android:textColor="@android:color/black"
- android:textSize="30sp"
- android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toStartOf="@+id/logoPlace"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.47" />
-
- <ImageView
- android:id="@+id/logoPlace"
- android:layout_width="91dp"
- android:layout_height="81dp"
- android:layout_marginEnd="16dp"
- android:contentDescription="@string/desc"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toEndOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.533"
- app:srcCompat="@drawable/pill" />
-
<TextView
android:id="@+id/factorsIntro"
android:layout_width="match_parent"
android:layout_height="130dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="12dp"
- app:autoSizeTextType="uniform"
+ android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:maxLines="30"
android:text="@string/calendarIntro"
android:textColor="@android:color/black"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/topView" />
+ app:layout_constraintTop_toTopOf="parent" />
<RelativeLayout
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/act_consent.xml b/app/src/main/res/layout/act_consent.xml
index 96ec8a9adc158fa1a084c44525b3b7ffeedaf5f2..a72877b84131ce05e569ffb455edbd14a6658675 100644
--- a/app/src/main/res/layout/act_consent.xml
+++ b/app/src/main/res/layout/act_consent.xml
@@ -11,58 +11,36 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <View
- android:id="@+id/topView"
- android:layout_width="match_parent"
- android:layout_height="75dp"
- android:background="@color/LightSteelBlue"
- tools:ignore="MissingConstraints"
- tools:layout_editor_absoluteY="0dp" />
-
<TextView
android:id="@+id/factorsTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
- android:layout_marginStart="16dp"
android:text="@string/consentPageTitle"
android:textAllCaps="false"
android:textColor="@android:color/black"
android:textSize="22sp"
android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toStartOf="@+id/logoPlace"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.47" />
-
- <ImageView
- android:id="@+id/logoPlace"
- android:layout_width="91dp"
- android:layout_height="81dp"
- android:layout_marginEnd="16dp"
- android:contentDescription="@string/desc"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toEndOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.533"
- app:srcCompat="@drawable/pill" />
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/factorsIntro"
android:layout_width="match_parent"
android:layout_height="80dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
android:maxLines="5"
android:text="@string/consentIntro"
android:textColor="@android:color/black"
app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/topView" />
+ app:layout_constraintTop_toBottomOf="@+id/factorsTitle" />
<ScrollView
android:id="@+id/ScrollViewQuestionnaire"
diff --git a/app/src/main/res/layout/act_data.xml b/app/src/main/res/layout/act_data.xml
index f0a793bec6c66ea445fb9d53910a2495b7fa9262..bd18d80abd7fec5ff40071ad911916c549219bde 100644
--- a/app/src/main/res/layout/act_data.xml
+++ b/app/src/main/res/layout/act_data.xml
@@ -1,64 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#FFF">
+ android:background="#FFF"
+ android:clickable="true">
- <View
- android:id="@+id/topView"
+ <android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
- android:layout_height="75dp"
- android:background="@color/LightSteelBlue"
- tools:ignore="MissingConstraints"
- tools:layout_editor_absoluteX="0dp"
- tools:layout_editor_absoluteY="0dp" />
-
- <TextView
- android:id="@+id/factorsTitle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
- android:layout_marginStart="16dp"
- android:text="@string/dataTitle"
- android:textAllCaps="false"
- android:textColor="@android:color/black"
- android:textSize="30sp"
- android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toStartOf="@+id/logoPlace"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.47" />
-
- <ImageView
- android:id="@+id/logoPlace"
- android:layout_width="91dp"
- android:layout_height="81dp"
- android:layout_marginEnd="16dp"
- android:contentDescription="@string/desc"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toEndOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.533"
- app:srcCompat="@drawable/pill" />
-
- <TextView
- android:id="@+id/dataIntro"
- android:layout_width="match_parent"
- android:layout_height="120dp"
- android:layout_marginEnd="8dp"
- android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
- app:autoSizeTextType="uniform"
- android:maxLines="30"
- android:text="@string/dataIntro"
- android:textColor="@android:color/black"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/topView" />
+ android:layout_height="match_parent">
+
+ <TextView
+ android:id="@+id/dataIntro"
+ android:layout_width="match_parent"
+ android:layout_height="120dp"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
+ android:maxLines="30"
+ android:text="@string/dataIntro"
+ android:textColor="@android:color/black"
+ app:autoSizeTextType="uniform"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<ScrollView
android:id="@+id/ScrollViewQuestionnaire"
@@ -457,4 +423,6 @@
</FrameLayout>
</ScrollView>
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</android.support.constraint.ConstraintLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/act_demograpics.xml b/app/src/main/res/layout/act_demograpics.xml
index fa89af04e8ab2732fb57d3d163faae9af1ebb9e6..bf82c047fdbf74b31c9b00844b824edf63120425 100644
--- a/app/src/main/res/layout/act_demograpics.xml
+++ b/app/src/main/res/layout/act_demograpics.xml
@@ -7,47 +7,21 @@
android:background="@android:color/white"
tools:context=".SecondPage">
- <View
- android:id="@+id/topView"
- android:layout_width="match_parent"
- android:layout_height="75dp"
- android:background="@color/LightSteelBlue"
- tools:ignore="MissingConstraints"
- tools:layout_editor_absoluteX="16dp"
- tools:layout_editor_absoluteY="0dp" />
-
<TextView
+ android:id="@+id/textView4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
android:text="@string/surveyTitle"
android:textAllCaps="false"
android:textColor="@android:color/black"
android:textSize="30sp"
android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toStartOf="@+id/logoPlace"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.444"
- tools:ignore="RtlHardcoded" />
-
- <ImageView
- android:id="@+id/logoPlace"
- android:layout_width="91dp"
- android:layout_height="81dp"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
- android:layout_marginTop="8dp"
- android:contentDescription="@string/desc"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toEndOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:srcCompat="@drawable/pill"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
tools:ignore="RtlHardcoded" />
<ScrollView
@@ -55,9 +29,9 @@
style="@android:style/Widget.Material.ScrollView"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
android:fillViewport="true"
android:scrollbarStyle="insideOverlay"
android:visibility="visible"
@@ -65,19 +39,19 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.454"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/topView"
+ app:layout_constraintTop_toBottomOf="@+id/textView4"
tools:targetApi="lollipop">
<FrameLayout
android:id="@+id/FrameForScrollView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
- android:layout_marginLeft="8dp"
- android:layout_marginRight="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginRight="8dp"
+ android:layout_marginBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/ScrollViewQuestionnaire"
app:layout_constraintStart_toStartOf="@+id/ScrollViewQuestionnaire"
@@ -93,8 +67,8 @@
android:id="@+id/firstSet"
android:layout_width="match_parent"
android:layout_height="160dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -115,10 +89,10 @@
android:id="@+id/submitButton"
android:layout_width="102dp"
android:layout_height="43dp"
- android:layout_marginBottom="24dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginBottom="24dp"
android:text="@string/submitUpdate"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -130,9 +104,9 @@
android:id="@+id/fallAsleepUsually"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:cursorVisible="false"
@@ -152,9 +126,9 @@
android:id="@+id/s5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:cursorVisible="false"
@@ -174,9 +148,9 @@
android:id="@+id/s6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:cursorVisible="false"
@@ -196,9 +170,9 @@
android:id="@+id/s7"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:cursorVisible="false"
@@ -218,9 +192,9 @@
android:id="@+id/wakeUpUsually"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:cursorVisible="false"
@@ -240,9 +214,9 @@
android:id="@+id/usually"
android:layout_width="match_parent"
android:layout_height="14dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:cursorVisible="false"
@@ -262,9 +236,9 @@
android:id="@+id/freshUsually2d"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:cursorVisible="false"
@@ -284,9 +258,9 @@
android:id="@+id/q1Group"
android:layout_width="match_parent"
android:layout_height="98dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fallAsleepUsually">
@@ -318,9 +292,9 @@
android:id="@+id/q2Group"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/wakeUpUsually">
@@ -365,9 +339,9 @@
android:id="@+id/q3Group"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
@@ -413,9 +387,9 @@
android:id="@+id/q4Group"
android:layout_width="match_parent"
android:layout_height="148dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
@@ -461,9 +435,9 @@
android:id="@+id/q5Group"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
@@ -509,9 +483,9 @@
android:id="@+id/q6Group"
android:layout_width="match_parent"
android:layout_height="158dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/s6">
@@ -570,9 +544,9 @@
android:id="@+id/q7Group"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/s7">
diff --git a/app/src/main/res/layout/act_diary.xml b/app/src/main/res/layout/act_diary.xml
index cdf27c8fcc26b19cf816f88c73ad148b206628c1..506b3c55a542286c40ef36130a204ef8dc74c2d1 100644
--- a/app/src/main/res/layout/act_diary.xml
+++ b/app/src/main/res/layout/act_diary.xml
@@ -14,55 +14,13 @@
android:layout_height="match_parent"
tools:context=".ThirdPage">
- <View
- android:id="@+id/topView"
- android:layout_width="match_parent"
- android:layout_height="75dp"
- android:background="@color/LightSteelBlue"
- tools:ignore="MissingConstraints"
- tools:layout_editor_absoluteX="0dp"
- tools:layout_editor_absoluteY="0dp" />
-
- <TextView
- android:id="@+id/goalDiaryTitle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
- android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
- android:text="@string/goalDiaryTitlee"
- android:textAllCaps="false"
- android:textColor="@android:color/black"
- android:textSize="30sp"
- android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toStartOf="@+id/logoPlace"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.444" />
-
- <ImageView
- android:id="@+id/logoPlace"
- android:layout_width="91dp"
- android:layout_height="81dp"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
- android:layout_marginTop="8dp"
- android:contentDescription="@string/desc"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toEndOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:srcCompat="@drawable/pill" />
-
<EditText
android:id="@+id/pleaseInput"
android:layout_width="match_parent"
android:layout_height="80dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="4dp"
+ android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:cursorVisible="false"
@@ -71,14 +29,14 @@
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
android:inputType=""
+ android:maxLines="5"
android:text="@string/goalDiaryIntro"
android:textSize="16sp"
android:textStyle="italic"
- android:maxLines="5"
app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/logoPlace" />
+ app:layout_constraintTop_toTopOf="parent" />
<EditText
android:id="@+id/yourGoal"
diff --git a/app/src/main/res/layout/act_experiments.xml b/app/src/main/res/layout/act_experiments.xml
index 3ab3f92353e8e1dfa2e775107a6db145134cd21e..e471b9ce8a1131a87e8b122137a0ae2c3134a360 100644
--- a/app/src/main/res/layout/act_experiments.xml
+++ b/app/src/main/res/layout/act_experiments.xml
@@ -11,58 +11,20 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <View
- android:id="@+id/topView"
- android:layout_width="match_parent"
- android:layout_height="75dp"
- android:background="@color/LightSteelBlue"
- tools:ignore="MissingConstraints"
- tools:layout_editor_absoluteY="0dp" />
-
- <TextView
- android:id="@+id/factorsTitle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
- android:layout_marginStart="16dp"
- android:text="@string/factorsTitle"
- android:textAllCaps="false"
- android:textColor="@android:color/black"
- android:textSize="30sp"
- android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toStartOf="@+id/logoPlace"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.47" />
-
- <ImageView
- android:id="@+id/logoPlace"
- android:layout_width="91dp"
- android:layout_height="81dp"
- android:layout_marginEnd="16dp"
- android:contentDescription="@string/desc"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toEndOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.533"
- app:srcCompat="@drawable/pill" />
-
<TextView
android:id="@+id/factorsIntro"
android:layout_width="match_parent"
- app:autoSizeTextType="uniform"
- android:maxLines="30"
android:layout_height="90dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
+ android:maxLines="30"
android:text="@string/factorsIntroduction"
android:textColor="@android:color/black"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/topView" />
+ app:layout_constraintTop_toTopOf="parent" />
<ScrollView
android:id="@+id/ScrollViewQuestionnaire"
diff --git a/app/src/main/res/layout/act_main_menu.xml b/app/src/main/res/layout/act_main_menu.xml
index 7d921cc7312fe086fab5dba3400d66ec5fef9a2f..df0914052d505e824868b1789d0a81ac5a72985b 100644
--- a/app/src/main/res/layout/act_main_menu.xml
+++ b/app/src/main/res/layout/act_main_menu.xml
@@ -1,168 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/relativeLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
- tools:context=".MainMenu"
- tools:showIn="@layout/extra_bar_main">
+ tools:context=".MainMenu">
- <FrameLayout
- android:id="@+id/content_frame"
+ <android.support.v7.widget.Toolbar
+ android:id="@+id/toolbar_id"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="1.0"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent">
-
- <android.support.constraint.ConstraintLayout
- android:id="@+id/lay"
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <Button
- android:id="@+id/whatSleep"
- android:layout_width="139dp"
- android:layout_height="71dp"
- android:layout_marginEnd="8dp"
- android:layout_marginStart="8dp"
- android:layout_marginTop="24dp"
- android:background="@drawable/rounded_button_one"
- android:text="@string/firstOptionMainMenu"
- android:textColor="@android:color/white"
- app:layout_constraintEnd_toEndOf="@+id/textView"
- app:layout_constraintStart_toStartOf="@+id/textView"
- app:layout_constraintTop_toBottomOf="@+id/textView3" />
-
- <Button
- android:id="@+id/WhatExperiments"
- android:layout_width="139dp"
- android:layout_height="71dp"
- android:layout_marginEnd="8dp"
- android:layout_marginTop="8dp"
- android:background="@drawable/rounded_button_two"
- android:text="@string/secondOptionMainMenu"
- android:textColor="@android:color/white"
- app:layout_constraintEnd_toEndOf="@+id/whatSleep"
- app:layout_constraintStart_toStartOf="@+id/whatSleep"
- app:layout_constraintTop_toBottomOf="@+id/whatSleep" />
-
- <EditText
- android:id="@+id/upText"
- android:layout_width="match_parent"
- android:layout_height="33dp"
- android:layout_marginEnd="8dp"
- android:layout_marginStart="8dp"
- android:layout_marginTop="4dp"
- android:clickable="false"
- android:cursorVisible="false"
- android:ems="10"
- android:focusable="false"
- android:focusableInTouchMode="false"
- android:inputType="textPersonName"
- android:text="@string/mainMenuUp"
- android:textAlignment="center"
- android:textSize="9sp"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.428"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-
- <EditText
- android:id="@+id/down"
- android:layout_width="match_parent"
- android:layout_height="19dp"
- android:layout_marginEnd="8dp"
- android:layout_marginStart="8dp"
- android:clickable="false"
- android:cursorVisible="false"
- android:ems="10"
- android:focusable="false"
- android:focusableInTouchMode="false"
- android:inputType="textPersonName"
- android:text=" "
- app:layout_constraintBottom_toTopOf="@+id/textView4"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
-
- <TextView
- android:id="@+id/textView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="8dp"
- android:text="@string/introUp"
- android:textColor="@android:color/holo_red_dark"
- android:textSize="20sp"
- android:textStyle="bold"
- app:layout_constraintEnd_toEndOf="@+id/imageView3"
- app:layout_constraintStart_toStartOf="@+id/imageView3"
- app:layout_constraintTop_toBottomOf="@+id/imageView3" />
+ android:layout_height="?attr/actionBarSize"
+ android:background="@color/toolbarColor"
+ app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
- <TextView
- android:id="@+id/textView3"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
- android:text="@string/introUpsub"
- android:textColor="@android:color/holo_blue_dark"
- app:layout_constraintEnd_toEndOf="@+id/imageView3"
- app:layout_constraintStart_toStartOf="@+id/imageView3"
- app:layout_constraintTop_toBottomOf="@+id/textView" />
-
- <TextView
- android:id="@+id/youHave"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
- android:layout_marginStart="8dp"
- android:layout_marginTop="13dp"
- android:text="You have 2 days left of the current experiment."
- android:textColor="#000000"
- android:textSize="8sp"
- android:textStyle="bold"
- app:layout_constraintEnd_toEndOf="@+id/textView"
- app:layout_constraintStart_toStartOf="@+id/textView"
- app:layout_constraintTop_toBottomOf="@+id/textView3" />
-
- <ImageView
- android:id="@+id/imageView2"
- android:layout_width="127dp"
- android:layout_height="92dp"
- android:layout_marginEnd="8dp"
- android:layout_marginStart="8dp"
- app:layout_constraintEnd_toEndOf="@+id/textView"
- app:layout_constraintStart_toStartOf="@+id/textView"
- app:layout_constraintTop_toBottomOf="@+id/WhatExperiments"
- app:srcCompat="@drawable/sleep" />
-
- <TextView
- android:id="@+id/textView4"
- android:layout_width="wrap_content"
- android:layout_height="14dp"
- android:layout_marginEnd="8dp"
- android:layout_marginStart="8dp"
- android:text="@string/introDown"
- android:textColor="@android:color/black"
- android:textSize="10sp"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
+ <android.support.design.widget.TabLayout
+ android:id="@+id/tabLayout_id"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/toolbar_id"
+ android:background="@color/toolbarColor"
+ app:tabMode="scrollable"
+ app:tabGravity="fill"
+ app:tabTextColor="@color/black"/>
+
+ <android.support.v4.view.ViewPager
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:id="@+id/viewPager_id"
+ android:layout_below="@id/tabLayout_id"
+ >
- <ImageView
- android:id="@+id/imageView3"
- android:layout_width="61dp"
- android:layout_height="49dp"
- android:layout_marginEnd="8dp"
- android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
- app:layout_constraintEnd_toEndOf="@+id/upText"
- app:layout_constraintStart_toStartOf="@+id/upText"
- app:layout_constraintTop_toBottomOf="@+id/upText"
- app:srcCompat="@drawable/pill" />
- </android.support.constraint.ConstraintLayout>
- </FrameLayout>
+ </android.support.v4.view.ViewPager>
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/act_menu.xml b/app/src/main/res/layout/act_menu.xml
index 349f0dd91737a5b26106a24c868cb8df6679e1e4..b12a324eef7c73446ed3f8720a951844fcf78dcc 100644
--- a/app/src/main/res/layout/act_menu.xml
+++ b/app/src/main/res/layout/act_menu.xml
@@ -1,27 +1,158 @@
<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
- android:theme="@style/AppTheme"
- android:id="@+id/drawer_layout"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:fitsSystemWindows="true"
- tools:theme="@style/AppTheme"
- tools:openDrawer="start">
-
- <include
- layout="@layout/extra_bar_main"
+ android:layout_width="match_parent" android:layout_height="match_parent">
+
+ <android.support.constraint.ConstraintLayout
+ android:id="@+id/lay"
android:layout_width="match_parent"
- android:layout_height="match_parent" />
-
- <android.support.design.widget.NavigationView
- android:id="@+id/nav_view"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_gravity="start"
- android:fitsSystemWindows="true"
- app:headerLayout="@layout/extra_nav_header_menu"
- app:menu="@menu/activity_menu_drawer" />
-
-</android.support.v4.widget.DrawerLayout>
+ android:layout_height="match_parent">
+
+ <ImageView
+ android:id="@+id/imageView"
+ android:layout_width="256dp"
+ android:layout_height="144dp"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="13dp"
+ android:layout_marginEnd="8dp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/youHave"
+ app:srcCompat="@drawable/bear" />
+
+ <Button
+ android:id="@+id/whatSleep"
+ android:layout_width="139dp"
+ android:layout_height="15dp"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
+ android:background="@drawable/rounded_button_one"
+ android:text="@string/settingsTitle"
+ android:textColor="@android:color/white"
+ android:textSize="10sp"
+ app:layout_constraintStart_toStartOf="@+id/editText3"
+ app:layout_constraintTop_toBottomOf="@+id/editText3" />
+
+ <Button
+ android:id="@+id/whatSleep2"
+ android:layout_width="241dp"
+ android:layout_height="44dp"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
+ android:background="@drawable/rounded_button_one"
+ android:text="@string/firstOptionMainMenu"
+ android:textColor="@android:color/white"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/textView3" />
+
+ <Button
+ android:id="@+id/whatSleep3"
+ android:layout_width="241dp"
+ android:layout_height="44dp"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
+ android:background="@drawable/rounded_button_one"
+ android:text="My Experiment"
+ android:textColor="@android:color/white"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.487"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/imageView" />
+
+ <Button
+ android:id="@+id/WhatExperiments"
+ android:layout_width="244dp"
+ android:layout_height="38dp"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
+ android:background="@drawable/rounded_button_two"
+ android:text="@string/secondOptionMainMenu"
+ android:textColor="@android:color/white"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/whatSleep2" />
+
+ <TextView
+ android:id="@+id/textView"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="24dp"
+ android:layout_marginEnd="8dp"
+ android:text="@string/introUp"
+ android:textColor="@android:color/holo_red_dark"
+ android:textSize="20sp"
+ android:textStyle="bold"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="0.497"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/view" />
+
+ <TextView
+ android:id="@+id/textView3"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
+ android:text="@string/introUpsub"
+ android:textColor="@android:color/holo_blue_dark"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/textView" />
+
+ <TextView
+ android:id="@+id/youHave"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
+ android:text="You have 2 days left of the current experiment."
+ android:textColor="#000000"
+ android:textSize="8sp"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/WhatExperiments" />
+
+ <ImageView
+ android:id="@+id/imageView2"
+ android:layout_width="127dp"
+ android:layout_height="92dp"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="8dp"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:srcCompat="@drawable/pillow" />
+
+ <EditText
+ android:id="@+id/editText3"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="8dp"
+ android:ems="10"
+ android:inputType="textPersonName"
+ android:text="George Catalin Muresan"
+ app:layout_constraintStart_toEndOf="@+id/imageView2"
+ app:layout_constraintTop_toTopOf="parent" />
+
+ <View
+ android:id="@+id/view"
+ android:layout_width="382dp"
+ android:layout_height="2dp"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
+ android:background="@color/black"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/imageView2" />
+
+ </android.support.constraint.ConstraintLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/act_notice.xml b/app/src/main/res/layout/act_notice.xml
index 54b69aad74642bedaaba55551eafcb6df1301119..4ad65b2d9b98bb8344f886d259a7f1f77187d973 100644
--- a/app/src/main/res/layout/act_notice.xml
+++ b/app/src/main/res/layout/act_notice.xml
@@ -6,20 +6,20 @@
android:layout_height="match_parent"
tools:context=".FirstPage">
- <View
- android:id="@+id/topView"
+ <FrameLayout
+ android:id="@+id/content_frame"
android:layout_width="match_parent"
- android:layout_height="75dp"
- android:background="@color/LightSteelBlue"
- tools:ignore="MissingConstraints"
- tools:layout_editor_absoluteX="0dp"
- tools:layout_editor_absoluteY="0dp" />
+ android:layout_height="match_parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintHorizontal_bias="1.0"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"/>
<TextView
android:id="@+id/welcomeTo"
android:layout_width="match_parent"
android:layout_height="100dp"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="16dp"
android:maxLines="30"
android:text="@string/notice"
android:textAlignment="center"
@@ -29,41 +29,23 @@
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/logoPlace" />
+ app:layout_constraintTop_toBottomOf="@+id/welcomeTitle" />
<TextView
android:id="@+id/welcomeTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
android:text="@string/noticeTitle"
android:textAllCaps="false"
android:textColor="@android:color/black"
android:textSize="30sp"
android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toStartOf="@+id/logoPlace"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.444" />
-
- <ImageView
- android:id="@+id/logoPlace"
- android:layout_width="91dp"
- android:layout_height="81dp"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="4dp"
- android:layout_marginTop="8dp"
- android:contentDescription="@string/desc"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toEndOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.363"
- app:srcCompat="@drawable/pill" />
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="@+id/content_frame" />
<Button
android:id="@+id/submitButton"
diff --git a/app/src/main/res/layout/act_ques_final.xml b/app/src/main/res/layout/act_ques_final.xml
index fc50265f2aba9070649420270adcc2b79923b539..b85a280d91cf0128fb4df04b1c8ac150a8c71889 100644
--- a/app/src/main/res/layout/act_ques_final.xml
+++ b/app/src/main/res/layout/act_ques_final.xml
@@ -7,48 +7,21 @@
android:background="@android:color/white"
tools:context=".Qfinal">
- <View
- android:id="@+id/topView"
- android:layout_width="match_parent"
- android:layout_height="75dp"
- android:background="@color/LightSteelBlue"
- tools:ignore="MissingConstraints"
- tools:layout_editor_absoluteX="16dp"
- tools:layout_editor_absoluteY="0dp" />
-
<TextView
android:id="@+id/questionnaireTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
android:text="@string/questionnaireTitle"
android:textAllCaps="false"
android:textColor="@android:color/black"
android:textSize="30sp"
android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toStartOf="@+id/logoPlace"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.444"
- tools:ignore="RtlHardcoded" />
-
- <ImageView
- android:id="@+id/logoPlace"
- android:layout_width="91dp"
- android:layout_height="81dp"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
- android:layout_marginTop="8dp"
- android:contentDescription="@string/desc"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toEndOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:srcCompat="@drawable/pill"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
tools:ignore="RtlHardcoded" />
<ScrollView
@@ -56,9 +29,9 @@
style="@android:style/Widget.Material.ScrollView"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
android:fillViewport="true"
android:scrollbarStyle="insideOverlay"
android:visibility="visible"
@@ -66,19 +39,19 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.454"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/topView"
+ app:layout_constraintTop_toBottomOf="@+id/questionnaireTitle"
tools:targetApi="lollipop">
<FrameLayout
android:id="@+id/FrameForScrollView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
- android:layout_marginLeft="8dp"
- android:layout_marginRight="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginRight="8dp"
+ android:layout_marginBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/ScrollViewQuestionnaire"
app:layout_constraintStart_toStartOf="@+id/ScrollViewQuestionnaire"
@@ -94,9 +67,9 @@
android:id="@+id/firstSet"
android:layout_width="match_parent"
android:layout_height="70dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -117,9 +90,9 @@
android:id="@+id/secondSet"
android:layout_width="match_parent"
android:layout_height="70dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -141,9 +114,9 @@
android:id="@+id/thirdSet"
android:layout_width="match_parent"
android:layout_height="90dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -165,10 +138,10 @@
android:id="@+id/submitButton"
android:layout_width="102dp"
android:layout_height="43dp"
- android:layout_marginBottom="16dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginBottom="16dp"
android:text="@string/submitUpdate"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -180,11 +153,9 @@
android:id="@+id/fallAsleepUsually"
android:layout_width="match_parent"
android:layout_height="14dp"
- app:autoSizeTextType="uniform"
- android:maxLines="30"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:cursorVisible="false"
@@ -193,8 +164,10 @@
android:focusableInTouchMode="false"
android:hint="@string/some_explanation_about_the_input"
android:inputType="textMultiLine|textUri"
+ android:maxLines="30"
android:text="@string/s1.1"
android:textSize="12sp"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.428"
app:layout_constraintStart_toStartOf="parent"
@@ -204,9 +177,9 @@
android:id="@+id/s5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:cursorVisible="false"
@@ -226,9 +199,9 @@
android:id="@+id/s6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:cursorVisible="false"
@@ -248,9 +221,9 @@
android:id="@+id/s7"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:cursorVisible="false"
@@ -270,9 +243,9 @@
android:id="@+id/s8"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:cursorVisible="false"
@@ -291,9 +264,9 @@
android:id="@+id/wakeUpUsually"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:cursorVisible="false"
@@ -313,9 +286,9 @@
android:id="@+id/usually"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:cursorVisible="false"
@@ -335,9 +308,9 @@
android:id="@+id/q1Group"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fallAsleepUsually">
@@ -382,9 +355,9 @@
android:id="@+id/q2Group"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/wakeUpUsually">
@@ -429,9 +402,9 @@
android:id="@+id/q3Group"
android:layout_width="match_parent"
android:layout_height="148dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/usually">
@@ -476,9 +449,9 @@
android:id="@+id/q5Group"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/s5">
@@ -523,9 +496,9 @@
android:id="@+id/q6Group"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/s6">
@@ -570,9 +543,9 @@
android:id="@+id/q7Group"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/s7">
@@ -617,9 +590,9 @@
android:id="@+id/q8Group"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/act_ques_initial.xml b/app/src/main/res/layout/act_ques_initial.xml
index b9e1a41f411ee8441cad49f147b860918c5ccc45..ef67498cd2baa7e93fabda940959053547f5d053 100644
--- a/app/src/main/res/layout/act_ques_initial.xml
+++ b/app/src/main/res/layout/act_ques_initial.xml
@@ -6,48 +6,21 @@
android:layout_height="match_parent"
tools:context=".SecondPage">
- <View
- android:id="@+id/topView"
- android:layout_width="match_parent"
- android:layout_height="75dp"
- android:background="@color/LightSteelBlue"
- tools:ignore="MissingConstraints"
- tools:layout_editor_absoluteX="16dp"
- tools:layout_editor_absoluteY="0dp" />
-
<TextView
android:id="@+id/questionnaireTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
android:text="@string/questionnaireTitle"
android:textAllCaps="false"
android:textColor="@android:color/black"
android:textSize="30sp"
android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toStartOf="@+id/logoPlace"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.444"
- tools:ignore="RtlHardcoded" />
-
- <ImageView
- android:id="@+id/logoPlace"
- android:layout_width="91dp"
- android:layout_height="81dp"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
- android:layout_marginTop="8dp"
- android:contentDescription="@string/desc"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toEndOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:srcCompat="@drawable/pill"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
tools:ignore="RtlHardcoded" />
<ScrollView
@@ -55,9 +28,9 @@
style="@android:style/Widget.Material.ScrollView"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
android:fillViewport="true"
android:scrollbarStyle="insideOverlay"
android:visibility="visible"
@@ -65,19 +38,19 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.454"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/topView"
+ app:layout_constraintTop_toBottomOf="@+id/questionnaireTitle"
tools:targetApi="lollipop">
<FrameLayout
android:id="@+id/FrameForScrollView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
- android:layout_marginLeft="8dp"
- android:layout_marginRight="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginRight="8dp"
+ android:layout_marginBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/ScrollViewQuestionnaire"
app:layout_constraintStart_toStartOf="@+id/ScrollViewQuestionnaire"
@@ -93,9 +66,9 @@
android:id="@+id/firstSet"
android:layout_width="match_parent"
android:layout_height="70dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -116,9 +89,9 @@
android:id="@+id/secondSet"
android:layout_width="match_parent"
android:layout_height="70dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -140,9 +113,9 @@
android:id="@+id/thirdSet"
android:layout_width="match_parent"
android:layout_height="90dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -164,9 +137,9 @@
android:id="@+id/fourthSet"
android:layout_width="match_parent"
android:layout_height="90dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -188,10 +161,10 @@
android:id="@+id/submitButton"
android:layout_width="102dp"
android:layout_height="43dp"
- android:layout_marginBottom="16dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="24dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginBottom="16dp"
android:text="@string/nextButton"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -203,9 +176,9 @@
android:id="@+id/fallAsleepUsually"
android:layout_width="match_parent"
android:layout_height="14dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:cursorVisible="false"
@@ -225,9 +198,9 @@
android:id="@+id/s4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:cursorVisible="false"
@@ -247,9 +220,9 @@
android:id="@+id/s5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:cursorVisible="false"
@@ -269,9 +242,9 @@
android:id="@+id/s6"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:cursorVisible="false"
@@ -291,9 +264,9 @@
android:id="@+id/s7"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:cursorVisible="false"
@@ -313,9 +286,9 @@
android:id="@+id/s8"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:cursorVisible="false"
@@ -335,9 +308,9 @@
android:id="@+id/s9"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:cursorVisible="false"
@@ -357,9 +330,9 @@
android:id="@+id/wakeUpUsually"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:cursorVisible="false"
@@ -379,9 +352,9 @@
android:id="@+id/usually"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:background="@android:color/transparent"
android:clickable="false"
android:cursorVisible="false"
@@ -401,9 +374,9 @@
android:id="@+id/q1Group"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/fallAsleepUsually">
@@ -448,9 +421,9 @@
android:id="@+id/q2Group"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/wakeUpUsually">
@@ -495,9 +468,9 @@
android:id="@+id/q3Group"
android:layout_width="match_parent"
android:layout_height="148dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/usually">
@@ -542,9 +515,9 @@
android:id="@+id/q4Group"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/s4">
@@ -589,9 +562,9 @@
android:id="@+id/q5Group"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/s5">
@@ -636,9 +609,9 @@
android:id="@+id/q6Group"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/s6">
@@ -683,9 +656,9 @@
android:id="@+id/q7Group"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.6"
app:layout_constraintStart_toStartOf="parent"
@@ -731,9 +704,9 @@
android:id="@+id/q8Group"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.555"
app:layout_constraintStart_toStartOf="parent"
@@ -779,9 +752,9 @@
android:id="@+id/q9Group"
android:layout_width="match_parent"
android:layout_height="128dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.555"
app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/act_update_caffeine_empty.xml b/app/src/main/res/layout/act_update_caffeine_empty.xml
index 61afd9f4ccbb67db9efcf0210afa200c8ad172de..1bf17210118b8bd29ef2dc21bad1a4c0a15f3321 100644
--- a/app/src/main/res/layout/act_update_caffeine_empty.xml
+++ b/app/src/main/res/layout/act_update_caffeine_empty.xml
@@ -12,73 +12,36 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <View
- android:id="@+id/topView"
- android:layout_width="match_parent"
- android:layout_height="75dp"
- android:background="@color/LightSteelBlue"
- tools:ignore="MissingConstraints"
- tools:layout_editor_absoluteX="0dp"
- tools:layout_editor_absoluteY="0dp" />
-
- <TextView
- android:id="@+id/caffeineSubtitle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="16dp"
- android:text="@string/caffeineSubTitle"
- android:textAllCaps="false"
- android:textColor="@android:color/black"
- android:textSize="18sp"
- android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.72" />
-
<TextView
android:id="@+id/experimentTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
- android:layout_marginStart="16dp"
- android:text="@string/experimentTitle"
+ android:text="@string/preQues"
android:textAllCaps="false"
android:textColor="@android:color/black"
android:textSize="30sp"
android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toStartOf="@+id/logoPlace"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.205" />
-
- <ImageView
- android:id="@+id/logoPlace"
- android:layout_width="91dp"
- android:layout_height="81dp"
- android:layout_marginEnd="16dp"
- android:contentDescription="@string/desc"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toEndOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.533"
- app:srcCompat="@drawable/pill" />
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/lightIntro"
android:layout_width="match_parent"
- app:autoSizeTextType="uniform"
- android:maxLines="30"
android:layout_height="70dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
+ android:maxLines="30"
android:text="@string/stomachIntro"
android:textColor="@android:color/black"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/topView" />
+ app:layout_constraintTop_toBottomOf="@+id/experimentTitle" />
<ScrollView
android:id="@+id/ScrollViewQuestionnaire"
diff --git a/app/src/main/res/layout/act_update_caffeine_limit.xml b/app/src/main/res/layout/act_update_caffeine_limit.xml
index 1464b009cf7456b3b968e2560aa6a67d5187c504..80c301b4d3c6cabae16f410858f0b1578f762397 100644
--- a/app/src/main/res/layout/act_update_caffeine_limit.xml
+++ b/app/src/main/res/layout/act_update_caffeine_limit.xml
@@ -12,73 +12,36 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <View
- android:id="@+id/topView"
- android:layout_width="match_parent"
- android:layout_height="75dp"
- android:background="@color/LightSteelBlue"
- tools:ignore="MissingConstraints"
- tools:layout_editor_absoluteX="0dp"
- tools:layout_editor_absoluteY="0dp" />
-
- <TextView
- android:id="@+id/caffeineSubtitle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="16dp"
- android:text="@string/caffeineSubTitle"
- android:textAllCaps="false"
- android:textColor="@android:color/black"
- android:textSize="18sp"
- android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.72" />
-
- <ImageView
- android:id="@+id/logoPlace"
- android:layout_width="91dp"
- android:layout_height="81dp"
- android:layout_marginEnd="16dp"
- android:contentDescription="@string/desc"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toEndOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.533"
- app:srcCompat="@drawable/pill" />
-
<TextView
android:id="@+id/experimentTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
- android:layout_marginStart="16dp"
- android:text="@string/experimentTitle"
+ android:text="@string/preQues"
android:textAllCaps="false"
android:textColor="@android:color/black"
android:textSize="30sp"
android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toStartOf="@+id/logoPlace"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.205" />
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/lightIntro"
- app:autoSizeTextType="uniform"
- android:maxLines="30"
android:layout_width="match_parent"
android:layout_height="70dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
+ android:maxLines="30"
android:text="@string/limitIntro"
android:textColor="@android:color/black"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/topView" />
+ app:layout_constraintTop_toBottomOf="@+id/experimentTitle" />
<ScrollView
android:id="@+id/ScrollViewQuestionnaire"
diff --git a/app/src/main/res/layout/act_update_caffeine_six.xml b/app/src/main/res/layout/act_update_caffeine_six.xml
index 2d859d7f8216f49eca223ce213b6d455a4a9219d..f72b9da06a760bec2888b33b3aa13cd993e47bbe 100644
--- a/app/src/main/res/layout/act_update_caffeine_six.xml
+++ b/app/src/main/res/layout/act_update_caffeine_six.xml
@@ -12,73 +12,36 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <View
- android:id="@+id/topView"
- android:layout_width="match_parent"
- android:layout_height="75dp"
- android:background="@color/LightSteelBlue"
- tools:ignore="MissingConstraints"
- tools:layout_editor_absoluteX="0dp"
- tools:layout_editor_absoluteY="0dp" />
-
- <TextView
- android:id="@+id/caffeineSubtitle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="16dp"
- android:text="@string/caffeineSubTitle"
- android:textAllCaps="false"
- android:textColor="@android:color/black"
- android:textSize="18sp"
- android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.72" />
-
<TextView
android:id="@+id/experimentTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
- android:layout_marginStart="16dp"
- android:text="@string/experimentTitle"
+ android:text="@string/preQues"
android:textAllCaps="false"
android:textColor="@android:color/black"
android:textSize="30sp"
android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toStartOf="@+id/logoPlace"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.205" />
-
- <ImageView
- android:id="@+id/logoPlace"
- android:layout_width="91dp"
- android:layout_height="81dp"
- android:layout_marginEnd="16dp"
- android:contentDescription="@string/desc"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toEndOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.533"
- app:srcCompat="@drawable/pill" />
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/lightIntro"
- app:autoSizeTextType="uniform"
- android:maxLines="30"
android:layout_width="match_parent"
android:layout_height="70dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
+ android:maxLines="30"
android:text="@string/sixIntro"
android:textColor="@android:color/black"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/topView" />
+ app:layout_constraintTop_toBottomOf="@+id/experimentTitle" />
<ScrollView
android:id="@+id/ScrollViewQuestionnaire"
diff --git a/app/src/main/res/layout/act_update_light_bright.xml b/app/src/main/res/layout/act_update_light_bright.xml
index 1bb353f42f2dd083742613a42c69fbaa1344ddbd..bc5a12e3b2fce7e5cea18f442ee92cc701b79bb3 100644
--- a/app/src/main/res/layout/act_update_light_bright.xml
+++ b/app/src/main/res/layout/act_update_light_bright.xml
@@ -12,73 +12,36 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <View
- android:id="@+id/topView"
- android:layout_width="match_parent"
- android:layout_height="75dp"
- android:background="@color/LightSteelBlue"
- tools:ignore="MissingConstraints"
- tools:layout_editor_absoluteX="0dp"
- tools:layout_editor_absoluteY="0dp" />
-
<TextView
android:id="@+id/experimentTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
- android:layout_marginStart="16dp"
- android:text="@string/experimentTitle"
+ android:text="@string/preQues"
android:textAllCaps="false"
android:textColor="@android:color/black"
android:textSize="30sp"
android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toStartOf="@+id/logoPlace"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.205" />
-
- <TextView
- android:id="@+id/sleepSettingsTitle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="16dp"
- android:text="@string/lightSubTitle"
- android:textAllCaps="false"
- android:textColor="@android:color/black"
- android:textSize="18sp"
- android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.72" />
-
- <ImageView
- android:id="@+id/logoPlace"
- android:layout_width="91dp"
- android:layout_height="81dp"
- android:layout_marginEnd="16dp"
- android:contentDescription="@string/desc"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toEndOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.533"
- app:srcCompat="@drawable/pill" />
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/lightIntro"
- app:autoSizeTextType="uniform"
- android:maxLines="30"
android:layout_width="match_parent"
android:layout_height="70dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
+ android:maxLines="30"
android:text="@string/brightExposureIntro"
android:textColor="@android:color/black"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/topView" />
+ app:layout_constraintTop_toBottomOf="@+id/experimentTitle" />
<ScrollView
android:id="@+id/ScrollViewQuestionnaire"
diff --git a/app/src/main/res/layout/act_update_light_glasses.xml b/app/src/main/res/layout/act_update_light_glasses.xml
index 38a51abe1edc0a8b0defaa027ecb1a2c0817a185..fd67446ca3860d11c3469f5e651d066b02420053 100644
--- a/app/src/main/res/layout/act_update_light_glasses.xml
+++ b/app/src/main/res/layout/act_update_light_glasses.xml
@@ -12,73 +12,36 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <View
- android:id="@+id/topView"
- android:layout_width="match_parent"
- android:layout_height="75dp"
- android:background="@color/LightSteelBlue"
- tools:ignore="MissingConstraints"
- tools:layout_editor_absoluteX="0dp"
- tools:layout_editor_absoluteY="0dp" />
-
- <TextView
- android:id="@+id/sleepSettingsTitle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="16dp"
- android:text="@string/lightSubTitle"
- android:textAllCaps="false"
- android:textColor="@android:color/black"
- android:textSize="18sp"
- android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.72" />
-
<TextView
android:id="@+id/experimentTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
- android:layout_marginStart="16dp"
- android:text="@string/experimentTitle"
+ android:text="@string/preQues"
android:textAllCaps="false"
android:textColor="@android:color/black"
android:textSize="30sp"
android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toStartOf="@+id/logoPlace"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.205" />
-
- <ImageView
- android:id="@+id/logoPlace"
- android:layout_width="91dp"
- android:layout_height="81dp"
- android:layout_marginEnd="16dp"
- android:contentDescription="@string/desc"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toEndOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.533"
- app:srcCompat="@drawable/pill" />
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/lightIntro"
android:layout_width="match_parent"
- app:autoSizeTextType="uniform"
- android:maxLines="30"
android:layout_height="70dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
+ android:maxLines="30"
android:text="@string/glassesIntro"
android:textColor="@android:color/black"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/topView" />
+ app:layout_constraintTop_toBottomOf="@+id/experimentTitle" />
<ScrollView
android:id="@+id/ScrollViewQuestionnaire"
diff --git a/app/src/main/res/layout/act_update_light_turnoffs.xml b/app/src/main/res/layout/act_update_light_turnoffs.xml
index 0667ef9d59ef89c532e7c94b01cd56baf2d42595..45694f285cf1ef7917a1ff6686a811fe342c0699 100644
--- a/app/src/main/res/layout/act_update_light_turnoffs.xml
+++ b/app/src/main/res/layout/act_update_light_turnoffs.xml
@@ -12,71 +12,34 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <View
- android:id="@+id/topView"
- android:layout_width="match_parent"
- android:layout_height="75dp"
- android:background="@color/LightSteelBlue"
- tools:ignore="MissingConstraints"
- tools:layout_editor_absoluteX="0dp"
- tools:layout_editor_absoluteY="0dp" />
-
- <TextView
- android:id="@+id/sleepSettingsTitle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="16dp"
- android:text="@string/lightSubTitle"
- android:textAllCaps="false"
- android:textColor="@android:color/black"
- android:textSize="18sp"
- android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.72" />
-
<TextView
android:id="@+id/experimentTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
- android:layout_marginStart="16dp"
- android:text="@string/experimentTitle"
+ android:text="@string/preQues"
android:textAllCaps="false"
android:textColor="@android:color/black"
android:textSize="30sp"
android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toStartOf="@+id/logoPlace"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.205" />
-
- <ImageView
- android:id="@+id/logoPlace"
- android:layout_width="91dp"
- android:layout_height="81dp"
- android:layout_marginEnd="16dp"
- android:contentDescription="@string/desc"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toEndOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.533"
- app:srcCompat="@drawable/pill" />
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/lightIntro"
android:layout_width="match_parent"
android:layout_height="70dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
android:text="@string/turnOffIntro"
android:textColor="@android:color/black"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/topView" />
+ app:layout_constraintTop_toBottomOf="@+id/experimentTitle" />
<ScrollView
android:id="@+id/ScrollViewQuestionnaire"
diff --git a/app/src/main/res/layout/act_update_schedule_midnight.xml b/app/src/main/res/layout/act_update_schedule_midnight.xml
index 572356beecde9439406d4889d9fdd2dcfbed8c51..f10f52a5eb44dcfbb3b0bb235a2a7dff275e01b6 100644
--- a/app/src/main/res/layout/act_update_schedule_midnight.xml
+++ b/app/src/main/res/layout/act_update_schedule_midnight.xml
@@ -12,73 +12,36 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <TextView
- android:id="@+id/caffeineSubtitle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="16dp"
- android:text="@string/scheduleSubTitle"
- android:textAllCaps="false"
- android:textColor="@android:color/black"
- android:textSize="18sp"
- android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.72" />
-
- <View
- android:id="@+id/topView"
- android:layout_width="match_parent"
- android:layout_height="75dp"
- android:background="@color/LightSteelBlue"
- tools:ignore="MissingConstraints"
- tools:layout_editor_absoluteX="0dp"
- tools:layout_editor_absoluteY="0dp" />
-
<TextView
android:id="@+id/experimentTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
- android:layout_marginStart="16dp"
- android:text="@string/experimentTitle"
+ android:text="@string/preQues"
android:textAllCaps="false"
android:textColor="@android:color/black"
android:textSize="30sp"
android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toStartOf="@+id/logoPlace"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.205" />
-
- <ImageView
- android:id="@+id/logoPlace"
- android:layout_width="91dp"
- android:layout_height="81dp"
- android:layout_marginEnd="16dp"
- android:contentDescription="@string/desc"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toEndOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.533"
- app:srcCompat="@drawable/pill" />
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/lightIntro"
android:layout_width="match_parent"
- app:autoSizeTextType="uniform"
- android:maxLines="30"
android:layout_height="70dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
+ android:maxLines="30"
android:text="@string/sevenIntro"
android:textColor="@android:color/black"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/topView" />
+ app:layout_constraintTop_toBottomOf="@+id/experimentTitle" />
<ScrollView
android:id="@+id/ScrollViewQuestionnaire"
diff --git a/app/src/main/res/layout/act_update_schedule_relax.xml b/app/src/main/res/layout/act_update_schedule_relax.xml
index 400fc82b846fcc4d47540e974108646e35bdf846..4d72664104996d82b966db6c73f292384b2e1e50 100644
--- a/app/src/main/res/layout/act_update_schedule_relax.xml
+++ b/app/src/main/res/layout/act_update_schedule_relax.xml
@@ -12,71 +12,34 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <View
- android:id="@+id/topView"
- android:layout_width="match_parent"
- android:layout_height="75dp"
- android:background="@color/LightSteelBlue"
- tools:ignore="MissingConstraints"
- tools:layout_editor_absoluteX="0dp"
- tools:layout_editor_absoluteY="0dp" />
-
- <TextView
- android:id="@+id/scheduleTitle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="16dp"
- android:text="@string/scheduleSubTitle"
- android:textAllCaps="false"
- android:textColor="@android:color/black"
- android:textSize="18sp"
- android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.72" />
-
<TextView
android:id="@+id/experimentTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
- android:layout_marginStart="16dp"
android:text="@string/experimentTitle"
android:textAllCaps="false"
android:textColor="@android:color/black"
android:textSize="30sp"
android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toStartOf="@+id/logoPlace"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.205" />
-
- <ImageView
- android:id="@+id/logoPlace"
- android:layout_width="91dp"
- android:layout_height="81dp"
- android:layout_marginEnd="16dp"
- android:contentDescription="@string/desc"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toEndOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.533"
- app:srcCompat="@drawable/pill" />
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/lightIntro"
android:layout_width="match_parent"
android:layout_height="90dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
android:text="@string/relaxIntro"
android:textColor="@android:color/black"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/topView" />
+ app:layout_constraintTop_toBottomOf="@+id/experimentTitle" />
<ScrollView
android:id="@+id/ScrollViewQuestionnaire"
diff --git a/app/src/main/res/layout/act_update_schedule_sametime.xml b/app/src/main/res/layout/act_update_schedule_sametime.xml
index 67fe2fe63b086e0d097134bab068cc643b71e657..cd8a30564709b4eecbe038f40ade0c48428d19a9 100644
--- a/app/src/main/res/layout/act_update_schedule_sametime.xml
+++ b/app/src/main/res/layout/act_update_schedule_sametime.xml
@@ -12,71 +12,34 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <View
- android:id="@+id/topView"
- android:layout_width="match_parent"
- android:layout_height="75dp"
- android:background="@color/LightSteelBlue"
- tools:ignore="MissingConstraints"
- tools:layout_editor_absoluteX="0dp"
- tools:layout_editor_absoluteY="0dp" />
-
- <TextView
- android:id="@+id/scheduleSubTitle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="16dp"
- android:text="@string/scheduleSubTitle"
- android:textAllCaps="false"
- android:textColor="@android:color/black"
- android:textSize="18sp"
- android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.72" />
-
<TextView
android:id="@+id/experimentTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
- android:layout_marginStart="16dp"
- android:text="@string/experimentTitle"
+ android:text="@string/preQues"
android:textAllCaps="false"
android:textColor="@android:color/black"
android:textSize="30sp"
android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toStartOf="@+id/logoPlace"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.205" />
-
- <ImageView
- android:id="@+id/logoPlace"
- android:layout_width="91dp"
- android:layout_height="81dp"
- android:layout_marginEnd="16dp"
- android:contentDescription="@string/desc"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toEndOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.533"
- app:srcCompat="@drawable/pill" />
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/sametimeIntro"
android:layout_width="match_parent"
android:layout_height="70dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
android:text="@string/sametimeIntro"
android:textColor="@android:color/black"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/topView" />
+ app:layout_constraintTop_toBottomOf="@+id/experimentTitle" />
<ScrollView
android:id="@+id/ScrollViewQuestionnaire"
diff --git a/app/src/main/res/layout/act_update_schedule_seven.xml b/app/src/main/res/layout/act_update_schedule_seven.xml
index f570d8eeb978cbf2268727cc86154c50afc6db4d..ad77b2212a43b5f42ef3eba2b41f93decac1bbf9 100644
--- a/app/src/main/res/layout/act_update_schedule_seven.xml
+++ b/app/src/main/res/layout/act_update_schedule_seven.xml
@@ -12,71 +12,34 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <View
- android:id="@+id/topView"
- android:layout_width="match_parent"
- android:layout_height="75dp"
- android:background="@color/LightSteelBlue"
- tools:ignore="MissingConstraints"
- tools:layout_editor_absoluteX="0dp"
- tools:layout_editor_absoluteY="0dp" />
-
- <TextView
- android:id="@+id/scheduleSubTitle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="16dp"
- android:text="@string/scheduleSubTitle"
- android:textAllCaps="false"
- android:textColor="@android:color/black"
- android:textSize="18sp"
- android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.72" />
-
<TextView
android:id="@+id/experimentTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
- android:layout_marginStart="16dp"
- android:text="@string/experimentTitle"
+ android:text="@string/preQues"
android:textAllCaps="false"
android:textColor="@android:color/black"
android:textSize="30sp"
android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toStartOf="@+id/logoPlace"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.205" />
-
- <ImageView
- android:id="@+id/logoPlace"
- android:layout_width="91dp"
- android:layout_height="81dp"
- android:layout_marginEnd="16dp"
- android:contentDescription="@string/desc"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toEndOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.533"
- app:srcCompat="@drawable/pill" />
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/sevenIntro"
android:layout_width="match_parent"
android:layout_height="70dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
android:text="@string/sevenIntro"
android:textColor="@android:color/black"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/topView" />
+ app:layout_constraintTop_toBottomOf="@+id/experimentTitle" />
<ScrollView
android:id="@+id/ScrollViewQuestionnaire"
diff --git a/app/src/main/res/layout/act_welcome.xml b/app/src/main/res/layout/act_welcome.xml
index 401906e588756d3e23edf342b072190384e2ef5d..40144b1543403e9631464d6f69fb4cf0952cb360 100644
--- a/app/src/main/res/layout/act_welcome.xml
+++ b/app/src/main/res/layout/act_welcome.xml
@@ -22,19 +22,11 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/yourName" />
- <View
- android:id="@+id/topView"
- android:layout_width="match_parent"
- android:layout_height="75dp"
- android:background="@color/LightSteelBlue"
- tools:ignore="MissingConstraints"
- tools:layout_editor_absoluteX="0dp"
- tools:layout_editor_absoluteY="0dp" />
-
<TextView
android:id="@+id/welcomeTo"
android:layout_width="match_parent"
android:layout_height="150dp"
+ android:layout_marginTop="16dp"
android:maxLines="20"
android:text="@string/appIntro"
android:textAlignment="center"
@@ -44,41 +36,23 @@
app:layout_constraintHorizontal_bias="0.508"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/logoPlace" />
+ app:layout_constraintTop_toBottomOf="@+id/welcomeTitle" />
<TextView
android:id="@+id/welcomeTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
android:text="@string/introductionTitle"
android:textAllCaps="false"
android:textColor="@android:color/black"
android:textSize="30sp"
android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toStartOf="@+id/logoPlace"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.444" />
-
- <ImageView
- android:id="@+id/logoPlace"
- android:layout_width="91dp"
- android:layout_height="81dp"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="4dp"
- android:layout_marginTop="8dp"
- android:contentDescription="@string/desc"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toEndOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.363"
- app:srcCompat="@drawable/pill" />
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/submitButton"
diff --git a/app/src/main/res/layout/act_what_experiments.xml b/app/src/main/res/layout/act_what_experiments.xml
index 6bd2b2d0cf71d1820d20fcd64ad6e9992cfba239..6d4d9a54f04f47119fec2452e3a39102a955fa71 100644
--- a/app/src/main/res/layout/act_what_experiments.xml
+++ b/app/src/main/res/layout/act_what_experiments.xml
@@ -11,10 +11,10 @@
style="@android:style/Widget.Material.ScrollView"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginBottom="8dp"
android:fillViewport="true"
android:scrollbarStyle="insideOverlay"
android:visibility="visible"
@@ -22,20 +22,19 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/topView"
- app:layout_constraintVertical_bias="0.0"
+ app:layout_constraintTop_toBottomOf="@+id/welcomeTitle"
tools:targetApi="lollipop">
<FrameLayout
android:id="@+id/FrameForScrollView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
- android:layout_marginLeft="8dp"
- android:layout_marginRight="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginRight="8dp"
+ android:layout_marginBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/ScrollViewQuestionnaire"
app:layout_constraintStart_toStartOf="@+id/ScrollViewQuestionnaire"
@@ -52,8 +51,8 @@
android:id="@+id/sleepHygieneTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -70,9 +69,9 @@
android:id="@+id/missionTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -89,8 +88,8 @@
android:id="@+id/tuningTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -107,8 +106,8 @@
android:id="@+id/textView5"
android:layout_width="match_parent"
android:layout_height="380dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginEnd="8dp"
android:maxLines="30"
android:text="@string/features"
android:textColor="@android:color/black"
@@ -122,14 +121,14 @@
android:id="@+id/textView6"
android:layout_width="match_parent"
android:layout_height="120dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:maxLines="5"
- app:autoSizeTextType="uniform"
android:text="@string/experiments"
android:textAlignment="textStart"
android:textColor="@android:color/black"
+ app:autoSizeTextType="uniform"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/sleepHygieneTitle" />
@@ -138,10 +137,10 @@
android:id="@+id/back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginBottom="16dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginBottom="16dp"
android:text="@string/backButton"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -152,9 +151,9 @@
android:id="@+id/textView7"
android:layout_width="match_parent"
android:layout_height="140dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:maxLines="30"
android:text="@string/loggingExp"
android:textColor="@android:color/black"
@@ -167,43 +166,43 @@
android:id="@+id/imageView23"
android:layout_width="133dp"
android:layout_height="133dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="12dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toEndOf="@+id/textView6"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView6"
- app:srcCompat="@drawable/phone" />
+ app:srcCompat="@drawable/data" />
<ImageView
android:id="@+id/imageView24"
android:layout_width="133dp"
android:layout_height="133dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
app:layout_constraintEnd_toStartOf="@+id/imageView25"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView7"
- app:srcCompat="@drawable/moon" />
+ app:srcCompat="@drawable/data" />
<ImageView
android:id="@+id/imageView25"
android:layout_width="133dp"
android:layout_height="133dp"
- android:layout_marginEnd="36dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="36dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView7"
- app:srcCompat="@drawable/ques" />
+ app:srcCompat="@drawable/data" />
<TextView
android:id="@+id/textView9"
android:layout_width="match_parent"
android:layout_height="180dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:maxLines="30"
android:text="@string/experiments2"
android:textColor="@android:color/black"
@@ -217,47 +216,24 @@
</FrameLayout>
</ScrollView>
- <View
- android:id="@+id/topView"
- android:layout_width="match_parent"
- android:layout_height="75dp"
- android:background="@color/LightSteelBlue"
- tools:ignore="MissingConstraints"
- tools:layout_editor_absoluteX="0dp"
- tools:layout_editor_absoluteY="0dp" />
-
<TextView
android:id="@+id/welcomeTitle"
android:layout_width="0dp"
android:layout_height="60dp"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
+ android:clickable="false"
android:maxLines="5"
- app:autoSizeTextType="uniform"
+ android:gravity="center"
android:text="@string/whatExeriments"
android:textAllCaps="false"
android:textColor="@android:color/black"
android:textSize="20sp"
android:textStyle="bold"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toStartOf="@+id/logoPlace"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:layout_constraintVertical_bias="0.0" />
-
- <ImageView
- android:id="@+id/logoPlace"
- android:layout_width="91dp"
- android:layout_height="81dp"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
- android:layout_marginTop="8dp"
- android:contentDescription="@string/desc"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toEndOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:srcCompat="@drawable/pill" />
+ app:autoSizeTextType="uniform"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/act_what_is_sleep.xml b/app/src/main/res/layout/act_what_is_sleep.xml
index ac8f68d6752a6bc5409f65fdfadaf5b7a257824c..bd93489413f33b4e0c47dcdc1c312f7b804e0219 100644
--- a/app/src/main/res/layout/act_what_is_sleep.xml
+++ b/app/src/main/res/layout/act_what_is_sleep.xml
@@ -6,36 +6,14 @@
android:layout_height="match_parent"
tools:context=".FirstPage">
- <View
- android:id="@+id/topView"
- android:layout_width="match_parent"
- android:layout_height="75dp"
- android:background="@color/LightSteelBlue"
- tools:ignore="MissingConstraints"
- tools:layout_editor_absoluteX="0dp"
- tools:layout_editor_absoluteY="0dp" />
-
- <ImageView
- android:id="@+id/logoPlace"
- android:layout_width="91dp"
- android:layout_height="81dp"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
- android:layout_marginTop="8dp"
- android:contentDescription="@string/desc"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toEndOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView"
- app:srcCompat="@drawable/pill" />
-
<TextView
android:id="@+id/welcomeTitle"
android:layout_width="0dp"
android:layout_height="40dp"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
+ android:gravity="center"
android:maxLines="5"
android:text="@string/whatISTitle"
android:textAllCaps="false"
@@ -43,19 +21,19 @@
android:textSize="22sp"
android:textStyle="bold"
app:autoSizeTextType="uniform"
- app:layout_constraintBottom_toBottomOf="@+id/topView"
- app:layout_constraintEnd_toStartOf="@+id/logoPlace"
- app:layout_constraintStart_toStartOf="@+id/topView"
- app:layout_constraintTop_toTopOf="@+id/topView" />
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
<ScrollView
android:id="@+id/ScrollViewQuestionnaire"
style="@android:style/Widget.Material.ScrollView"
android:layout_width="match_parent"
android:layout_height="0dp"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginBottom="8dp"
android:fillViewport="true"
android:scrollbarStyle="insideOverlay"
android:visibility="visible"
@@ -63,19 +41,19 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@+id/logoPlace"
+ app:layout_constraintTop_toBottomOf="@+id/welcomeTitle"
tools:targetApi="lollipop">
<FrameLayout
android:id="@+id/FrameForScrollView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
- android:layout_marginLeft="8dp"
- android:layout_marginRight="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginLeft="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginRight="8dp"
+ android:layout_marginBottom="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/ScrollViewQuestionnaire"
app:layout_constraintStart_toStartOf="@+id/ScrollViewQuestionnaire"
@@ -92,9 +70,9 @@
android:id="@+id/sleepHygieneTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -110,9 +88,9 @@
android:id="@+id/missionTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -129,8 +107,8 @@
android:id="@+id/tuningTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
+ android:layout_marginEnd="8dp"
android:clickable="false"
android:cursorVisible="false"
android:ems="10"
@@ -146,9 +124,9 @@
android:id="@+id/textView5"
android:layout_width="0dp"
android:layout_height="230dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
android:maxLines="30"
android:text="@string/ourMissionn"
android:textColor="@android:color/black"
@@ -162,9 +140,9 @@
android:id="@+id/textView6"
android:layout_width="0dp"
android:layout_height="230dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:maxLines="30"
android:text="@string/sleepDescription"
android:textAlignment="textStart"
@@ -179,13 +157,13 @@
android:id="@+id/imageView4"
android:layout_width="79dp"
android:layout_height="101dp"
- android:layout_marginEnd="16dp"
android:layout_marginStart="5dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="16dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/textView6"
app:layout_constraintTop_toBottomOf="@+id/sleepHygieneTitle"
- app:srcCompat="@drawable/sleepmoon" />
+ app:srcCompat="@drawable/data" />
<ImageView
android:id="@+id/imageView5"
@@ -194,16 +172,16 @@
app:layout_constraintEnd_toStartOf="@+id/textView5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/missionTitle"
- app:srcCompat="@drawable/mission" />
+ app:srcCompat="@drawable/data" />
<Button
android:id="@+id/back"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginBottom="16dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginBottom="16dp"
android:text="@string/backButton"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -214,9 +192,9 @@
android:id="@+id/textView7"
android:layout_width="match_parent"
android:layout_height="90dp"
- android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
+ android:layout_marginEnd="8dp"
android:maxLines="30"
android:text="@string/tuning"
android:textColor="@android:color/black"
diff --git a/app/src/main/res/layout/extra_bar_main.xml b/app/src/main/res/layout/extra_bar_main.xml
deleted file mode 100644
index b60e7998cec56a34ae295f7d83dc2a72d4a796d7..0000000000000000000000000000000000000000
--- a/app/src/main/res/layout/extra_bar_main.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- tools:context=".MainMenu">
-
- <android.support.design.widget.AppBarLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:theme="@style/AppTheme.AppBarOverlay">
-
- <android.support.v7.widget.Toolbar
- android:id="@+id/toolbar"
- android:layout_width="match_parent"
- android:layout_height="?attr/actionBarSize"
- android:background="?attr/colorPrimary"
- app:popupTheme="@style/AppTheme.PopupOverlay" />
-
- </android.support.design.widget.AppBarLayout>
-
- <include layout="@layout/act_main_menu" />
-
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/extra_nav_header_menu.xml b/app/src/main/res/layout/extra_nav_header_menu.xml
deleted file mode 100644
index 54e858db4a8a419d5379813ac95e023311f3d2de..0000000000000000000000000000000000000000
--- a/app/src/main/res/layout/extra_nav_header_menu.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="230dp"
- android:background="@android:color/holo_blue_dark"
- android:gravity="bottom"
- android:paddingBottom="@dimen/activity_vertical_margin"
- android:paddingLeft="@dimen/activity_horizontal_margin"
- android:paddingRight="@dimen/activity_horizontal_margin"
- android:paddingTop="@dimen/activity_vertical_margin"
- android:theme="@style/ThemeOverlay.AppCompat.Dark">
-
- <android.support.constraint.ConstraintLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent">
-
- <TextView
- android:id="@+id/nameOfUser"
- android:layout_width="107dp"
- android:layout_height="67dp"
- android:layout_marginBottom="8dp"
- android:layout_marginEnd="8dp"
- android:layout_marginStart="8dp"
- android:layout_marginTop="8dp"
- android:fontFamily="sans-serif-smallcaps"
- android:paddingTop="@dimen/nav_header_vertical_spacing"
- android:text="@string/nav_header_title"
- android:textAppearance="@style/TextAppearance.AppCompat.Body1"
- android:textSize="16sp"
- android:textStyle="bold"
- android:visibility="visible"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toStartOf="@+id/userProf"
- app:layout_constraintHorizontal_bias="0.079"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.508" />
-
- <ImageView
- android:id="@+id/userProf"
- android:layout_width="128dp"
- android:layout_height="128dp"
- android:layout_marginBottom="6dp"
- android:layout_marginTop="8dp"
- android:contentDescription="@string/nav_header_desc"
- android:paddingTop="8dp"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.0"
- app:srcCompat="@drawable/stickman" />
- </android.support.constraint.ConstraintLayout>
-
- <!--android:src="@drawable/happy"/>-->
-
-
-</LinearLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index b9b473b0f9dd2e571dc9a8eadfd07f4efc59abf8..7e711f696baa2eb4bec5419bafd09867decd10d7 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#3F51B5</color>
- <color name="colorPrimaryDark">#303F9F</color>
+ <color name="colorPrimaryDark">#2E3A91</color>
<color name="colorAccent">#FF4081</color>
- <color name="LightSteelBlue">#b0c4de</color>
+ <color name="toolbarColor">#5A9DEC</color>
+ <color name="black">#000000</color>
</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3f8c5f2387750467e042e47a077254da0a6f2b2c..124cbbaafdfd3714f4d0b8c4c3f33a511ee671b5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -78,9 +78,9 @@
<string name="s4">How many nights a week do you have a problem with your sleep?</string>
<string name="s5">How would you rate your sleep quality?</string>
<string name="q3desc">This set of questions refer to the impact your sleeping pattern usually has on your daily activities and your life in general. Please choose the most appropriate answer.</string>
- <string name="s6">How do you think sleep impacted your mood, energy, or relationships?</string>
- <string name="s7">How do you think sleep impacted your concentration, productivity, or ability to stay awake?</string>
- <string name="s8">How do you think sleep impacted your life in general?</string>
+ <string name="s6">How do you think sleep negatively impacted your mood, energy, or relationships?</string>
+ <string name="s7">How do you think sleep negatively impacted your concentration, productivity, or ability to stay awake?</string>
+ <string name="s8">How do you think sleep negatively impacted your life in general?</string>
<string name="q4desc">This set of questions aim to asses the severity of your sleep problems (if any). Please choose the most appropriate answer.</string>
<string name="s9">How long have you had a problem with your sleep?</string>
@@ -198,6 +198,8 @@
<string name="nav_header_desc">Navigation header</string>
<string name="factorsTitle">EXPERIMENTS</string>
+ <string name="settingsTitle">Settings</string>
+ <string name="preQues">PRE-QUESTIONNAIRE</string>
<string name="factorsIntroduction">
These are the next factors and associated experiments that impact your sleep hygiene. The chosen experiment is the one you chose to follow.
<font fgcolor="red"><b>Please bare in mind that after clicking Submit you will only be able to change the experiment after 5 days.</b></font>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e10167e9fe03fe4ec010ddce96ead051963cd5dd..0ea46f5d40c0792dfe23224dc6580f8e4b02d509 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
<resources>
<!-- Base application theme. -->
- <style name="AppTheme" parent="Base.Theme.AppCompat.Light.DarkActionBar">
+ <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
diff --git a/build.gradle b/build.gradle
index 43c070853e6387cb26e12ad00449e2c4df192bf6..9c3977b58fe1f9f2b5ccc2b549e8ad6ad4ffc8ff 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.1.3'
+ classpath 'com.android.tools.build:gradle:3.4.2'
// NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e8496f83b802fa29656df8998d0bb525b73ea4e6..e46a22c00c3a882e40d194955e94372bd649974f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jul 03 13:21:53 BST 2018
+#Thu Aug 22 17:00:13 BST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/pics/icons/calendar.png b/pics/icons/calendar.png
new file mode 100755
index 0000000000000000000000000000000000000000..c44acf3b728e95ad84acbe99e7da8e8152958612
Binary files /dev/null and b/pics/icons/calendar.png differ
diff --git a/pics/icons/data.png b/pics/icons/data.png
new file mode 100755
index 0000000000000000000000000000000000000000..eb49237f9d2fd3f091246fb780e0c9eddb460723
Binary files /dev/null and b/pics/icons/data.png differ
diff --git a/pics/icons/diaryic.png b/pics/icons/diaryic.png
new file mode 100755
index 0000000000000000000000000000000000000000..cfc98c59eacafc26e7311bbcac84deb0dbdb7b8c
Binary files /dev/null and b/pics/icons/diaryic.png differ
diff --git a/pics/icons/experiments.png b/pics/icons/experiments.png
new file mode 100755
index 0000000000000000000000000000000000000000..ca21a04598d8e61ee85b8da2329aac62c88c7f05
Binary files /dev/null and b/pics/icons/experiments.png differ
diff --git a/pics/icons/imageedit_32_4626940004.png b/pics/icons/imageedit_32_4626940004.png
new file mode 100644
index 0000000000000000000000000000000000000000..05d2904ea105993f48132adb4036991736e4e2fd
Binary files /dev/null and b/pics/icons/imageedit_32_4626940004.png differ
diff --git a/pics/icons/pen.png b/pics/icons/pen.png
new file mode 100755
index 0000000000000000000000000000000000000000..e84418ebee7570319997f4e0b1ac2b4e80151bc5
Binary files /dev/null and b/pics/icons/pen.png differ
diff --git a/pics/icons/pillow.png b/pics/icons/pillow.png
new file mode 100644
index 0000000000000000000000000000000000000000..08b74ce201677bb5830049b66b713ee4b03f896f
Binary files /dev/null and b/pics/icons/pillow.png differ
diff --git a/pics/inapp/alarm-1673577_1280.png b/pics/inapp/alarm-1673577_1280.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5320269171104bd414b82f093f5748bf1bb265e
Binary files /dev/null and b/pics/inapp/alarm-1673577_1280.png differ
diff --git a/pics/inapp/alarm-3122687_1280.png b/pics/inapp/alarm-3122687_1280.png
new file mode 100644
index 0000000000000000000000000000000000000000..671faa661751649cfcbcc69918364bd1b5b843ce
Binary files /dev/null and b/pics/inapp/alarm-3122687_1280.png differ
diff --git a/pics/inapp/bear-2079672_1280.png b/pics/inapp/bear-2079672_1280.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0f00e0b0e1e67a824fba9c81ff16ffcd16e7989
Binary files /dev/null and b/pics/inapp/bear-2079672_1280.png differ
diff --git a/pics/inapp/bed-1545991_1280.png b/pics/inapp/bed-1545991_1280.png
new file mode 100644
index 0000000000000000000000000000000000000000..6c693a400205d7ba31030597960eb571c979b0e3
Binary files /dev/null and b/pics/inapp/bed-1545991_1280.png differ
diff --git a/pics/inapp/bed-1545998_1280.png b/pics/inapp/bed-1545998_1280.png
new file mode 100644
index 0000000000000000000000000000000000000000..0030be282d32ae790fb630c296150a01d90bdf15
Binary files /dev/null and b/pics/inapp/bed-1545998_1280.png differ
diff --git a/pics/inapp/camouflage-1297384_1280.png b/pics/inapp/camouflage-1297384_1280.png
new file mode 100644
index 0000000000000000000000000000000000000000..b8bbbac264428369aa8c34727e047e89a997ff11
Binary files /dev/null and b/pics/inapp/camouflage-1297384_1280.png differ
diff --git a/pics/inapp/checklist-1622517_1280.png b/pics/inapp/checklist-1622517_1280.png
new file mode 100644
index 0000000000000000000000000000000000000000..0afd50d3d3f1c60eae3df9814b3650982a1ea7aa
Binary files /dev/null and b/pics/inapp/checklist-1622517_1280.png differ
diff --git a/pics/inapp/diary2.png b/pics/inapp/diary2.png
new file mode 100644
index 0000000000000000000000000000000000000000..c549dd2be998d776d1940b3364d85388b0727ef7
Binary files /dev/null and b/pics/inapp/diary2.png differ
diff --git a/pics/inapp/emoji-3518075_1280.png b/pics/inapp/emoji-3518075_1280.png
new file mode 100644
index 0000000000000000000000000000000000000000..4adacccf25c38f7e89bb4de7803b12beea355dfc
Binary files /dev/null and b/pics/inapp/emoji-3518075_1280.png differ
diff --git a/pics/inapp/hunger-4291381_1280.png b/pics/inapp/hunger-4291381_1280.png
new file mode 100644
index 0000000000000000000000000000000000000000..64e6bac730ee1cfad970125b67b0b3ef8db6bda0
Binary files /dev/null and b/pics/inapp/hunger-4291381_1280.png differ
diff --git a/pics/inapp/kitten-1456832_1280.png b/pics/inapp/kitten-1456832_1280.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc1044802a97af02a4b9a46481192ddf422d290a
Binary files /dev/null and b/pics/inapp/kitten-1456832_1280.png differ
diff --git a/pics/inapp/moon-1751987_1280.png b/pics/inapp/moon-1751987_1280.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ea7baec19e219cb2d6484839a1b539a8fb99ed2
Binary files /dev/null and b/pics/inapp/moon-1751987_1280.png differ
diff --git a/pics/inapp/owl.jpg b/pics/inapp/owl.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..4c781c34fc777dc39ce90b636cd931dd41c8a530
Binary files /dev/null and b/pics/inapp/owl.jpg differ
diff --git a/pics/inapp/sky-1753246_1280.png b/pics/inapp/sky-1753246_1280.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ae3bed93f3f15b5e967449675ae4538a1f1f93d
Binary files /dev/null and b/pics/inapp/sky-1753246_1280.png differ
diff --git a/pics/inapp/sleep-2001207_1280.png b/pics/inapp/sleep-2001207_1280.png
new file mode 100644
index 0000000000000000000000000000000000000000..b35fa82b13aaf95d54f6f97c6c758faa48496428
Binary files /dev/null and b/pics/inapp/sleep-2001207_1280.png differ
diff --git a/pics/inapp/soda-can-35653_1280.png b/pics/inapp/soda-can-35653_1280.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab5b7d6bb269cfaf34cd0fb05c9dca23b5bf9931
Binary files /dev/null and b/pics/inapp/soda-can-35653_1280.png differ
diff --git a/pics/inapp/sport-1014015_1280.jpg b/pics/inapp/sport-1014015_1280.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..fe9cdfa11dbd24f715c438f9add93da11dedcc54
Binary files /dev/null and b/pics/inapp/sport-1014015_1280.jpg differ
diff --git a/pics/inapp/sun-157126_1280.png b/pics/inapp/sun-157126_1280.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1f465e808908a00f8bbbe647bae10cfcec761b3
Binary files /dev/null and b/pics/inapp/sun-157126_1280.png differ
diff --git a/pics/inapp/tablet-313002_1280.jpg b/pics/inapp/tablet-313002_1280.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..73f7dbfe671833eacdc6ac9abb31a8332cba6a75
Binary files /dev/null and b/pics/inapp/tablet-313002_1280.jpg differ
diff --git a/pics/inapp/targett.png b/pics/inapp/targett.png
new file mode 100644
index 0000000000000000000000000000000000000000..84623c93d7de465b186af4148881acb1b917f93c
Binary files /dev/null and b/pics/inapp/targett.png differ
diff --git a/pics/inapp/work-1015501_1280.jpg b/pics/inapp/work-1015501_1280.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a4b3d59968206ef94ee831ef6dfcf4223e07c283
Binary files /dev/null and b/pics/inapp/work-1015501_1280.jpg differ
diff --git a/pics/inapp/you-151415_1280.png b/pics/inapp/you-151415_1280.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c27fab18c322bd7e5f63249362c0943e2443ff8
Binary files /dev/null and b/pics/inapp/you-151415_1280.png differ