Skip to content
This repository has been archived by the owner on Feb 28, 2024. It is now read-only.

Small change to the discrete Slider to allow it to constantly display the value #246

Open
wants to merge 31 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
7ac9cca
Merge pull request #1 from rey5137/dev
rey5137 Mar 18, 2015
9c440de
Merge pull request #2 from rey5137/dev
rey5137 Mar 26, 2015
6fa7f6b
Merge pull request #3 from rey5137/dev
rey5137 Mar 27, 2015
ca65d1a
Merge pull request #4 from rey5137/dev
rey5137 Mar 27, 2015
aff0f07
Update README.md
rey5137 Mar 27, 2015
c32788c
Merge pull request #9 from rey5137/dev
rey5137 Mar 30, 2015
388bb69
Update README.md
rey5137 Apr 1, 2015
de96d63
Update README.md
rey5137 Apr 1, 2015
68f60b4
Update README.md
rey5137 Apr 1, 2015
8509171
Update README.md
rey5137 Apr 1, 2015
1d3c3c7
Merge pull request #15 from rey5137/dev
rey5137 Apr 2, 2015
ac83d8f
Merge pull request #27 from rey5137/dev
rey5137 Apr 7, 2015
88c9f3b
Update README.md
rey5137 Apr 7, 2015
837689a
Update README.md
rey5137 Apr 7, 2015
148a308
Update README.md
rey5137 Apr 7, 2015
f0b0bd5
Update README.md
rey5137 Apr 15, 2015
8764cb0
Update README.md
rey5137 Apr 16, 2015
9971266
Update README.md
rey5137 Apr 16, 2015
6fdd94f
Update README.md
rey5137 May 14, 2015
9a197b0
Update README.md
rey5137 May 14, 2015
de57877
Merge pull request #102 from rey5137/dev
rey5137 May 14, 2015
8217833
Merge pull request #109 from rey5137/dev
rey5137 May 19, 2015
6cf08c9
Update README.md
rey5137 May 19, 2015
40acc72
Update README.md
rey5137 May 19, 2015
608f254
Merge pull request #202 from rey5137/dev
rey5137 Jul 25, 2015
3f641c7
Update README.md
rey5137 Jul 25, 2015
a5a76e2
Merge pull request #203 from rey5137/dev
rey5137 Jul 25, 2015
1f103c3
Update README.md
rey5137 Jul 25, 2015
f0cbf12
Update README.md
rey5137 Aug 26, 2015
8920687
Added option to constantly display value on discrete slider
shalskar Sep 11, 2015
bfaca18
Removed keystore for non-release
shalskar Sep 11, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Material.iml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="Material" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.github.rey5137" external.system.module.version="1.2.1" type="JAVA_MODULE" version="4">
<module external.linked.project.id="material" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.github.rey5137" external.system.module.version="1.2.1" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
Expand All @@ -8,7 +8,7 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
Expand Down
175 changes: 173 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,175 @@
Material
========
=====================

A library to bring Material Design UI to pre-Lolipop Android.
[![Maven Central](https://img.shields.io/maven-central/v/com.github.rey5137/material.svg)](https://oss.sonatype.org/content/repositories/releases/com/github/rey5137/material/1.2.1/material-1.2.1.aar) [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-Material-brightgreen.svg?style=flat)](http://android-arsenal.com/details/1/1685)

MaterialLibrary is an Open Source Android library that back-port Material Design components to pre-Lolipop Android. MaterialLibrary's original author is [Rey Pham](https://github.com/rey5137).

* [Features](#features)
* [Demo](#demo)
* [Getting Started](#getting-started)
* [Donation](#donation)
* [Contributing](#contributing)

##Features
- [Progress](https://github.com/rey5137/Material/wiki/Progress)
- Circular

![](https://github.com/rey5137/Material/raw/master/image/progress_circular_indeterminate.gif) ![](https://github.com/rey5137/Material/raw/master/image/progress_circular_determinate.gif)
- Linear

![](https://github.com/rey5137/Material/raw/master/image/progress_linear_indeterminate.gif)
![](https://github.com/rey5137/Material/raw/master/image/progress_linear_determinate.gif)
![](https://github.com/rey5137/Material/raw/master/image/progress_linear_query.gif)
![](https://github.com/rey5137/Material/raw/master/image/progress_linear_buffer.gif)

- [Button](https://github.com/rey5137/Material/wiki/Button)

![](https://github.com/rey5137/Material/raw/master/image/button_raise_touch.gif) ![](https://github.com/rey5137/Material/raw/master/image/button_raise_wave.gif)

![](https://github.com/rey5137/Material/raw/master/image/fab_image.gif) ![](https://github.com/rey5137/Material/raw/master/image/fab_line.gif)

- [Switch](https://github.com/rey5137/Material/wiki/Switch)

![](https://github.com/rey5137/Material/raw/master/image/cb.gif)

![](https://github.com/rey5137/Material/raw/master/image/rb.gif)

![](https://github.com/rey5137/Material/raw/master/image/switch.gif)

- [Slider](https://github.com/rey5137/Material/wiki/Slider)

![](https://github.com/rey5137/Material/raw/master/image/slider_continuous.gif)

![](https://github.com/rey5137/Material/raw/master/image/slider_discrete.gif)

- [Spinner](https://github.com/rey5137/Material/wiki/Spinner)

![](https://github.com/rey5137/Material/raw/master/image/spn.gif)

- [Text Field](https://github.com/rey5137/Material/wiki/Text-Field)

![](https://github.com/rey5137/Material/raw/master/image/textfield.gif)

- [TabPageIndicator](https://github.com/rey5137/Material/wiki/TabPageIndicator)

![](https://github.com/rey5137/Material/raw/master/image/tpi.gif)

- [SnackBar](https://github.com/rey5137/Material/wiki/SnackBar)

![](https://github.com/rey5137/Material/raw/master/image/snackbar.png)

- [Dialog](https://github.com/rey5137/Material/wiki/Dialog)

![](https://github.com/rey5137/Material/raw/master/image/dialog_3.png) ![](https://github.com/rey5137/Material/raw/master/image/dialog_4.png)

- [BottomSheetDialog](https://github.com/rey5137/Material/wiki/BottomSheet)

![](https://github.com/rey5137/Material/raw/master/image/bottomsheet.gif)

- [Dynamic theme](https://github.com/rey5137/Material/wiki/Theme)

![](https://github.com/rey5137/Material/raw/master/image/theme.gif)

## Demo

<a href="https://play.google.com/store/apps/details?id=com.rey.material.demo">
<img alt="Get it on Google Play"
src="https://developer.android.com/images/brand/en_generic_rgb_wo_60.png" />
</a>

Or try it [here](https://appetize.io/app/dxznk4bqkbzu6tr5qgrzpfhayc).

## Getting Started

Add Gradle dependency:

```gradle
dependencies {
compile 'com.github.rey5137:material:1.2.1'
}
```

* Or
[Download from Maven](https://oss.sonatype.org/content/repositories/releases/com/github/rey5137/material/1.2.1/material-1.2.1.aar)

You can try the SNAPSHOT version:

```gradle
dependencies {
compile 'com.github.rey5137:material:1.2.1.6-SNAPSHOT'
}
```
Make sure to add the snapshot repository:

```gradle
repositories {
maven {
url "https://oss.sonatype.org/content/repositories/snapshots"
}
}
```

AppCompat and CardView library is required by Material library.

```gradle
dependencies {
compile 'com.android.support:appcompat-v7:22.2.1'
compile 'com.android.support:cardview-v7:22.2.1'
}
```
Now you can use any widget in **com.rey.material.widget** package as you wish. For styling, please view [Wiki](https://github.com/rey5137/Material/wiki). Note that default style of widgets depend on theme of AppCompat. Here is an example:

```xml
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- Customize your theme here. -->

<!-- colorPrimary is used for the default action bar background -->
<item name="colorPrimary">@color/colorPrimary</item>

<!-- colorPrimaryDark is used for the status bar -->
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>

<!-- colorAccent is used as the default value for colorControlActivated
which is used to tint widgets -->
<item name="colorAccent">@color/colorAccent</item>

<!-- You can also set colorControlNormal, colorControlActivated
colorControlHighlight & colorSwitchThumbNormal. -->
</style>
```

## Donation
You can support the project and thank the author for his hard work.

<a href='https://pledgie.com/campaigns/28714'><img alt='Click here to lend your support to: Support Material Library project. and make a donation at pledgie.com !' src='https://pledgie.com/campaigns/28714.png?skin_name=chrome' border='0' ></a>

**PayPal**
- [Donate] (https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=pea5137%40gmail%2ecom&lc=US&item_name=Rey%20Pham&no_note=0&currency_code=USD&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHostedGuest)

## Contributing
Want to contribute? You are welcome!
Note that all pull request should go to `dev` branch.

Developed By
------------

* Rey Pham - <[email protected]>


License
--------

Copyright 2015 Rey Pham.

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

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
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.
8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ android {

signingConfigs {
release {
storeFile file(MATERIAL_KEYSTORE_FILE)
storePassword MATERIAL_KEYSTORE_PASSWORD
keyAlias MATERIAL_KEYSTORE_ALIAS
keyPassword MATERIAL_KEYSTORE_PASSWORD
// storeFile file(MATERIAL_KEYSTORE_FILE)
// storePassword MATERIAL_KEYSTORE_PASSWORD
// keyAlias MATERIAL_KEYSTORE_ALIAS
// keyPassword MATERIAL_KEYSTORE_PASSWORD
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/fragment_slider.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
android:gravity="center"
android:padding="16dp"
app:sl_value="50"
app:v_styleId="@array/slider"/>
app:v_styleId="@array/slider" />

<com.rey.material.widget.TextView
android:id="@+id/slider_tv_continuous"
Expand Down
15 changes: 7 additions & 8 deletions lib/lib.iml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
<afterSyncTasks>
<task>generateDebugAndroidTestSources</task>
<task>generateDebugSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
Expand All @@ -25,7 +27,7 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
<exclude-output />
Expand Down Expand Up @@ -63,7 +65,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
Expand All @@ -83,16 +84,14 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
<orderEntry type="library" exported="" name="cardview-v7-22.2.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
<orderEntry type="library" exported="" name="cardview-v7-22.2.0" level="project" />
</component>
</module>
Loading