Merge pull request #455 from fossasia/development

Merging development into master
fossasia · Sep 2, 2019 · be6a211 · be6a211
2 parents 75d600c + e8ec703
commit be6a211
Show file tree

Hide file tree

Showing 36 changed files with 245 additions and 135 deletions.
diff --git a/README.md b/README.md
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -16,7 +16,7 @@
     <application
         android:allowBackup="true"
         android:hardwareAccelerated="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/ic_neurolab_app"
         android:label="@string/app_name"
         android:largeHeap="true"
         android:roundIcon="@mipmap/ic_launcher_round"

diff --git a/app/src/main/java/io/neurolab/fragments/FocusVisualFragment.java b/app/src/main/java/io/neurolab/fragments/FocusVisualFragment.java
@@ -59,6 +59,7 @@ public class FocusVisualFragment extends android.support.v4.app.Fragment {
     private boolean isRecording = false;
     private static boolean isVisible = true;
     private static String[] extractedData;
+    private static double[] freq;
     private AlertDialog progressDialog;
     private String filePath;
     private AlertDialog instructionsDialog;
@@ -161,7 +162,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
         if (id == R.id.play_focus_anim) {
             toggleMenuItem(menu, !isPlaying);
             rocketAnimation.playRocketAnim(view);
-            rocketAnimation.animateRocket(convertToDouble(extractedData), getActivity());
+            rocketAnimation.animateRocket(freq, getActivity());
 
         } else if (id == R.id.stop_focus_anim) {
             toggleMenuItem(menu, isPlaying);
@@ -329,6 +330,7 @@ public void onPause() {
         super.onPause();
         rocketAnimation.pauseRocketAnim(view);
         extractedData = null;
+        freq = null;
         SpaceAnimationVisuals.count = 0;
     }
 
@@ -390,13 +392,13 @@ protected void onPostExecute(String[] strings) {
             super.onPostExecute(strings);
             extractedData = strings;
             FrequencyProcessor frequencyProcessor = new FrequencyProcessor(extractedData.length, 32, 16.0);
-            double[] freq = frequencyProcessor.processFFTData(convertToDouble(extractedData));
-            getActivity().runOnUiThread(new Runnable() {
+            freq = frequencyProcessor.processFFTData(convertToDouble(extractedData));
+            activity.runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
                     if (extractedData != null) {
                         progressDialog.dismiss();
-                        rocketAnimation.animateRocket(freq, getActivity());
+                        rocketAnimation.animateRocket(freq, activity);
                         rocketAnimation.playRocketAnim(view);
                     } else {
                         rocketAnimation.pauseRocketAnim(view);

diff --git a/app/src/main/java/io/neurolab/fragments/SpectrumFragment.java b/app/src/main/java/io/neurolab/fragments/SpectrumFragment.java
@@ -91,11 +91,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
     private double[] convertToDouble(String[] parsedData) {
         double[] parsedDoubleData = new double[parsedData.length];
-        int startTrimIndex = 0;
-        int endTrimIndex = 9;
         for (int i = 0; i < parsedData.length; i++) {
             if (parsedData[i].length() > 0) {
-                parsedDoubleData[i] = Double.parseDouble(parsedData[i].substring(startTrimIndex, endTrimIndex));
+                parsedDoubleData[i] = Double.parseDouble(parsedData[i]);
                 if (parsedDoubleData[i] > 5060) {
                     parsedDoubleData[i] = 5060;
                 }

diff --git a/app/src/main/java/io/neurolab/main/output/visual/SpaceAnimationVisuals.java b/app/src/main/java/io/neurolab/main/output/visual/SpaceAnimationVisuals.java
@@ -139,7 +139,7 @@ public void pauseRocketAnim(View view) {
     public void animateRocket(double[] data, Activity activity) {
 
         if (count < data.length) {
-            double value = Double.parseDouble(Double.toString(data[count]).substring(0, 3));
+            double value = Double.parseDouble(Double.toString(data[count] * 100));
             valueAnimator[0] = ValueAnimator.ofFloat(0f, (float) -value);
             valueAnimator[0].setInterpolator(new AccelerateInterpolator());
             valueAnimator[0].setDuration(600);

diff --git a/app/src/main/res/drawable/ic_neurolab_app.xml b/app/src/main/res/drawable/ic_neurolab_app.xml
@@ -0,0 +1,63 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="192dp"
+    android:height="192dp"
+    android:viewportWidth="483.556"
+    android:viewportHeight="483.556">
+  <path
+      android:pathData="M241.777,28.445c0,-0 0,-28.445 -42.666,-28.445c-28.445,-0 -76.445,29.041 -85.334,56.889c-28.445,-0 -71.111,56.889 -56.889,99.555c-42.666,14.222 -51.555,114.375 -28.445,128C0,312.889 14.222,384 71.111,398.223c14.35,44.018 51.2,73.287 85.334,71.111c12.445,10.069 25.486,14.222 42.666,14.222c42.666,-0 42.666,-27.847 42.666,-70.514L241.777,28.445z"
+      android:fillColor="#7367ee"/>
+  <path
+      android:pathData="M241.777,28.445c0,-0 0,-28.445 42.666,-28.445c28.445,-0 76.445,29.041 85.334,56.889c28.445,-0 71.111,56.889 56.889,99.555c42.666,14.222 51.555,114.375 28.445,128c28.445,28.445 14.222,99.555 -42.666,113.778c-14.35,44.018 -51.2,73.287 -85.334,71.111c-12.445,10.069 -25.486,14.222 -42.666,14.222c-42.666,-0 -42.666,-27.847 -42.666,-70.514L241.779,28.445z"
+      android:fillColor="#7367ee"/>
+  <path
+      android:pathData="M156.445,135.111c-0.74,-0 -1.494,-0.114 -2.247,-0.37C116.594,122.211 106.666,87.637 106.666,71.111c0,-3.911 3.171,-7.082 7.082,-7.097l0.029,-0c3.898,-0 7.082,3.158 7.111,7.069c0.014,1.536 0.698,37.803 37.803,50.176c3.726,1.237 5.746,5.262 4.494,8.989C162.19,133.234 159.417,135.111 156.445,135.111"
+      android:fillColor="#FFF"/>
+  <path
+      android:pathData="M156.445,163.555c-2.618,-0 -5.12,-1.436 -6.371,-3.925c-13.767,-27.534 5.376,-46.194 17.407,-52.21c3.512,-1.735 7.78,-0.341 9.542,3.171c1.749,3.499 0.341,7.765 -3.158,9.529c-2.247,1.153 -21.689,11.89 -11.065,33.138c1.749,3.512 0.327,7.794 -3.186,9.542C158.592,163.314 157.511,163.555 156.445,163.555"
+      android:fillColor="#FFF"/>
+  <path
+      android:pathData="M117.361,236.217l-5.831,-1.92c-45.924,-15.302 -57.272,-62.663 -57.728,-64.669c-0.881,-3.811 1.507,-7.622 5.319,-8.505c3.826,-0.868 7.638,1.494 8.534,5.319c0.1,0.399 9.23,37.789 43.107,52.353c6.258,-9.273 21.305,-26.795 45.696,-26.795c3.925,-0 7.111,3.171 7.111,7.111c0,3.925 -3.186,7.111 -7.111,7.111c-23.595,-0 -36.195,24.278 -36.324,24.534L117.361,236.217z"
+      android:fillColor="#FFF"/>
+  <path
+      android:pathData="M142.208,289.579c-0.782,-0 -1.593,-0.127 -2.375,-0.399c-3.684,-1.322 -5.617,-5.334 -4.338,-9.031c0.171,-0.469 17.109,-46.62 79.559,-31.061c3.811,0.967 6.13,4.821 5.163,8.632c-0.953,3.811 -4.85,6.087 -8.619,5.178c-49.565,-12.401 -62.165,20.594 -62.691,21.987C147.854,287.772 145.124,289.579 142.208,289.579"
+      android:fillColor="#FFF"/>
+  <path
+      android:pathData="M99.555,362.666c-1.066,-0 -2.148,-0.241 -3.171,-0.754c-21.589,-10.795 -23.722,-29.34 -20.736,-42.666c-26.055,-3.983 -44.316,-22.656 -45.17,-23.538c-2.716,-2.816 -2.631,-7.31 0.185,-10.041c2.816,-2.716 7.325,-2.631 10.041,0.171c0.199,0.185 19.684,19.94 44.629,19.94l11.52,-0l-5.149,10.297c-1.095,2.247 -10.211,22.5 11.036,33.124c3.512,1.764 4.935,6.03 3.186,9.542C104.675,361.216 102.173,362.666 99.555,362.666"
+      android:fillColor="#FFF"/>
+  <path
+      android:pathData="M170.666,462.223c-1.862,-0 -3.726,-0.725 -5.12,-2.176c-2.716,-2.83 -2.645,-7.325 0.171,-10.041c0.256,-0.256 25.756,-25.315 19.414,-48.682c-1.024,-3.798 1.209,-7.694 4.992,-8.733c3.798,-1.01 7.709,1.209 8.733,5.006c8.561,31.516 -21.959,61.369 -23.267,62.635C174.223,461.554 172.445,462.223 170.666,462.223"
+      android:fillColor="#FFF"/>
+  <path
+      android:pathData="M201.386,406.585c-26.936,-0 -36.565,-18.489 -37.02,-19.385c-1.764,-3.512 -0.341,-7.794 3.158,-9.557c3.512,-1.749 7.738,-0.355 9.515,3.1c0.441,0.811 8.96,15.601 34.972,10.51c3.826,-0.796 7.58,1.735 8.349,5.589c0.768,3.854 -1.749,7.595 -5.589,8.349C209.891,406.172 205.44,406.585 201.386,406.585"
+      android:fillColor="#FFF"/>
+  <path
+      android:pathData="M166.869,56.989c-1.706,-0 -3.414,-0.611 -4.779,-1.849c-2.901,-2.631 -3.129,-7.111 -0.498,-10.026c0.74,-0.811 18.319,-19.996 40.534,-20.551c11.179,-0.399 21.49,4.11 30.45,13.085c2.774,2.774 2.774,7.267 0,10.055c-2.774,2.774 -7.281,2.774 -10.055,-0c-6.173,-6.173 -13.07,-9.174 -19.968,-8.917c-16.085,0.37 -30.279,15.73 -30.421,15.872C170.724,56.206 168.804,56.989 166.869,56.989"
+      android:fillColor="#FFF"/>
+  <path
+      android:pathData="M327.111,135.111c-2.973,-0 -5.746,-1.877 -6.755,-4.864c-1.237,-3.726 0.782,-7.751 4.509,-8.989c37.106,-12.374 37.789,-48.64 37.803,-50.176c0.029,-3.925 2.774,-7.225 7.14,-7.069c3.911,0.014 7.082,3.186 7.082,7.097c0,16.526 -9.927,51.1 -47.531,63.63C328.605,134.997 327.865,135.111 327.111,135.111"
+      android:fillColor="#FFF"/>
+  <path
+      android:pathData="M327.111,163.555c-1.066,-0 -2.148,-0.241 -3.186,-0.754c-3.512,-1.749 -4.921,-6.03 -3.171,-9.542c10.738,-21.461 -8.775,-31.986 -11.051,-33.124c-3.512,-1.749 -4.921,-6.03 -3.171,-9.542c1.764,-3.512 6.045,-4.906 9.542,-3.171c12.033,6.016 31.161,24.675 17.394,52.21C332.217,162.119 329.714,163.555 327.111,163.555"
+      android:fillColor="#FFF"/>
+  <path
+      android:pathData="M366.208,236.245l-2.774,-5.49c-0.127,-0.241 -12.743,-24.534 -36.324,-24.534c-3.925,-0 -7.111,-3.171 -7.111,-7.111c0,-3.925 3.186,-7.111 7.111,-7.111c24.391,-0 39.424,17.536 45.681,26.809c34.076,-14.606 43.007,-51.954 43.107,-52.353c0.868,-3.811 4.651,-6.273 8.519,-5.334c3.826,0.868 6.215,4.694 5.347,8.519c-0.455,2.005 -11.805,49.351 -57.743,64.654L366.208,236.245z"
+      android:fillColor="#FFF"/>
+  <path
+      android:pathData="M341.334,289.608c-2.93,-0 -5.66,-1.82 -6.699,-4.721c-0.512,-1.408 -13.269,-34.389 -62.691,-21.987c-3.798,0.881 -7.68,-1.38 -8.619,-5.178c-0.953,-3.811 1.351,-7.666 5.178,-8.632c62.421,-15.601 79.374,30.593 79.545,31.061c1.294,3.713 -0.654,7.765 -4.366,9.06C342.897,289.479 342.115,289.608 341.334,289.608"
+      android:fillColor="#FFF"/>
+  <path
+      android:pathData="M384,362.666c-2.602,-0 -5.106,-1.451 -6.358,-3.925c-1.749,-3.512 -0.341,-7.78 3.171,-9.542c21.461,-10.738 12.174,-30.863 11.051,-33.124l-5.149,-10.297l11.506,-0c24.96,-0 44.445,-19.755 44.644,-19.94c2.759,-2.801 7.211,-2.901 10.055,-0.156c2.816,2.716 2.901,7.211 0.171,10.026c-0.854,0.881 -19.115,19.555 -45.17,23.538c2.986,13.326 0.839,31.872 -20.736,42.666C386.147,362.425 385.066,362.666 384,362.666"
+      android:fillColor="#FFF"/>
+  <path
+      android:pathData="M312.889,462.223c-1.778,-0 -3.555,-0.669 -4.935,-1.991c-1.294,-1.266 -31.815,-31.119 -23.254,-62.635c1.024,-3.783 4.906,-6.016 8.719,-5.006c3.783,1.039 6.03,4.935 4.992,8.733c-6.371,23.481 19.158,48.412 19.414,48.669c2.83,2.716 2.915,7.225 0.185,10.055C316.615,461.497 314.753,462.223 312.889,462.223"
+      android:fillColor="#FFF"/>
+  <path
+      android:pathData="M282.226,406.585c-4.054,-0 -8.519,-0.413 -13.369,-1.394c-3.869,-0.754 -6.371,-4.494 -5.604,-8.349c0.768,-3.854 4.565,-6.414 8.349,-5.589c26.282,5.149 34.618,-9.87 34.986,-10.525c1.82,-3.441 6.101,-4.793 9.571,-2.986c3.441,1.793 4.835,5.988 3.086,9.458C318.791,388.096 309.149,406.585 282.226,406.585"
+      android:fillColor="#FFF"/>
+  <path
+      android:pathData="M316.686,56.989c-1.934,-0 -3.854,-0.782 -5.262,-2.332c-0.142,-0.142 -14.336,-15.503 -30.421,-15.872c-7.381,-0.341 -13.795,2.745 -19.968,8.917c-2.774,2.774 -7.281,2.774 -10.055,-0c-2.774,-2.787 -2.774,-7.281 0,-10.055c8.96,-8.96 18.816,-13.583 30.45,-13.085c22.201,0.555 39.794,19.74 40.534,20.551c2.631,2.915 2.404,7.395 -0.498,10.026C320.1,56.377 318.393,56.989 316.686,56.989"
+      android:fillColor="#FFF"/>
+  <path
+      android:pathData="M248.889,42.666l-14.222,-0c-3.911,-0 -7.111,3.2 -7.111,7.111l0,369.777c0,3.911 3.2,7.111 7.111,7.111l14.222,-0c3.911,-0 7.111,-3.2 7.111,-7.111L256,49.778C256,45.866 252.8,42.666 248.889,42.666"
+      android:fillColor="#FFF"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#070707"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z"/>
+</vector>
diff --git a/app/src/main/res/layout/card_focus.xml b/app/src/main/res/layout/card_focus.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/focus_card"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="@dimen/nav_header_height"
     android:layout_marginStart="@dimen/card_main_margin_lr"
     android:layout_marginTop="@dimen/card_main_margin_tb"
     android:layout_marginEnd="@dimen/card_main_margin_lr"
@@ -19,7 +19,7 @@
 
         <ImageView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:adjustViewBounds="true"
             android:alpha="0.3"
             android:scaleType="fitCenter"

diff --git a/app/src/main/res/layout/card_meditation.xml b/app/src/main/res/layout/card_meditation.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/meditation_card"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="@dimen/nav_header_height"
     android:layout_marginStart="@dimen/card_main_margin_lr"
     android:layout_marginTop="@dimen/card_main_margin_tb"
     android:layout_marginEnd="@dimen/card_main_margin_lr"
@@ -19,7 +19,7 @@
 
         <ImageView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:adjustViewBounds="true"
             android:alpha="0.3"
             android:scaleType="fitCenter"

diff --git a/app/src/main/res/layout/card_mem_graph.xml b/app/src/main/res/layout/card_mem_graph.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/mem_graph_card"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="@dimen/nav_header_height"
     android:layout_marginStart="@dimen/card_main_margin_lr"
     android:layout_marginTop="@dimen/card_main_margin_tb"
     android:layout_marginEnd="@dimen/card_main_margin_lr"
@@ -19,7 +19,7 @@
 
         <ImageView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:adjustViewBounds="true"
             android:alpha="0.3"
             android:scaleType="fitCenter"
@@ -55,6 +55,7 @@
                     android:layout_marginStart="@dimen/image_main_layout_margin"
                     android:layout_marginEnd="@dimen/image_main_layout_margin"
                     android:text="@string/mem_graph"
+                    android:textSize="@dimen/heading_text_size"
                     android:textAppearance="@style/TextAppearance.AppCompat.Display1"
                     android:textColor="#fff" />
 

diff --git a/app/src/main/res/layout/card_relax.xml b/app/src/main/res/layout/card_relax.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/relax_card"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="@dimen/nav_header_height"
     android:layout_marginStart="@dimen/card_main_margin_lr"
     android:layout_marginLeft="@dimen/card_main_margin_lr"
     android:layout_marginTop="@dimen/card_main_margin_tb"
@@ -21,7 +21,7 @@
 
         <ImageView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:adjustViewBounds="true"
             android:alpha="0.3"
             android:scaleType="fitCenter"

diff --git a/app/src/main/res/layout/fragment_spectrum.xml b/app/src/main/res/layout/fragment_spectrum.xml
@@ -45,6 +45,7 @@
                 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" />
 
         </LinearLayout>
@@ -65,6 +66,7 @@
                 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" />
 
         </LinearLayout>

diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
@@ -2,50 +2,52 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     tools:showIn="navigation_view">
-    <item android:title="@string/programs">
-        <menu>
-            <group android:checkableBehavior="single">
-
-                <item
-                    android:id="@+id/nav_focus"
-                    android:title="@string/focus" />
-                <item
-                    android:id="@+id/nav_relax"
-                    android:title="@string/relax" />
-                <item
-                    android:id="@+id/nav_meditation"
-                    android:title="@string/meditation" />
-                <item
-                    android:id="@+id/nav_memory_graph"
-                    android:title="@string/mem_graph" />
 
-            </group>
-        </menu>
-    </item>
+    <group android:checkableBehavior="single">
+        <item
+            android:id="@+id/nav_focus"
+            android:icon="@drawable/ic_card_focus"
+            android:title="@string/focus" />
+        <item
+            android:id="@+id/nav_relax"
+            android:icon="@drawable/ic_card_relax"
+            android:title="@string/relax" />
+        <item
+            android:id="@+id/nav_meditation"
+            android:icon="@drawable/ic_card_meditation"
+            android:title="@string/meditation" />
+        <item
+            android:id="@+id/nav_memory_graph"
+            android:icon="@drawable/ic_card_mem_graph"
+            android:title="@string/mem_graph" />
+    </group>
 
     <item
         android:id="@+id/nav_data_logger"
+        android:icon="@drawable/ic_import"
         android:title="@string/logged_data" />
 
     <item
         android:id="@+id/nav_connect_device"
+        android:icon="@drawable/ic_device_connected"
         android:title="@string/connect_device" />
 
     <item
         android:id="@+id/nav_settings"
+        android:icon="@drawable/ic_settings"
         android:title="@string/settings" />
 
     <item android:title="@string/other_head_nav_drawer">
         <menu>
-            <item
-                android:id="@+id/nav_share"
-                android:icon="@drawable/ic_menu_share"
-                android:title="@string/share_nav_drawer" />
-
             <item
                 android:id="@+id/nav_about_us"
                 android:icon="@drawable/ic_info"
                 android:title="@string/about_us" />
+
+            <item
+                android:id="@+id/nav_share"
+                android:icon="@drawable/ic_menu_share"
+                android:title="@string/share_nav_drawer" />
         </menu>
     </item>
 

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -48,9 +48,9 @@
     <dimen name="meditation_bg_height">150dp</dimen>
     <dimen name="on_boarding_frag_image_size">250dp</dimen>
     <dimen name="spacing_none">0dp</dimen>
-    <dimen name="nav_header_height">176dp</dimen>
+    <dimen name="nav_header_height">175dp</dimen>
     <dimen name="fab_margin">16dp</dimen>
-    <dimen name="heading_text_size">26sp</dimen>
+    <dimen name="heading_text_size">25sp</dimen>
     <dimen name="padding_feedback_views">5dp</dimen>
     <dimen name="spectrum_screen_height">400dp</dimen>
     <dimen name="view_width_or_height">1dp</dimen>