fixed canvas.restore issue

ceryle · May 2, 2017 · d8e8d40 · d8e8d40
1 parent 59dfdd6
commit d8e8d40
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 13 deletions.
diff --git a/library/build.gradle b/library/build.gradle
@@ -6,7 +6,6 @@ group = 'com.github.ceryle'
 android {
     compileSdkVersion 25
     buildToolsVersion "25.0.2"
-    enforceUniquePackageName = false
 
     defaultConfig {
         minSdkVersion 11
@@ -47,5 +46,5 @@ artifacts {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:25.2.0'
+    compile 'com.android.support:appcompat-v7:25.3.1'
 }
diff --git a/library/src/main/java/co/ceryle/segmentedbutton/SegmentedButton.java b/library/src/main/java/co/ceryle/segmentedbutton/SegmentedButton.java
@@ -370,6 +370,7 @@ protected void onDraw(Canvas canvas) {
 
             canvas.restore();
         }
+        canvas.save();
 
         // Bitmap normal
         if (hasDrawable) {

diff --git a/library/src/main/java/co/ceryle/segmentedbutton/SegmentedButtonGroup.java b/library/src/main/java/co/ceryle/segmentedbutton/SegmentedButtonGroup.java
@@ -204,11 +204,6 @@ protected void onDraw(Canvas canvas) {
         }
     }
 
-    @Override
-    protected void dispatchDraw(Canvas canvas) {
-        super.dispatchDraw(canvas);
-    }
-
     private void setBackgroundColor(View v, Drawable d, int c) {
         if (null != d) {
             BackgroundHelper.setBackground(v, d);

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -3,10 +3,9 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 25
     buildToolsVersion "25.0.2"
-    enforceUniquePackageName = false
 
     defaultConfig {
-        applicationId "co.ceryle.segmentedbutton"
+        applicationId "co.ceryle.segmentedbutton.sample"
         minSdkVersion 11
         targetSdkVersion 25
         versionCode 1
@@ -23,6 +22,6 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:25.2.0'
+    compile 'com.android.support:appcompat-v7:25.3.1'
     compile project(":library")
 }
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="co.ceryle.segmentedbutton"
+<manifest package="co.ceryle.segmentedbutton.sample"
           xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
@@ -8,7 +8,7 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="co.ceryle.segmentedbutton.MainActivity">
+        <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 

diff --git a/.../ceryle/segmentedbutton/MainActivity.java → .../segmentedbutton/sample/MainActivity.java b/.../ceryle/segmentedbutton/MainActivity.java → .../segmentedbutton/sample/MainActivity.java
@@ -1,11 +1,13 @@
-package co.ceryle.segmentedbutton;
+package co.ceryle.segmentedbutton.sample;
 
 import android.os.Handler;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 
+import co.ceryle.segmentedbutton.SegmentedButtonGroup;
+
 public class MainActivity extends AppCompatActivity {
 
     private Button button;