Skip to content

Fix D-pad navigation: top bar focus trap and attach button highlight #14

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

Merged
JMTDI merged 3 commits into from
Jan 17, 2026
Merged

Fix D-pad navigation: top bar focus trap and attach button highlight #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eefe967
Initial plan
Copilot Jan 16, 2026
357863b
Fix D-pad navigation issues in main and compose activities
Copilot Jan 16, 2026
e2a618a
Fix D-pad navigation and attach menu highlighting
Copilot Jan 16, 2026
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
43 changes: 43 additions & 0 deletions presentation/src/main/res/drawable/circle_attach_menu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
~
~ This file is part of QKSMS.
~
~ QKSMS is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ QKSMS is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true">
<layer-list>
<item>
<shape android:shape="rectangle">
<corners android:radius="1000dp" />
<solid android:color="@android:color/white" />
</shape>
</item>
<item android:top="2dp" android:bottom="2dp" android:left="2dp" android:right="2dp">
<shape android:shape="rectangle">
<corners android:radius="1000dp" />
<stroke android:width="3dp" android:color="#2196F3" />
</shape>
</item>
</layer-list>
</item>
<item>
<shape android:shape="rectangle">
<corners android:radius="1000dp" />
<solid android:color="@color/tools_theme" />
</shape>
</item>
</selector>
43 changes: 43 additions & 0 deletions presentation/src/main/res/drawable/rounded_rectangle_attach_menu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2019 Moez Bhatti <moez.bhatti@gmail.com>
~
~ This file is part of QKSMS.
~
~ QKSMS is free software: you can redistribute it and/or modify
~ it under the terms of the GNU General Public License as published by
~ the Free Software Foundation, either version 3 of the License, or
~ (at your option) any later version.
~
~ QKSMS is distributed in the hope that it will be useful,
~ but WITHOUT ANY WARRANTY; without even the implied warranty of
~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
~ GNU General Public License for more details.
~
~ You should have received a copy of the GNU General Public License
~ along with QKSMS. If not, see <http://www.gnu.org/licenses/>.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_focused="true">
<layer-list>
<item>
<shape android:shape="rectangle">
<corners android:radius="4dp" />
<solid android:color="@color/white" />
</shape>
</item>
<item android:top="2dp" android:bottom="2dp" android:left="2dp" android:right="2dp">
<shape android:shape="rectangle">
<corners android:radius="4dp" />
<stroke android:width="3dp" android:color="#2196F3" />
</shape>
</item>
</layer-list>
</item>
<item>
<shape android:shape="rectangle">
<solid android:color="@color/tools_theme" />
<corners android:radius="4dp" />
</shape>
</item>
</selector>
39 changes: 15 additions & 24 deletions presentation/src/main/res/layout/compose_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
android:focusableInTouchMode="true"
android:descendantFocusability="afterDescendants"
android:nextFocusDown="@+id/message"
android:nextFocusUp="@+id/toolbar"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintBottom_toTopOf="@id/messageBackground"
app:layout_constraintEnd_toEndOf="parent"
Expand Down Expand Up @@ -424,8 +425,7 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginBottom="12dp"
android:background="@drawable/circle_focusable"
android:backgroundTint="@color/tools_theme"
android:background="@drawable/circle_attach_menu"
android:contentDescription="@string/compose_contact_cd"
android:elevation="4dp"
android:padding="10dp"
Expand All @@ -445,8 +445,7 @@
android:layout_width="wrap_content"
android:layout_height="32dp"
android:layout_marginStart="8dp"
android:background="@drawable/rounded_rectangle_focusable_4dp"
android:backgroundTint="@color/tools_theme"
android:background="@drawable/rounded_rectangle_attach_menu"
android:elevation="4dp"
android:gravity="center_vertical"
android:paddingStart="8dp"
Expand All @@ -465,8 +464,7 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginBottom="12dp"
android:background="@drawable/circle_focusable"
android:backgroundTint="@color/tools_theme"
android:background="@drawable/circle_attach_menu"
android:contentDescription="@string/compose_schedule_cd"
android:elevation="4dp"
android:padding="10dp"
Expand All @@ -487,8 +485,7 @@
android:layout_width="wrap_content"
android:layout_height="32dp"
android:layout_marginStart="8dp"
android:background="@drawable/rounded_rectangle_focusable_4dp"
android:backgroundTint="@color/tools_theme"
android:background="@drawable/rounded_rectangle_attach_menu"
android:elevation="4dp"
android:gravity="center_vertical"
android:paddingStart="8dp"
Expand All @@ -507,8 +504,7 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginBottom="12dp"
android:background="@drawable/circle_focusable"
android:backgroundTint="@color/tools_theme"
android:background="@drawable/circle_attach_menu"
android:contentDescription="@string/compose_attach_file_cd"
android:elevation="4dp"
android:padding="10dp"
Expand All @@ -530,8 +526,7 @@
android:layout_width="wrap_content"
android:layout_height="32dp"
android:layout_marginStart="8dp"
android:background="@drawable/rounded_rectangle_focusable_4dp"
android:backgroundTint="@color/tools_theme"
android:background="@drawable/rounded_rectangle_attach_menu"
android:elevation="4dp"
android:gravity="center_vertical"
android:paddingStart="8dp"
Expand All @@ -550,8 +545,7 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginBottom="12dp"
android:background="@drawable/circle_focusable"
android:backgroundTint="@color/tools_theme"
android:background="@drawable/circle_attach_menu"
android:contentDescription="@string/compose_audio_message_cd"
android:elevation="4dp"
android:padding="10dp"
Expand All @@ -572,8 +566,7 @@
android:layout_width="wrap_content"
android:layout_height="32dp"
android:layout_marginStart="8dp"
android:background="@drawable/rounded_rectangle_focusable_4dp"
android:backgroundTint="@color/tools_theme"
android:background="@drawable/rounded_rectangle_attach_menu"
android:elevation="4dp"
android:gravity="center_vertical"
android:paddingStart="8dp"
Expand All @@ -592,8 +585,7 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginBottom="12dp"
android:background="@drawable/circle_focusable"
android:backgroundTint="@color/tools_theme"
android:background="@drawable/circle_attach_menu"
android:contentDescription="@string/compose_gallery_cd"
android:elevation="4dp"
android:padding="10dp"
Expand All @@ -614,8 +606,7 @@
android:layout_width="wrap_content"
android:layout_height="32dp"
android:layout_marginStart="8dp"
android:background="@drawable/rounded_rectangle_focusable_4dp"
android:backgroundTint="@color/tools_theme"
android:background="@drawable/rounded_rectangle_attach_menu"
android:elevation="4dp"
android:gravity="center_vertical"
android:paddingStart="8dp"
Expand All @@ -634,8 +625,7 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginBottom="16dp"
android:background="@drawable/circle_focusable"
android:backgroundTint="@color/tools_theme"
android:background="@drawable/circle_attach_menu"
android:contentDescription="@string/compose_camera_cd"
android:elevation="4dp"
android:padding="10dp"
Expand All @@ -655,8 +645,7 @@
android:layout_width="wrap_content"
android:layout_height="32dp"
android:layout_marginStart="8dp"
android:background="@drawable/rounded_rectangle_focusable_4dp"
android:backgroundTint="@color/tools_theme"
android:background="@drawable/rounded_rectangle_attach_menu"
android:elevation="4dp"
android:gravity="center_vertical"
android:paddingStart="8dp"
Expand All @@ -676,6 +665,7 @@
android:layout_height="44dp"
android:layout_marginStart="12dp"
android:background="@drawable/circle_focusable"
android:backgroundTint="?attr/bubbleColor"
android:contentDescription="@string/compose_attach_cd"
android:elevation="4dp"
android:padding="10dp"
Expand All @@ -687,6 +677,7 @@
android:nextFocusUp="@+id/toolbar"
app:layout_constraintBottom_toBottomOf="@id/messageBackground"
app:layout_constraintStart_toStartOf="parent"
app:tint="?android:attr/textColorSecondary"
tools:backgroundTint="@color/tools_theme"
tools:tint="@color/textPrimaryDark" />

Expand Down
3 changes: 2 additions & 1 deletion presentation/src/main/res/layout/main_activity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
android:focusableInTouchMode="true"
android:nextFocusLeft="@+id/recyclerView"
android:nextFocusRight="@+id/toolbarSearch"
android:nextFocusDown="@+id/toolbarSearch"
android:nextFocusDown="@+id/recyclerView"
app:tint="?android:attr/textColorPrimary" />

<dev.octoshrimpy.quik.common.widget.QkEditText
Expand Down Expand Up @@ -112,6 +112,7 @@
android:focusable="true"
android:focusableInTouchMode="true"
android:descendantFocusability="afterDescendants"
android:nextFocusUp="@+id/compose"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_constraintBottom_toTopOf="@id/bottom"
app:layout_constraintTop_toBottomOf="@id/toolbar"
Expand Down