Skip to content

Commit ffdb254

Browse files
committed
feat: unify indicator colors to colorPrimary and bump version to v1.0.6
1 parent 9da5d6b commit ffdb254

3 files changed

Lines changed: 5 additions & 10 deletions

File tree

demo/src/main/res/drawable/contained.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
android:strokeColor="#00000000"
1111
android:pathData="M204.811584,306.222168 C139.828201,296.059143 93.946114,241.540558 95.138779,176.362564 C96.380989,108.476791 152.888931,52.444736 220.766998,51.792332 C286.145782,51.163952 340.232605,97.394440 349.652435,161.956619 C360.312500,235.018967 304.974182,302.921417 231.153915,307.067230 C222.560928,307.549866 213.886459,306.581360 204.811584,306.222168 M152.883652,235.713425 C154.043457,236.369400 155.131470,237.252426 156.374405,237.645416 C166.279266,240.777054 172.854568,247.466675 178.427963,256.092712 C185.240265,266.636230 198.850494,270.528564 211.330673,266.271790 C219.092697,263.624329 226.526901,263.551666 234.295227,266.157471 C248.436493,270.901001 262.032471,265.934692 269.708282,253.189056 C273.762482,246.457062 279.243073,241.863190 286.494110,238.962906 C301.026550,233.150131 308.049713,220.929611 305.611206,205.565018 C304.434113,198.148209 305.648102,191.368317 309.247437,184.864456 C316.768005,171.275070 314.439850,157.443069 302.783691,146.960434 C296.865784,141.638351 293.260590,135.262772 291.768280,127.358780 C289.137054,113.422653 277.801117,104.001564 263.558075,103.623619 C255.435333,103.408081 248.326065,101.063713 241.897873,95.928703 C230.163177,86.554710 215.870682,86.524796 204.215179,95.852592 C197.944321,100.871124 191.037796,103.358452 183.085785,103.605209 C167.805832,104.079369 157.074921,113.152641 154.065063,128.214523 C152.639786,135.346802 149.397690,141.263123 144.049850,146.188232 C131.135910,158.081390 129.086227,169.899719 137.156174,185.626068 C140.380859,191.910187 141.524475,198.370270 140.387146,205.429810 C138.418747,217.647980 142.233582,227.766434 152.883652,235.713425 z" />
1212
<path
13-
android:fillColor="?attr/colorOnPrimaryContainer"
13+
android:fillColor="?attr/colorPrimary"
1414
android:strokeColor="#00000000"
1515
android:pathData="M152.587799,235.503052 C142.233582,227.766434 138.418747,217.647980 140.387146,205.429810 C141.524475,198.370270 140.380859,191.910187 137.156174,185.626068 C129.086227,169.899719 131.135910,158.081390 144.049850,146.188232 C149.397690,141.263123 152.639786,135.346802 154.065063,128.214523 C157.074921,113.152641 167.805832,104.079369 183.085785,103.605209 C191.037796,103.358452 197.944321,100.871124 204.215179,95.852592 C215.870682,86.524796 230.163177,86.554710 241.897873,95.928703 C248.326065,101.063713 255.435333,103.408081 263.558075,103.623619 C277.801117,104.001564 289.137054,113.422653 291.768280,127.358780 C293.260590,135.262772 296.865784,141.638351 302.783691,146.960434 C314.439850,157.443069 316.768005,171.275070 309.247437,184.864456 C305.648102,191.368317 304.434113,198.148209 305.611206,205.565018 C308.049713,220.929611 301.026550,233.150131 286.494110,238.962906 C279.243073,241.863190 273.762482,246.457062 269.708282,253.189056 C262.032471,265.934692 248.436493,270.901001 234.295227,266.157471 C226.526901,263.551666 219.092697,263.624329 211.330673,266.271790 C198.850494,270.528564 185.240265,266.636230 178.427963,256.092712 C172.854568,247.466675 166.279266,240.777054 156.374405,237.645416 C155.131470,237.252426 154.043457,236.369400 152.587799,235.503052 z" />
1616
</vector>

refresh/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ android {
1111
minSdk 26
1212
targetSdk 36
1313
versionCode 1
14-
versionName "1.0.5"
14+
versionName "1.0.6"
1515

1616
consumerProguardFiles 'consumer-rules.pro'
1717
}
@@ -51,7 +51,7 @@ afterEvaluate {
5151
release(MavenPublication) {
5252
groupId = 'com.github.Netsnake-TN'
5353
artifactId = 'ExpressivepullToRefresh'
54-
version = '1.0.5'
54+
version = '1.0.6'
5555
from components.release
5656
}
5757
}

refresh/src/main/java/com/expressive/refresh/ExpressivePullToRefresh.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,10 @@ public ExpressivePullToRefresh(@NonNull Context context, @Nullable AttributeSet
116116
}
117117

118118
private void updateColors(Context context) {
119-
if (mCurrentStyle == STYLE_CONTAINED) {
120119
mColors = new int[]{
121-
MaterialColors.getColor(context, com.google.android.material.R.attr.colorOnPrimaryContainer, 0xFF21005D)
120+
MaterialColors.getColor(context, androidx.appcompat.R.attr.colorPrimary, 0xFF21005D)
122121
};
123-
} else {
124-
mColors = new int[]{
125-
MaterialColors.getColor(context, androidx.appcompat.R.attr.colorPrimary, 0xFF6750A4)
126-
};
127-
}
122+
128123
}
129124

130125
private void setupProgressIndicator(int style) {

0 commit comments

Comments
 (0)