chore: new core-tabs package

Author: farfromrefug

packages/bottom-navigation/package.json

@@ -51,7 +51,8 @@
     },
     "readmeFilename": "README.md",
     "dependencies": {
-        "@nativescript-community/ui-material-core": "^6.2.20"
+        "@nativescript-community/ui-material-core": "^6.2.20",
+        "@nativescript-community/ui-material-core-tabs": "^6.2.20"
     },
     "gitHead": "f4a17600487dd826a4a581f2ebde8cf6457710ca"
 }

packages/bottom-navigation/tsconfig.json

@@ -6,6 +6,7 @@
         "paths": {
             "@nativescript-community/ui-material-core": ["packages/core/index"],
             "@nativescript-community/ui-material-core/*": ["packages/core/*"],
+            "@nativescript-community/ui-material-core-tabs/*": ["packages/core-tabs/*"],
         }
     },
     "include": ["../../src/bottom-navigation/**/*.ts", "../../references.d.ts", "../../src/references.d.ts"],

packages/core-tabs/.npmignore

@@ -0,0 +1,9 @@
+node_modules/
+pnpm-global/
+bin/
+src/
+hooks/
+*.ts
+*.old
+tsconfig.json
+!*.d.ts

packages/core-tabs/README.md

@@ -0,0 +1,5 @@
+# Nativescript Material Core
+
+[npm-url]:https://npmjs.org/package/nativescript-material-components
+
+Core module for all Nativescript material components

packages/core-tabs/package.json

@@ -0,0 +1,45 @@
+{
+    "name": "@nativescript-community/ui-material-core-tabs",
+    "version": "6.2.20",
+    "description": "Material Core Tabs component",
+    "main": "./index",
+    "sideEffects": false,
+    "typings": "./index.d.ts",
+    "scripts": {
+        "tsc": "../../node_modules/.bin/cpy '**/*.d.ts' '../../packages/core-tabs' --cwd=../../src/core-tabs --parents && ../../node_modules/.bin/tsc -d",
+        "tsc-win": "..\\..\\node_modules\\.bin\\cpy '**/*.d.ts' '..\\..\\packages\\core-tabs' --cwd=..\\..\\src\\core-tabs --parents && ..\\..\\node_modules\\.bin\\tsc -d",
+        "build": "npm run tsc ",
+        "build.watch": "npm run tsc -- -w",
+        "build.win": "npm run tsc-win ",
+        "build.all": "npm run build.hooks && npm run build",
+        "build.all.win": "npm run build.hooks.win && npm run build.win",
+        "clean": "../../node_modules/.bin/rimraf ./*.d.ts ./*.js ./*.js.map android"
+    },
+    "nativescript": {
+        "platforms": {
+            "android": "6.2.0",
+            "ios": "6.2.0"
+        }
+    },
+    "keywords": [
+        "NativeScript",
+        "JavaScript",
+        "Android",
+        "iOS"
+    ],
+    "author": {
+        "name": "Martin Guillon",
+        "email": "[email protected]"
+    },
+    "bugs": {
+        "url": "https://github.com/nativescript-community/ui-material-components/issues"
+    },
+    "license": "Apache-2.0",
+    "homepage": "https://github.com/nativescript-community/ui-material-components",
+    "repository": "https://github.com/nativescript-community/ui-material-components",
+    "readmeFilename": "README.md",
+    "dependencies": {
+        "@nativescript-community/ui-material-core": "^6.2.20"
+    },
+    "gitHead": "f4a17600487dd826a4a581f2ebde8cf6457710ca"
+}

packages/core-tabs/platforms/android/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.nativescript.material.coretabs"/>

packages/core-tabs/platforms/android/include.gradle

@@ -0,0 +1,5 @@
+
+dependencies {
+	def androidxViewPager2Version =  project.hasProperty("androidxViewPager2Version") ? project.androidxViewPager2Version : "1.0.0"
+	implementation "androidx.viewpager2:viewpager2:$androidxViewPager2Version"
+}

packages/core/platforms/android/java/com/nativescript/material/core/BottomNavigationBar.java renamed to packages/core-tabs/platforms/android/java/com/nativescript/material/core/BottomNavigationBar.java

@@ -287,8 +287,8 @@ public void setSelectedPosition(int position) {
             return;
         }
 
-        mTabStrip.setSelectedPosition(position);
         onSelectedPositionChange(position, prevPosition);
+        mTabStrip.setSelectedPosition(position);
     }
 
     public void setContentDescription(int i, String desc) {

packages/core/platforms/android/java/com/nativescript/material/core/TabItemSpec.java renamed to packages/core-tabs/platforms/android/java/com/nativescript/material/core/TabItemSpec.java

@@ -23,6 +23,7 @@
 import android.graphics.Paint;
 import android.util.AttributeSet;
 import android.util.TypedValue;
+import android.util.Log;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -45,7 +46,6 @@ class TabStrip extends LinearLayout {
     private int mSelectedPosition;
     private float mSelectionOffset;
 
-    private TabLayout.TabColorizer mCustomTabColorizer;
     private final SimpleTabColorizer mDefaultTabColorizer;
 
     private int mTabTextColor;
@@ -94,14 +94,7 @@ class TabStrip extends LinearLayout {
         setMeasureWithLargestChildEnabled(true);
     }
 
-    void setCustomTabColorizer(TabLayout.TabColorizer customTabColorizer) {
-        mCustomTabColorizer = customTabColorizer;
-        invalidate();
-    }
-
     void setSelectedIndicatorColors(int... colors) {
-        // Make sure that the custom colorizer is removed
-        mCustomTabColorizer = null;
         mDefaultTabColorizer.setIndicatorColors(colors);
         invalidate();
     }
@@ -128,12 +121,24 @@ void setShouldUpdateTabsTextColor(boolean value) {
         mShouldUpdateTabsTextColor = value;
     }
 
+
+    private void updateTabTextColor(int index, boolean selected){
+        if (mShouldUpdateTabsTextColor) {
+            TextView textView = getTextViewAt(index);
+            if (selected){
+                textView.setTextColor(mSelectedTabTextColor);
+            }
+            else {
+                textView.setTextColor(mTabTextColor);
+            }
+        }
+    }
+
     private void updateTabsTextColor(){
         if (mShouldUpdateTabsTextColor) {
             final int childCount = getChildCount();
             for (int i = 0; i < childCount; i++){
-                LinearLayout linearLayout = (LinearLayout)getChildAt(i);
-                TextView textView = (TextView)linearLayout.getChildAt(1);
+                TextView textView = getTextViewAt(i);
                 if (i == mSelectedPosition){
                     textView.setTextColor(mSelectedTabTextColor);
                 }
@@ -153,26 +158,21 @@ float getTabTextFontSize(){
         return mTabTextFontSize;
     }
 
+    private TextView getTextViewAt(int index) {
+        LinearLayout linearLayout = (LinearLayout)getChildAt(index);
+        return (TextView)linearLayout.getChildAt(1);
+    }
+
     private void updateTabsTextFontSize(){
         final int childCount = getChildCount();
         for (int i = 0; i < childCount; i++){
-            LinearLayout linearLayout = (LinearLayout)getChildAt(i);
-            TextView textView = (TextView)linearLayout.getChildAt(1);
+            TextView textView = getTextViewAt(i);
             textView.setTextSize(mTabTextFontSize);
         }
     }
 
-    // Used by TabLayout (the 'old' tab-view control)
-    void onViewPagerPageChanged(int position, float positionOffset) {
-        mSelectedPosition = position;
-        mSelectionOffset = positionOffset;
-        invalidate();
-        updateTabsTextColor();
-    }
 
-    // Used by TabsBar
     void onTabsViewPagerPageChanged(int position, float positionOffset) {
-        mSelectedPosition = position;
         mSelectionOffset = positionOffset;
         invalidate();
     }
@@ -182,9 +182,14 @@ int getSelectedPosition(){
     }
 
     void setSelectedPosition(int position) {
-        mSelectedPosition = position;
-        invalidate();
-        updateTabsTextColor();
+        if (mSelectedPosition != position) {
+            getChildAt(mSelectedPosition).setSelected(false);
+            getChildAt(position).setSelected(true);
+            updateTabTextColor(mSelectedPosition, false);
+            updateTabTextColor(position, false);
+            mSelectedPosition = position;
+            invalidate();
+        }
     }
 
     @Override
@@ -193,9 +198,7 @@ protected void dispatchDraw(Canvas canvas) {
 
         final int height = getHeight();
         final int childCount = getChildCount();
-        final TabLayout.TabColorizer tabColorizer = mCustomTabColorizer != null
-                ? mCustomTabColorizer
-                : mDefaultTabColorizer;
+        final SimpleTabColorizer tabColorizer = mDefaultTabColorizer;
 
         // Thick colored underline below the current selection
         if (childCount > 0 && mSelectedPosition < childCount) {
@@ -249,10 +252,9 @@ private static int blendColors(int color1, int color2, float ratio) {
         return Color.rgb((int) r, (int) g, (int) b);
     }
 
-    private static class SimpleTabColorizer implements TabLayout.TabColorizer {
+    private static class SimpleTabColorizer {
         private int[] mIndicatorColors;
 
-        @Override
         public final int getIndicatorColor(int position) {
             return mIndicatorColors[position % mIndicatorColors.length];
         }