diff --git a/build.gradle b/build.gradle
index 78254f2..fdae216 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,13 +2,18 @@
buildscript {
repositories {
- mavenCentral()
+ jcenter()
maven {
url "https://oss.sonatype.org/content/repositories/snapshots"
}
+ maven {
+ url 'https://maven.google.com/'
+ name 'Google'
+ }
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.5.0'
+ classpath 'com.android.tools.build:gradle:4.0.1'
+ classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
}
}
@@ -21,10 +26,17 @@ allprojects {
group = GROUP
repositories {
+ google()
+ jcenter()
+
mavenCentral()
maven {
url "https://oss.sonatype.org/content/repositories/snapshots"
}
+ maven {
+ url 'https://maven.google.com/'
+ name 'Google'
+ }
}
}
diff --git a/demo/src/main/res/layout/fragment_sample.xml b/demo/src/main/res/layout/fragment_sample.xml
index 25ce8a5..0195383 100644
--- a/demo/src/main/res/layout/fragment_sample.xml
+++ b/demo/src/main/res/layout/fragment_sample.xml
@@ -61,6 +61,7 @@
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:orientation="horizontal"
+ segmentedgroup:sc_text_color="@color/radio_button_text_color"
segmentedgroup:sc_border_width="1dp"
segmentedgroup:sc_corner_radius="5dp"
segmentedgroup:sc_tint_color="#009688">
diff --git a/demo/src/main/res/values/colors.xml b/demo/src/main/res/values/colors.xml
index 5b96dbd..4c1c989 100644
--- a/demo/src/main/res/values/colors.xml
+++ b/demo/src/main/res/values/colors.xml
@@ -1,5 +1,4 @@
#ff33b5e5
- @android:color/transparent
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index dc1d282..bf729ab 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/library/build.gradle b/library/build.gradle
index 66cb39e..3c9bef1 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -22,6 +22,7 @@ dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:support-annotations:23.2.0'
}
-
+apply plugin: 'com.github.dcendents.android-maven'
// Used to push in maven
-apply from: '../maven_push.gradle'
+//apply from: '../maven_push.gradle'
+group='com.github.MuhammadTouseeq'
\ No newline at end of file
diff --git a/library/src/main/java/info/hoang8f/android/segmented/SegmentedGroup.java b/library/src/main/java/info/hoang8f/android/segmented/SegmentedGroup.java
index 0cb1a0a..da2d652 100644
--- a/library/src/main/java/info/hoang8f/android/segmented/SegmentedGroup.java
+++ b/library/src/main/java/info/hoang8f/android/segmented/SegmentedGroup.java
@@ -27,6 +27,7 @@ public class SegmentedGroup extends RadioGroup {
private int mMarginDp;
private Resources resources;
private int mTintColor;
+ private int mTextColor;
private int mUnCheckedTintColor;
private int mCheckedTextColor = Color.WHITE;
private LayoutSelector mLayoutSelector;
@@ -39,6 +40,7 @@ public SegmentedGroup(Context context) {
super(context);
resources = getResources();
mTintColor = resources.getColor(R.color.radio_button_selected_color);
+ mTextColor = resources.getColor(R.color.radio_button_text_color);
mUnCheckedTintColor = resources.getColor(R.color.radio_button_unselected_color);
mMarginDp = (int) getResources().getDimension(R.dimen.radio_button_stroke_border);
mCornerRadius = getResources().getDimension(R.dimen.radio_button_conner_radius);
@@ -49,6 +51,8 @@ public SegmentedGroup(Context context, AttributeSet attrs) {
super(context, attrs);
resources = getResources();
mTintColor = resources.getColor(R.color.radio_button_selected_color);
+ mTextColor = resources.getColor(R.color.radio_button_text_color);
+
mUnCheckedTintColor = resources.getColor(R.color.radio_button_unselected_color);
mMarginDp = (int) getResources().getDimension(R.dimen.radio_button_stroke_border);
mCornerRadius = getResources().getDimension(R.dimen.radio_button_conner_radius);
@@ -75,7 +79,9 @@ private void initAttrs(AttributeSet attrs) {
mTintColor = typedArray.getColor(
R.styleable.SegmentedGroup_sc_tint_color,
getResources().getColor(R.color.radio_button_selected_color));
-
+ mTextColor = typedArray.getColor(
+ R.styleable.SegmentedGroup_sc_text_color,
+ getResources().getColor(R.color.radio_button_text_color));
mCheckedTextColor = typedArray.getColor(
R.styleable.SegmentedGroup_sc_checked_text_color,
getResources().getColor(android.R.color.white));
@@ -140,7 +146,7 @@ private void updateBackground(View view) {
ColorStateList colorStateList = new ColorStateList(new int[][]{
{-android.R.attr.state_checked},
{android.R.attr.state_checked}},
- new int[]{mTintColor, mCheckedTextColor});
+ new int[]{mTextColor, mCheckedTextColor});
((Button) view).setTextColor(colorStateList);
//Redraw with tint color
@@ -158,7 +164,7 @@ private void updateBackground(View view) {
maskDrawable.setStroke(mMarginDp, mTintColor);
maskDrawable.setColor(mUnCheckedTintColor);
maskDrawable.setCornerRadii(mLayoutSelector.getChildRadii(view));
- int maskColor = Color.argb(50, Color.red(mTintColor), Color.green(mTintColor), Color.blue(mTintColor));
+ int maskColor = Color.argb(50, Color.red(mTintColor), Color.green(mTintColor), Color.blue(mTintColor));
maskDrawable.setColor(maskColor);
LayerDrawable pressedDrawable = new LayerDrawable(new Drawable[] {uncheckedDrawable, maskDrawable});
diff --git a/library/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml
index 2c17aba..8d10faf 100644
--- a/library/src/main/res/values/attrs.xml
+++ b/library/src/main/res/values/attrs.xml
@@ -4,6 +4,7 @@
+
diff --git a/library/src/main/res/values/colors.xml b/library/src/main/res/values/colors.xml
index 737f955..b0a491c 100644
--- a/library/src/main/res/values/colors.xml
+++ b/library/src/main/res/values/colors.xml
@@ -1,5 +1,7 @@
#ff33b5e5
- #e0e0e0
+ #ffffff
+ #000000
+
\ No newline at end of file