Skip to content

Commit

Permalink
HealthGro Bugs Fixes : 64635,64637,64641,64643,64645,64648,64640
Browse files Browse the repository at this point in the history
  • Loading branch information
@shubh-gupta-cantech
shubh-gupta-cantech committed May 15, 2023
1 parent 9d92d35 commit c3d8174
Show file tree
Hide file tree
Showing 18 changed files with 266 additions and 27 deletions.
53 changes: 53 additions & 0 deletions festive_poster/src/arantoo/res/drawable/ic_browse_all.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="60dp"
android:height="60dp"
android:viewportWidth="60"
android:viewportHeight="60">
<path
android:pathData="M30,30m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"
android:fillColor="#ffffff"/>
<path
android:pathData="M30,30m-29,0a29,29 0,1 1,58 0a29,29 0,1 1,-58 0"
android:strokeAlpha="0.33"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="#0400A6"/>
<path
android:pathData="M23.24,27.922C25.826,27.922 27.922,25.826 27.922,23.24C27.922,20.655 25.826,18.559 23.24,18.559C20.655,18.559 18.559,20.655 18.559,23.24C18.559,25.826 20.655,27.922 23.24,27.922Z"
android:strokeLineJoin="round"
android:strokeWidth="2.21937"
android:fillColor="#00000000"
android:strokeColor="#FFB800"
android:strokeLineCap="round"/>
<path
android:pathData="M36.764,27.922C39.349,27.922 41.445,25.826 41.445,23.24C41.445,20.655 39.349,18.559 36.764,18.559C34.178,18.559 32.082,20.655 32.082,23.24C32.082,25.826 34.178,27.922 36.764,27.922Z"
android:strokeAlpha="0.63"
android:strokeLineJoin="round"
android:strokeWidth="2.21937"
android:fillColor="#00000000"
android:strokeColor="#0400A6"
android:strokeLineCap="round"/>
<path
android:pathData="M23.24,41.445C25.826,41.445 27.922,39.349 27.922,36.764C27.922,34.178 25.826,32.082 23.24,32.082C20.655,32.082 18.559,34.178 18.559,36.764C18.559,39.349 20.655,41.445 23.24,41.445Z"
android:strokeAlpha="0.63"
android:strokeLineJoin="round"
android:strokeWidth="2.21937"
android:fillColor="#00000000"
android:strokeColor="#0400A6"
android:strokeLineCap="round"/>
<path
android:pathData="M36.764,41.445C39.349,41.445 41.445,39.349 41.445,36.764C41.445,34.178 39.349,32.082 36.764,32.082C34.178,32.082 32.082,34.178 32.082,36.764C32.082,39.349 34.178,41.445 36.764,41.445Z"
android:strokeAlpha="0.63"
android:strokeLineJoin="round"
android:strokeWidth="2.21937"
android:fillColor="#00000000"
android:strokeColor="#0400A6"
android:strokeLineCap="round"/>
<path
android:pathData="M26.491,26.813L29.171,29.493"
android:strokeLineJoin="round"
android:strokeWidth="2.21937"
android:fillColor="#00000000"
android:strokeColor="#FFB800"
android:strokeLineCap="round"/>
</vector>
53 changes: 53 additions & 0 deletions festive_poster/src/ardhim/res/drawable/ic_browse_all.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="60dp"
android:height="60dp"
android:viewportWidth="60"
android:viewportHeight="60">
<path
android:pathData="M30,30m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"
android:fillColor="#ffffff"/>
<path
android:pathData="M30,30m-29,0a29,29 0,1 1,58 0a29,29 0,1 1,-58 0"
android:strokeAlpha="0.33"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="#0400A6"/>
<path
android:pathData="M23.24,27.922C25.826,27.922 27.922,25.826 27.922,23.24C27.922,20.655 25.826,18.559 23.24,18.559C20.655,18.559 18.559,20.655 18.559,23.24C18.559,25.826 20.655,27.922 23.24,27.922Z"
android:strokeLineJoin="round"
android:strokeWidth="2.21937"
android:fillColor="#00000000"
android:strokeColor="#012F6B"
android:strokeLineCap="round"/>
<path
android:pathData="M36.764,27.922C39.349,27.922 41.445,25.826 41.445,23.24C41.445,20.655 39.349,18.559 36.764,18.559C34.178,18.559 32.082,20.655 32.082,23.24C32.082,25.826 34.178,27.922 36.764,27.922Z"
android:strokeAlpha="0.63"
android:strokeLineJoin="round"
android:strokeWidth="2.21937"
android:fillColor="#00000000"
android:strokeColor="#0400A6"
android:strokeLineCap="round"/>
<path
android:pathData="M23.24,41.445C25.826,41.445 27.922,39.349 27.922,36.764C27.922,34.178 25.826,32.082 23.24,32.082C20.655,32.082 18.559,34.178 18.559,36.764C18.559,39.349 20.655,41.445 23.24,41.445Z"
android:strokeAlpha="0.63"
android:strokeLineJoin="round"
android:strokeWidth="2.21937"
android:fillColor="#00000000"
android:strokeColor="#0400A6"
android:strokeLineCap="round"/>
<path
android:pathData="M36.764,41.445C39.349,41.445 41.445,39.349 41.445,36.764C41.445,34.178 39.349,32.082 36.764,32.082C34.178,32.082 32.082,34.178 32.082,36.764C32.082,39.349 34.178,41.445 36.764,41.445Z"
android:strokeAlpha="0.63"
android:strokeLineJoin="round"
android:strokeWidth="2.21937"
android:fillColor="#00000000"
android:strokeColor="#0400A6"
android:strokeLineCap="round"/>
<path
android:pathData="M26.491,26.813L29.171,29.493"
android:strokeLineJoin="round"
android:strokeWidth="2.21937"
android:fillColor="#00000000"
android:strokeColor="#012F6B"
android:strokeLineCap="round"/>
</vector>
53 changes: 53 additions & 0 deletions festive_poster/src/checkkinn/res/drawable/ic_browse_all.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="60dp"
android:height="60dp"
android:viewportWidth="60"
android:viewportHeight="60">
<path
android:pathData="M30,30m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"
android:fillColor="#ffffff"/>
<path
android:pathData="M30,30m-29,0a29,29 0,1 1,58 0a29,29 0,1 1,-58 0"
android:strokeAlpha="0.33"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="#0400A6"/>
<path
android:pathData="M23.24,27.922C25.826,27.922 27.922,25.826 27.922,23.24C27.922,20.655 25.826,18.559 23.24,18.559C20.655,18.559 18.559,20.655 18.559,23.24C18.559,25.826 20.655,27.922 23.24,27.922Z"
android:strokeLineJoin="round"
android:strokeWidth="2.21937"
android:fillColor="#00000000"
android:strokeColor="#FF8427"
android:strokeLineCap="round"/>
<path
android:pathData="M36.764,27.922C39.349,27.922 41.445,25.826 41.445,23.24C41.445,20.655 39.349,18.559 36.764,18.559C34.178,18.559 32.082,20.655 32.082,23.24C32.082,25.826 34.178,27.922 36.764,27.922Z"
android:strokeAlpha="0.63"
android:strokeLineJoin="round"
android:strokeWidth="2.21937"
android:fillColor="#00000000"
android:strokeColor="#0400A6"
android:strokeLineCap="round"/>
<path
android:pathData="M23.24,41.445C25.826,41.445 27.922,39.349 27.922,36.764C27.922,34.178 25.826,32.082 23.24,32.082C20.655,32.082 18.559,34.178 18.559,36.764C18.559,39.349 20.655,41.445 23.24,41.445Z"
android:strokeAlpha="0.63"
android:strokeLineJoin="round"
android:strokeWidth="2.21937"
android:fillColor="#00000000"
android:strokeColor="#0400A6"
android:strokeLineCap="round"/>
<path
android:pathData="M36.764,41.445C39.349,41.445 41.445,39.349 41.445,36.764C41.445,34.178 39.349,32.082 36.764,32.082C34.178,32.082 32.082,34.178 32.082,36.764C32.082,39.349 34.178,41.445 36.764,41.445Z"
android:strokeAlpha="0.63"
android:strokeLineJoin="round"
android:strokeWidth="2.21937"
android:fillColor="#00000000"
android:strokeColor="#0400A6"
android:strokeLineCap="round"/>
<path
android:pathData="M26.491,26.813L29.171,29.493"
android:strokeLineJoin="round"
android:strokeWidth="2.21937"
android:fillColor="#00000000"
android:strokeColor="#FF8427"
android:strokeLineCap="round"/>
</vector>
53 changes: 53 additions & 0 deletions festive_poster/src/healthgro/res/drawable/ic_browse_all.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="60dp"
android:height="60dp"
android:viewportWidth="60"
android:viewportHeight="60">
<path
android:pathData="M30,30m-30,0a30,30 0,1 1,60 0a30,30 0,1 1,-60 0"
android:fillColor="#ffffff"/>
<path
android:pathData="M30,30m-29,0a29,29 0,1 1,58 0a29,29 0,1 1,-58 0"
android:strokeAlpha="0.33"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="#0400A6"/>
<path
android:pathData="M23.24,27.922C25.826,27.922 27.922,25.826 27.922,23.24C27.922,20.655 25.826,18.559 23.24,18.559C20.655,18.559 18.559,20.655 18.559,23.24C18.559,25.826 20.655,27.922 23.24,27.922Z"
android:strokeLineJoin="round"
android:strokeWidth="2.21937"
android:fillColor="#00000000"
android:strokeColor="#001D85"
android:strokeLineCap="round"/>
<path
android:pathData="M36.764,27.922C39.349,27.922 41.445,25.826 41.445,23.24C41.445,20.655 39.349,18.559 36.764,18.559C34.178,18.559 32.082,20.655 32.082,23.24C32.082,25.826 34.178,27.922 36.764,27.922Z"
android:strokeAlpha="0.63"
android:strokeLineJoin="round"
android:strokeWidth="2.21937"
android:fillColor="#00000000"
android:strokeColor="#0400A6"
android:strokeLineCap="round"/>
<path
android:pathData="M23.24,41.445C25.826,41.445 27.922,39.349 27.922,36.764C27.922,34.178 25.826,32.082 23.24,32.082C20.655,32.082 18.559,34.178 18.559,36.764C18.559,39.349 20.655,41.445 23.24,41.445Z"
android:strokeAlpha="0.63"
android:strokeLineJoin="round"
android:strokeWidth="2.21937"
android:fillColor="#00000000"
android:strokeColor="#0400A6"
android:strokeLineCap="round"/>
<path
android:pathData="M36.764,41.445C39.349,41.445 41.445,39.349 41.445,36.764C41.445,34.178 39.349,32.082 36.764,32.082C34.178,32.082 32.082,34.178 32.082,36.764C32.082,39.349 34.178,41.445 36.764,41.445Z"
android:strokeAlpha="0.63"
android:strokeLineJoin="round"
android:strokeWidth="2.21937"
android:fillColor="#00000000"
android:strokeColor="#0400A6"
android:strokeLineCap="round"/>
<path
android:pathData="M26.491,26.813L29.171,29.493"
android:strokeLineJoin="round"
android:strokeWidth="2.21937"
android:fillColor="#00000000"
android:strokeColor="#001D85"
android:strokeLineCap="round"/>
</vector>
1 change: 0 additions & 1 deletion festive_poster/src/main/res/layout/activity_post_preview_social.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@
style="@style/primary_squared_button"
android:layout_height="59dp"
android:layout_gravity="bottom"
android:background="@drawable/yellow_bg_with_drop_shadow"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
Expand Down
2 changes: 1 addition & 1 deletion festive_poster/src/main/res/layout/bsheet_posting_progress.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
android:layout_marginTop="@dimen/size_16"
android:indeterminate="true"
app:indeterminateAnimationType="disjoint"
app:indicatorColor="@color/colorF8E71C"
app:indicatorColor="@color/primary_toolbar_color"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvSocialParam"
Expand Down
2 changes: 1 addition & 1 deletion festive_poster/src/main/res/layout/fragment_favourite_list.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginStart="8dp"
app:cardBackgroundColor="#FEEFD1"
app:cardBackgroundColor="@color/color_ffb900_op10_jio_ec008c_op10"
app:cardCornerRadius="10dp"
app:cardElevation="@dimen/size_0"
app:layout_constraintBottom_toBottomOf="@+id/tv_cat_title"
Expand Down
2 changes: 1 addition & 1 deletion festive_poster/src/main/res/values/style.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@
<style name="primary_squared_button">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">@dimen/size_52</item>
<item name="android:background">@color/colorPrimary</item>
<item name="android:background">@color/primary_toolbar_color</item>
<item name="fontFamily">@font/bold</item>
<item name="textSize">@dimen/text_16</item>
<item name="android:gravity">center</item>
Expand Down
10 changes: 5 additions & 5 deletions framework/src/arantoo/res/values/colors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
<color name="color_dialog_bg">#FDFDFE</color>
<color name="color_border_4a4a4a">#4a4a4a</color>
<color name="color_border_ffb900">#F5991E</color>
<color name="color_ffb900_op10_jio_ec008c_op10">#1AFFB900</color>
<color name="color_ffb900_op40_jio_ec008c_op40">#66FFB900</color>
<color name="color_ffb900_op10_jio_ec008c_op10">#1A044BB1</color>
<color name="color_ffb900_op40_jio_ec008c_op40">#66044BB1</color>
<color name="color_ffb900_jio_ec008c">#F5991E</color>
<color name="color_ffb900_jio_0400A6">#F5991E</color>

Expand All @@ -68,9 +68,9 @@
<color name="grey_DADADA">#DADADA</color>
<color name="grey_09121F">#ECEFF1</color>
<color name="gray_333333">#333333</color>
<color name="color_fcaf17_jio_0400a6">#FCAF17</color>
<color name="color_fcaf17_op70_jio_0400a6">#B3FCAF17</color>
<color name="colorPrimary_20">#33FFB900</color>
<color name="color_fcaf17_jio_0400a6">#044BB1</color>
<color name="color_fcaf17_op70_jio_0400a6">#B3044BB1</color>
<color name="colorPrimary_20">#33044BB1</color>
<color name="black_4a4a4a_20">#334A4A4A</color>
<color name="black_09121F">#09121F</color>
<color name="white_F5F7FA">#F5F7FA</color>
Expand Down
10 changes: 5 additions & 5 deletions framework/src/ardhim/res/values/colors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
<color name="color_dialog_bg">#FDFDFE</color>
<color name="color_border_4a4a4a">#4a4a4a</color>
<color name="color_border_ffb900">#F5991E</color>
<color name="color_ffb900_op10_jio_ec008c_op10">#1AFFB900</color>
<color name="color_ffb900_op40_jio_ec008c_op40">#66FFB900</color>
<color name="color_ffb900_op10_jio_ec008c_op10">#1AF5991E</color>
<color name="color_ffb900_op40_jio_ec008c_op40">#66F5991E</color>
<color name="color_ffb900_jio_ec008c">#F5991E</color>
<color name="color_ffb900_jio_0400A6">#F5991E</color>

Expand All @@ -68,9 +68,9 @@
<color name="grey_DADADA">#DADADA</color>
<color name="grey_09121F">#ECEFF1</color>
<color name="gray_333333">#333333</color>
<color name="color_fcaf17_jio_0400a6">#FCAF17</color>
<color name="color_fcaf17_op70_jio_0400a6">#B3FCAF17</color>
<color name="colorPrimary_20">#33FFB900</color>
<color name="color_fcaf17_jio_0400a6">#F5991E</color>
<color name="color_fcaf17_op70_jio_0400a6">#B3F5991E</color>
<color name="colorPrimary_20">#33F5991E</color>
<color name="black_4a4a4a_20">#334A4A4A</color>
<color name="black_09121F">#09121F</color>
<color name="white_F5F7FA">#F5F7FA</color>
Expand Down
10 changes: 5 additions & 5 deletions framework/src/checkkinn/res/values/colors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
<color name="color_dialog_bg">#FDFDFE</color>
<color name="color_border_4a4a4a">#4a4a4a</color>
<color name="color_border_ffb900">#5F2892</color>
<color name="color_ffb900_op10_jio_ec008c_op10">#1AFFB900</color>
<color name="color_ffb900_op40_jio_ec008c_op40">#66FFB900</color>
<color name="color_ffb900_op10_jio_ec008c_op10">#1A5F2892</color>
<color name="color_ffb900_op40_jio_ec008c_op40">#665F2892</color>
<color name="color_ffb900_jio_ec008c">#5F2892</color>
<color name="color_ffb900_jio_0400A6">#5F2892</color>

Expand All @@ -67,9 +67,9 @@
<color name="grey_DADADA">#DADADA</color>
<color name="grey_09121F">#ECEFF1</color>
<color name="gray_333333">#333333</color>
<color name="color_fcaf17_jio_0400a6">#FCAF17</color>
<color name="color_fcaf17_op70_jio_0400a6">#B3FCAF17</color>
<color name="colorPrimary_20">#33FFB900</color>
<color name="color_fcaf17_jio_0400a6">#5F2892</color>
<color name="color_fcaf17_op70_jio_0400a6">#B35F2892</color>
<color name="colorPrimary_20">#335F2892</color>
<color name="black_4a4a4a_20">#334A4A4A</color>
<color name="black_09121F">#09121F</color>
<color name="white_F5F7FA">#F5F7FA</color>
Expand Down
10 changes: 5 additions & 5 deletions framework/src/healthgro/res/values/colors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
<color name="color_dialog_bg">#FDFDFE</color>
<color name="color_border_4a4a4a">#4a4a4a</color>
<color name="color_border_ffb900">#001D85</color>
<color name="color_ffb900_op10_jio_ec008c_op10">#1AFFB900</color>
<color name="color_ffb900_op40_jio_ec008c_op40">#66FFB900</color>
<color name="color_ffb900_op10_jio_ec008c_op10">#1A409F94</color>
<color name="color_ffb900_op40_jio_ec008c_op40">#66409F94</color>
<color name="color_ffb900_jio_ec008c">#001D85</color>
<color name="color_ffb900_jio_0400A6">#001D85</color>

Expand All @@ -68,9 +68,9 @@
<color name="grey_DADADA">#DADADA</color>
<color name="grey_09121F">#ECEFF1</color>
<color name="gray_333333">#333333</color>
<color name="color_fcaf17_jio_0400a6">#FCAF17</color>
<color name="color_fcaf17_op70_jio_0400a6">#B3FCAF17</color>
<color name="colorPrimary_20">#33FFB900</color>
<color name="color_fcaf17_jio_0400a6">#409F94</color>
<color name="color_fcaf17_op70_jio_0400a6">#B3409F94</color>
<color name="colorPrimary_20">#33409F94</color>
<color name="black_4a4a4a_20">#334A4A4A</color>
<color name="black_09121F">#09121F</color>
<color name="white_F5F7FA">#F5F7FA</color>
Expand Down
7 changes: 7 additions & 0 deletions presignin/src/arantoo/res/color/disable_enable_button_selector.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">

<item android:color="@color/buttonTint" android:state_enabled="true" />

<item android:color="@color/gray_DADADA" android:state_enabled="false" />
</selector>
7 changes: 7 additions & 0 deletions presignin/src/ardhim/res/color/disable_enable_button_selector.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">

<item android:color="@color/buttonTint" android:state_enabled="true" />

<item android:color="@color/gray_DADADA" android:state_enabled="false" />
</selector>
7 changes: 7 additions & 0 deletions presignin/src/checkkinn/res/color/disable_enable_button_selector.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">

<item android:color="@color/buttonTint" android:state_enabled="true" />

<item android:color="@color/gray_DADADA" android:state_enabled="false" />
</selector>
7 changes: 7 additions & 0 deletions presignin/src/healthgro/res/color/disable_enable_button_selector.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">

<item android:color="@color/buttonTint" android:state_enabled="true" />

<item android:color="@color/gray_DADADA" android:state_enabled="false" />
</selector>
Loading

0 comments on commit c3d8174

Please sign in to comment.