Skip to content

Commit

Permalink
fix: Remove overlapping of action bar icons
Browse files Browse the repository at this point in the history
  • Loading branch information
@KevinBoulongne
KevinBoulongne committed Feb 10, 2025
1 parent 0794426 commit 2eaff26
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 54 deletions.
2 changes: 1 addition & 1 deletion app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageEditorManager.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ class NewMessageEditorManager @Inject constructor(private val insertLinkDialog:

editorActions.isGone = isExpanded
sendLayout.isGone = isExpanded
formatOptionsScrollView.isVisible = isExpanded
formatOptionsLayout.isVisible = isExpanded
}

fun observeEditorStatus(): Unit = with(binding) {
Expand Down
105 changes: 52 additions & 53 deletions app/src/main/res/layout/fragment_new_message.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -542,76 +542,75 @@
app:icon="@drawable/ic_editor_text_options"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/dynamicEditorActionsLayout"
app:layout_constraintHorizontal_bias="0"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<FrameLayout
<HorizontalScrollView
android:id="@+id/dynamicEditorActionsLayout"
android:layout_width="0dp"
android:layout_height="match_parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/sendLayout"
app:layout_constraintStart_toEndOf="@id/editorTextOptions"
app:layout_constraintTop_toTopOf="parent">

<LinearLayout
android:id="@+id/editorActions"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:visibility="gone">
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="match_parent">

<com.google.android.material.button.MaterialButton
android:id="@+id/editorAttachment"
style="@style/EditorIconButton"
android:layout_width="@dimen/newMessageToolbarItemWidth"
<LinearLayout
android:id="@+id/editorActions"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:contentDescription="@string/buttonAttachment"
app:icon="@drawable/ic_attachment" />
android:orientation="horizontal"
tools:visibility="gone">

<com.google.android.material.button.MaterialButton
android:id="@+id/editorCamera"
style="@style/EditorIconButton"
android:layout_width="@dimen/newMessageToolbarItemWidth"
android:layout_height="match_parent"
android:contentDescription="@string/buttonCamera"
android:visibility="gone"
app:icon="@drawable/ic_editor_camera" />
<com.google.android.material.button.MaterialButton
android:id="@+id/editorAttachment"
style="@style/EditorIconButton"
android:layout_width="@dimen/newMessageToolbarItemWidth"
android:layout_height="match_parent"
android:contentDescription="@string/buttonAttachment"
app:icon="@drawable/ic_attachment" />

<com.google.android.material.button.MaterialButton
android:id="@+id/editorClock"
style="@style/EditorIconButton"
android:layout_width="@dimen/newMessageToolbarItemWidth"
android:layout_height="match_parent"
android:contentDescription="@string/buttonSchedule"
android:visibility="gone"
app:icon="@drawable/ic_editor_clock" />
<com.google.android.material.button.MaterialButton
android:id="@+id/editorCamera"
style="@style/EditorIconButton"
android:layout_width="@dimen/newMessageToolbarItemWidth"
android:layout_height="match_parent"
android:contentDescription="@string/buttonCamera"
android:visibility="gone"
app:icon="@drawable/ic_editor_camera" />

<com.google.android.material.button.MaterialButton
android:id="@+id/editorAi"
style="@style/EditorIconButton"
android:layout_width="@dimen/newMessageToolbarItemWidth"
android:layout_height="match_parent"
android:contentDescription="@string/buttonSchedule"
android:theme="@style/AiCursorAndPrimaryColorTheme"
android:visibility="gone"
app:icon="@drawable/ic_ai_magic_wand"
app:iconTint="@color/aiColor"
tools:visibility="visible" />
</LinearLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/editorClock"
style="@style/EditorIconButton"
android:layout_width="@dimen/newMessageToolbarItemWidth"
android:layout_height="match_parent"
android:contentDescription="@string/buttonSchedule"
android:visibility="gone"
app:icon="@drawable/ic_editor_clock" />

<HorizontalScrollView
android:id="@+id/formatOptionsScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"
tools:visibility="visible">
<com.google.android.material.button.MaterialButton
android:id="@+id/editorAi"
style="@style/EditorIconButton"
android:layout_width="@dimen/newMessageToolbarItemWidth"
android:layout_height="match_parent"
android:contentDescription="@string/buttonSchedule"
android:theme="@style/AiCursorAndPrimaryColorTheme"
android:visibility="gone"
app:icon="@drawable/ic_ai_magic_wand"
app:iconTint="@color/aiColor"
tools:visibility="visible" />
</LinearLayout>

<LinearLayout
android:id="@+id/formatOptionsLayout"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal">
android:orientation="horizontal"
android:visibility="gone"
tools:visibility="visible">

<com.google.android.material.button.MaterialButton
android:id="@+id/buttonLink"
Expand Down Expand Up @@ -662,8 +661,8 @@
app:icon="@drawable/ic_editor_strikethrough" />

</LinearLayout>
</HorizontalScrollView>
</FrameLayout>
</FrameLayout>
</HorizontalScrollView>

<LinearLayout
android:id="@+id/sendLayout"
Expand All @@ -677,7 +676,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/scheduleButton"
style="@style/IconButton"
android:layout_width="80dp"
android:layout_width="@dimen/newMessageToolbarItemWidth"
android:layout_height="match_parent"
android:contentDescription="@string/scheduleSendingTitle"
android:visibility="gone"
Expand All @@ -687,7 +686,7 @@
<com.google.android.material.button.MaterialButton
android:id="@+id/sendButton"
style="@style/IconButton"
android:layout_width="80dp"
android:layout_width="@dimen/newMessageToolbarItemWidth"
android:layout_height="match_parent"
android:contentDescription="@string/send"
app:icon="@drawable/ic_send" />
Expand Down

0 comments on commit 2eaff26

Please sign in to comment.