From 861e458b51281f8a39ecd1fdf1546513aaaf0ad1 Mon Sep 17 00:00:00 2001 From: Den Drobiazko Date: Thu, 17 Dec 2015 15:30:49 +0200 Subject: [PATCH 1/3] Patch .gitignore, remove redundant file from version-control --- .gitignore | 1 + app/app.iml | 101 ---------------------------------------------------- 2 files changed, 1 insertion(+), 101 deletions(-) delete mode 100644 app/app.iml diff --git a/.gitignore b/.gitignore index 144cfe7..b62d661 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ .idea /library/build *.iml +**/*.iml diff --git a/app/app.iml b/app/app.iml deleted file mode 100644 index a6444d1..0000000 --- a/app/app.iml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From cb5368abff7b9b4453cb0de612b261ced8e751a7 Mon Sep 17 00:00:00 2001 From: Den Drobiazko Date: Thu, 17 Dec 2015 15:32:52 +0200 Subject: [PATCH 2/3] Update build versions, version up --- app/build.gradle | 6 +++--- library/AndroidManifest.xml | 4 ++-- library/build.gradle | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 735cbe1..039c27a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 23 - buildToolsVersion "23.0.1" + buildToolsVersion "23.0.2" defaultConfig { applicationId "io.techery.properratingbar.sample" @@ -22,8 +22,8 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:23.0.1' - compile 'com.android.support:design:23.0.1' + compile 'com.android.support:appcompat-v7:23.1.1' + compile 'com.android.support:design:23.1.1' compile 'com.jakewharton:butterknife:7.0.1' compile project(':library') } diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml index 7cbb7f4..ffc9b26 100644 --- a/library/AndroidManifest.xml +++ b/library/AndroidManifest.xml @@ -1,5 +1,5 @@ diff --git a/library/build.gradle b/library/build.gradle index 18f06e1..e3fb74a 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -5,7 +5,7 @@ group = "io.techery" android { compileSdkVersion 23 - buildToolsVersion "23.0.1" + buildToolsVersion "23.0.2" defaultConfig { minSdkVersion 14 @@ -25,5 +25,5 @@ repositories { mavenCentral() } dependencies { - compile 'com.android.support:support-annotations:23.0.1' + compile 'com.android.support:support-annotations:23.1.1' } From aafca8d87d81bd2cb1b97b690df44404c60e2dcd Mon Sep 17 00:00:00 2001 From: Den Drobiazko Date: Thu, 17 Dec 2015 15:33:45 +0200 Subject: [PATCH 3/3] Add ability to set symbolic tick programmatically, update sample --- .../properratingbarsample/MainActivity.java | 21 +++++++++--- app/src/main/res/layout/content_main.xml | 12 ++++++- app/src/main/res/values/strings.xml | 1 + .../properratingbar/ProperRatingBar.java | 33 ++++++++++++++++--- 4 files changed, 56 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/io/techery/properratingbarsample/MainActivity.java b/app/src/main/java/io/techery/properratingbarsample/MainActivity.java index dd7df9e..48ee587 100644 --- a/app/src/main/java/io/techery/properratingbarsample/MainActivity.java +++ b/app/src/main/java/io/techery/properratingbarsample/MainActivity.java @@ -16,8 +16,12 @@ public class MainActivity extends AppCompatActivity { @Bind(R.id.rootView) ViewGroup rootView; - @Bind(R.id.ratingBar) - ProperRatingBar ratingBar; + @Bind(R.id.upperRatingBar) + ProperRatingBar upperRatingBar; + @Bind(R.id.lowerRatingBar) + ProperRatingBar lowerRatingBar; + + private String[] ticksArray = new String[] {"$", "★"}; @Override protected void onCreate(Bundle savedInstanceState) { @@ -27,17 +31,24 @@ protected void onCreate(Bundle savedInstanceState) { Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); // - ratingBar.setListener(ratingListener); + lowerRatingBar.setListener(ratingListener); + } + + @OnClick(R.id.toggleTick) void toggleTick() { // here goes shit-code. No time to do properly + String tick; + if (upperRatingBar.getSymbolicTick().equals(ticksArray[0])) tick = ticksArray[1]; + else tick = ticksArray[0]; + upperRatingBar.setSymbolicTick(tick); } @OnClick(R.id.getRatingButton) void getRatingClicked() { Snackbar.make(rootView, - String.format(getString(R.string.get_rating_snack_caption_format), ratingBar.getRating()), + String.format(getString(R.string.get_rating_snack_caption_format), lowerRatingBar.getRating()), Snackbar.LENGTH_SHORT).show(); } @OnClick(R.id.setRatingButton) void setRatingClicked() { - ratingBar.setRating(2); + lowerRatingBar.setRating(2); Snackbar.make(rootView, R.string.set_rating_snack_caption, Snackbar.LENGTH_SHORT).show(); } diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml index 7b6f83d..7ca04f6 100644 --- a/app/src/main/res/layout/content_main.xml +++ b/app/src/main/res/layout/content_main.xml @@ -23,6 +23,7 @@ /> +