Skip to content

Commit eb92c34

Browse files
cweitatcweitat
authored
Merge pull request #1942 from neel1998/sidenav_fix
fix: side navbar rearranged
2 parents 4ed4e6d + e6707b3 commit eb92c34

File tree

11 files changed

+90
-62
lines changed

11 files changed

+90
-62
lines changed

‎app/build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,11 @@ android {
6363
flavorDimensions 'default'
6464
productFlavors {
6565
fdroid {
66+
resValue "string", "flavor", "Fdroid version"
6667
dimension = 'default'
6768
}
6869
playstore {
70+
resValue "string", "flavor", "Play Store version"
6971
dimension = 'default'
7072
}
7173
}

‎app/src/main/java/io/pslab/activity/MainActivity.java‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -187,13 +187,11 @@ public void run() {
187187

188188
private Fragment getHomeFragment() throws IOException {
189189
switch (navItemIndex) {
190-
case 1:
191-
return HomeFragment.newInstance(ScienceLabCommon.scienceLab.isConnected(), ScienceLabCommon.scienceLab.isDeviceFound());
192190
case 2:
193-
return null;
194-
case 3:
191+
return HomeFragment.newInstance(ScienceLabCommon.scienceLab.isConnected(), ScienceLabCommon.scienceLab.isDeviceFound());
192+
case 5:
195193
return AboutUsFragment.newInstance();
196-
case 4:
194+
case 7:
197195
return FAQFragment.newInstance();
198196
default:
199197
return InstrumentsFragment.newInstance();
@@ -228,11 +226,11 @@ private void selectNavMenu() {
228226
case 2:
229227
navigationView.getMenu().getItem(navItemIndex).setChecked(true);
230228
break;
231-
case 3:
232-
navigationView.getMenu().getItem(size_menu-1).getSubMenu().getItem(1).setChecked(true);
229+
case 5:
230+
navigationView.getMenu().getItem(navItemIndex).setChecked(true);
233231
break;
234-
case 4:
235-
navigationView.getMenu().getItem(size_menu-1).getSubMenu().getItem(0).setChecked(true);
232+
case 7:
233+
navigationView.getMenu().getItem(navItemIndex).setChecked(true);
236234
break;
237235
default:
238236
navigationView.getMenu().getItem(0).setChecked(true);
@@ -250,7 +248,7 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
250248
CURRENT_TAG = TAG_INSTRUMENTS;
251249
break;
252250
case R.id.nav_device:
253-
navItemIndex = 1;
251+
navItemIndex = 2;
254252
CURRENT_TAG = TAG_DEVICE;
255253
break;
256254
case R.id.nav_settings:
@@ -262,22 +260,19 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
262260
startActivity(intent);
263261
return true;
264262
case R.id.nav_about_us:
265-
navItemIndex = 3;
263+
navItemIndex = 5;
266264
CURRENT_TAG = TAG_ABOUTUS;
267265
break;
268266
case R.id.nav_help_feedback:
269-
navItemIndex = 4;
267+
navItemIndex = 7;
270268
CURRENT_TAG = TAG_FAQ;
271269
break;
272-
case R.id.nav_report_us:
273-
customTabService.launchUrl("https://goo.gl/forms/sHlmRAPFmzcGQ27u2");
270+
case R.id.nav_buy_pslab:
271+
customTabService.launchUrl("https://pslab.io/shop/");
274272
if (drawer != null) {
275273
drawer.closeDrawers();
276274
}
277275
break;
278-
case R.id.nav_app_version:
279-
setTitleColor(R.color.gray);
280-
break;
281276
case R.id.sensor_data_logger:
282277
if (drawer != null) {
283278
drawer.closeDrawers();

‎app/src/main/java/io/pslab/fragment/AboutUsFragment.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import butterknife.BindView;
1717
import butterknife.ButterKnife;
1818
import mehdi.sakout.aboutpage.AboutPage;
19+
import mehdi.sakout.aboutpage.Element;
1920

2021
/**
2122
* Created by Abhinav on 12-05-2018.
@@ -43,6 +44,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
4344
View aboutPage = new AboutPage(getActivity())
4445
.isRTL(false)
4546
.setImage(R.drawable.logo200x200)
47+
.addWebsite("https://goo.gl/forms/sHlmRAPFmzcGQ27u2", getString(R.string.nav_report))
48+
.addItem(new Element(getString(R.string.version), R.drawable.ic_widgets_black_24dp))
49+
.addItem(new Element(getString(R.string.flavor), R.drawable.ic_android_black_24dp))
4650
.setDescription(getString(R.string.about_us_description))
4751
.addGroup("Connect with us")
4852
.addEmail("pslab-fossasia@googlegroups.com")

‎app/src/main/java/io/pslab/fragment/FAQFragment.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,13 @@ public static FAQFragment newInstance() {
2323
public void onCreate(Bundle savedInstanceState) {
2424
super.onCreate(savedInstanceState);
2525

26-
questions = new String[]{getString(R.string.faq_question1), getString(R.string.faq_question2), getString(R.string.faq_question3), getString(R.string.faq_question4), getString(R.string.faq_question5)};
26+
questions = new String[]{getString(R.string.faq_question1), getString(R.string.faq_question2), getString(R.string.faq_question3), getString(R.string.faq_question4)};
2727

2828
answers = new String[][]{
2929
{getString(R.string.faq_answer1)},
3030
{getString(R.string.faq_answer2)},
3131
{getString(R.string.faq_answer3)},
32-
{getString(R.string.faq_answer4)},
33-
{getString(R.string.faq_answer5)}
32+
{getString(R.string.faq_answer4)}
3433
};
3534
}
3635

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24.0"
5+
android:viewportHeight="24.0">
6+
<path
7+
android:fillColor="#FF000000"
8+
android:pathData="M6,18c0,0.55 0.45,1 1,1h1v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L11,19h2v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L16,19h1c0.55,0 1,-0.45 1,-1L18,8L6,8v10zM3.5,8C2.67,8 2,8.67 2,9.5v7c0,0.83 0.67,1.5 1.5,1.5S5,17.33 5,16.5v-7C5,8.67 4.33,8 3.5,8zM20.5,8c-0.83,0 -1.5,0.67 -1.5,1.5v7c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5v-7c0,-0.83 -0.67,-1.5 -1.5,-1.5zM15.53,2.16l1.3,-1.3c0.2,-0.2 0.2,-0.51 0,-0.71 -0.2,-0.2 -0.51,-0.2 -0.71,0l-1.48,1.48C13.85,1.23 12.95,1 12,1c-0.96,0 -1.86,0.23 -2.66,0.63L7.85,0.15c-0.2,-0.2 -0.51,-0.2 -0.71,0 -0.2,0.2 -0.2,0.51 0,0.71l1.31,1.31C6.97,3.26 6,5.01 6,7h12c0,-1.99 -0.97,-3.75 -2.47,-4.84zM10,5L9,5L9,4h1v1zM15,5h-1L14,4h1v1z"/>
9+
</vector>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24.0"
5+
android:viewportHeight="24.0">
6+
<path
7+
android:fillColor="#FF000000"
8+
android:pathData="M7,18c-1.1,0 -1.99,0.9 -1.99,2S5.9,22 7,22s2,-0.9 2,-2 -0.9,-2 -2,-2zM1,2v2h2l3.6,7.59 -1.35,2.45c-0.16,0.28 -0.25,0.61 -0.25,0.96 0,1.1 0.9,2 2,2h12v-2L7.42,15c-0.14,0 -0.25,-0.11 -0.25,-0.25l0.03,-0.12 0.9,-1.63h7.45c0.75,0 1.41,-0.41 1.75,-1.03l3.58,-6.49c0.08,-0.14 0.12,-0.31 0.12,-0.48 0,-0.55 -0.45,-1 -1,-1L5.21,4l-0.94,-2L1,2zM17,18c-1.1,0 -1.99,0.9 -1.99,2s0.89,2 1.99,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
9+
</vector>

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24.0"
5+
android:viewportHeight="24.0">
6+
<path
7+
android:fillColor="#FF000000"
8+
android:pathData="M13,13v8h8v-8h-8zM3,21h8v-8L3,13v8zM3,3v8h8L11,3L3,3zM16.66,1.69L11,7.34 16.66,13l5.66,-5.66 -5.66,-5.65z"/>
9+
</vector>

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

Lines changed: 0 additions & 5 deletions
This file was deleted.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
<ExpandableListView
1010
android:id="@+id/expListView"
11+
android:layout_margin="@dimen/faq_answer_margin_start"
1112
android:layout_width="match_parent"
1213
android:layout_height="@dimen/dimen_zero_dp"
1314
android:layout_weight="0.14"

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

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<menu xmlns:android="http://schemas.android.com/apk/res/android">
3-
<group android:checkableBehavior="single">
3+
<group
4+
android:id="@+id/group1"
5+
android:checkableBehavior="single">
46
<item
57
android:id="@+id/nav_instruments"
68
android:icon="@drawable/ic_apps_black_24dp"
79
android:title="@string/nav_instruments" />
8-
<item
9-
android:id="@+id/nav_device"
10-
android:icon="@drawable/ic_developer_board_black_24dp"
11-
android:title="@string/nav_device" />
1210
<item
1311
android:id="@+id/sensor_data_logger"
1412
android:icon="@drawable/ic_wifi_tethering_black_24dp"
1513
android:title="@string/logged_data" />
14+
</group>
15+
<group
16+
android:id="@+id/group2"
17+
android:checkableBehavior="single">
18+
<item
19+
android:id="@+id/nav_device"
20+
android:icon="@drawable/ic_developer_board_black_24dp"
21+
android:title="@string/nav_device" />
1622
<item
1723
android:id="@+id/nav_generate_config"
1824
android:icon="@drawable/create_config_icon"
@@ -21,33 +27,29 @@
2127
android:id="@+id/nav_settings"
2228
android:icon="@drawable/ic_settings_black_24dp"
2329
android:title="@string/nav_settings" />
30+
</group>
31+
32+
<group
33+
android:id="@+id/group3"
34+
android:checkableBehavior="single">
35+
<item
36+
android:id="@+id/nav_about_us"
37+
android:checkable="true"
38+
android:icon="@drawable/ic_info_black_24dp"
39+
android:title="@string/nav_about_us" />
40+
<item
41+
android:id="@+id/nav_buy_pslab"
42+
android:checkable="true"
43+
android:icon="@drawable/ic_shopping_cart_black_24dp"
44+
android:title="@string/nav_buy_pslab" />
45+
<item
46+
android:id="@+id/nav_help_feedback"
47+
android:checkable="true"
48+
android:icon="@drawable/ic_feedback_black_24dp"
49+
android:title="@string/nav_help_feedback" />
2450
<item
2551
android:id="@+id/nav_share_app"
2652
android:icon="@drawable/share_icon"
27-
android:title="@string/nav_share"
28-
/>
53+
android:title="@string/nav_share" />
2954
</group>
30-
31-
<item android:title="@string/other">
32-
<menu>
33-
<item
34-
android:id="@+id/nav_help_feedback"
35-
android:icon="@drawable/ic_feedback_black_24dp"
36-
android:title="@string/nav_help_feedback"
37-
android:checkable="true" />
38-
<item
39-
android:id="@+id/nav_about_us"
40-
android:icon="@drawable/ic_info_black_24dp"
41-
android:title="@string/nav_about_us"
42-
android:checkable="true" />
43-
<item
44-
android:id="@+id/nav_report_us"
45-
android:icon="@drawable/ic_bug_report_black_24dp"
46-
android:title="@string/nav_report" />
47-
<item
48-
android:id="@+id/nav_app_version"
49-
android:icon="@drawable/icon_version"
50-
android:title="@string/version" />
51-
</menu>
52-
</item>
5355
</menu>

0 commit comments

Comments
 (0)