Merge pull request #56 from TheAndroidMaster/develop

Version 0.1.3
fennifith · Sep 18, 2018 · fb5f20a · fb5f20a
2 parents 5ab1130 + 4c13711
commit fb5f20a
Show file tree

Hide file tree

Showing 41 changed files with 115 additions and 101 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,16 +1,16 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         applicationId "me.jfenn.attriboutersample"
         minSdkVersion 15
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
@@ -24,11 +24,11 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
+    implementation 'androidx.appcompat:appcompat:1.0.0-rc02'
+    implementation 'com.google.android.material:material:1.0.0-rc02'
     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'
+    androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
 
     implementation project(':attribouter')
 }
diff --git a/app/src/main/java/me/jfenn/attriboutersample/MainActivity.java b/app/src/main/java/me/jfenn/attriboutersample/MainActivity.java
@@ -1,8 +1,8 @@
 package me.jfenn.attriboutersample;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 
 import me.jfenn.attribouter.Attribouter;
 

diff --git a/attribouter/build.gradle b/attribouter/build.gradle
@@ -3,19 +3,19 @@ apply plugin: 'com.android.library'
 ext {
     PUBLISH_GROUP_ID = 'me.jfenn'
     PUBLISH_ARTIFACT_ID = 'attribouter'
-    PUBLISH_VERSION = '0.1.2'
+    PUBLISH_VERSION = '0.1.3'
 }
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 27
-        versionCode 11
-        versionName "0.1.2"
+        targetSdkVersion 28
+        versionCode 12
+        versionName "0.1.3"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
 
@@ -30,9 +30,9 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
-    implementation 'com.android.support:customtabs:27.1.1'
+    implementation 'androidx.appcompat:appcompat:1.0.0-rc02'
+    implementation 'androidx.browser:browser:1.0.0-rc02'
+    implementation 'com.google.android.material:material:1.0.0-rc02'
     implementation 'com.google.code.gson:gson:2.8.4'
     implementation 'com.google.android:flexbox:1.0.0'
     implementation 'com.github.bumptech.glide:glide:4.7.1'

diff --git a/attribouter/src/main/java/me/jfenn/attribouter/Attribouter.java b/attribouter/src/main/java/me/jfenn/attribouter/Attribouter.java
@@ -3,8 +3,8 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.XmlRes;
-import android.support.v4.app.Fragment;
+import androidx.annotation.XmlRes;
+import androidx.fragment.app.Fragment;
 
 import me.jfenn.attribouter.activities.AboutActivity;
 import me.jfenn.attribouter.fragments.AboutFragment;

diff --git a/attribouter/src/main/java/me/jfenn/attribouter/activities/AboutActivity.java b/attribouter/src/main/java/me/jfenn/attribouter/activities/AboutActivity.java
@@ -5,11 +5,11 @@
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.PersistableBundle;
-import android.support.annotation.Nullable;
-import android.support.graphics.drawable.VectorDrawableCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.Nullable;
+import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 
 import me.jfenn.attribouter.R;

diff --git a/attribouter/src/main/java/me/jfenn/attribouter/adapters/InfoAdapter.java b/attribouter/src/main/java/me/jfenn/attribouter/adapters/InfoAdapter.java
@@ -1,7 +1,7 @@
 package me.jfenn.attribouter.adapters;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 

diff --git a/attribouter/src/main/java/me/jfenn/attribouter/dialogs/LicenseDialog.java b/attribouter/src/main/java/me/jfenn/attribouter/dialogs/LicenseDialog.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatDialog;
+import androidx.appcompat.app.AppCompatDialog;
 import android.view.View;
 import android.widget.TextView;
 

diff --git a/attribouter/src/main/java/me/jfenn/attribouter/dialogs/OverflowDialog.java b/attribouter/src/main/java/me/jfenn/attribouter/dialogs/OverflowDialog.java
@@ -2,10 +2,10 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatDialog;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.app.AppCompatDialog;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 
 import java.util.List;

diff --git a/attribouter/src/main/java/me/jfenn/attribouter/dialogs/UserDialog.java b/attribouter/src/main/java/me/jfenn/attribouter/dialogs/UserDialog.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatDialog;
-import android.support.v7.widget.RecyclerView;
+import androidx.appcompat.app.AppCompatDialog;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;

diff --git a/attribouter/src/main/java/me/jfenn/attribouter/fragments/AboutFragment.java b/attribouter/src/main/java/me/jfenn/attribouter/fragments/AboutFragment.java
@@ -3,12 +3,12 @@
 import android.content.Context;
 import android.content.res.XmlResourceParser;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.DividerItemDecoration;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/attribouter/src/main/java/me/jfenn/attribouter/utils/ColorUtils.java b/attribouter/src/main/java/me/jfenn/attribouter/utils/ColorUtils.java
@@ -1,7 +1,7 @@
 package me.jfenn.attribouter.utils;
 
 import android.graphics.Color;
-import android.support.annotation.ColorInt;
+import androidx.annotation.ColorInt;
 
 public class ColorUtils {
 

diff --git a/attribouter/src/main/java/me/jfenn/attribouter/utils/ImageUtils.java b/attribouter/src/main/java/me/jfenn/attribouter/utils/ImageUtils.java
@@ -8,7 +8,7 @@
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.VectorDrawable;
 import android.os.Build;
-import android.support.graphics.drawable.VectorDrawableCompat;
+import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
 
 public class ImageUtils {
 

diff --git a/attribouter/src/main/java/me/jfenn/attribouter/utils/ResourceUtils.java b/attribouter/src/main/java/me/jfenn/attribouter/utils/ResourceUtils.java
@@ -2,10 +2,10 @@
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.Nullable;
-import android.support.annotation.StyleRes;
-import android.support.annotation.StyleableRes;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
+import androidx.annotation.StyleRes;
+import androidx.annotation.StyleableRes;
 import android.widget.ImageView;
 
 import com.bumptech.glide.Glide;

diff --git a/attribouter/src/main/java/me/jfenn/attribouter/utils/UrlClickListener.java b/attribouter/src/main/java/me/jfenn/attribouter/utils/UrlClickListener.java
@@ -1,7 +1,7 @@
 package me.jfenn.attribouter.utils;
 
 import android.net.Uri;
-import android.support.customtabs.CustomTabsIntent;
+import androidx.browser.customtabs.CustomTabsIntent;
 import android.view.View;
 
 public class UrlClickListener implements View.OnClickListener {

diff --git a/attribouter/src/main/java/me/jfenn/attribouter/views/CircleImageView.java b/attribouter/src/main/java/me/jfenn/attribouter/views/CircleImageView.java
@@ -5,9 +5,9 @@
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.media.ThumbnailUtils;
-import android.support.v4.graphics.drawable.RoundedBitmapDrawable;
-import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.core.graphics.drawable.RoundedBitmapDrawable;
+import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
 
 import me.jfenn.attribouter.utils.ImageUtils;

diff --git a/attribouter/src/main/java/me/jfenn/attribouter/wedges/AppWedge.java b/attribouter/src/main/java/me/jfenn/attribouter/wedges/AppWedge.java
@@ -5,8 +5,8 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.res.XmlResourceParser;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;

diff --git a/attribouter/src/main/java/me/jfenn/attribouter/wedges/ContributorWedge.java b/attribouter/src/main/java/me/jfenn/attribouter/wedges/ContributorWedge.java
@@ -2,7 +2,6 @@
 
 import android.content.Context;
 import android.content.res.XmlResourceParser;
-import android.support.annotation.Nullable;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -11,6 +10,7 @@
 
 import java.io.IOException;
 
+import androidx.annotation.Nullable;
 import me.jfenn.attribouter.R;
 import me.jfenn.attribouter.data.github.GitHubData;
 import me.jfenn.attribouter.data.github.UserData;
@@ -163,12 +163,18 @@ public void onClick(View view) {
             });
         } else {
             LinkWedge importantLink = null;
+            View.OnClickListener clickListener = null;
             for (LinkWedge link : getChildren(LinkWedge.class)) {
-                if (!link.isHidden() && (importantLink == null || link.getPriority() > importantLink.getPriority()))
-                    importantLink = link;
+                if (!link.isHidden() && (importantLink == null || link.getPriority() > importantLink.getPriority())) {
+                    View.OnClickListener listener = link.getListener(context);
+                    if (listener != null) {
+                        importantLink = link;
+                        clickListener = listener;
+                    }
+                }
             }
 
-            viewHolder.itemView.setOnClickListener(importantLink != null ? importantLink.getListener(context) : null);
+            viewHolder.itemView.setOnClickListener(clickListener);
         }
     }
 

diff --git a/attribouter/src/main/java/me/jfenn/attribouter/wedges/ContributorsWedge.java b/attribouter/src/main/java/me/jfenn/attribouter/wedges/ContributorsWedge.java
@@ -2,9 +2,9 @@
 
 import android.content.Context;
 import android.content.res.XmlResourceParser;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;

diff --git a/attribouter/src/main/java/me/jfenn/attribouter/wedges/LicenseWedge.java b/attribouter/src/main/java/me/jfenn/attribouter/wedges/LicenseWedge.java
@@ -2,8 +2,6 @@
 
 import android.content.Context;
 import android.content.res.XmlResourceParser;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.TextView;
 
@@ -20,6 +18,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import me.jfenn.attribouter.R;
 import me.jfenn.attribouter.adapters.InfoAdapter;
 import me.jfenn.attribouter.data.github.GitHubData;
@@ -283,12 +283,18 @@ public void bind(Context context, ViewHolder viewHolder) {
         } else viewHolder.links.setVisibility(View.GONE);
 
         LinkWedge importantLink = null;
+        View.OnClickListener clickListener = null;
         for (LinkWedge link : links) {
-            if (importantLink == null || link.getPriority() > importantLink.getPriority())
-                importantLink = link;
+            if (importantLink == null || link.getPriority() > importantLink.getPriority()) {
+                View.OnClickListener listener = link.getListener(context);
+                if (listener != null) {
+                    clickListener = listener;
+                    importantLink = link;
+                }
+            }
         }
 
-        viewHolder.itemView.setOnClickListener(importantLink != null ? importantLink.getListener(context) : null);
+        viewHolder.itemView.setOnClickListener(clickListener);
     }
 
     @Override

diff --git a/attribouter/src/main/java/me/jfenn/attribouter/wedges/LicensesWedge.java b/attribouter/src/main/java/me/jfenn/attribouter/wedges/LicensesWedge.java
@@ -2,9 +2,9 @@
 
 import android.content.Context;
 import android.content.res.XmlResourceParser;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.TextView;
 

diff --git a/attribouter/src/main/java/me/jfenn/attribouter/wedges/TranslatorWedge.java b/attribouter/src/main/java/me/jfenn/attribouter/wedges/TranslatorWedge.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.content.res.XmlResourceParser;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;

diff --git a/attribouter/src/main/java/me/jfenn/attribouter/wedges/TranslatorsWedge.java b/attribouter/src/main/java/me/jfenn/attribouter/wedges/TranslatorsWedge.java
@@ -2,9 +2,9 @@
 
 import android.content.Context;
 import android.content.res.XmlResourceParser;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.TextView;
 

diff --git a/attribouter/src/main/java/me/jfenn/attribouter/wedges/Wedge.java b/attribouter/src/main/java/me/jfenn/attribouter/wedges/Wedge.java
@@ -2,8 +2,8 @@
 
 import android.content.Context;
 import android.content.res.XmlResourceParser;
-import android.support.annotation.LayoutRes;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.LayoutRes;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.View;
 

diff --git a/attribouter/src/main/java/me/jfenn/attribouter/wedges/link/EmailLinkWedge.java b/attribouter/src/main/java/me/jfenn/attribouter/wedges/link/EmailLinkWedge.java
@@ -1,7 +1,7 @@
 package me.jfenn.attribouter.wedges.link;
 
 import android.content.res.XmlResourceParser;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public class EmailLinkWedge extends LinkWedge {
 

diff --git a/attribouter/src/main/java/me/jfenn/attribouter/wedges/link/GitHubLinkWedge.java b/attribouter/src/main/java/me/jfenn/attribouter/wedges/link/GitHubLinkWedge.java
@@ -1,6 +1,6 @@
 package me.jfenn.attribouter.wedges.link;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public class GitHubLinkWedge extends LinkWedge {