diff --git a/app/src/main/java/com/zebra/zdsDemo/MainActivity.java b/app/src/main/java/com/zebra/zdsDemo/MainActivity.java index 37fa0b9..d8f5dce 100644 --- a/app/src/main/java/com/zebra/zdsDemo/MainActivity.java +++ b/app/src/main/java/com/zebra/zdsDemo/MainActivity.java @@ -161,11 +161,13 @@ public void onDrawerOpened(@NonNull View drawerView) { // Setup Navigation view header and footer ((TextView) navView.getHeaderView(0).findViewById(R.id.title)).setText("Title"); ((TextView) navView.getHeaderView(0).findViewById(R.id.subtitle)).setText("Subtitle"); -// ((TextView) findViewById(R.id.footer_subtitle)).setText("version " + BuildConfig.VERSION_NAME); - - ((AppCompatImageView) navView.getHeaderView(0).findViewById(R.id.image)).setImageResource(R.drawable.ic_baseline_emoji_emotions_24); + // x-release-please-start-version + ((TextView) findViewById(R.id.footer_subtitle)).setText("ZDS Android v1.0.0"); + // x-release-please-end + ((AppCompatImageView) navView.getHeaderView(0).findViewById(R.id.image)).setImageResource(R.drawable.ic_happy_round); + ((AppCompatImageView) navView.getHeaderView(0).findViewById(R.id.image)).setImageTintList(ColorStateList.valueOf(Color.WHITE)); ((ZdsIconButton) navView.getHeaderView(0).findViewById(R.id.action)).setIconTint(ColorStateList.valueOf(Color.WHITE)); - ((ZdsIconButton) navView.getHeaderView(0).findViewById(R.id.action)).setIconResource(R.drawable.ic_baseline_settings_24); + ((ZdsIconButton) navView.getHeaderView(0).findViewById(R.id.action)).setIconResource(R.drawable.ic_settings_round); setMenuCounter(navView, R.id.buttonsFragment, 24); @@ -173,7 +175,7 @@ public void onDrawerOpened(@NonNull View drawerView) { ActionBar actionbar = getSupportActionBar(); if (actionbar != null) { actionbar.setDisplayHomeAsUpEnabled(true); - actionbar.setHomeAsUpIndicator(R.drawable.ic_baseline_menu_24); + actionbar.setHomeAsUpIndicator(R.drawable.ic_hamburger_menu_round); } getBanner().setOnClickListener(v -> hideBanner()); @@ -245,8 +247,8 @@ public ZdsSystemBanner getBanner() { public void showBanner() { ZdsSystemBanner.Style style = getBanner().getStyle(); - int statusBarColor = R.color.zebra_black_toolbar; - switch(style) { + int statusBarColor = R.color.zebra_toolbar; + switch (style) { case DEFAULT: statusBarColor = R.color.zebra_blue_enabled; break; @@ -269,6 +271,6 @@ public void showBanner() { public void hideBanner() { ((MotionLayout) findViewById(R.id.mainLayout)).transitionToStart(); getBanner().setVisibility(View.GONE); - getWindow().setStatusBarColor(ContextCompat.getColor(this, R.color.zebra_black_toolbar)); + getWindow().setStatusBarColor(ContextCompat.getColor(this, R.color.zebra_toolbar)); } } diff --git a/app/src/main/java/com/zebra/zdsDemo/fragments/DialogsFragment.java b/app/src/main/java/com/zebra/zdsDemo/fragments/DialogsFragment.java index ddf461c..3107a45 100644 --- a/app/src/main/java/com/zebra/zdsDemo/fragments/DialogsFragment.java +++ b/app/src/main/java/com/zebra/zdsDemo/fragments/DialogsFragment.java @@ -45,7 +45,7 @@ private void showDialog() { ZdsDialog.Builder builder = new ZdsDialog.Builder(requireContext()); builder.setTitle("Dialog Title").setContent("Lorem ipsum dolor sit amet, conse ctetur adipiscing elit, sed do eiusm od tempor incididunt ut labore et do lore magna aliqua."); if (titleImage.isChecked()) { - builder.setIcon(R.drawable.ic_baseline_warning_24); + builder.setIcon(R.drawable.ic_warning_round); } if (gravityRadioGroup.getCheckedRadioButtonId() == R.id.gravityLeft) { builder.setTitleGravity(Gravity.START); diff --git a/app/src/main/java/com/zebra/zdsDemo/fragments/DropdownFragment.java b/app/src/main/java/com/zebra/zdsDemo/fragments/DropdownFragment.java index 99bf306..44e1270 100644 --- a/app/src/main/java/com/zebra/zdsDemo/fragments/DropdownFragment.java +++ b/app/src/main/java/com/zebra/zdsDemo/fragments/DropdownFragment.java @@ -90,18 +90,18 @@ private void showMenu(View view, DropdownStyle style) { case COUNTRY: itemResId = R.layout.dropdown_item_icon; items.clear(); - items.add(new ListPopupItem("Option 1", R.drawable.ic_baseline_flag_24)); - items.add(new ListPopupItem("Option 2", R.drawable.ic_baseline_flag_24)); - items.add(new ListPopupItem("Option 3", R.drawable.ic_baseline_flag_24)); - items.add(new ListPopupItem("Option 4", R.drawable.ic_baseline_flag_24)); + items.add(new ListPopupItem("Option 1", R.drawable.ic_flag_round)); + items.add(new ListPopupItem("Option 2", R.drawable.ic_flag_round)); + items.add(new ListPopupItem("Option 3", R.drawable.ic_flag_round)); + items.add(new ListPopupItem("Option 4", R.drawable.ic_flag_round)); break; case COUNTRY_CONDENSED: itemResId = R.layout.dropdown_item_icon_condensed; items.clear(); - items.add(new ListPopupItem("Option 1", R.drawable.ic_baseline_flag_24)); - items.add(new ListPopupItem("Option 2", R.drawable.ic_baseline_flag_24)); - items.add(new ListPopupItem("Option 3", R.drawable.ic_baseline_flag_24)); - items.add(new ListPopupItem("Option 4", R.drawable.ic_baseline_flag_24)); + items.add(new ListPopupItem("Option 1", R.drawable.ic_flag_round)); + items.add(new ListPopupItem("Option 2", R.drawable.ic_flag_round)); + items.add(new ListPopupItem("Option 3", R.drawable.ic_flag_round)); + items.add(new ListPopupItem("Option 4", R.drawable.ic_flag_round)); break; } diff --git a/app/src/main/java/com/zebra/zdsDemo/fragments/ListFragment.java b/app/src/main/java/com/zebra/zdsDemo/fragments/ListFragment.java index 002f9d8..6942cae 100644 --- a/app/src/main/java/com/zebra/zdsDemo/fragments/ListFragment.java +++ b/app/src/main/java/com/zebra/zdsDemo/fragments/ListFragment.java @@ -88,7 +88,7 @@ public void onBindViewHolder(ZdsListItem.ZdsViewHolder viewHolder, final int pos viewHolder.getIconRight().setImageTintList(ColorStateList.valueOf(Color.GRAY)); if (imageLeftCheckBox.isChecked()) { - viewHolder.showIconLeft(R.drawable.ic_baseline_star_24); + viewHolder.showIconLeft(R.drawable.ic_star_sharp); } else { viewHolder.hideIconLeft(); @@ -96,7 +96,7 @@ public void onBindViewHolder(ZdsListItem.ZdsViewHolder viewHolder, final int pos switch (elementRightRadioGroup.getCheckedRadioButtonId()) { case R.id.showImageRight: - viewHolder.showIconRight(R.drawable.ic_baseline_star_24); + viewHolder.showIconRight(R.drawable.ic_star_sharp); break; case R.id.showMeta: viewHolder.setMeta("Meta"); diff --git a/app/src/main/res/drawable/ic_baseline_add_24.xml b/app/src/main/res/drawable/ic_baseline_add_24.xml deleted file mode 100644 index 89633bb..0000000 --- a/app/src/main/res/drawable/ic_baseline_add_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_delete_24.xml b/app/src/main/res/drawable/ic_baseline_delete_24.xml deleted file mode 100644 index de011dd..0000000 --- a/app/src/main/res/drawable/ic_baseline_delete_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_emoji_emotions_24.xml b/app/src/main/res/drawable/ic_baseline_emoji_emotions_24.xml deleted file mode 100644 index 68a3a63..0000000 --- a/app/src/main/res/drawable/ic_baseline_emoji_emotions_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_flag_24.xml b/app/src/main/res/drawable/ic_baseline_flag_24.xml deleted file mode 100644 index 86c5dd4..0000000 --- a/app/src/main/res/drawable/ic_baseline_flag_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_invert_colors_24.xml b/app/src/main/res/drawable/ic_baseline_invert_colors_24.xml deleted file mode 100644 index 078a0ed..0000000 --- a/app/src/main/res/drawable/ic_baseline_invert_colors_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_menu_24.xml b/app/src/main/res/drawable/ic_baseline_menu_24.xml deleted file mode 100644 index 543cee9..0000000 --- a/app/src/main/res/drawable/ic_baseline_menu_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_more_horiz_24.xml b/app/src/main/res/drawable/ic_baseline_more_horiz_24.xml deleted file mode 100644 index afbe22d..0000000 --- a/app/src/main/res/drawable/ic_baseline_more_horiz_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_more_vert_24.xml b/app/src/main/res/drawable/ic_baseline_more_vert_24.xml deleted file mode 100644 index 39fbab5..0000000 --- a/app/src/main/res/drawable/ic_baseline_more_vert_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_sd_card_24.xml b/app/src/main/res/drawable/ic_baseline_sd_card_24.xml deleted file mode 100644 index ee95d31..0000000 --- a/app/src/main/res/drawable/ic_baseline_sd_card_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_search_24.xml b/app/src/main/res/drawable/ic_baseline_search_24.xml deleted file mode 100644 index 6bae888..0000000 --- a/app/src/main/res/drawable/ic_baseline_search_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_baseline_settings_24.xml b/app/src/main/res/drawable/ic_baseline_settings_24.xml deleted file mode 100644 index 298a5a1..0000000 --- a/app/src/main/res/drawable/ic_baseline_settings_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_star_24.xml b/app/src/main/res/drawable/ic_baseline_star_24.xml deleted file mode 100644 index 12a4a50..0000000 --- a/app/src/main/res/drawable/ic_baseline_star_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_baseline_warning_24.xml b/app/src/main/res/drawable/ic_baseline_warning_24.xml deleted file mode 100644 index f0164e6..0000000 --- a/app/src/main/res/drawable/ic_baseline_warning_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/layout/fragment_buttons.xml b/app/src/main/res/layout/fragment_buttons.xml index 4c4a9ab..2ecdcc4 100644 --- a/app/src/main/res/layout/fragment_buttons.xml +++ b/app/src/main/res/layout/fragment_buttons.xml @@ -58,7 +58,7 @@ android:layout_gravity="center" android:text="Button" android:theme="@style/Zds.Button.Primary" - app:icon="@drawable/ic_baseline_star_24" + app:icon="@drawable/ic_star_round" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/materialButtonIconLeft" app:layout_constraintStart_toStartOf="parent" @@ -72,7 +72,7 @@ android:layout_gravity="center" android:text="Button" android:theme="@style/Zds.Button.Primary.Sharp" - app:icon="@drawable/ic_baseline_star_24" + app:icon="@drawable/ic_star_round" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/materialButtonIconLeft2" @@ -93,7 +93,7 @@ android:layout_gravity="center" android:text="Button" android:theme="@style/Zds.Button.Primary" - app:icon="@drawable/ic_baseline_star_24" + app:icon="@drawable/ic_star_round" app:iconGravity="end" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/materialButtonIconRight" @@ -108,7 +108,7 @@ android:layout_gravity="center" android:text="Button" android:theme="@style/Zds.Button.Primary.Sharp" - app:icon="@drawable/ic_baseline_star_24" + app:icon="@drawable/ic_star_round" app:iconGravity="end" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -163,7 +163,7 @@ android:layout_gravity="center" android:text="Button" android:theme="@style/Zds.Button.Variant" - app:icon="@drawable/ic_baseline_star_24" + app:icon="@drawable/ic_star_round" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/materialButtonVariantIconLeft" app:layout_constraintStart_toStartOf="parent" @@ -177,7 +177,7 @@ android:layout_gravity="center" android:text="Button" android:theme="@style/Zds.Button.Variant" - app:icon="@drawable/ic_baseline_star_24" + app:icon="@drawable/ic_star_round" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/materialButtonVariantIconLeft2" @@ -192,13 +192,13 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_dialogs.xml b/app/src/main/res/layout/fragment_dialogs.xml index 1364f00..023721e 100644 --- a/app/src/main/res/layout/fragment_dialogs.xml +++ b/app/src/main/res/layout/fragment_dialogs.xml @@ -1,7 +1,6 @@ + app:srcCompat="@drawable/ic_add_sharp" /> + app:srcCompat="@drawable/ic_add_sharp" /> + app:srcCompat="@drawable/ic_add_sharp" /> + app:srcCompat="@drawable/ic_add_sharp" /> + app:srcCompat="@drawable/ic_add_sharp" /> + app:srcCompat="@drawable/ic_add_sharp" /> + app:srcCompat="@drawable/ic_add_sharp" /> + app:srcCompat="@drawable/ic_add_sharp" /> + app:srcCompat="@drawable/ic_add_sharp" /> + app:srcCompat="@drawable/ic_add_sharp" /> + app:srcCompat="@drawable/ic_add_sharp" /> + app:srcCompat="@drawable/ic_add_sharp" /> + + + + + + + + - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/fragment_progress_indicators.xml b/app/src/main/res/layout/fragment_progress_indicators.xml index f8fab2c..90459c5 100644 --- a/app/src/main/res/layout/fragment_progress_indicators.xml +++ b/app/src/main/res/layout/fragment_progress_indicators.xml @@ -19,6 +19,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:max="100" + android:progress="50" /> - - diff --git a/app/src/main/res/layout/fragment_tabs.xml b/app/src/main/res/layout/fragment_tabs.xml index 38bfc82..fa9f08f 100644 --- a/app/src/main/res/layout/fragment_tabs.xml +++ b/app/src/main/res/layout/fragment_tabs.xml @@ -23,21 +23,21 @@ android:id="@+id/tab1" android:layout_width="wrap_content" android:layout_height="match_parent" - android:icon="@drawable/ic_baseline_star_24" + android:icon="@drawable/ic_star_round" android:text="Tab1" /> @@ -46,7 +46,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:background="@color/zebra_black_toolbar" + android:background="@color/zebra_toolbar" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tabLayout"> @@ -65,42 +65,42 @@ android:id="@+id/tab1Scroll" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:icon="@drawable/ic_baseline_star_24" + android:icon="@drawable/ic_star_round" android:text="Tab1" /> diff --git a/app/src/main/res/layout/fragment_text_input.xml b/app/src/main/res/layout/fragment_text_input.xml index ed21433..fa03546 100644 --- a/app/src/main/res/layout/fragment_text_input.xml +++ b/app/src/main/res/layout/fragment_text_input.xml @@ -24,7 +24,7 @@ zebra:label="Custom label" zebra:label_style="mandatory" zebra:prefixText="$" - zebra:startIconDrawable="@drawable/ic_baseline_star_24" /> + zebra:startIconDrawable="@drawable/ic_star_round" /> @@ -47,8 +46,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/toolbar_avatar" app:menu="@menu/search_menu" - app:navigationIcon="@drawable/ic_baseline_menu_24" - app:navigationIconTint="@android:color/white" + app:navigationIcon="@drawable/ic_hamburger_menu_round" app:title="@string/app_name" app:titleMarginTop="16dp" /> diff --git a/app/src/main/res/menu/app_menu.xml b/app/src/main/res/menu/app_menu.xml index 2567312..f24d866 100644 --- a/app/src/main/res/menu/app_menu.xml +++ b/app/src/main/res/menu/app_menu.xml @@ -4,7 +4,7 @@ \ No newline at end of file diff --git a/app/src/main/res/menu/contextual_action_bar.xml b/app/src/main/res/menu/contextual_action_bar.xml index f869734..48a7e9e 100644 --- a/app/src/main/res/menu/contextual_action_bar.xml +++ b/app/src/main/res/menu/contextual_action_bar.xml @@ -4,7 +4,7 @@ \ No newline at end of file diff --git a/app/src/main/res/menu/fragment_toolbar_menu.xml b/app/src/main/res/menu/fragment_toolbar_menu.xml index fc720e0..5ee63b9 100644 --- a/app/src/main/res/menu/fragment_toolbar_menu.xml +++ b/app/src/main/res/menu/fragment_toolbar_menu.xml @@ -4,13 +4,13 @@ \ No newline at end of file diff --git a/app/src/main/res/menu/navigation_drawer.xml b/app/src/main/res/menu/navigation_drawer.xml index a3bc00c..4cd5981 100644 --- a/app/src/main/res/menu/navigation_drawer.xml +++ b/app/src/main/res/menu/navigation_drawer.xml @@ -10,21 +10,21 @@ @@ -33,72 +33,72 @@ + \ No newline at end of file diff --git a/app/src/main/res/menu/search_menu.xml b/app/src/main/res/menu/search_menu.xml index 901fbb9..41232ce 100644 --- a/app/src/main/res/menu/search_menu.xml +++ b/app/src/main/res/menu/search_menu.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/components/build.gradle b/components/build.gradle index a2a0836..fb9692d 100644 --- a/components/build.gradle +++ b/components/build.gradle @@ -58,13 +58,13 @@ publishing { } repositories { - // maven { - // credentials { - // username = project.property('artifactoryusername') - // password = project.property('artifactorypassword') - // } - // url = project.property('zds-android-maven') + project.property('publish') - // } + maven { + credentials { + username = project.property('artifactoryusername') + password = project.property('artifactorypassword') + } + url = project.property('zds-android-maven') + project.property('publish') + } } } diff --git a/components/docs/assets/index.md b/components/docs/assets/index.md index 8026342..9a4bd2e 100644 --- a/components/docs/assets/index.md +++ b/components/docs/assets/index.md @@ -16,4 +16,5 @@ "app:icon":"@drawable/ic_barcode" ``` -This package provides all of the Zebra icons for use in applications. To see all icons, see [Zeta Icons](https://design.zebra.com/icons) +This package provides all of the Zebra icons for use in applications. To see all icons, +see [Zeta Icons](https://design.zebra.com/icons) diff --git a/components/docs/components/index.md b/components/docs/components/index.md index 894a235..a117859 100644 --- a/components/docs/components/index.md +++ b/components/docs/components/index.md @@ -38,6 +38,8 @@ - Zds.Button.Primary.Sharp - Zds.Button.Variant - Zds.Button.Variant.Sharp +- Zds.Button.Positive +- Zds.Button.Positive.Sharp - Zds.Button.Negative - Zds.Button.Negative.Sharp - Zds.Button.Outline @@ -77,6 +79,8 @@ its properties. Another way is to override attributes in the XML layout file. - Zds.IconButton.Primary.Sharp - Zds.IconButton.Variant - Zds.IconButton.Variant.Sharp +- Zds.IconButton.Positive +- Zds.IconButton.Positive.Sharp - Zds.IconButton.Negative - Zds.IconButton.Negative.Sharp - Zds.IconButton.Outline diff --git a/components/src/main/java/com/zebra/zds/ZdsBanner.kt b/components/src/main/java/com/zebra/zds/ZdsBanner.kt index 4633393..d7e9958 100644 --- a/components/src/main/java/com/zebra/zds/ZdsBanner.kt +++ b/components/src/main/java/com/zebra/zds/ZdsBanner.kt @@ -170,7 +170,7 @@ class ZdsBanner : FrameLayout { Style.NEGATIVE -> { colorTint = ContextCompat.getColor(context, R.color.zebra_red_enabled) - colorStroke = ContextCompat.getColor(context, R.color.zebra_red_inverse) + colorStroke = ContextCompat.getColor(context, R.color.zebra_red_stroke) colorBackground = ContextCompat.getColor(context, R.color.zebra_red_error_background) iconResId = R.drawable.ic_info_sharp diff --git a/components/src/main/java/com/zebra/zds/ZdsButton.kt b/components/src/main/java/com/zebra/zds/ZdsButton.kt index 2232ae3..feb54f5 100644 --- a/components/src/main/java/com/zebra/zds/ZdsButton.kt +++ b/components/src/main/java/com/zebra/zds/ZdsButton.kt @@ -4,10 +4,11 @@ import android.content.Context import android.content.res.ColorStateList import android.graphics.Color import android.util.AttributeSet +import androidx.core.content.ContextCompat import com.google.android.material.button.MaterialButton import com.google.android.material.color.MaterialColors -class ZdsButton @JvmOverloads constructor( +open class ZdsButton @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyle: Int = 0 @@ -30,9 +31,12 @@ class ZdsButton @JvmOverloads constructor( iconTint = colorStateList setTextColor(colorStateList) } else { - val colorStateList = ColorStateList.valueOf(resources.getColor(R.color.textDisabled)) - iconTint = colorStateList + val colorStateList = + ColorStateList.valueOf(ContextCompat.getColor(context, R.color.textDisabled)) setTextColor(colorStateList) + iconTint = colorStateList + backgroundTintList = + ColorStateList.valueOf(ContextCompat.getColor(context, R.color.surfaceDisabled)) } super.setEnabled(enabled) diff --git a/components/src/main/java/com/zebra/zds/ZdsCheckBox.kt b/components/src/main/java/com/zebra/zds/ZdsCheckBox.kt index fc8f18b..a9961a2 100644 --- a/components/src/main/java/com/zebra/zds/ZdsCheckBox.kt +++ b/components/src/main/java/com/zebra/zds/ZdsCheckBox.kt @@ -6,6 +6,4 @@ import com.google.android.material.checkbox.MaterialCheckBox class ZdsCheckBox @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null -) : MaterialCheckBox(context, attrs) { - -} \ No newline at end of file +) : MaterialCheckBox(context, attrs) \ No newline at end of file diff --git a/components/src/main/java/com/zebra/zds/ZdsIconButton.kt b/components/src/main/java/com/zebra/zds/ZdsIconButton.kt index 82d4e45..cc191db 100644 --- a/components/src/main/java/com/zebra/zds/ZdsIconButton.kt +++ b/components/src/main/java/com/zebra/zds/ZdsIconButton.kt @@ -1,38 +1,10 @@ package com.zebra.zds import android.content.Context -import android.content.res.ColorStateList -import android.graphics.Color import android.util.AttributeSet -import com.google.android.material.button.MaterialButton -import com.google.android.material.color.MaterialColors class ZdsIconButton @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyle: Int = 0 -) : MaterialButton(context, attrs, defStyle) { - - init { - isEnabled = isEnabled - } - - override fun setEnabled(enabled: Boolean) { - - iconTint = if (enabled) { - val colorStateList = ColorStateList.valueOf( - MaterialColors.getColor( - context, - R.attr.iconTint, - Color.BLACK - ) - ) - colorStateList - } else { - val colorStateList = ColorStateList.valueOf(resources.getColor(R.color.textDisabled)) - colorStateList - } - - super.setEnabled(enabled) - } -} \ No newline at end of file +) : ZdsButton(context, attrs, defStyle) \ No newline at end of file diff --git a/components/src/main/java/com/zebra/zds/ZdsRadioButton.kt b/components/src/main/java/com/zebra/zds/ZdsRadioButton.kt index 5a565ac..9225783 100644 --- a/components/src/main/java/com/zebra/zds/ZdsRadioButton.kt +++ b/components/src/main/java/com/zebra/zds/ZdsRadioButton.kt @@ -25,7 +25,7 @@ class ZdsRadioButton @JvmOverloads constructor( if (enabled || isChecked) { setButtonDrawable(R.drawable.abc_btn_radio_material_anim) } else { - setButtonDrawable(R.drawable.radio_disabled_unchecked) + setButtonDrawable(R.drawable.ic_radio_button_unchecked_round) } } } \ No newline at end of file diff --git a/components/src/main/java/com/zebra/zds/ZdsSwitch.kt b/components/src/main/java/com/zebra/zds/ZdsSwitch.kt index 78ba174..11954b3 100644 --- a/components/src/main/java/com/zebra/zds/ZdsSwitch.kt +++ b/components/src/main/java/com/zebra/zds/ZdsSwitch.kt @@ -1,7 +1,9 @@ package com.zebra.zds import android.content.Context +import android.content.res.ColorStateList import android.util.AttributeSet +import androidx.core.content.ContextCompat import com.google.android.material.materialswitch.MaterialSwitch @@ -10,5 +12,18 @@ class ZdsSwitch @JvmOverloads constructor( ) : MaterialSwitch(context, attrs) { init { setEnforceSwitchWidth(true) + isEnabled = isEnabled + } + + override fun setEnabled(enabled: Boolean) { + + if (!enabled) { + thumbTintList = + ColorStateList.valueOf(ContextCompat.getColor(context, R.color.textDisabled)) + trackTintList = + ColorStateList.valueOf(ContextCompat.getColor(context, R.color.surfaceDisabled)) + } + + super.setEnabled(enabled) } } \ No newline at end of file diff --git a/components/src/main/java/com/zebra/zds/ZdsTabItem.kt b/components/src/main/java/com/zebra/zds/ZdsTabItem.kt index 8a543a9..9477b39 100644 --- a/components/src/main/java/com/zebra/zds/ZdsTabItem.kt +++ b/components/src/main/java/com/zebra/zds/ZdsTabItem.kt @@ -6,5 +6,4 @@ import com.google.android.material.tabs.TabItem class ZdsTabItem @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null -) : TabItem(context, attrs) { -} \ No newline at end of file +) : TabItem(context, attrs) \ No newline at end of file diff --git a/components/src/main/java/com/zebra/zds/ZdsTabLayout.kt b/components/src/main/java/com/zebra/zds/ZdsTabLayout.kt index f9b5f02..dd644f8 100644 --- a/components/src/main/java/com/zebra/zds/ZdsTabLayout.kt +++ b/components/src/main/java/com/zebra/zds/ZdsTabLayout.kt @@ -6,6 +6,5 @@ import com.google.android.material.tabs.TabLayout class ZdsTabLayout @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null -) : TabLayout(context, attrs) { -} +) : TabLayout(context, attrs) diff --git a/components/src/main/java/com/zebra/zds/ZdsToolbar.kt b/components/src/main/java/com/zebra/zds/ZdsToolbar.kt index a08ad11..05185ec 100644 --- a/components/src/main/java/com/zebra/zds/ZdsToolbar.kt +++ b/components/src/main/java/com/zebra/zds/ZdsToolbar.kt @@ -6,6 +6,4 @@ import com.google.android.material.appbar.MaterialToolbar class ZdsToolbar @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null -) : MaterialToolbar(context, attrs) { - -} \ No newline at end of file +) : MaterialToolbar(context, attrs) \ No newline at end of file diff --git a/components/src/main/res/drawable/radio_disabled_unchecked.xml b/components/src/main/res/drawable/radio_disabled_unchecked.xml deleted file mode 100644 index fbfb3c7..0000000 --- a/components/src/main/res/drawable/radio_disabled_unchecked.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/components/src/main/res/drawable/switch_track_tint.xml b/components/src/main/res/drawable/switch_track_tint.xml deleted file mode 100644 index f8e938e..0000000 --- a/components/src/main/res/drawable/switch_track_tint.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/components/src/main/res/drawable/text_input_selector.xml b/components/src/main/res/drawable/text_input_selector.xml deleted file mode 100644 index c4c22e9..0000000 --- a/components/src/main/res/drawable/text_input_selector.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/components/src/main/res/layout/banner.xml b/components/src/main/res/layout/banner.xml index 2e47149..3934be0 100644 --- a/components/src/main/res/layout/banner.xml +++ b/components/src/main/res/layout/banner.xml @@ -22,11 +22,11 @@ @@ -21,11 +21,11 @@ - #008577 - #00574B + #599FE5 + #0061C2 #FFFFFF - #0C0D0E + #151519 - #FFFFFF - #1D1E23 - #646A78 + #1D1E23 + #F3F6FA + #7A8190 #AFB6C2 + #2C2F36 - #2C2F36 + #7A8190 #3C414B - #FFFFFF + #BBC1CB #CED2DB - #3C414B - #99A1B2 + #2C2F36 + #2C2F36 #F3F6FA - #FFFFFF + #F3F6FA #1D1E23 - #1D1E23 + #151519 - #0073E6 - #0061C2 - #7EBEFF + #599FE5 + #7EBEFF + #0061c2 #3C414B - #FFD200 - #C29500 + #FBB348 + #DBB91C #9B5A00 - #331D00 + #1E1100 + #F3D961 - #D70015 - #8F000E - #FF8692 + #F36170 + #F98C97 + #8F000E #220F11 - #CEA4FF + #9B71DF #43008F #180F22 - #84DAB6 + #67B796 + #D8FFEF #005F38 - #081711 - + #00864F + \ No newline at end of file diff --git a/components/src/main/res/values-night/styles-buttons.xml b/components/src/main/res/values-night/styles-buttons.xml index 9f4f6de..9c40591 100644 --- a/components/src/main/res/values-night/styles-buttons.xml +++ b/components/src/main/res/values-night/styles-buttons.xml @@ -1,122 +1,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/components/src/main/res/values-night/styles-fab.xml b/components/src/main/res/values-night/styles-fab.xml index e320fb7..fe29c73 100644 --- a/components/src/main/res/values-night/styles-fab.xml +++ b/components/src/main/res/values-night/styles-fab.xml @@ -1,50 +1,33 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/components/src/main/res/values-night/styles-navigation.xml b/components/src/main/res/values-night/styles-navigation.xml index 045052a..78554f9 100644 --- a/components/src/main/res/values-night/styles-navigation.xml +++ b/components/src/main/res/values-night/styles-navigation.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/components/src/main/res/values-night/styles-searchview.xml b/components/src/main/res/values-night/styles-searchview.xml index 23d46ef..febbe4a 100644 --- a/components/src/main/res/values-night/styles-searchview.xml +++ b/components/src/main/res/values-night/styles-searchview.xml @@ -6,34 +6,21 @@ @drawable/ic_arrow_back_sharp Search true - @null + @color/colorAccent @color/zebra_hint 10000dp + @color/colorAccent - \ No newline at end of file diff --git a/components/src/main/res/values-night/styles-tabs.xml b/components/src/main/res/values-night/styles-tabs.xml index ac583a0..28a7019 100644 --- a/components/src/main/res/values-night/styles-tabs.xml +++ b/components/src/main/res/values-night/styles-tabs.xml @@ -3,21 +3,23 @@ \ No newline at end of file diff --git a/components/src/main/res/values-night/styles-toolbar.xml b/components/src/main/res/values-night/styles-toolbar.xml index e655bba..c9aa7ec 100644 --- a/components/src/main/res/values-night/styles-toolbar.xml +++ b/components/src/main/res/values-night/styles-toolbar.xml @@ -2,18 +2,20 @@ \ No newline at end of file diff --git a/components/src/main/res/values-night/themes.xml b/components/src/main/res/values-night/themes.xml index 0c8e83b..9731c9f 100644 --- a/components/src/main/res/values-night/themes.xml +++ b/components/src/main/res/values-night/themes.xml @@ -2,17 +2,17 @@ - - - - + + + + diff --git a/components/src/main/res/values/styles-fab.xml b/components/src/main/res/values/styles-fab.xml index 4ca9a5f..a145e5c 100644 --- a/components/src/main/res/values/styles-fab.xml +++ b/components/src/main/res/values/styles-fab.xml @@ -11,7 +11,7 @@ @@ -39,10 +39,24 @@ 4dp + + + + - - - - - - - - - - \ No newline at end of file diff --git a/components/src/main/res/values/styles-searchview.xml b/components/src/main/res/values/styles-searchview.xml index 315c04c..5d28e41 100644 --- a/components/src/main/res/values/styles-searchview.xml +++ b/components/src/main/res/values/styles-searchview.xml @@ -4,8 +4,8 @@ - \ No newline at end of file diff --git a/components/src/main/res/values/styles-select-input.xml b/components/src/main/res/values/styles-select-input.xml index 2bcce5f..acdb62f 100644 --- a/components/src/main/res/values/styles-select-input.xml +++ b/components/src/main/res/values/styles-select-input.xml @@ -4,8 +4,9 @@ diff --git a/components/src/main/res/values/styles-toolbar.xml b/components/src/main/res/values/styles-toolbar.xml index 58b7ed6..5864549 100644 --- a/components/src/main/res/values/styles-toolbar.xml +++ b/components/src/main/res/values/styles-toolbar.xml @@ -2,20 +2,21 @@ - \ No newline at end of file diff --git a/components/src/main/res/values/text-styles.xml b/components/src/main/res/values/text-styles.xml index 1745cd8..ddbb52c 100644 --- a/components/src/main/res/values/text-styles.xml +++ b/components/src/main/res/values/text-styles.xml @@ -146,13 +146,4 @@ @color/textPrimaryVariant - - \ No newline at end of file diff --git a/components/src/main/res/values/themes.xml b/components/src/main/res/values/themes.xml index ba951c7..bdcaa4f 100644 --- a/components/src/main/res/values/themes.xml +++ b/components/src/main/res/values/themes.xml @@ -1,9 +1,11 @@ - +