Skip to content

Fix minor UI issue for fab in landscape orientation #17861

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
mikehardy merged 1 commit into from
Jan 26, 2025
Merged

Fix minor UI issue for fab in landscape orientation #17861

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
280 changes: 141 additions & 139 deletions AnkiDroid/src/main/res/layout/floating_add_button.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,161 +12,163 @@
android:background="@color/transparent"
android:visibility="gone"
/>

<LinearLayout
android:id="@+id/fabLinearLayout"
<ScrollView
android:layout_width="wrap_content"
android:orientation="vertical"
android:padding="12dp"
android:layout_marginEnd="10dp"
android:layout_gravity="bottom|end"
android:layout_height="wrap_content"
>

android:layout_marginEnd="10dp"
android:layout_gravity="bottom|end">
<LinearLayout
android:id="@+id/add_shared_layout"
android:id="@+id/fabLinearLayout"
android:layout_width="wrap_content"
android:orientation="vertical"
android:padding="12dp"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:gravity="center_vertical"
android:orientation="horizontal"
android:layout_gravity="bottom|end"
android:visibility="gone"
android:alpha="0"
android:translationY="300px"
>
<TextView
android:layout_width="wrap_content"
android:background="@color/material_grey_600"
android:id="@+id/add_shared_label"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:paddingEnd="10dp"
android:paddingStart="10dp"
android:textColor="@color/white"
android:layout_marginEnd="5dp"
android:layout_height="wrap_content"
android:text="@string/menu_get_shared_decks"
/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/add_shared_action"
style="?attr/floatingActionButtonSmallStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
app:backgroundTint="?attr/fab_normal"
android:src="@drawable/ic_file_download_white"
/>
</LinearLayout>
>

<LinearLayout
android:id="@+id/add_filtered_deck_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:gravity="center_vertical"
android:orientation="horizontal"
android:layout_gravity="bottom|end"
android:visibility="gone"
android:alpha="0"
android:translationY="400px"
>
<TextView
android:layout_width="wrap_content"
android:background="@color/material_grey_600"
android:id="@+id/add_filtered_deck_label"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:paddingEnd="10dp"
android:paddingStart="10dp"
android:textColor="@color/white"
android:layout_marginEnd="5dp"
android:layout_height="wrap_content"
android:text="@string/new_dynamic_deck"
/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/add_filtered_deck_action"
<LinearLayout
android:id="@+id/add_shared_layout"
android:layout_width="wrap_content"
style="?attr/floatingActionButtonSmallStyle"
android:layout_height="wrap_content"
android:layout_margin="10dp"
app:backgroundTint="?attr/fab_normal"
android:src="@drawable/ic_add_filtered_deck"
/>
</LinearLayout>
android:clipToPadding="false"
android:gravity="center_vertical"
android:orientation="horizontal"
android:layout_gravity="bottom|end"
android:visibility="gone"
android:alpha="0"
android:translationY="300px"
>
<TextView
android:layout_width="wrap_content"
android:background="@color/material_grey_600"
android:id="@+id/add_shared_label"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:paddingEnd="10dp"
android:paddingStart="10dp"
android:textColor="@color/white"
android:layout_marginEnd="5dp"
android:layout_height="wrap_content"
android:text="@string/menu_get_shared_decks"
/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/add_shared_action"
style="?attr/floatingActionButtonSmallStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
app:backgroundTint="?attr/fab_normal"
android:src="@drawable/ic_file_download_white"
/>
</LinearLayout>

<LinearLayout
android:id="@+id/add_deck_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:gravity="center_vertical"
android:orientation="horizontal"
android:layout_gravity="bottom|end"
android:visibility="gone"
android:alpha="0"
android:translationY="400px"
>
<TextView
android:layout_width="wrap_content"
android:background="@color/material_grey_600"
android:id="@+id/add_deck_label"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:paddingEnd="10dp"
android:paddingStart="10dp"
android:textColor="@color/white"
android:layout_marginEnd="5dp"
android:layout_height="wrap_content"
android:text="@string/new_deck"
/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/add_deck_action"
<LinearLayout
android:id="@+id/add_filtered_deck_layout"
android:layout_width="wrap_content"
style="?attr/floatingActionButtonSmallStyle"
android:layout_height="wrap_content"
android:layout_margin="10dp"
app:backgroundTint="?attr/fab_normal"
android:src="@drawable/ic_add_deck_filled"
/>
</LinearLayout>
android:clipToPadding="false"
android:gravity="center_vertical"
android:orientation="horizontal"
android:layout_gravity="bottom|end"
android:visibility="gone"
android:alpha="0"
android:translationY="400px"
>
<TextView
android:layout_width="wrap_content"
android:background="@color/material_grey_600"
android:id="@+id/add_filtered_deck_label"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:paddingEnd="10dp"
android:paddingStart="10dp"
android:textColor="@color/white"
android:layout_marginEnd="5dp"
android:layout_height="wrap_content"
android:text="@string/new_dynamic_deck"
/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/add_filtered_deck_action"
android:layout_width="wrap_content"
style="?attr/floatingActionButtonSmallStyle"
android:layout_height="wrap_content"
android:layout_margin="10dp"
app:backgroundTint="?attr/fab_normal"
android:src="@drawable/ic_add_filtered_deck"
/>
</LinearLayout>

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:layout_gravity="bottom|end"
>
<TextView
<LinearLayout
android:id="@+id/add_deck_layout"
android:layout_width="wrap_content"
android:background="@color/material_grey_600"
android:id="@+id/add_note_label"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:paddingEnd="10dp"
android:paddingStart="10dp"
android:textColor="@color/white"
android:layout_marginEnd="5dp"
android:layout_height="wrap_content"
android:text="@string/menu_add"
android:clipToPadding="false"
android:gravity="center_vertical"
android:orientation="horizontal"
android:layout_gravity="bottom|end"
android:visibility="gone"
android:translationX="180px"
/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_main"
android:alpha="0"
android:translationY="400px"
>
<TextView
android:layout_width="wrap_content"
android:background="@color/material_grey_600"
android:id="@+id/add_deck_label"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:paddingEnd="10dp"
android:paddingStart="10dp"
android:textColor="@color/white"
android:layout_marginEnd="5dp"
android:layout_height="wrap_content"
android:text="@string/new_deck"
/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/add_deck_action"
android:layout_width="wrap_content"
style="?attr/floatingActionButtonSmallStyle"
android:layout_height="wrap_content"
android:layout_margin="10dp"
app:backgroundTint="?attr/fab_normal"
android:src="@drawable/ic_add_deck_filled"
/>
</LinearLayout>

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:layout_marginStart="10dp"
android:layout_marginBottom="17dp"
android:layout_marginTop="10dp"
app:srcCompat="@drawable/ic_add_white"
app:backgroundTint="?attr/fab_normal"
app:fabSize="normal"
/>
</LinearLayout>

</LinearLayout>
android:gravity="center_vertical"
android:orientation="horizontal"
android:layout_gravity="bottom|end"
>
<TextView
android:layout_width="wrap_content"
android:background="@color/material_grey_600"
android:id="@+id/add_note_label"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:paddingEnd="10dp"
android:paddingStart="10dp"
android:textColor="@color/white"
android:layout_marginEnd="5dp"
android:layout_height="wrap_content"
android:text="@string/menu_add"
android:visibility="gone"
android:translationX="180px"
/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_main"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:layout_marginStart="10dp"
android:layout_marginBottom="17dp"
android:layout_marginTop="10dp"
app:srcCompat="@drawable/ic_add_white"
app:backgroundTint="?attr/fab_normal"
app:fabSize="normal"
/>
</LinearLayout>

</LinearLayout>
</ScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
Loading