Merge pull request #3 from invissvenska/develop

Develop
invissvenska · Aug 30, 2020 · 58ad738 · 58ad738
2 parents e6e9992 + a036209
commit 58ad738
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # NumberPickerPreference
-[![API](https://img.shields.io/badge/API-24%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=24) [![](https://jitpack.io/v/invissvenska/NumberPickerPreference.svg)](https://jitpack.io/#invissvenska/NumberPickerPreference)  
+[![API](https://img.shields.io/badge/API-19%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=19) [![](https://jitpack.io/v/invissvenska/NumberPickerPreference.svg)](https://jitpack.io/#invissvenska/NumberPickerPreference)  
 
 ## Prerequisites
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -24,11 +24,10 @@ android {
 
 dependencies {
     implementation "androidx.appcompat:appcompat:$androidXVersion"
-    implementation "com.google.android.material:material:$androidXVersion"
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
     testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
     implementation project(':numberpickerpreference')
 

diff --git a/app/src/main/java/nl/invissvenska/numberpickerpreference/sample/MainFragment.java b/app/src/main/java/nl/invissvenska/numberpickerpreference/sample/MainFragment.java
@@ -5,6 +5,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -13,8 +14,6 @@
 import androidx.fragment.app.FragmentTransaction;
 import androidx.preference.PreferenceManager;
 
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-
 public class MainFragment extends Fragment {
 
     private SharedPreferences preferences;
@@ -39,7 +38,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.content_main, container, false);
 
-        FloatingActionButton fb = view.findViewById(R.id.fab);
+        Button fb = view.findViewById(R.id.fab);
         fb.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {

diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
@@ -3,8 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior">
+    android:layout_height="match_parent">
 
     <TextView
         android:id="@+id/demo1"
@@ -90,7 +89,8 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/demo5" />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
+
+    <Button
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -99,7 +99,7 @@
         android:layout_marginBottom="16dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:srcCompat="@drawable/ic_settings"
-        tools:ignore="VectorDrawableCompat" />
+        android:text="Settings"
+        tools:ignore="VectorDrawableCompat"  />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -26,11 +26,11 @@ ext {
     minSdkVersion = 16
     targetSdkVersion = compileSdkVersion
 
-    androidXVersion = '1.1.0'
+    androidXVersion = '1.1.1'
     androidXLifeCycleVersion = '2.2.0'
 
-    versionCode = 1
-    versionName = '1.0.0'
+    versionCode = 2
+    versionName = '1.0.1'
 }
 
 task clean(type: Delete) {

diff --git a/numberpickerpreference/build.gradle b/numberpickerpreference/build.gradle
@@ -25,7 +25,6 @@ android {
 }
 
 dependencies {
-    api "com.google.android.material:material:$androidXVersion"
     api "androidx.lifecycle:lifecycle-extensions:$androidXLifeCycleVersion"
     api "androidx.preference:preference:$androidXVersion"
 }