Skip to content

Commit

Permalink
Finish reform of spelling to match Android US spelling conventions
Browse files Browse the repository at this point in the history
  • Loading branch information
turing-tech committed Aug 6, 2017
1 parent bc123da commit c8e1b29
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
@@ -1,3 +1,3 @@
Feel free to contribute in any way you'd like.

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.
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.
18 changes: 9 additions & 9 deletions README.md
Expand Up @@ -40,7 +40,7 @@ dependencies {
```
## Documentation

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.
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.

### How to use

Expand Down Expand Up @@ -72,16 +72,16 @@ Option 2 - Touch

Additonal optional attributes:

* msb_handleColour - Colour
* msb_barColour - Colour
* msb_handleOffColour - Colour
* msb_textColour - Colour
* msb_handleColor - Color
* msb_barColor - Color
* msb_handleOffColor - Color
* msb_textColor - Color
* msb_barThickness - Integer
* msb_rightToLeft - Boolean

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.

\* 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.
\* 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.

------

Expand Down Expand Up @@ -156,7 +156,7 @@ Material Scroll Bar:
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

This licensing is applicable to all code offered as part of this
repository, which can be identified by the lisence notice preceding
the content AND/OR by its inclusion in a package starting with "com.
Expand All @@ -165,7 +165,7 @@ Material Scroll Bar:
RecyclerView-FastScroll:

Copyright (C) 2016 Tim Malseed

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
Expand All @@ -179,7 +179,7 @@ RecyclerView-FastScroll:
limitations under the License.

Launcher 3:

Copyright (C) 2010 The Android Open Source Project

Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
2 changes: 1 addition & 1 deletion lib/build.gradle
@@ -1,6 +1,6 @@
apply plugin: 'com.android.library'

def libVersion = '12.5.1'
def libVersion = '13.0.0'

android {
compileSdkVersion 26
Expand Down
8 changes: 4 additions & 4 deletions lib/src/main/res/values/attrs.xml
Expand Up @@ -20,10 +20,10 @@
<declare-styleable name="MaterialScrollBar">
<attr name="msb_recyclerView" format="reference"/>
<attr name="msb_lightOnTouch" format="boolean|reference"/>
<attr name="msb_handleColour" format="color|reference"/>
<attr name="msb_barColour" format="color|reference"/>
<attr name="msb_handleOffColour" format="color|reference"/>
<attr name="msb_textColour" format="color|reference"/>
<attr name="msb_handleColor" format="color|reference"/>
<attr name="msb_barColor" format="color|reference"/>
<attr name="msb_handleOffColor" format="color|reference"/>
<attr name="msb_textColor" format="color|reference"/>
<attr name="msb_barThickness" format="dimension|reference"/>
<attr name="msb_rightToLeft" format="boolean|reference"/>
</declare-styleable>
Expand Down

0 comments on commit c8e1b29

Please sign in to comment.