From 4c716dd2fa7862fa306e238015ab14e268050bd9 Mon Sep 17 00:00:00 2001
From: Kosh <kosh20111@gmail.com>
Date: Sun, 5 Mar 2017 13:05:02 +0800
Subject: [PATCH] removed the progressbar for avatars and replaced it with an
 oval grey to close #43. ready to release 1.0.5

---
 app/build.gradle                                    |  4 ++--
 .../com/fastaccess/ui/widgets/AvatarLayout.java     |  7 +++----
 app/src/main/res/drawable/circle_shape.xml          |  7 +++++++
 .../layouts/other_layouts/layout/avatar_layout.xml  |  6 ++----
 app/src/main/res/menu/pull_request_menu.xml         | 13 ++++++-------
 5 files changed, 20 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/res/drawable/circle_shape.xml

diff --git a/app/build.gradle b/app/build.gradle
index 0eaeedee..7f327c8e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,8 +19,8 @@ android {
         applicationId "com.fastaccess.github"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 104
-        versionName "1.0.4"
+        versionCode 105
+        versionName "1.0.5"
         signingConfig signingConfigs.signing
         buildConfigField "String", "GITHUB_CLIENT_ID", "\"${GITHUB_CLIENT_ID}\""
         buildConfigField "String", "GITHUB_SECRET", "\"${GITHUB_SECRET}\""
diff --git a/app/src/main/java/com/fastaccess/ui/widgets/AvatarLayout.java b/app/src/main/java/com/fastaccess/ui/widgets/AvatarLayout.java
index 938bcb1c..9b2a7914 100644
--- a/app/src/main/java/com/fastaccess/ui/widgets/AvatarLayout.java
+++ b/app/src/main/java/com/fastaccess/ui/widgets/AvatarLayout.java
@@ -2,6 +2,7 @@ package com.fastaccess.ui.widgets;
 
 import android.content.Context;
 import android.graphics.Bitmap;
+import android.graphics.Color;
 import android.support.annotation.AttrRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -79,16 +80,15 @@ public class AvatarLayout extends FrameLayout implements ImageLoadingListener {
     }
 
     @Override public void onLoadingStarted(String imageUri, View view) {
-        avatarProgress.setVisibility(VISIBLE);
+        setBackgroundResource(R.drawable.circle_shape);
     }
 
     @Override public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
-        avatarProgress.setVisibility(GONE);
         avatar.setImageResource(R.drawable.ic_github_black);
     }
 
     @Override public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
-        avatarProgress.setVisibility(GONE);
+        setBackgroundColor(Color.TRANSPARENT);
     }
 
     @Override public void onLoadingCancelled(String imageUri, View view) {}
@@ -100,7 +100,6 @@ public class AvatarLayout extends FrameLayout implements ImageLoadingListener {
             ImageLoader.getInstance().displayImage(url, avatar, this);
         } else {
             ImageLoader.getInstance().displayImage(null, avatar);
-            avatarProgress.setVisibility(GONE);
         }
     }
 }
diff --git a/app/src/main/res/drawable/circle_shape.xml b/app/src/main/res/drawable/circle_shape.xml
new file mode 100644
index 00000000..4184b9cb
--- /dev/null
+++ b/app/src/main/res/drawable/circle_shape.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval">
+
+    <solid android:color="@color/universal_primary_dark_color"/>
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/other_layouts/layout/avatar_layout.xml b/app/src/main/res/layouts/other_layouts/layout/avatar_layout.xml
index 8e6e9455..115089b9 100644
--- a/app/src/main/res/layouts/other_layouts/layout/avatar_layout.xml
+++ b/app/src/main/res/layouts/other_layouts/layout/avatar_layout.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:foreground="?selectableItemBackgroundBorderless">
 
     <de.hdodenhof.circleimageview.CircleImageView
@@ -9,12 +8,11 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:scaleType="centerCrop"
-        android:src="@drawable/ic_github"/>
+        android:src="@color/primary"/>
 
     <ProgressBar
         android:id="@+id/avatarProgress"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="gone"
-        tools:visibility="visible"/>
+        android:visibility="gone"/>
 </merge>
\ No newline at end of file
diff --git a/app/src/main/res/menu/pull_request_menu.xml b/app/src/main/res/menu/pull_request_menu.xml
index 568cdf30..85504c36 100644
--- a/app/src/main/res/menu/pull_request_menu.xml
+++ b/app/src/main/res/menu/pull_request_menu.xml
@@ -41,18 +41,17 @@
                 android:icon="@drawable/ic_profile"
                 android:title="@string/assignees"/>
         </menu>
+        <item
+            android:id="@+id/merge"
+            android:icon="@drawable/ic_merge"
+            android:title="@string/merge"
+            app:showAsAction="ifRoom"/>
     </item>
 
-    <item
-        android:id="@+id/merge"
-        android:icon="@drawable/ic_merge"
-        android:title="@string/merge"
-        app:showAsAction="ifRoom"/>
-
     <item
         android:id="@+id/share"
         android:icon="@drawable/ic_share"
         android:title="@string/share"
-        app:showAsAction="never"/>
+        app:showAsAction="ifRoom"/>
 
 </menu>
\ No newline at end of file