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.

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

Jump to bottom

Placed help button location to after question title #1984

Closed
wants to merge 2 commits into from
Closed

Placed help button location to after question title #1984

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcfacef
Placed help button location to after question title
khyativyasargus Apr 24, 2023
f56cd60
help icon positioning
khyativyasargus Jul 7, 2023
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
Next Next commit
Placed help button location to after question title
  • Loading branch information
@khyativyasargus
khyativyasargus committed Apr 24, 2023
commit dcfacef7f20e6366c213f61de5376de0f7707e3a
49 changes: 28 additions & 21 deletions datacapture/src/main/res/layout/group_type_header_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,60 +13,67 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingEnd="@dimen/prefix_padding_end"
app:layout_constraintEnd_toStartOf="@+id/question"
app:layout_constraintEnd_toStartOf="@+id/questionContainer"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
/>

<TextView
android:id="@+id/question"
style="?attr/questionnaireGroupTypeQuestionTextStyle"
<LinearLayout
android:id="@+id/questionContainer"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/prefix"
app:layout_constraintTop_toTopOf="parent"
/>

<LinearLayout
android:id="@+id/helpContainer"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/help_container_margin_top"
android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@id/question"
app:layout_constraintStart_toStartOf="parent"
>

<TextView
android:id="@+id/hint"
style="?attr/questionnaireSubtitleTextStyle"
android:id="@+id/question"
style="?attr/questionnaireGroupTypeQuestionTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight=".7"
android:layout_gravity="center_vertical"
tools:text="Sample helper text"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/prefix"
app:layout_constraintTop_toTopOf="parent"
/>

<Button
style="?attr/questionnaireHelpButtonStyle"
android:id="@+id/helpButton"
android:layout_width="@dimen/help_button_width"
android:layout_height="@dimen/help_button_height"
android:layout_gravity="center_vertical"
android:layout_weight=".3"
android:layout_marginStart="@dimen/help_button_margin_start"
app:icon="@drawable/ic_help_48px"
app:layout_constraintStart_toEndOf="@id/question"
app:layout_constraintTop_toTopOf="parent"
/>
</LinearLayout>



<TextView
android:id="@+id/hint"
style="?attr/questionnaireSubtitleTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight=".7"
android:layout_gravity="center_vertical"
tools:text="Sample helper text"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/questionContainer"
/>


<com.google.android.material.card.MaterialCardView
android:id="@+id/helpCardView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/help_card_margin_top"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/helpContainer"
app:layout_constraintTop_toBottomOf="@id/hint"
app:layout_constraintStart_toStartOf="parent"
>
<LinearLayout
Expand Down
48 changes: 26 additions & 22 deletions datacapture/src/main/res/layout/header_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,59 +13,62 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingEnd="@dimen/prefix_padding_end"
app:layout_constraintEnd_toStartOf="@+id/question"
app:layout_constraintEnd_toStartOf="@+id/questionContainer"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
/>

<TextView
android:id="@+id/question"
style="?attr/questionnaireQuestionTextStyle"
<LinearLayout
android:id="@+id/questionContainer"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/prefix"
app:layout_constraintTop_toTopOf="parent"
/>

<LinearLayout
android:id="@+id/helpContainer"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/help_container_margin_top"
android:orientation="horizontal"
app:layout_constraintTop_toBottomOf="@id/question"
app:layout_constraintStart_toStartOf="parent"
>

<TextView
android:id="@+id/hint"
style="?attr/questionnaireSubtitleTextStyle"
android:id="@+id/question"
style="?attr/questionnaireQuestionTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight=".7"
android:layout_gravity="center_vertical"
tools:text="Sample helper text"
app:layout_constraintStart_toEndOf="@id/prefix"
app:layout_constraintTop_toTopOf="parent"
/>

<Button
style="?attr/questionnaireHelpButtonStyle"
android:id="@+id/helpButton"
android:layout_width="@dimen/help_button_width"
android:layout_height="@dimen/help_button_height"
android:layout_gravity="center_vertical"
android:layout_weight=".3"
android:layout_marginStart="@dimen/help_button_margin_start"
app:icon="@drawable/ic_help_48px"
app:layout_constraintStart_toEndOf="@id/question"
app:layout_constraintTop_toTopOf="parent"
/>
</LinearLayout>

<TextView
android:id="@+id/hint"
style="?attr/questionnaireSubtitleTextStyle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
tools:text="Sample helper text"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/questionContainer"
/>

<TextView
android:id="@+id/error_text_at_header"
style="?attr/questionnaireErrorTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/error_text_at_header_margin_top"
android:layout_gravity="center_vertical"
app:layout_constraintTop_toBottomOf="@id/helpContainer"
app:layout_constraintTop_toBottomOf="@id/hint"
app:layout_constraintStart_toStartOf="parent"
tools:text="Sample error text"
android:visibility="gone"
Expand All @@ -78,14 +81,15 @@
android:layout_marginTop="@dimen/help_card_margin_top"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/helpContainer"
app:layout_constraintTop_toBottomOf="@id/hint"
app:layout_constraintStart_toStartOf="parent"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorSurfaceVariant"
android:orientation="vertical"
android:paddingBottom="@dimen/help_margin_bottom"
>
<TextView
style="?attr/questionnaireHelpHeaderStyle"
Expand Down