diff --git a/app/build.gradle b/app/build.gradle index dcd0c56..c6934f2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 + compileSdkVersion 23 defaultConfig { applicationId "com.rulerview" minSdkVersion 17 - targetSdkVersion 26 + targetSdkVersion 23 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -20,7 +20,7 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.android.support:appcompat-v7:26.1.0' + implementation 'com.android.support:appcompat-v7:23.1.0' implementation 'com.android.support.constraint:constraint-layout:1.1.3' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.1' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b55b331..699da1d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -6,7 +6,6 @@ android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> diff --git a/app/src/main/java/com/rulerview/MainActivity.java b/app/src/main/java/com/rulerview/MainActivity.java index 432cd15..6065ee3 100644 --- a/app/src/main/java/com/rulerview/MainActivity.java +++ b/app/src/main/java/com/rulerview/MainActivity.java @@ -17,8 +17,8 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - mSizeViewKg = findViewById(R.id.sizeview_kg); - mSizeViewCm = findViewById(R.id.sizeview_cm); + mSizeViewKg = (RulerView) findViewById(R.id.sizeview_kg); + mSizeViewCm = (RulerView) findViewById(R.id.sizeview_cm); mSizeViewKg.setCurrentValue(89); diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index c7bd21d..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index d5fccc5..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cf..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 1b52399..0000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 115a4c7..0000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 459ca60..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index 8e19b41..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 4c19a13..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/rulerlibrary/build.gradle b/rulerlibrary/build.gradle index b31839a..853c3bd 100644 --- a/rulerlibrary/build.gradle +++ b/rulerlibrary/build.gradle @@ -1,13 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 26 - - + compileSdkVersion 23 defaultConfig { minSdkVersion 17 - targetSdkVersion 26 + targetSdkVersion 23 versionCode 1 versionName "1.0" @@ -27,7 +25,7 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:26.1.0' + implementation 'com.android.support:appcompat-v7:23.1.0' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.1' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' diff --git a/rulerlibrary/src/main/java/com/rulerlibrary/RulerView.java b/rulerlibrary/src/main/java/com/rulerlibrary/RulerView.java index 84a36a0..7c8c8ec 100644 --- a/rulerlibrary/src/main/java/com/rulerlibrary/RulerView.java +++ b/rulerlibrary/src/main/java/com/rulerlibrary/RulerView.java @@ -12,7 +12,6 @@ import android.graphics.RegionIterator; import android.os.Build; import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; import android.support.v4.view.GestureDetectorCompat; import android.support.v4.view.animation.FastOutLinearInInterpolator; import android.text.TextUtils; @@ -98,13 +97,6 @@ public RulerView(Context context, @Nullable AttributeSet attrs, int defStyleAttr initView(context, attrs); } - @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP) - public RulerView(Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - initView(context, attrs); - } - - private void initView(Context context, AttributeSet attrs) { mDetector = new GestureDetectorCompat(context, new RulerGestureListener());