Skip to content
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.

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

Add auto advance icon #1945

Merged
merged 2 commits into from
Jun 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 36 additions & 0 deletions app/src/main/res/drawable/ic_auto_advance_arrow_down.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<!--
~ Infomaniak Mail - Android
~ Copyright (C) 2024 Infomaniak Network SA
~
~ This program 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.
~
~ This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="@color/iconColor"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M12,23.247V0.747"
android:strokeWidth="1"
android:strokeColor="#666666"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
<path
android:pathData="M8.25,19.497L12,23.247L15.75,19.497"
android:strokeWidth="1"
android:strokeColor="#666666"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
</vector>
36 changes: 36 additions & 0 deletions app/src/main/res/drawable/ic_auto_advance_arrow_up.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<!--
~ Infomaniak Mail - Android
~ Copyright (C) 2024 Infomaniak Network SA
~
~ This program 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.
~
~ This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="@color/iconColor"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M12,23.247V0.747"
android:strokeWidth="1"
android:strokeColor="#666666"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
<path
android:pathData="M8.25,4.497L12,0.747L15.75,4.497"
android:strokeWidth="1"
android:strokeColor="#666666"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
</vector>
48 changes: 48 additions & 0 deletions app/src/main/res/drawable/ic_auto_advance_last_action.xml
LunarX marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<!--
~ Infomaniak Mail - Android
~ Copyright (C) 2024 Infomaniak Network SA
~
~ This program 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.
~
~ This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="@color/iconColor"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M18.359,7C17.278,5.69 15.819,4.746 14.182,4.297C12.544,3.847 10.807,3.914 9.209,4.488C7.611,5.062 6.229,6.115 5.251,7.504C4.274,8.892 3.748,10.549 3.747,12.247V14.5"
android:strokeWidth="1"
android:strokeColor="#9F9F9F"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
<path
android:pathData="M5.997,17.908C7.131,19.109 8.599,19.943 10.212,20.3C11.825,20.658 13.508,20.523 15.043,19.913C16.578,19.303 17.895,18.246 18.823,16.879C19.751,15.513 20.247,13.899 20.247,12.247V10.747"
android:strokeWidth="1"
android:strokeColor="#9F9F9F"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
<path
android:pathData="M0.747,11.497L3.747,14.497L6.747,11.497"
android:strokeWidth="1"
android:strokeColor="#9F9F9F"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
<path
android:pathData="M23.247,13.747L20.247,10.747L17.247,13.747"
android:strokeWidth="1"
android:strokeColor="#9F9F9F"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
</vector>
60 changes: 60 additions & 0 deletions app/src/main/res/drawable/ic_auto_advance_list_conversation.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<!--
~ Infomaniak Mail - Android
~ Copyright (C) 2024 Infomaniak Network SA
~
~ This program 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.
~
~ This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="@color/iconColor"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M3,5.248C4.243,5.248 5.25,4.241 5.25,2.998C5.25,1.755 4.243,0.748 3,0.748C1.757,0.748 0.75,1.755 0.75,2.998C0.75,4.241 1.757,5.248 3,5.248Z"
android:strokeWidth="1"
android:strokeColor="#666666"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
<path
android:pathData="M3,14.248C4.243,14.248 5.25,13.241 5.25,11.998C5.25,10.755 4.243,9.748 3,9.748C1.757,9.748 0.75,10.755 0.75,11.998C0.75,13.241 1.757,14.248 3,14.248Z"
android:strokeWidth="1"
android:strokeColor="#666666"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
<path
android:pathData="M3,23.248C4.243,23.248 5.25,22.241 5.25,20.998C5.25,19.755 4.243,18.748 3,18.748C1.757,18.748 0.75,19.755 0.75,20.998C0.75,22.241 1.757,23.248 3,23.248Z"
android:strokeWidth="1"
android:strokeColor="#666666"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
<path
android:pathData="M8.25,3.748H23.25"
android:strokeWidth="1"
android:strokeColor="#666666"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
<path
android:pathData="M8.25,12.748H23.25"
android:strokeWidth="1"
android:strokeColor="#666666"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
<path
android:pathData="M8.25,21.748H23.25"
android:strokeWidth="1"
android:strokeColor="#666666"
android:strokeLineCap="round"
android:strokeLineJoin="round" />
</vector>
4 changes: 4 additions & 0 deletions app/src/main/res/layout/fragment_auto_advance_settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
android:id="@+id/lastThread"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:icon="@drawable/ic_auto_advance_arrow_up"
app:text="@string/settingsAutoAdvancePreviousThreadTitle"
app:value="lastThread" />

Expand All @@ -55,6 +56,7 @@
android:id="@+id/nextThread"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:icon="@drawable/ic_auto_advance_arrow_down"
app:text="@string/settingsAutoAdvanceFollowingThreadTitle"
app:value="nextThread" />

Expand All @@ -64,6 +66,7 @@
android:id="@+id/listThread"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:icon="@drawable/ic_auto_advance_list_conversation"
app:text="@string/settingsAutoAdvanceListOfThreadsTitle"
app:value="listThread" />

Expand All @@ -73,6 +76,7 @@
android:id="@+id/lastAction"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:icon="@drawable/ic_auto_advance_last_action"
app:text="@string/settingsAutoAdvanceNaturalThreadTitle"
app:value="lastAction" />

Expand Down
Loading