Skip to content

Commit 84938ed

Browse files
microbit-gracemicrobit-grace
committed
Relabel and arrange menu items
so that the ordering is now: - Create Code - My Programs - Manage Connections - Project Ideas Like the iOS app
1 parent 41cb284 commit 84938ed

File tree

5 files changed

+59
-59
lines changed

5 files changed

+59
-59
lines changed

‎app/src/main/res/layout-land/activity_main.xml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -37,39 +37,39 @@
3737
android:layout_marginBottom="@dimen/buttons_layout_margin"
3838
android:layout_marginEnd="@dimen/buttons_layout_margin"
3939
android:layout_marginStart="@dimen/buttons_layout_margin">
40-
<!-- Connections -->
40+
<!-- Create Code -->
4141
<Button
42-
android:id="@+id/connect_device_btn"
42+
android:id="@+id/create_code_btn"
4343
style="@style/main_activity_button_style"
44-
android:contentDescription="@string/desc_connect_btn"
45-
android:drawableTop="@drawable/ic_connect"
44+
android:contentDescription="@string/desc_create_code"
45+
android:drawableTop="@drawable/ic_create_code"
4646
android:nextFocusDown="@+id/flash_microbit_btn"
47-
android:text="@string/connect_device" />
47+
android:text="@string/create_code" />
4848

49-
<!-- Flash -->
49+
<!-- My Programs -->
5050
<Button
5151
android:id="@+id/flash_microbit_btn"
5252
style="@style/main_activity_button_style"
53-
android:contentDescription="@string/desc_flash_btn"
53+
android:contentDescription="@string/desc_my_programs"
5454
android:drawableTop="@drawable/ic_flash"
55-
android:nextFocusDown="@+id/create_code_btn"
56-
android:text="@string/flash_microbit" />
55+
android:nextFocusDown="@+id/connect_device_btn"
56+
android:text="@string/my_programs" />
5757

58-
<!-- create code -->
58+
<!-- Manage Connections -->
5959
<Button
60-
android:id="@+id/create_code_btn"
60+
android:id="@+id/connect_device_btn"
6161
style="@style/main_activity_button_style"
62-
android:contentDescription="@string/desc_create_code"
63-
android:drawableTop="@drawable/ic_create_code"
62+
android:contentDescription="@string/desc_manage_connections"
63+
android:drawableTop="@drawable/ic_connect"
6464
android:nextFocusDown="@+id/discover_btn"
65-
android:text="@string/create_code" />
65+
android:text="@string/manage_connections" />
6666

67-
<!-- Discover -->
67+
<!-- Project Ideas -->
6868
<Button
6969
android:id="@+id/discover_btn"
7070
style="@style/main_activity_button_style"
71-
android:contentDescription="@string/desc_discover"
71+
android:contentDescription="@string/desc_project_ideas"
7272
android:drawableTop="@drawable/ic_discover"
73-
android:text="@string/discover" />
73+
android:text="@string/project_ideas" />
7474
</LinearLayout>
7575
</LinearLayout>

‎app/src/main/res/layout-port/activity_main.xml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,39 +30,39 @@
3030
android:scrollbars="none"/>
3131

3232
</RelativeLayout>
33-
<!-- Connections -->
33+
<!-- Create Code -->
3434
<Button
35-
android:id="@+id/connect_device_btn"
35+
android:id="@+id/create_code_btn"
3636
style="@style/main_activity_button_style"
37-
android:contentDescription="@string/desc_connect_btn"
38-
android:drawableEnd="@drawable/device_status_disconnected"
37+
android:contentDescription="@string/desc_create_code"
38+
android:drawableEnd="@drawable/ic_create_code"
3939
android:nextFocusDown="@+id/flash_microbit_btn"
40-
android:text="@string/connect_device" />
40+
android:text="@string/create_code" />
4141

42-
<!-- Flash -->
42+
<!-- My Programs -->
4343
<Button
4444
android:id="@+id/flash_microbit_btn"
4545
style="@style/main_activity_button_style"
46-
android:contentDescription="@string/desc_flash_btn"
46+
android:contentDescription="@string/desc_my_programs"
4747
android:drawableEnd="@drawable/ic_flash"
48-
android:nextFocusDown="@+id/create_code_btn"
49-
android:text="@string/flash_microbit" />
48+
android:nextFocusDown="@+id/connect_device_btn"
49+
android:text="@string/my_programs" />
5050

51-
<!-- Create code -->
51+
<!-- Manage Connections -->
5252
<Button
53-
android:id="@+id/create_code_btn"
53+
android:id="@+id/connect_device_btn"
5454
style="@style/main_activity_button_style"
55-
android:contentDescription="@string/desc_create_code"
56-
android:drawableEnd="@drawable/ic_create_code"
55+
android:contentDescription="@string/desc_manage_connections"
56+
android:drawableEnd="@drawable/device_status_disconnected"
5757
android:nextFocusDown="@+id/discover_btn"
58-
android:text="@string/create_code" />
58+
android:text="@string/manage_connections" />
5959

60-
<!-- Discover -->
60+
<!-- Project Ideas -->
6161
<Button
6262
android:id="@+id/discover_btn"
6363
style="@style/main_activity_button_style"
64-
android:contentDescription="@string/desc_discover"
64+
android:contentDescription="@string/desc_project_ideas"
6565
android:drawableEnd="@drawable/ic_discover"
6666
android:layout_marginBottom="0dp"
67-
android:text="@string/discover" />
67+
android:text="@string/project_ideas" />
6868
</LinearLayout>

‎app/src/main/res/layout-sw600dp-port/activity_main.xml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,23 +47,23 @@
4747
android:layout_height="0dp"
4848
android:layout_weight="1">
4949

50-
<!-- Connections -->
50+
<!-- Create Code -->
5151
<Button
52-
android:id="@+id/connect_device_btn"
52+
android:id="@+id/create_code_btn"
5353
style="@style/button_style"
54-
android:contentDescription="@string/desc_connect_btn"
55-
android:drawableTop="@drawable/ic_connect"
54+
android:contentDescription="@string/desc_create_code"
55+
android:drawableTop="@drawable/ic_create_code"
5656
android:nextFocusDown="@+id/flash_microbit_btn"
57-
android:text="@string/connect_device" />
57+
android:text="@string/create_code" />
5858

59-
<!-- Flash -->
59+
<!-- My Programs -->
6060
<Button
6161
android:id="@+id/flash_microbit_btn"
6262
style="@style/button_style"
63-
android:contentDescription="@string/desc_flash_btn"
63+
android:contentDescription="@string/desc_my_programs"
6464
android:drawableTop="@drawable/ic_flash"
65-
android:nextFocusDown="@+id/create_code_btn"
66-
android:text="@string/flash_microbit" />
65+
android:nextFocusDown="@+id/connect_device_btn"
66+
android:text="@string/my_programs" />
6767

6868
</LinearLayout>
6969

@@ -72,22 +72,22 @@
7272
android:layout_height="0dp"
7373
android:layout_weight="1">
7474

75-
<!-- create code -->
75+
<!-- Manage Connections -->
7676
<Button
77-
android:id="@+id/create_code_btn"
77+
android:id="@+id/connect_device_btn"
7878
style="@style/button_style"
79-
android:contentDescription="@string/desc_create_code"
80-
android:drawableTop="@drawable/ic_create_code"
79+
android:contentDescription="@string/desc_manage_connections"
80+
android:drawableTop="@drawable/ic_connect"
8181
android:nextFocusDown="@+id/discover_btn"
82-
android:text="@string/create_code" />
82+
android:text="@string/manage_connections" />
8383

84-
<!-- Discover -->
84+
<!-- Project Ideas -->
8585
<Button
8686
android:id="@+id/discover_btn"
8787
style="@style/button_style"
88-
android:contentDescription="@string/desc_discover"
88+
android:contentDescription="@string/desc_project_ideas"
8989
android:drawableTop="@drawable/ic_discover"
90-
android:text="@string/discover" />
90+
android:text="@string/project_ideas" />
9191
</LinearLayout>
9292
</LinearLayout>
9393
</LinearLayout>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
android:layout_height="wrap_content"
3232
android:layout_gravity="center_vertical"
3333
android:layout_marginStart="16dp"
34-
android:contentDescription="@string/desc_connect_btn"
34+
android:contentDescription="@string/desc_manage_connections"
3535
android:nextFocusDown="@id/backBtn"
3636
android:nextFocusRight="@id/backBtn"
37-
android:text="@string/connect_device"
37+
android:text="@string/manage_connections"
3838
android:textSize="@dimen/app_bar_title_text_size"
3939
android:textColor="@color/white_color" />
4040

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -275,9 +275,9 @@
275275
<string name="navigation_drawer_open">Open Menu</string>
276276
<string name="navigation_drawer_close">Close Menu</string>
277277
<string name="create_code">Create Code</string>
278-
<string name="flash_microbit">Flash</string>
279-
<string name="connect_device">Pair</string>
280-
<string name="discover">Discover</string>
278+
<string name="my_programs">My Programs</string>
279+
<string name="manage_connections">Manage Connections</string>
280+
<string name="project_ideas">Project Ideas</string>
281281

282282
<string name="email_body" formatted="false">
283283
<![CDATA[
@@ -306,10 +306,10 @@
306306
<string name="desc_subtitle_manage_and_remove_microbits_label">Follow the on-screen instructions to</string>
307307
<string name="manage_and_remove_microbit">How do I remove a paired micro:bit?</string>
308308
<string name="desc_homescreen_logo_img">Hello</string>
309-
<string name="desc_connect_btn">Pair</string>
310-
<string name="desc_flash_btn">Flash</string>
309+
<string name="desc_manage_connections">Manage Connections</string>
310+
<string name="desc_my_programs">My Programs</string>
311311
<string name="desc_create_code">Create Code</string>
312-
<string name="desc_discover">Discover</string>
312+
<string name="desc_project_ideas">Project Ideas</string>
313313
<string name="desc_back_to_home_from_flash_btn">Back to Menu</string>
314314
<string name="desc_flash_toolbar_header">Flash</string>
315315
<string name="desc_go_to_bluetooth_settings">Go to bluetooth settings</string>

0 commit comments

Comments
 (0)