Merge pull request #35 from TheAndroidMaster/develop

Version 0.0.8
fennifith · Jul 17, 2018 · 2990752 · 2990752
2 parents e043bcc + 4b20a0c
commit 2990752
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 9 deletions.
diff --git a/Attribouter-lib/attribouter/build.gradle b/Attribouter-lib/attribouter/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.library'
 ext {
     PUBLISH_GROUP_ID = 'me.jfenn'
     PUBLISH_ARTIFACT_ID = 'attribouter'
-    PUBLISH_VERSION = '0.0.7'
+    PUBLISH_VERSION = '0.0.8'
 }
 
 android {
@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 7
-        versionName "0.0.7"
+        versionCode 8
+        versionName "0.0.8"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

diff --git a/...er-lib/attribouter/src/main/java/me/jfenn/attribouter/data/info/ContributorsInfoData.java b/...er-lib/attribouter/src/main/java/me/jfenn/attribouter/data/info/ContributorsInfoData.java
@@ -163,9 +163,12 @@ public void onClick(View v) {
 
         ContributorInfoData first = null, second = null, third = null;
         List<InfoData> remainingContributors = new ArrayList<>();
+        int hiddenContributors = 0;
         for (ContributorInfoData contributor : contributors) {
-            if (contributor.isHidden)
+            if (contributor.isHidden) {
+                hiddenContributors++;
                 continue;
+            }
 
             if (contributor.position != null) {
                 if (first == null && contributor.position == 1) {
@@ -271,12 +274,18 @@ public void onClick(View view) {
             viewHolder.recycler.setAdapter(new InfoAdapter(remainingContributors));
         } else viewHolder.recycler.setVisibility(View.GONE);
 
-        if (remainingContributors.size() + (first != null && second != null && third != null ? 3 : 0) < contributors.size()) {
+        if (remainingContributors.size() + (first != null && second != null && third != null ? 3 : 0) < contributors.size() - hiddenContributors) {
             viewHolder.expand.setVisibility(View.VISIBLE);
             viewHolder.expand.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    new OverflowDialog(v.getContext(), contributorsTitle, new ArrayList<InfoData>(contributors)).show();
+                    ArrayList<InfoData> overflowList = new ArrayList<>();
+                    for (ContributorInfoData contributor : contributors) {
+                        if (!contributor.isHidden)
+                            overflowList.add(contributor);
+                    }
+
+                    new OverflowDialog(v.getContext(), contributorsTitle, overflowList).show();
                 }
             });
         } else viewHolder.expand.setVisibility(View.GONE);

diff --git a/...outer-lib/attribouter/src/main/java/me/jfenn/attribouter/data/info/link/LinkInfoData.java b/...outer-lib/attribouter/src/main/java/me/jfenn/attribouter/data/info/link/LinkInfoData.java
@@ -135,7 +135,7 @@ public int compareTo(Context context, @NonNull LinkInfoData o) {
         String name = ResourceUtils.getString(context, this.name);
         String oname = ResourceUtils.getString(context, o.name);
         int comparison = name != null && oname != null ? name.compareTo(oname) : 0;
-        return ((o.priority - priority) * 2) + (comparison / Math.abs(comparison));
+        return ((o.priority - priority) * 2) + (comparison != 0 ? comparison / Math.abs(comparison) : 0);
     }
 
     public static class ViewHolder extends InfoData.ViewHolder {

diff --git a/Attribouter-lib/attribouter/src/main/java/me/jfenn/attribouter/fragments/AboutFragment.java b/Attribouter-lib/attribouter/src/main/java/me/jfenn/attribouter/fragments/AboutFragment.java
@@ -1,5 +1,6 @@
 package me.jfenn.attribouter.fragments;
 
+import android.content.Context;
 import android.content.res.XmlResourceParser;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -139,7 +140,10 @@ public void onRequest(InfoData info, GitHubData request) {
         if (!requests.contains(request)) {
             requests.add(request);
             request.addOnInitListener(this);
-            request.startInit(getContext(), gitHubToken);
+
+            Context context = getContext();
+            if (context != null)
+                request.startInit(context, gitHubToken);
         } else {
             int i = requests.indexOf(request);
             GitHubData activeRequest = requests.get(i).merge(request);

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ For demonstration and experimentation, an apk of the sample project can be downl
 The Gradle dependency is available through jCenter, which is used by default in Android Studio. To add the dependency to your project, copy this line into the dependencies section of your app's build.gradle file.
 
 ```gradle
-implementation 'me.jfenn:attribouter:0.0.7'
+implementation 'me.jfenn:attribouter:0.0.8'
 ```
 
 #### Starting an Activity