YSY commit

This commit is contained in:
yadavendras
2019-03-01 20:32:01 +05:30
parent 863ac18681
commit 97d30b2f5b
170 changed files with 8407 additions and 943 deletions
+32
View File
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<declare-styleable name="CircularProgressBar">
<attr name="cpb_hasShadow" format="boolean"/>
<attr name="cpb_progressColor" format="string"/>
<attr name="cpb_backgroundColor" format="string"/>
<attr name="cpb_title" format="string"/>
<attr name="cpb_titleColor" format="string"/>
<attr name="cpb_subtitle" format="string"/>
<attr name="cpb_subtitleColor" format="string"/>
<attr name="cpb_strokeWidth" format="integer"/>
</declare-styleable>
<declare-styleable name="BlurView">
<attr name="blurRadius" format="integer"/>
<attr name="downsampleFactor" format="integer"/>
<attr name="overlayColor" format="color"/>
</declare-styleable>
<declare-styleable name="BigButtonView">
<attr name="text" format="string"/>
<attr name="subText" format="string"/>
</declare-styleable>
<declare-styleable name="BlurLockView">
<attr name="password_type" format="string"/>
</declare-styleable>
<attr name="catalogToolbarStyle" format="reference"/>
<attr name="catalogToolbarWithCloseButtonStyle" format="reference"/>
</resources>
@@ -19,4 +19,9 @@
<color name="transparent">#00FFFFFF</color>
<color name="char_card_bg">#b7ffa1</color>
<color name="circular_progress_default_progress">#bada55</color>
<color name="circular_progress_default_background">#787878</color>
<color name="circular_progress_default_title">#bada55</color>
<color name="circular_progress_default_subtitle">#D1D1D1</color>
</resources>
@@ -0,0 +1,58 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="default_big_button_width">80dp</dimen>
<dimen name="default_big_button_height">80dp</dimen>
<color name="default_big_button_text_color">#ffffff</color>
<integer name="default_big_button_text_size">35</integer>
<color name="default_big_button_sub_text_color">#ffffff</color>
<integer name="default_big_button_sub_text_size">12</integer>
<dimen name="default_small_button_width">40dp</dimen>
<dimen name="default_small_button_height">40dp</dimen>
<color name="default_small_button_text_color">#ffffff</color>
<integer name="default_small_button_text_size">12</integer>
<integer name="default_title_text_size">20</integer>
<color name="default_title_text_color">#ffffff</color>
<integer name="default_left_button_text_size">20</integer>
<color name="default_left_button_text_color">#ffffff</color>
<integer name="default_right_button_text_size">20</integer>
<color name="default_right_button_text_color">#ffffff</color>
<string-array
name="default_big_button_text">
<item>0</item>
<item>1</item>
<item>2</item>
<item>3</item>
<item>4</item>
<item>5</item>
<item>6</item>
<item>7</item>
<item>8</item>
<item>9</item>
</string-array>
<string-array
name="default_big_button_sub_text">
<item>0</item>
<item>1</item>
<item>ABC</item>
<item>DEF</item>
<item>GHI</item>
<item>JKL</item>
<item>MNO</item>
<item>PQRS</item>
<item>TUV</item>
<item>WXYZ</item>
</string-array>
<integer name="default_blur_radius">11</integer>
<integer name="default_downsample_factor">6</integer>
<color name="default_overlay_color">#99999999</color>
<color name="default_button_press">#66ffffff</color>
<color name="default_indicator">#99ffffff</color>
</resources>
+9 -2
View File
@@ -1,7 +1,7 @@
<resources>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="nav_header_vertical_spacing">16dp</dimen>
<dimen name="nav_header_height">160dp</dimen>
<dimen name="nav_header_height">170dp</dimen>
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">5dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
@@ -16,4 +16,11 @@
<dimen name="text_size_xsmall">12sp</dimen>
<dimen name="button_radius_large">10dp</dimen>
<dimen name="button_margin">15dp</dimen>
<!--Floating action button-->
<dimen name="design_fab_image_size" tools:override="true">36dp</dimen>
</resources>
+25 -1
View File
@@ -288,7 +288,7 @@
<string name="stock_planogram_shelf">Shelf </string>
<string name="stock_planogram_shelf_position"> Position </string>
<string name="stock_planogram_already_exists">is already exists</string>
<string name="stock_planogram_data_select_one_sku">Please select atleast one sku</string>
<string name="stock_planogram_data_select_one_sku">Please select at least one sku</string>
<string name="stock_planogram_data_add_shelf">Add sku, shelf can not be empty</string>
<string name="stock_planogram_data_add_shelf_position_already_exists">Shelf/ Position already exists</string>
@@ -396,5 +396,29 @@
<string name="pls_select_price">Please select price flasher</string>
<string name="exists">Exists</string>
<string name="price_flasher_available">Price flasher available?</string>
<string name="title_activity_change_password">Change Password</string>
<string name="want_to_download">Do you want to download data</string>
<string name="want_to_upload">Do you want to upload data</string>
<string name="want_to_exit">Do you want to exit</string>
<!-- Change Password-->
<string name="submit">Submit</string>
<string name="old_password">Old Password</string>
<string name="new_password">New Password</string>
<string name="confirm_password">Confirm Password</string>
<string name="password_rules">Password Rules</string>
<string name="pw_rules">1. Must be between 6 to 8 characters long. \n\n 2. Must contain following combinations \n\n a. Uppercase characters(A-Z) \n b. Lowercase characters(a-z) \n c. Numbers(0-9) \n d. Special characters(@#$%)</string>
<string name="invalid_password">Invalid Password</string>
<string name="password_and_confirm_password_not_match">Password and confirm password does not match</string>
<string name="space_not_allowed_in_password">Space is not allowed in password</string>
<string name="new_password_not_equal_to_old_password">New password should not be equal to old password</string>
<string name="password_updated_successfully">Password updated successfully</string>
<string name="title_activity_mpin">MPin</string>
<string name="error_incorrect_pin">This pin is incorrect</string>
<string name="add_sku">Add SKU</string>
<string name="is_there_promo_compliance">Is there any Promo running</string>
<string name="first_click_compulsory_image">First click compulsory image</string>
</resources>