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

UX Questionnaire adjustments #2032

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

UX Questionnaire adjustments #2032

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion android/engine/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ dependencies {

implementation 'androidx.core:core-ktx:1.9.0'
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'com.google.android.material:material:1.7.0'
implementation 'com.google.android.material:material:1.6.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation "androidx.constraintlayout:constraintlayout-compose:1.0.1"
implementation 'androidx.fragment:fragment-ktx:1.5.5'
Expand Down
4 changes: 4 additions & 0 deletions android/engine/src/main/res/color/checkbox_checked_background_border.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="0.24" android:color="#006EB8" />
</selector>
4 changes: 4 additions & 0 deletions android/engine/src/main/res/color/checkbox_checked_background_solid.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:alpha="0.8" android:color="#DEECF6" />
</selector>
5 changes: 5 additions & 0 deletions android/engine/src/main/res/color/checkbox_checked_color.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="#006EB8" android:state_checked="true" />
<item android:color="#919191" />
</selector>
14 changes: 14 additions & 0 deletions android/engine/src/main/res/color/input_field_border_color.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?attr/colorPrimary" android:state_focused="true" />
<item
android:color="#BFBFBF"
android:state_hovered="true"
/>
<item
android:alpha="0.38"
android:color="#BFBFBF"
android:state_enabled="false"
/>
<item android:color="#BFBFBF" />
</selector>
6 changes: 6 additions & 0 deletions android/engine/src/main/res/drawable-ldrtl/checkbox_inset.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<inset
xmlns:android="http://schemas.android.com/apk/res/android"
android:drawable="@drawable/checkbox_icon"
android:insetRight="@dimen/icon_inset"
/>
6 changes: 6 additions & 0 deletions android/engine/src/main/res/drawable-ldrtl/radio_button_inset.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<inset
xmlns:android="http://schemas.android.com/apk/res/android"
android:drawable="@drawable/radio_button_icon"
android:insetRight="@dimen/icon_inset"
/>
8 changes: 8 additions & 0 deletions android/engine/src/main/res/drawable/checkbox_background.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:drawable="@drawable/checkbox_checked_background"
android:state_checked="true"
/>
<item android:drawable="@drawable/checkbox_unchecked_background" />
</selector>
9 changes: 9 additions & 0 deletions android/engine/src/main/res/drawable/checkbox_checked_background.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"
>
<solid android:color="@color/checkbox_checked_background_solid" />
<stroke android:width="1dp" android:color="@color/checkbox_checked_background_border"/>
<corners android:radius="7dp" />
</shape>
10 changes: 10 additions & 0 deletions android/engine/src/main/res/drawable/checkbox_icon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/checked"
android:state_checked="true"
android:drawable="@drawable/ic_checkbox_checked" />
<item
android:id="@+id/unchecked"
android:drawable="@drawable/ic_checkbox_unchecked" />
</animated-selector>
6 changes: 6 additions & 0 deletions android/engine/src/main/res/drawable/checkbox_inset.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<inset
xmlns:android="http://schemas.android.com/apk/res/android"
android:drawable="@drawable/checkbox_icon"
android:insetLeft="@dimen/icon_inset"
/>
9 changes: 9 additions & 0 deletions android/engine/src/main/res/drawable/checkbox_unchecked_background.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"
>
<stroke android:width="1dp" android:color="#EFEFEF" />
<solid android:color="#0501395A" />
<corners android:radius="7dp" />
</shape>
10 changes: 10 additions & 0 deletions android/engine/src/main/res/drawable/ic_checkbox_checked.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M3.955,5.061C3,6.375 3,8.25 3,12C3,15.75 3,17.625 3.955,18.939C4.263,19.363 4.637,19.737 5.061,20.045C6.375,21 8.25,21 12,21C15.75,21 17.625,21 18.939,20.045C19.363,19.737 19.737,19.363 20.045,18.939C21,17.625 21,15.75 21,12C21,8.25 21,6.375 20.045,5.061C19.737,4.637 19.363,4.263 18.939,3.955C17.625,3 15.75,3 12,3C8.25,3 6.375,3 5.061,3.955C4.637,4.263 4.263,4.637 3.955,5.061ZM17.309,9.457C17.7,9.067 17.7,8.433 17.309,8.043C16.919,7.652 16.285,7.652 15.895,8.043L10.395,13.836L8.102,11.543C7.712,11.152 7.078,11.152 6.688,11.543C6.297,11.934 6.297,12.567 6.688,12.957L9.688,15.957C10.078,16.348 10.712,16.348 11.102,15.957L17.309,9.457Z"
android:fillColor="#006EB8"
android:fillType="evenOdd"/>
</vector>
11 changes: 11 additions & 0 deletions android/engine/src/main/res/drawable/ic_checkbox_unchecked.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M8,4L16,4A4,4 0,0 1,20 8L20,16A4,4 0,0 1,16 20L8,20A4,4 0,0 1,4 16L4,8A4,4 0,0 1,8 4z"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="#919191"/>
</vector>
17 changes: 17 additions & 0 deletions android/engine/src/main/res/drawable/ic_radio_button_checked.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M2,12C2,6.477 6.477,2 12,2C17.523,2 22,6.477 22,12C22,17.523 17.523,22 12,22C6.477,22 2,17.523 2,12Z"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="#006EB8"
android:strokeLineCap="round"/>
<path
android:pathData="M6,12C6,8.686 8.686,6 12,6C15.314,6 18,8.686 18,12C18,15.314 15.314,18 12,18C8.686,18 6,15.314 6,12Z"
android:fillColor="#006EB8"
android:fillType="evenOdd"/>
</vector>
9 changes: 9 additions & 0 deletions android/engine/src/main/res/drawable/ic_radio_button_unchecked.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M12,23C5.9,23 1,18.1 1,12C1,5.9 5.9,1 12,1C18.1,1 23,5.9 23,12C23,18.1 18.1,23 12,23ZM12,3C7,3 3,7 3,12C3,17 7,21 12,21C17,21 21,17 21,12C21,7 17,3 12,3Z"
android:fillColor="#919191"/>
</vector>
10 changes: 10 additions & 0 deletions android/engine/src/main/res/drawable/radio_button_icon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/checked"
android:state_checked="true"
android:drawable="@drawable/ic_radio_button_checked" />
<item
android:id="@+id/unchecked"
android:drawable="@drawable/ic_radio_button_unchecked" />
</animated-selector>
6 changes: 6 additions & 0 deletions android/engine/src/main/res/drawable/radio_button_inset.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<inset
xmlns:android="http://schemas.android.com/apk/res/android"
android:drawable="@drawable/radio_button_icon"
android:insetLeft="@dimen/icon_inset"
/>
7 changes: 7 additions & 0 deletions android/engine/src/main/res/drawable/rounded_submit_button.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"
>
<corners android:radius="3dp" />
</shape>
2 changes: 1 addition & 1 deletion android/engine/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<resources>
<color name="colorError">#DD0000</color>
<color name="colorErrorDull">#f2d0d3</color>
<color name="colorPrimary">#005084</color>
<color name="colorPrimary">#006EB8</color>
<color name="colorPrimaryDark">#003D66</color>
<color name="colorPrimaryLight">#006EB8</color>
<color name="colorAccent">#0283DA</color>
Expand Down
3 changes: 3 additions & 0 deletions android/engine/src/main/res/values/dimens.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
</resources>
67 changes: 56 additions & 11 deletions android/engine/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</style>

<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
<style name="AppTheme" parent="Theme.Material3.DayNight.NoActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
Expand Down Expand Up @@ -59,21 +59,66 @@
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="android:textColorSecondary">@color/white</item>
<item name="questionnaireSubmitButtonStyle">@style/Quest.Questionnaire.SubmitButtonStyle
</item>
<item name="questionnaireSubmitButtonStyle">@style/Quest.Questionnaire.SubmitButtonStyle</item>
<item name="questionnaireQuestionTextStyle">@style/Quest.Questionnaire.QuestionTextStyle</item>
<item name="questionnaireCheckBoxStyle">@style/Quest.Questionnaire.CheckBoxStyle</item>
<item name="questionnaireRadioButtonStyle">@style/Quest.Questionnaire.RadioButtonStyle</item>
<item name="questionnaireTextInputLayoutStyle">@style/Quest.Questionnaire.TextInputLayoutStyle</item>
<item name="questionnaireDropdownLayoutStyle">@style/Quest.Questionnaire.DropdownLayoutStyle</item>
</style>

<style name="Quest.Questionnaire.SubmitButtonStyle" parent="Questionnaire.SubmitButtonStyle">
<item name="android:text">@string/str_save</item>
<item name="android:textAllCaps">true</item>
<item name="android:layout_marginVertical">15dp</item>
<item name="android:layout_marginHorizontal">15dp</item>
<item name="android:background">?attr/colorPrimary</item>
<item name="android:drawablePadding">5dp</item>
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:padding">10dp</item>
<item name="android:letterSpacing">0.1</item>
<item name="android:layout_width">match_parent</item>
<item name="android:background">@drawable/rounded_submit_button</item>
<item name="android:textColor">@color/white</item>
<item name="android:textSize">18sp</item>
<item name="android:layout_gravity">bottom|start</item>
<item name="android:textSize">14sp</item>
</style>

<style name="Quest.Questionnaire.QuestionTextStyle" parent="TextAppearance.Material3.TitleLarge">

</style>

<style
name="Quest.Questionnaire.CheckBoxStyle"
parent="Questionnaire.CheckBoxStyle"
>
<item name="android:button">@drawable/checkbox_inset</item>
<item name="buttonTint">@color/checkbox_checked_color</item>
<item name="android:textColor">@color/checked_text_color</item>
<item name="android:textSize">16sp</item>
<item name="android:background">@drawable/checkbox_background</item>
<item name="android:padding">14dp</item>
<item name="android:paddingStart">8dp</item>
</style>

<style
name="Quest.Questionnaire.RadioButtonStyle"
parent="Questionnaire.RadioButtonStyle"
>
<item name="android:button">@drawable/radio_button_inset</item>
<item name="buttonTint">@color/checkbox_checked_color</item>
<item name="android:textColor">@color/checked_text_color</item>
<item name="android:textSize">16sp</item>
<item name="android:background">@drawable/checkbox_background</item>
<item name="android:padding">14dp</item>
<item name="android:paddingStart">8dp</item>
</style>

<style
name="Quest.Questionnaire.TextInputLayoutStyle"
parent="Questionnaire.TextInputLayoutStyle"
>
<item name="boxStrokeColor">@color/input_field_border_color</item>
</style>

<style
name="Quest.Questionnaire.DropdownLayoutStyle"
parent="Questionnaire.DropdownLayoutStyle"
>
<item name="boxStrokeColor">@color/input_field_border_color</item>
</style>

</resources>
18 changes: 10 additions & 8 deletions android/quest/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,7 @@

<activity
android:name=".ui.appsetting.AppSettingActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
android:exported="false">
</activity>

<activity
Expand All @@ -44,8 +39,15 @@

<activity
android:name=".ui.questionnaire.QuestionnaireActivity"
android:exported="false"
android:theme="@style/AppTheme" />
android:exported="true"
android:theme="@style/AppTheme">

<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<activity android:name=".HiltActivityForTest" />

Expand Down
Loading