Skip to content

Commit c8e1b29

Browse files
committed
Finish reform of spelling to match Android US spelling conventions
1 parent bc123da commit c8e1b29

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
Feel free to contribute in any way you'd like.
22

3-
To keep things internally consistent, please stick to UK English spellings. Depending on which is easiest for you, we can communicate in English, French, or German as necessary.
3+
To keep things internally consistent, please stick to US English spellings. Depending on which is easiest for you, we can communicate in English, French, or German as necessary.

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ dependencies {
4040
```
4141
## Documentation
4242

43-
Note: All customisation methods (`setAutoHide`, `setBarColour`, etc) return the `materialScrollBar`, so they can be chained together if wanted. Alternatively, you can just operate on a variable.
43+
Note: All customisation methods (`setAutoHide`, `setBarColor`, etc) return the `materialScrollBar`, so they can be chained together if wanted. Alternatively, you can just operate on a variable.
4444

4545
### How to use
4646

@@ -72,16 +72,16 @@ Option 2 - Touch
7272

7373
Additonal optional attributes:
7474

75-
* msb_handleColour - Colour
76-
* msb_barColour - Colour
77-
* msb_handleOffColour - Colour
78-
* msb_textColour - Colour
75+
* msb_handleColor - Color
76+
* msb_barColor - Color
77+
* msb_handleOffColor - Color
78+
* msb_textColor - Color
7979
* msb_barThickness - Integer
8080
* msb_rightToLeft - Boolean
8181

8282
Please note that for both of these configurations, both recyclerView and lightOnTouch* must have a valid value. The recyclerView attribute should point to the id of the `recyclerView` to which you want to link the scrollbar.
8383

84-
\* lightOnTouch behaves like this: A value of true will cause the handle to be grey until pressed, when it will become the normal accent colour (as set). A value of false will cause the handle to always have the accent colour, even when not being pressed.
84+
\* lightOnTouch behaves like this: A value of true will cause the handle to be grey until pressed, when it will become the normal accent color (as set). A value of false will cause the handle to always have the accent color, even when not being pressed.
8585

8686
------
8787

@@ -156,7 +156,7 @@ Material Scroll Bar:
156156
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
157157
See the License for the specific language governing permissions and
158158
limitations under the License.
159-
159+
160160
This licensing is applicable to all code offered as part of this
161161
repository, which can be identified by the lisence notice preceding
162162
the content AND/OR by its inclusion in a package starting with "com.
@@ -165,7 +165,7 @@ Material Scroll Bar:
165165
RecyclerView-FastScroll:
166166

167167
Copyright (C) 2016 Tim Malseed
168-
168+
169169
Licensed under the Apache License, Version 2.0 (the "License");
170170
you may not use this file except in compliance with the License.
171171
You may obtain a copy of the License at
@@ -179,7 +179,7 @@ RecyclerView-FastScroll:
179179
limitations under the License.
180180

181181
Launcher 3:
182-
182+
183183
Copyright (C) 2010 The Android Open Source Project
184184

185185
Licensed under the Apache License, Version 2.0 (the "License");

lib/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apply plugin: 'com.android.library'
22

3-
def libVersion = '12.5.1'
3+
def libVersion = '13.0.0'
44

55
android {
66
compileSdkVersion 26

lib/src/main/res/values/attrs.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
<declare-styleable name="MaterialScrollBar">
2121
<attr name="msb_recyclerView" format="reference"/>
2222
<attr name="msb_lightOnTouch" format="boolean|reference"/>
23-
<attr name="msb_handleColour" format="color|reference"/>
24-
<attr name="msb_barColour" format="color|reference"/>
25-
<attr name="msb_handleOffColour" format="color|reference"/>
26-
<attr name="msb_textColour" format="color|reference"/>
23+
<attr name="msb_handleColor" format="color|reference"/>
24+
<attr name="msb_barColor" format="color|reference"/>
25+
<attr name="msb_handleOffColor" format="color|reference"/>
26+
<attr name="msb_textColor" format="color|reference"/>
2727
<attr name="msb_barThickness" format="dimension|reference"/>
2828
<attr name="msb_rightToLeft" format="boolean|reference"/>
2929
</declare-styleable>

0 commit comments

Comments
 (0)