Skip to content

Relabel and arrange menu items #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Relabel and arrange menu items #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
84938ed
Relabel and arrange menu items
microbit-grace Apr 10, 2024
bd8b863
Revert to use Pair instead of Manage Conections
microbit-grace Apr 11, 2024
df0b278
Update Flash in toolbar header to My Programs
microbit-grace Apr 11, 2024
4ea5e8f
Update Flash in toolbar header to My Programs
microbit-grace Apr 11, 2024
55a9d39
Change landscape main activity btn style to not textAllCaps
microbit-grace Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions app/src/main/res/layout-land/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,39 +37,39 @@
android:layout_marginBottom="@dimen/buttons_layout_margin"
android:layout_marginEnd="@dimen/buttons_layout_margin"
android:layout_marginStart="@dimen/buttons_layout_margin">
<!-- Connections -->
<!-- Create Code -->
<Button
android:id="@+id/connect_device_btn"
android:id="@+id/create_code_btn"
style="@style/main_activity_button_style"
android:contentDescription="@string/desc_connect_btn"
android:drawableTop="@drawable/ic_connect"
android:contentDescription="@string/desc_create_code"
android:drawableTop="@drawable/ic_create_code"
android:nextFocusDown="@+id/flash_microbit_btn"
android:text="@string/connect_device" />
android:text="@string/create_code" />

<!-- Flash -->
<!-- My Programs -->
<Button
android:id="@+id/flash_microbit_btn"
style="@style/main_activity_button_style"
android:contentDescription="@string/desc_flash_btn"
android:contentDescription="@string/desc_my_programs"
android:drawableTop="@drawable/ic_flash"
android:nextFocusDown="@+id/create_code_btn"
android:text="@string/flash_microbit" />
android:nextFocusDown="@+id/connect_device_btn"
android:text="@string/my_programs" />

<!-- create code -->
<!-- Manage Connections -->
<Button
android:id="@+id/create_code_btn"
android:id="@+id/connect_device_btn"
style="@style/main_activity_button_style"
android:contentDescription="@string/desc_create_code"
android:drawableTop="@drawable/ic_create_code"
android:contentDescription="@string/desc_connect_btn"
android:drawableTop="@drawable/ic_connect"
android:nextFocusDown="@+id/discover_btn"
android:text="@string/create_code" />
android:text="@string/connect_device" />

<!-- Discover -->
<!-- Project Ideas -->
<Button
android:id="@+id/discover_btn"
style="@style/main_activity_button_style"
android:contentDescription="@string/desc_discover"
android:contentDescription="@string/desc_project_ideas"
android:drawableTop="@drawable/ic_discover"
android:text="@string/discover" />
android:text="@string/project_ideas" />
</LinearLayout>
</LinearLayout>
34 changes: 17 additions & 17 deletions app/src/main/res/layout-port/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,39 +30,39 @@
android:scrollbars="none"/>

</RelativeLayout>
<!-- Connections -->
<!-- Create Code -->
<Button
android:id="@+id/connect_device_btn"
android:id="@+id/create_code_btn"
style="@style/main_activity_button_style"
android:contentDescription="@string/desc_connect_btn"
android:drawableEnd="@drawable/device_status_disconnected"
android:contentDescription="@string/desc_create_code"
android:drawableEnd="@drawable/ic_create_code"
android:nextFocusDown="@+id/flash_microbit_btn"
android:text="@string/connect_device" />
android:text="@string/create_code" />

<!-- Flash -->
<!-- My Programs -->
<Button
android:id="@+id/flash_microbit_btn"
style="@style/main_activity_button_style"
android:contentDescription="@string/desc_flash_btn"
android:contentDescription="@string/desc_my_programs"
android:drawableEnd="@drawable/ic_flash"
android:nextFocusDown="@+id/create_code_btn"
android:text="@string/flash_microbit" />
android:nextFocusDown="@+id/connect_device_btn"
android:text="@string/my_programs" />

<!-- Create code -->
<!-- Manage Connections -->
<Button
android:id="@+id/create_code_btn"
android:id="@+id/connect_device_btn"
style="@style/main_activity_button_style"
android:contentDescription="@string/desc_create_code"
android:drawableEnd="@drawable/ic_create_code"
android:contentDescription="@string/desc_connect_btn"
android:drawableEnd="@drawable/device_status_disconnected"
android:nextFocusDown="@+id/discover_btn"
android:text="@string/create_code" />
android:text="@string/connect_device" />

<!-- Discover -->
<!-- Project Ideas -->
<Button
android:id="@+id/discover_btn"
style="@style/main_activity_button_style"
android:contentDescription="@string/desc_discover"
android:contentDescription="@string/desc_project_ideas"
android:drawableEnd="@drawable/ic_discover"
android:layout_marginBottom="0dp"
android:text="@string/discover" />
android:text="@string/project_ideas" />
</LinearLayout>
34 changes: 17 additions & 17 deletions app/src/main/res/layout-sw600dp-port/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,23 +47,23 @@
android:layout_height="0dp"
android:layout_weight="1">

<!-- Connections -->
<!-- Create Code -->
<Button
android:id="@+id/connect_device_btn"
android:id="@+id/create_code_btn"
style="@style/button_style"
android:contentDescription="@string/desc_connect_btn"
android:drawableTop="@drawable/ic_connect"
android:contentDescription="@string/desc_create_code"
android:drawableTop="@drawable/ic_create_code"
android:nextFocusDown="@+id/flash_microbit_btn"
android:text="@string/connect_device" />
android:text="@string/create_code" />

<!-- Flash -->
<!-- My Programs -->
<Button
android:id="@+id/flash_microbit_btn"
style="@style/button_style"
android:contentDescription="@string/desc_flash_btn"
android:contentDescription="@string/desc_my_programs"
android:drawableTop="@drawable/ic_flash"
android:nextFocusDown="@+id/create_code_btn"
android:text="@string/flash_microbit" />
android:nextFocusDown="@+id/connect_device_btn"
android:text="@string/my_programs" />

</LinearLayout>

Expand All @@ -72,22 +72,22 @@
android:layout_height="0dp"
android:layout_weight="1">

<!-- create code -->
<!-- Manage Connections -->
<Button
android:id="@+id/create_code_btn"
android:id="@+id/connect_device_btn"
style="@style/button_style"
android:contentDescription="@string/desc_create_code"
android:drawableTop="@drawable/ic_create_code"
android:contentDescription="@string/desc_connect_btn"
android:drawableTop="@drawable/ic_connect"
android:nextFocusDown="@+id/discover_btn"
android:text="@string/create_code" />
android:text="@string/connect_device" />

<!-- Discover -->
<!-- Project Ideas -->
<Button
android:id="@+id/discover_btn"
style="@style/button_style"
android:contentDescription="@string/desc_discover"
android:contentDescription="@string/desc_project_ideas"
android:drawableTop="@drawable/ic_discover"
android:text="@string/discover" />
android:text="@string/project_ideas" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/projects_app_bar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
android:focusableInTouchMode="true"
android:gravity="center"
android:nextFocusDown="@+id/connectedIndicatorIcon"
android:text="@string/flash"
android:text="@string/flash_toolbar_header"
android:textSize="@dimen/app_bar_title_text_size"
android:textColor="@android:color/white" />

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-land/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<item name="android:textSize">@dimen/main_activity_button_text_size</item>
<item name="android:textColor">@android:color/white</item>
<item name="android:textAlignment">center</item>
<item name="android:textAllCaps">true</item>
<item name="android:textAllCaps">false</item>
<item name="android:visibility">visible</item>
</style>

Expand Down
11 changes: 6 additions & 5 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,9 +275,9 @@
<string name="navigation_drawer_open">Open Menu</string>
<string name="navigation_drawer_close">Close Menu</string>
<string name="create_code">Create Code</string>
<string name="flash_microbit">Flash</string>
<string name="my_programs">My Programs</string>
<string name="connect_device">Pair</string>
<string name="discover">Discover</string>
<string name="project_ideas">Project Ideas</string>

<string name="email_body" formatted="false">
<![CDATA[
Expand Down Expand Up @@ -307,11 +307,12 @@
<string name="manage_and_remove_microbit">How do I remove a paired micro:bit?</string>
<string name="desc_homescreen_logo_img">Hello</string>
<string name="desc_connect_btn">Pair</string>
<string name="desc_flash_btn">Flash</string>
<string name="desc_my_programs">My Programs</string>
<string name="desc_create_code">Create Code</string>
<string name="desc_discover">Discover</string>
<string name="desc_project_ideas">Project Ideas</string>
<string name="desc_back_to_home_from_flash_btn">Back to Menu</string>
<string name="desc_flash_toolbar_header">Flash</string>
<string name="desc_flash_toolbar_header">My Programs</string>
<string name="flash_toolbar_header">My Programs</string>
<string name="desc_go_to_bluetooth_settings">Go to bluetooth settings</string>
<string name="tv_go_to_bluetooth_Settings">Go to bluetooth settings</string>
<string name="desc_connect_back_to_home_btn">Back to Menu</string>
Expand Down