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

Enable bottom container style and behavior customization #1859

Merged
merged 19 commits into from
Mar 24, 2023
Merged

Enable bottom container style and behavior customization #1859

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
45dd86e
Add onScrollListener that can be overridden
FikriMilano Feb 13, 2023
0534d59
Add divider above bottom container
FikriMilano Feb 13, 2023
a755ee0
Add styling to bottom container and the divider above it
FikriMilano Feb 13, 2023
e070e81
Merge branch 'master' of github.com:google/android-fhir into 1842-bot…
FikriMilano Feb 13, 2023
8d68a49
Merge branch 'master' into 1842-bottom-container-2
FikriMilano Feb 14, 2023
7cc730e
Add padding top and bottom for bottom container
FikriMilano Feb 16, 2023
b292bf2
Merge branch 'master' of github.com:google/android-fhir into 1842-bot…
FikriMilano Feb 16, 2023
4a514b4
Merge branch '1842-bottom-container-2' of github.com:opensrp/android-…
FikriMilano Feb 16, 2023
e7a4c4c
Show bottom container divider by default
FikriMilano Feb 20, 2023
569ddc4
Remove bottom container parent style
FikriMilano Feb 20, 2023
75043cd
Merge branch 'master' of github.com:google/android-fhir into 1842-bot…
FikriMilano Feb 20, 2023
6553faf
spotlessApply
FikriMilano Feb 20, 2023
7f98434
Rename bottom container padding
FikriMilano Feb 22, 2023
61076ab
Merge branch 'master' of github.com:google/android-fhir into 1842-bot…
FikriMilano Feb 22, 2023
b700a8c
spotlessApply
FikriMilano Feb 22, 2023
7351ac4
Merge branch 'master' of github.com:google/android-fhir into 1842-bot…
FikriMilano Mar 12, 2023
ce2034b
Address review
FikriMilano Mar 13, 2023
55e5c26
spotlessApply
FikriMilano Mar 13, 2023
981c349
Merge branch 'master' into 1842-bottom-container-2
jingtang10 Mar 24, 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
Prev Previous commit
Next Next commit
Merge branch 'master' of github.com:google/android-fhir into 1842-bot… 
…tom-container-2
  • Loading branch information
@FikriMilano
FikriMilano committed Feb 13, 2023
commit e070e81c1aca657613fead35ed0eb94dbb137ed2
6 changes: 3 additions & 3 deletions datacapture/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@
<item
name="questionnaireHelpTextStyle"
>@style/TextAppearance.Material3.BodyMedium</item>
<item
name="questionnaireHelpButtonStyle"
>@style/Widget.MaterialComponents.Button.TextButton.Icon</item>
<item name="questionnaireHelpButtonStyle">
@style/Widget.MaterialComponents.Button.TextButton.Icon
</item>
<item
name="questionnaireBottomContainerStyle"
>@style/Questionnaire.BottomContainerStyle</item>
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.