From 46b745d62d0f67ff060947100bc3d23003492b86 Mon Sep 17 00:00:00 2001
From: akshobhya <akshobhyapal@gmail.com>
Date: Sun, 26 Jan 2020 17:00:55 +0530
Subject: [PATCH] Reformatted code

---
 .../activities/MemoryGraphParent.java         |  5 +-
 app/src/main/res/layout/fragment_spectrum.xml | 89 ++++++++++---------
 .../main/res/layout/fragment_statistics.xml   |  8 +-
 3 files changed, 57 insertions(+), 45 deletions(-)

diff --git a/app/src/main/java/io/neurolab/activities/MemoryGraphParent.java b/app/src/main/java/io/neurolab/activities/MemoryGraphParent.java
index 9112b538..4899f0ef 100644
--- a/app/src/main/java/io/neurolab/activities/MemoryGraphParent.java
+++ b/app/src/main/java/io/neurolab/activities/MemoryGraphParent.java
@@ -17,6 +17,7 @@ public class MemoryGraphParent extends AppCompatActivity {
 
     private String filePath;
     public static final String MEMORY_GRAPH_FLAG = "Memory";
+    private static Fragment defaultProgram = MemoryGraphFragment.newInstance();
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -49,12 +50,11 @@ protected void onCreate(Bundle savedInstanceState) {
             selectedFragment.setArguments(bundle);
             FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
             transaction.replace(R.id.frame_layout, selectedFragment);
+            defaultProgram = selectedFragment;
             transaction.commit();
             return true;
         });
-
         FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-        Fragment defaultProgram = MemoryGraphFragment.newInstance();
         defaultProgram.setArguments(bundle);
         transaction.replace(R.id.frame_layout, defaultProgram);
         transaction.commit();
@@ -70,6 +70,7 @@ public boolean onSupportNavigateUp(){
     public void onBackPressed() {
         super.onBackPressed();
         StatisticsFragment.parsedData = null;
+        defaultProgram = MemoryGraphFragment.newInstance();
     }
 
     public void setActionBarTitle(String title) {
diff --git a/app/src/main/res/layout/fragment_spectrum.xml b/app/src/main/res/layout/fragment_spectrum.xml
index 3cbd0777..eb4f8302 100644
--- a/app/src/main/res/layout/fragment_spectrum.xml
+++ b/app/src/main/res/layout/fragment_spectrum.xml
@@ -15,61 +15,66 @@
         android:textColor="@android:color/white"
         android:textSize="@dimen/text_size_small" />
 
-    <LinearLayout
+    <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/memory_graph_background"
-        android:orientation="vertical">
-
-        <com.github.mikephil.charting.charts.LineChart
-            android:id="@+id/frequency_spectrum_chart"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/spectrum_screen_height"
-            android:background="@color/memory_graph_background">
-
-        </com.github.mikephil.charting.charts.LineChart>
+        android:background="@color/memory_graph_background">
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/padding_medium"
-            android:orientation="horizontal">
+            android:layout_height="match_parent"
+            android:background="@color/memory_graph_background"
+            android:orientation="vertical">
+
+            <com.github.mikephil.charting.charts.LineChart
+                android:id="@+id/frequency_spectrum_chart"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/spectrum_screen_height"
+                android:background="@color/memory_graph_background">
 
-            <ImageView
-                android:layout_width="@dimen/card_margin_large"
-                android:layout_height="@dimen/card_margin_large"
-                android:src="@android:color/holo_red_dark" />
+            </com.github.mikephil.charting.charts.LineChart>
 
-            <TextView
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/padding_small"
-                android:text="@string/anger_range"
-                android:textSize="@dimen/text_size_small"
-                android:textColor="@android:color/white" />
+                android:layout_margin="@dimen/padding_medium"
+                android:orientation="horizontal">
 
-        </LinearLayout>
+                <ImageView
+                    android:layout_width="@dimen/card_margin_large"
+                    android:layout_height="@dimen/card_margin_large"
+                    android:src="@android:color/holo_red_dark" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="@dimen/padding_medium"
-            android:orientation="horizontal">
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/padding_small"
+                    android:text="@string/anger_range"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/text_size_small" />
 
-            <ImageView
-                android:layout_width="@dimen/card_margin_large"
-                android:layout_height="@dimen/card_margin_large"
-                android:src="@color/calm_green" />
+            </LinearLayout>
 
-            <TextView
-                android:layout_width="wrap_content"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/padding_small"
-                android:text="@string/calm_range"
-                android:textSize="@dimen/text_size_small"
-                android:textColor="@android:color/white" />
+                android:layout_margin="@dimen/padding_medium"
+                android:orientation="horizontal">
 
-        </LinearLayout>
-    </LinearLayout>
+                <ImageView
+                    android:layout_width="@dimen/card_margin_large"
+                    android:layout_height="@dimen/card_margin_large"
+                    android:src="@color/calm_green" />
 
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/padding_small"
+                    android:text="@string/calm_range"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/text_size_small" />
+
+            </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_statistics.xml b/app/src/main/res/layout/fragment_statistics.xml
index 5ee4bbf5..61f5f415 100644
--- a/app/src/main/res/layout/fragment_statistics.xml
+++ b/app/src/main/res/layout/fragment_statistics.xml
@@ -7,6 +7,12 @@
     android:layout_height="match_parent"
     tools:context=".fragments.StatisticsFragment">
 
-    <include layout="@layout/stat_items" />
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <include layout="@layout/stat_items" />
+
+    </ScrollView>
 
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file