Update to androidx

Jawnnypoo · Jawnnypoo · commit ae58c4ae7410 · 2018-10-01T12:07:52.000-05:00
diff --git a/adapterflowlayout/src/main/java/com/commit451/adapterflowlayout/AdapterFlowLayout.java b/adapterflowlayout/src/main/java/com/commit451/adapterflowlayout/AdapterFlowLayout.java
@@ -1,15 +1,16 @@
 package com.commit451.adapterflowlayout;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
 
 import com.commit451.adapterlayout.AdapterLayoutDelegate;
 import com.wefika.flowlayout.FlowLayout;
 
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
- * {@link com.wefika.flowlayout.FlowLayout} with {@link android.support.v7.widget.RecyclerView.Adapter} support.
+ * {@link com.wefika.flowlayout.FlowLayout} with {@link androidx.recyclerview.widget.RecyclerView.Adapter} support.
  */
 @SuppressWarnings("unused")
 public class AdapterFlowLayout extends FlowLayout {
diff --git a/adapterlayout-kotlin/build.gradle b/adapterlayout-kotlin/build.gradle
@@ -9,9 +9,6 @@ android {
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
         versionName "1.0"
-
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-
     }
     buildTypes {
         release {
diff --git a/adapterlayout-kotlin/src/main/java/com/commit451/adapterlayout/kotlin/kotlin.kt b/adapterlayout-kotlin/src/main/java/com/commit451/adapterlayout/kotlin/kotlin.kt
@@ -2,7 +2,7 @@
 
 package com.commit451.adapterlayout.kotlin
 
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import com.commit451.adapterlayout.AdapterLayout
 
 fun RecyclerView.ViewHolder.getAdapterLayoutAdapterPosition(): Int {
diff --git a/adapterlayout/build.gradle b/adapterlayout/build.gradle
@@ -21,7 +21,7 @@ android {
 }
 
 dependencies {
-    api "com.android.support:recyclerview-v7:$supportLibVersion"
+    api "androidx.recyclerview:recyclerview:1.0.0"
 }
 
 apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.0.0/gradle-android-javadocs.gradle'
diff --git a/adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLayout.java b/adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLayout.java
@@ -1,6 +1,6 @@
 package com.commit451.adapterlayout;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 
 /**
  * Provides access to some of the public API of AdapterLayout in a way that will be available for any given
diff --git a/adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLayoutDelegate.java b/adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLayoutDelegate.java
@@ -1,13 +1,13 @@
 package com.commit451.adapterlayout;
 
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 
 /**
- * Does all the hard to work to map a {@link android.support.v7.widget.RecyclerView.Adapter} to a
+ * Does all the hard to work to map a {@link androidx.recyclerview.widget.RecyclerView.Adapter} to a
  * {@link ViewGroup}. See {@link AdapterLinearLayout} for an example on how to create your own
  */
 public class AdapterLayoutDelegate {
@@ -103,7 +103,7 @@ public RecyclerView.Adapter getAdapter() {
     }
 
     /**
-     * Return the {@link android.support.v7.widget.RecyclerView.ViewHolder} at the specified position.
+     * Return the {@link RecyclerView.ViewHolder} at the specified position.
      *
      * @param index the position at which to get the ViewHolder
      * @return the ViewHolder at the index, or null if none exists
diff --git a/adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLinearLayout.java b/adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLinearLayout.java
@@ -3,15 +3,16 @@
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.widget.Adapter;
 import android.widget.LinearLayout;
 
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * LinearLayout with {@link Adapter} support. See {@link AdapterLayoutDelegate} for
- * the good bits, and follow the convention here to create your own {@link android.support.v7.widget.RecyclerView.Adapter}
+ * the good bits, and follow the convention here to create your own {@link RecyclerView.Adapter}
  * backed {@link android.view.ViewGroup}
  */
 @SuppressWarnings("unused")
diff --git a/app/build.gradle b/app/build.gradle
@@ -22,16 +22,10 @@ android {
     }
 }
 
-ext {
-    butterknifeVersion = '8.8.1'
-}
 dependencies {
 
-    implementation "com.android.support:appcompat-v7:$supportLibVersion"
-    implementation "com.android.support:design:$supportLibVersion"
-
-    implementation "com.jakewharton:butterknife:$butterknifeVersion"
-    annotationProcessor "com.jakewharton:butterknife-compiler:$butterknifeVersion"
+    implementation "androidx.appcompat:appcompat:1.0.0"
+    implementation "com.google.android.material:material:1.0.0"
 
     implementation 'com.wefika:flowlayout:0.4.1'
 
diff --git a/app/src/main/java/com/commit451/adapterlayout/sample/AdapterFlowLayoutActivity.java b/app/src/main/java/com/commit451/adapterlayout/sample/AdapterFlowLayoutActivity.java
@@ -1,24 +1,19 @@
 package com.commit451.adapterlayout.sample;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.widget.Toast;
 
 import com.commit451.adapterflowlayout.AdapterFlowLayout;
 
 import java.util.ArrayList;
 
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 
 public class AdapterFlowLayoutActivity extends AppCompatActivity {
 
-    @BindView(R.id.toolbar)
     Toolbar toolbar;
-    @BindView(R.id.adapter_layout)
     AdapterFlowLayout adapterFlowLayout;
 
     CheeseAdapter adapter;
@@ -31,28 +26,12 @@ public void onItemClicked(Cheese cheese) {
         }
     };
 
-    @OnClick(R.id.add_cheese)
-    void onAddCheeseClicked() {
-        adapter.add(Cheeses.getRandomCheese());
-    }
-
-    @OnClick(R.id.remove_cheese)
-    void onRemoveCheeseClicked() {
-        adapter.removeLast();
-    }
-
-    @OnClick(R.id.new_adapter)
-    void onNewAdapterClicked() {
-        adapterFlowLayout.setAdapter(null);
-        adapter = new CheeseAdapter(listener);
-        adapterFlowLayout.setAdapter(adapter);
-    }
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_custom_adapter_layout);
-        ButterKnife.bind(this);
+        toolbar = findViewById(R.id.toolbar);
+        adapterFlowLayout = findViewById(R.id.adapter_layout);
         toolbar.setNavigationIcon(R.drawable.ic_arrow_back_24dp);
         toolbar.setNavigationOnClickListener(new View.OnClickListener() {
             @Override
@@ -62,6 +41,24 @@ public void onClick(View v) {
         });
         adapter = new CheeseAdapter(listener);
         adapterFlowLayout.setAdapter(adapter);
+
+        findViewById(R.id.add_cheese).setOnClickListener(new View.OnClickListener() {
+            @Override public void onClick(View v) {
+                adapter.add(Cheeses.getRandomCheese());
+            }
+        });
+        findViewById(R.id.remove_cheese).setOnClickListener(new View.OnClickListener() {
+            @Override public void onClick(View v) {
+                adapter.removeLast();
+            }
+        });
+        findViewById(R.id.new_adapter).setOnClickListener(new View.OnClickListener() {
+            @Override public void onClick(View v) {
+                adapterFlowLayout.setAdapter(null);
+                adapter = new CheeseAdapter(listener);
+                adapterFlowLayout.setAdapter(adapter);
+            }
+        });
         loadCheeses();
     }
 
diff --git a/app/src/main/java/com/commit451/adapterlayout/sample/CheeseAdapter.java b/app/src/main/java/com/commit451/adapterlayout/sample/CheeseAdapter.java
@@ -1,6 +1,5 @@
 package com.commit451.adapterlayout.sample;
 
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -9,6 +8,8 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * Adapter for the recyclerview, which holds cheeses
  */
diff --git a/app/src/main/java/com/commit451/adapterlayout/sample/CheeseViewHolder.java b/app/src/main/java/com/commit451/adapterlayout/sample/CheeseViewHolder.java
@@ -1,11 +1,12 @@
 package com.commit451.adapterlayout.sample;
 
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 /**
  * The view holder related to each Cheese item
  */
@@ -22,7 +23,7 @@ public static CheeseViewHolder inflate(ViewGroup parent) {
 
     public CheeseViewHolder(View view) {
         super(view);
-        title = (TextView) view.findViewById(R.id.text);
+        title = view.findViewById(R.id.text);
         buttonRemove = view.findViewById(R.id.button_remove);
     }
 
diff --git a/app/src/main/java/com/commit451/adapterlayout/sample/MainActivity.java b/app/src/main/java/com/commit451/adapterlayout/sample/MainActivity.java
@@ -3,29 +3,24 @@
 import android.animation.LayoutTransition;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.design.widget.Snackbar;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
+import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 
 import com.commit451.adapterlayout.AdapterLinearLayout;
+import com.google.android.material.snackbar.Snackbar;
 
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 
 public class MainActivity extends AppCompatActivity {
 
-    @BindView(R.id.root)
+
     ViewGroup root;
-    @BindView(R.id.toolbar)
     Toolbar toolbar;
-    @BindView(R.id.adapter_layout)
     AdapterLinearLayout adapterLinearLayout;
-    @BindView(R.id.animate_layout_changes)
     CheckBox checkBoxAnimateLayoutChanges;
 
     CheeseAdapter adapter;
@@ -38,48 +33,51 @@ public void onItemClicked(Cheese cheese) {
         }
     };
 
-    @OnClick(R.id.add_cheese)
-    void onAddCheeseClicked() {
-        adapter.add(Cheeses.getRandomCheese());
-    }
-
-    @OnClick(R.id.remove_cheese)
-    void onRemoveCheeseClicked() {
-        adapter.removeLast();
-    }
-
-    @OnClick(R.id.change_middle)
-    void onRemoveMiddleClicked() {
-        adapter.changeMiddle();
-    }
-
-    @OnClick(R.id.clear_all)
-    void onClearAll() {
-        adapter.clear();
-    }
-
-    @OnClick(R.id.change_all)
-    void onChangeAll() {
-        adapter.changeAll();
-    }
-
-    @OnClick(R.id.set_to_5)
-    void onSetTo5Clicked() {
-        adapter.setData(Cheeses.getRandomCheeses(5));
-    }
-
-    @OnClick(R.id.new_adapter)
-    void onNewAdapterClicked() {
-        adapterLinearLayout.setAdapter(null);
-        adapter = new CheeseAdapter(listener);
-        adapterLinearLayout.setAdapter(adapter);
-    }
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        ButterKnife.bind(this);
+        root = findViewById(R.id.root);
+        toolbar = findViewById(R.id.toolbar);
+        adapterLinearLayout = findViewById(R.id.adapter_layout);
+        checkBoxAnimateLayoutChanges = findViewById(R.id.animate_layout_changes);
+        findViewById(R.id.add_cheese).setOnClickListener(new View.OnClickListener() {
+            @Override public void onClick(View v) {
+                adapter.add(Cheeses.getRandomCheese());
+            }
+        });
+        findViewById(R.id.remove_cheese).setOnClickListener(new View.OnClickListener() {
+            @Override public void onClick(View v) {
+                adapter.removeLast();
+            }
+        });
+        findViewById(R.id.change_middle).setOnClickListener(new View.OnClickListener() {
+            @Override public void onClick(View v) {
+                adapter.changeMiddle();
+            }
+        });
+        findViewById(R.id.clear_all).setOnClickListener(new View.OnClickListener() {
+            @Override public void onClick(View v) {
+                adapter.clear();
+            }
+        });
+        findViewById(R.id.change_all).setOnClickListener(new View.OnClickListener() {
+            @Override public void onClick(View v) {
+                adapter.changeAll();
+            }
+        });
+        findViewById(R.id.set_to_5).setOnClickListener(new View.OnClickListener() {
+            @Override public void onClick(View v) {
+                adapter.setData(Cheeses.getRandomCheeses(5));
+            }
+        });
+        findViewById(R.id.new_adapter).setOnClickListener(new View.OnClickListener() {
+            @Override public void onClick(View v) {
+                adapterLinearLayout.setAdapter(null);
+                adapter = new CheeseAdapter(listener);
+                adapterLinearLayout.setAdapter(adapter);
+            }
+        });
         toolbar.setTitle(R.string.app_name);
         toolbar.inflateMenu(R.menu.main);
         toolbar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() {
diff --git a/app/src/main/res/layout/activity_custom_adapter_layout.xml b/app/src/main/res/layout/activity_custom_adapter_layout.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
diff --git a/build.gradle b/build.gradle
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ android {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`dependencies {`
`24`		`- api "com.android.support:recyclerview-v7:$supportLibVersion"`
	`24`	`+ api "androidx.recyclerview:recyclerview:1.0.0"`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.0.0/gradle-android-javadocs.gradle'`