Skip to content

Commit be6a211

Browse files
jddeepjddeep
authored
Merge pull request #455 from fossasia/development
Merging development into master
2 parents 75d600c + e8ec703 commit be6a211

36 files changed

+245
-135
lines changed

‎README.md

+112-86
Large diffs are not rendered by default.

‎app/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<application
1717
android:allowBackup="true"
1818
android:hardwareAccelerated="true"
19-
android:icon="@mipmap/ic_launcher"
19+
android:icon="@drawable/ic_neurolab_app"
2020
android:label="@string/app_name"
2121
android:largeHeap="true"
2222
android:roundIcon="@mipmap/ic_launcher_round"

‎app/src/main/java/io/neurolab/fragments/FocusVisualFragment.java

+6-4
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public class FocusVisualFragment extends android.support.v4.app.Fragment {
5959
private boolean isRecording = false;
6060
private static boolean isVisible = true;
6161
private static String[] extractedData;
62+
private static double[] freq;
6263
private AlertDialog progressDialog;
6364
private String filePath;
6465
private AlertDialog instructionsDialog;
@@ -161,7 +162,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
161162
if (id == R.id.play_focus_anim) {
162163
toggleMenuItem(menu, !isPlaying);
163164
rocketAnimation.playRocketAnim(view);
164-
rocketAnimation.animateRocket(convertToDouble(extractedData), getActivity());
165+
rocketAnimation.animateRocket(freq, getActivity());
165166

166167
} else if (id == R.id.stop_focus_anim) {
167168
toggleMenuItem(menu, isPlaying);
@@ -329,6 +330,7 @@ public void onPause() {
329330
super.onPause();
330331
rocketAnimation.pauseRocketAnim(view);
331332
extractedData = null;
333+
freq = null;
332334
SpaceAnimationVisuals.count = 0;
333335
}
334336

@@ -390,13 +392,13 @@ protected void onPostExecute(String[] strings) {
390392
super.onPostExecute(strings);
391393
extractedData = strings;
392394
FrequencyProcessor frequencyProcessor = new FrequencyProcessor(extractedData.length, 32, 16.0);
393-
double[] freq = frequencyProcessor.processFFTData(convertToDouble(extractedData));
394-
getActivity().runOnUiThread(new Runnable() {
395+
freq = frequencyProcessor.processFFTData(convertToDouble(extractedData));
396+
activity.runOnUiThread(new Runnable() {
395397
@Override
396398
public void run() {
397399
if (extractedData != null) {
398400
progressDialog.dismiss();
399-
rocketAnimation.animateRocket(freq, getActivity());
401+
rocketAnimation.animateRocket(freq, activity);
400402
rocketAnimation.playRocketAnim(view);
401403
} else {
402404
rocketAnimation.pauseRocketAnim(view);

‎app/src/main/java/io/neurolab/fragments/SpectrumFragment.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
9191

9292
private double[] convertToDouble(String[] parsedData) {
9393
double[] parsedDoubleData = new double[parsedData.length];
94-
int startTrimIndex = 0;
95-
int endTrimIndex = 9;
9694
for (int i = 0; i < parsedData.length; i++) {
9795
if (parsedData[i].length() > 0) {
98-
parsedDoubleData[i] = Double.parseDouble(parsedData[i].substring(startTrimIndex, endTrimIndex));
96+
parsedDoubleData[i] = Double.parseDouble(parsedData[i]);
9997
if (parsedDoubleData[i] > 5060) {
10098
parsedDoubleData[i] = 5060;
10199
}

‎app/src/main/java/io/neurolab/main/output/visual/SpaceAnimationVisuals.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public void pauseRocketAnim(View view) {
139139
public void animateRocket(double[] data, Activity activity) {
140140

141141
if (count < data.length) {
142-
double value = Double.parseDouble(Double.toString(data[count]).substring(0, 3));
142+
double value = Double.parseDouble(Double.toString(data[count] * 100));
143143
valueAnimator[0] = ValueAnimator.ofFloat(0f, (float) -value);
144144
valueAnimator[0].setInterpolator(new AccelerateInterpolator());
145145
valueAnimator[0].setDuration(600);

‎app/src/main/res/drawable/ic_neurolab_app.xml

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="192dp"
3+
android:height="192dp"
4+
android:viewportWidth="483.556"
5+
android:viewportHeight="483.556">
6+
<path
7+
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"
8+
android:fillColor="#7367ee"/>
9+
<path
10+
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"
11+
android:fillColor="#7367ee"/>
12+
<path
13+
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"
14+
android:fillColor="#FFF"/>
15+
<path
16+
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"
17+
android:fillColor="#FFF"/>
18+
<path
19+
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"
20+
android:fillColor="#FFF"/>
21+
<path
22+
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"
23+
android:fillColor="#FFF"/>
24+
<path
25+
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"
26+
android:fillColor="#FFF"/>
27+
<path
28+
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"
29+
android:fillColor="#FFF"/>
30+
<path
31+
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"
32+
android:fillColor="#FFF"/>
33+
<path
34+
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"
35+
android:fillColor="#FFF"/>
36+
<path
37+
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"
38+
android:fillColor="#FFF"/>
39+
<path
40+
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"
41+
android:fillColor="#FFF"/>
42+
<path
43+
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"
44+
android:fillColor="#FFF"/>
45+
<path
46+
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"
47+
android:fillColor="#FFF"/>
48+
<path
49+
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"
50+
android:fillColor="#FFF"/>
51+
<path
52+
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"
53+
android:fillColor="#FFF"/>
54+
<path
55+
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"
56+
android:fillColor="#FFF"/>
57+
<path
58+
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"
59+
android:fillColor="#FFF"/>
60+
<path
61+
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"
62+
android:fillColor="#FFF"/>
63+
</vector>

‎app/src/main/res/drawable/ic_settings.xml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<vector android:height="24dp" android:tint="#070707"
2+
android:viewportHeight="24" android:viewportWidth="24"
3+
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
4+
<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"/>
5+
</vector>

‎app/src/main/res/layout/card_focus.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
android:id="@+id/focus_card"
55
android:layout_width="match_parent"
6-
android:layout_height="wrap_content"
6+
android:layout_height="@dimen/nav_header_height"
77
android:layout_marginStart="@dimen/card_main_margin_lr"
88
android:layout_marginTop="@dimen/card_main_margin_tb"
99
android:layout_marginEnd="@dimen/card_main_margin_lr"
@@ -19,7 +19,7 @@
1919

2020
<ImageView
2121
android:layout_width="match_parent"
22-
android:layout_height="wrap_content"
22+
android:layout_height="match_parent"
2323
android:adjustViewBounds="true"
2424
android:alpha="0.3"
2525
android:scaleType="fitCenter"

‎app/src/main/res/layout/card_meditation.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
android:id="@+id/meditation_card"
55
android:layout_width="match_parent"
6-
android:layout_height="wrap_content"
6+
android:layout_height="@dimen/nav_header_height"
77
android:layout_marginStart="@dimen/card_main_margin_lr"
88
android:layout_marginTop="@dimen/card_main_margin_tb"
99
android:layout_marginEnd="@dimen/card_main_margin_lr"
@@ -19,7 +19,7 @@
1919

2020
<ImageView
2121
android:layout_width="match_parent"
22-
android:layout_height="wrap_content"
22+
android:layout_height="match_parent"
2323
android:adjustViewBounds="true"
2424
android:alpha="0.3"
2525
android:scaleType="fitCenter"

‎app/src/main/res/layout/card_mem_graph.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
android:id="@+id/mem_graph_card"
55
android:layout_width="match_parent"
6-
android:layout_height="wrap_content"
6+
android:layout_height="@dimen/nav_header_height"
77
android:layout_marginStart="@dimen/card_main_margin_lr"
88
android:layout_marginTop="@dimen/card_main_margin_tb"
99
android:layout_marginEnd="@dimen/card_main_margin_lr"
@@ -19,7 +19,7 @@
1919

2020
<ImageView
2121
android:layout_width="match_parent"
22-
android:layout_height="wrap_content"
22+
android:layout_height="match_parent"
2323
android:adjustViewBounds="true"
2424
android:alpha="0.3"
2525
android:scaleType="fitCenter"
@@ -55,6 +55,7 @@
5555
android:layout_marginStart="@dimen/image_main_layout_margin"
5656
android:layout_marginEnd="@dimen/image_main_layout_margin"
5757
android:text="@string/mem_graph"
58+
android:textSize="@dimen/heading_text_size"
5859
android:textAppearance="@style/TextAppearance.AppCompat.Display1"
5960
android:textColor="#fff" />
6061

‎app/src/main/res/layout/card_relax.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
android:id="@+id/relax_card"
55
android:layout_width="match_parent"
6-
android:layout_height="wrap_content"
6+
android:layout_height="@dimen/nav_header_height"
77
android:layout_marginStart="@dimen/card_main_margin_lr"
88
android:layout_marginLeft="@dimen/card_main_margin_lr"
99
android:layout_marginTop="@dimen/card_main_margin_tb"
@@ -21,7 +21,7 @@
2121

2222
<ImageView
2323
android:layout_width="match_parent"
24-
android:layout_height="wrap_content"
24+
android:layout_height="match_parent"
2525
android:adjustViewBounds="true"
2626
android:alpha="0.3"
2727
android:scaleType="fitCenter"

‎app/src/main/res/layout/fragment_spectrum.xml

+2
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
android:layout_height="wrap_content"
4646
android:layout_marginLeft="@dimen/padding_small"
4747
android:text="@string/anger_range"
48+
android:textSize="@dimen/text_size_small"
4849
android:textColor="@android:color/white" />
4950

5051
</LinearLayout>
@@ -65,6 +66,7 @@
6566
android:layout_height="wrap_content"
6667
android:layout_marginLeft="@dimen/padding_small"
6768
android:text="@string/calm_range"
69+
android:textSize="@dimen/text_size_small"
6870
android:textColor="@android:color/white" />
6971

7072
</LinearLayout>

‎app/src/main/res/menu/activity_main_drawer.xml

+26-24
Original file line numberDiff line numberDiff line change
@@ -2,50 +2,52 @@
22
<menu xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
tools:showIn="navigation_view">
5-
<item android:title="@string/programs">
6-
<menu>
7-
<group android:checkableBehavior="single">
8-
9-
<item
10-
android:id="@+id/nav_focus"
11-
android:title="@string/focus" />
12-
<item
13-
android:id="@+id/nav_relax"
14-
android:title="@string/relax" />
15-
<item
16-
android:id="@+id/nav_meditation"
17-
android:title="@string/meditation" />
18-
<item
19-
android:id="@+id/nav_memory_graph"
20-
android:title="@string/mem_graph" />
215

22-
</group>
23-
</menu>
24-
</item>
6+
<group android:checkableBehavior="single">
7+
<item
8+
android:id="@+id/nav_focus"
9+
android:icon="@drawable/ic_card_focus"
10+
android:title="@string/focus" />
11+
<item
12+
android:id="@+id/nav_relax"
13+
android:icon="@drawable/ic_card_relax"
14+
android:title="@string/relax" />
15+
<item
16+
android:id="@+id/nav_meditation"
17+
android:icon="@drawable/ic_card_meditation"
18+
android:title="@string/meditation" />
19+
<item
20+
android:id="@+id/nav_memory_graph"
21+
android:icon="@drawable/ic_card_mem_graph"
22+
android:title="@string/mem_graph" />
23+
</group>
2524

2625
<item
2726
android:id="@+id/nav_data_logger"
27+
android:icon="@drawable/ic_import"
2828
android:title="@string/logged_data" />
2929

3030
<item
3131
android:id="@+id/nav_connect_device"
32+
android:icon="@drawable/ic_device_connected"
3233
android:title="@string/connect_device" />
3334

3435
<item
3536
android:id="@+id/nav_settings"
37+
android:icon="@drawable/ic_settings"
3638
android:title="@string/settings" />
3739

3840
<item android:title="@string/other_head_nav_drawer">
3941
<menu>
40-
<item
41-
android:id="@+id/nav_share"
42-
android:icon="@drawable/ic_menu_share"
43-
android:title="@string/share_nav_drawer" />
44-
4542
<item
4643
android:id="@+id/nav_about_us"
4744
android:icon="@drawable/ic_info"
4845
android:title="@string/about_us" />
46+
47+
<item
48+
android:id="@+id/nav_share"
49+
android:icon="@drawable/ic_menu_share"
50+
android:title="@string/share_nav_drawer" />
4951
</menu>
5052
</item>
5153

‎app/src/main/res/values/dimens.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
<dimen name="meditation_bg_height">150dp</dimen>
4949
<dimen name="on_boarding_frag_image_size">250dp</dimen>
5050
<dimen name="spacing_none">0dp</dimen>
51-
<dimen name="nav_header_height">176dp</dimen>
51+
<dimen name="nav_header_height">175dp</dimen>
5252
<dimen name="fab_margin">16dp</dimen>
53-
<dimen name="heading_text_size">26sp</dimen>
53+
<dimen name="heading_text_size">25sp</dimen>
5454
<dimen name="padding_feedback_views">5dp</dimen>
5555
<dimen name="spectrum_screen_height">400dp</dimen>
5656
<dimen name="view_width_or_height">1dp</dimen>

0 commit comments

Comments
 (0)