fix: Updated colours to match Zeta (#5)

chore: Remove unnecessary icons from example app
chore: Add version to example app
feat: Add positive button variant
docs: Update button docs

Authored-by: mikecoomber <mike.coomber@zebra.com>
Co-authored-by: thelukewalton <lwalton@zebra.com>
Co-authored-by: github-actions <github-actions@github.com>

Author: 3 people

.github/workflows/on-release.yml

@@ -24,8 +24,8 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
       - name: Add environment variables
         run: |
-          echo "username=${{secrets.ARTIFACTORY_USERNAME}}" >> gradle.properties
-          echo "password=${{secrets.ARTIFACTORY_PASSWORD}}" >> gradle.properties 
+          echo "artifactoryusername=${{secrets.ARTIFACTORY_USERNAME}}" >> gradle.properties
+          echo "artifactorypassword=${{secrets.ARTIFACTORY_PASSWORD}}" >> gradle.properties 
           echo "zds-android-maven=${{secrets.ZDS_ANDROID_MAVEN}}" >> gradle.properties
 
       - name: Publish

app/src/main/java/com/zebra/zdsDemo/MainActivity.java

@@ -161,19 +161,21 @@ 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);
 
         // Setup support action bar
         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));
     }
 }

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);

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;
         }
 

app/src/main/java/com/zebra/zdsDemo/fragments/ListFragment.java

@@ -88,15 +88,15 @@ 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();
             }
 
             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");