Skip to content

Commit

Permalink
fix the broken dialog issue
Browse files Browse the repository at this point in the history
  • Loading branch information
@Prince-kushwaha
Prince-kushwaha committed Sep 13, 2024
1 parent fe67751 commit e64ccdf
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 52 deletions.
50 changes: 24 additions & 26 deletions AnkiDroid/src/main/res/layout/dialog_export_options.xml
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:padding="16dp">

<androidx.constraintlayout.widget.Barrier
android:id="@+id/decks_selected_barrier"
app:constraint_referenced_ids="decks_selector_container,selected_label"
app:barrierDirection="bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

<LinearLayout
android:id="@+id/export_extras_collection"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/export_extras_apkg">
app:layout_constraintTop_toBottomOf="@id/decks_selected_barrier">

<CheckBox
android:id="@+id/export_extras_collection_media"
Expand All @@ -34,8 +37,8 @@
android:fillViewport="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="@id/export_extras_collection"
app:layout_constraintTop_toBottomOf="@id/decks_selector_container">
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/decks_selected_barrier">

<LinearLayout
android:layout_width="match_parent"
Expand Down Expand Up @@ -64,18 +67,18 @@

<ScrollView
android:id="@+id/export_extras_notes"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:visibility="gone"
android:fillViewport="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="@id/export_extras_cards"
app:layout_constraintTop_toBottomOf="@id/decks_selector_container">
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/decks_selected_barrier">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">

<CheckBox
Expand All @@ -91,7 +94,6 @@
<CheckBox
android:id="@+id/notes_include_deck_name"
android:layout_width="match_parent"
android:checked="true"
android:layout_height="wrap_content" />
<CheckBox
android:id="@+id/notes_include_notetype_name"
Expand All @@ -106,12 +108,11 @@

<LinearLayout
android:id="@+id/export_extras_cards"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/export_extras_notes">
app:layout_constraintTop_toBottomOf="@id/decks_selected_barrier">

<CheckBox
android:id="@+id/cards_include_html"
Expand All @@ -127,7 +128,6 @@
android:minHeight="48dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@id/export_label_include"
app:layout_constraintTop_toBottomOf="@id/export_label_type" />

<com.ichi2.ui.FixedTextView
Expand All @@ -136,7 +136,6 @@
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@id/export_type_selector"
app:layout_constraintTop_toTopOf="parent" />

<com.ichi2.ui.FixedTextView
Expand All @@ -145,19 +144,19 @@
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@id/decks_selector_container"
app:layout_constraintTop_toBottomOf="@id/export_type_selector" />

<com.ichi2.ui.FixedTextView
android:id="@+id/selected_label"
android:layout_width="7dp"
android:layout_height="7dp"
android:gravity="center"
android:textStyle="italic"
android:visibility="gone"
android:gravity="center"
android:layout_marginBottom="16dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/export_label_include" />
app:layout_constraintTop_toBottomOf="@id/export_label_include"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />

<FrameLayout
android:id="@+id/decks_selector_container"
Expand All @@ -182,5 +181,4 @@
android:layout_gravity="center"
android:indeterminate="true" />
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</androidx.constraintlayout.widget.ConstraintLayout>
65 changes: 39 additions & 26 deletions AnkiDroid/src/main/res/layout/dialog_key_picker.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,33 +14,46 @@
~ this program. If not, see <http://www.gnu.org/licenses/>.
-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="center">
android:layout_height="match_parent">

<com.ichi2.ui.FixedTextView
android:id="@+id/key_picker_selected_key"
android:layout_width="wrap_content"
android:layout_margin="@dimen/dialog_frame_margin"
android:layout_height="wrap_content"
android:focusable="true"
android:focusableInTouchMode="true"
android:text="@string/key_picker_default_press_key"
android:textAlignment="center"
android:textSize="24sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:gravity="center"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="w,1:1"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

<com.ichi2.ui.FixedTextView
android:id="@+id/warning"
android:layout_width="wrap_content"
android:visibility="gone"
android:layout_margin="@dimen/content_vertical_padding"
android:layout_height="wrap_content"
android:textColor="?attr/colorError"
android:drawableStart="@drawable/ic_warning"
android:drawableTint="?attr/colorError"
android:drawablePadding="4dp"
/>
<com.ichi2.ui.FixedTextView
android:id="@+id/key_picker_selected_key"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="true"
android:focusableInTouchMode="true"
android:text="@string/key_picker_default_press_key"
android:textSize="24sp" />

</LinearLayout>
<com.ichi2.ui.FixedTextView
android:id="@+id/warning"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="6dp"
android:drawablePadding="4dp"
android:drawableStart="@drawable/ic_warning"
android:drawableTint="?attr/colorError"
android:textColor="?attr/colorError"
android:visibility="gone"
tools:text="Already used in X"
tools:visibility="visible" />

</LinearLayout>

</androidx.constraintlayout.widget.ConstraintLayout>

0 comments on commit e64ccdf

Please sign in to comment.