From a0b18c14434cb461ee80bcdb37f638798f5b034a Mon Sep 17 00:00:00 2001
From: George Muresan <georgecatalinmuresan@gmail.com>
Date: Mon, 13 Aug 2018 16:26:54 +0100
Subject: [PATCH] Merge branches 'master' and 'withoutbit' of
 https://github.com/georgemuresan/Internship into withoutbit

# Conflicts:
#	app/src/main/java/com/example/admin/sleepbetter/FirstPage.java
#	app/src/main/java/com/example/admin/sleepbetter/SecondPage.java
---
 app/src/main/java/com/example/admin/sleepbetter/Data.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/example/admin/sleepbetter/Data.java b/app/src/main/java/com/example/admin/sleepbetter/Data.java
index 0d7f18c..73651ce 100644
--- a/app/src/main/java/com/example/admin/sleepbetter/Data.java
+++ b/app/src/main/java/com/example/admin/sleepbetter/Data.java
@@ -111,8 +111,8 @@ public class Data extends Fragment implements AdapterView.OnItemSelectedListener
                 graph.setTitleColor(blackValue);
                 // graph.setTitleTextSize(13);
                 graph.getViewport().setMinX(0);
-                graph.getViewport().setMaxX(20);
-                graph.getViewport().setMaxXAxisSize(20);
+                graph.getViewport().setMaxX(15);
+                graph.getViewport().setMaxXAxisSize(15);
                 graph.getViewport().setMinY(1);
                 graph.getViewport().setMaxY(5);
 
@@ -402,8 +402,8 @@ public class Data extends Fragment implements AdapterView.OnItemSelectedListener
                 graph.setTitleColor(blackValue);
                 // graph.setTitleTextSize(13);
                 graph.getViewport().setMinX(0);
-                graph.getViewport().setMaxX(20);
-                graph.getViewport().setMaxXAxisSize(20);
+                graph.getViewport().setMaxX(15);
+                graph.getViewport().setMaxXAxisSize(15);
                 graph.getViewport().setMinY(1);
                 graph.getViewport().setMaxY(5);
 
-- 
GitLab