Bug fixing

Author: TalbotGooday

.idea/gradle.xml

@@ -3,13 +3,13 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "30.0.0"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.goodayapps.avatarview"
         minSdkVersion 19
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
 
@@ -35,9 +35,9 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'androidx.core:core-ktx:1.3.2'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 
-    implementation(project(":widget"))
+    implementation(project(':avatar-view'))
 }

app/build.gradle

@@ -27,14 +27,16 @@
             android:id="@+id/avatars_list"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:columnCount="3"
+            android:minHeight="200dp"
             android:divider="@drawable/divider_vertical_blank"
             android:gravity="center"
-            android:columnCount="3"
             android:orientation="horizontal"
             android:showDividers="middle">
 
             <com.goodayapps.widget.AvatarView
                 android:id="@+id/avatarView0"
+                style="@style/AvatarStyleHelper"
                 android:layout_width="@dimen/avatar_size"
                 android:layout_height="@dimen/avatar_size"
                 android:src="@drawable/ic_bell"
@@ -47,6 +49,7 @@
 
             <com.goodayapps.widget.AvatarView
                 android:id="@+id/avatarView10"
+                style="@style/AvatarStyleHelper"
                 android:layout_width="@dimen/avatar_size"
                 android:layout_height="@dimen/avatar_size"
                 android:src="@drawable/ic_more"
@@ -59,6 +62,7 @@
 
             <com.goodayapps.widget.AvatarView
                 android:id="@+id/avatarView1"
+                style="@style/AvatarStyleHelper"
                 android:layout_width="@dimen/avatar_size"
                 android:layout_height="@dimen/avatar_size"
                 android:src="@drawable/ic_launcher_foreground"
@@ -77,16 +81,17 @@
 
             <com.goodayapps.widget.AvatarView
                 android:id="@+id/avatarView2"
+                style="@style/AvatarStyleHelper"
                 android:layout_width="@dimen/avatar_size"
                 android:layout_height="@dimen/avatar_size"
                 android:src="@drawable/avatar1"
-
                 app:avBackgroundColor="@color/colorPrimary"
                 app:avBorderColor="@color/colorAccent"
                 app:avBorderWidth="5dp" />
 
             <com.goodayapps.widget.AvatarView
                 android:id="@+id/avatarView3"
+                style="@style/AvatarStyleHelper"
                 android:layout_width="@dimen/avatar_size"
                 android:layout_height="@dimen/avatar_size"
                 android:fontFamily="@font/font_19849"
@@ -96,6 +101,7 @@
                 app:iconDrawableScale=".7"
                 app:placeholderText="AV" />
         </GridLayout>
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

app/src/main/res/layout/activity_main.xml

@@ -8,4 +8,7 @@
 		<item name="fontFamily">@font/avenir_medium</item>
 	</style>
 
+	<style name="AvatarStyleHelper">
+		<item name="android:layout_margin">8dp</item>
+	</style>
 </resources>

app/src/main/res/values/styles.xml

@@ -37,6 +37,7 @@ class AvatarDrawable private constructor(
     private val border: Border,
     private val placeholder: Placeholder,
 ) : Drawable() {
+    private var iconColorFilter: ColorFilter? = null
     private var textLayout: StaticLayout? = null
 
     private var placeholderPaint = TextPaint(Paint.ANTI_ALIAS_FLAG).apply {
@@ -101,6 +102,23 @@ class AvatarDrawable private constructor(
     private val arcBorderRect = RectF()
     private val borderRect = RectF()
 
+    private val totalArchesDegreeArea
+        get() = border.archesDegreeArea.toFloat()
+
+    private val animationLoopDegrees
+        get() = border.archesAngle.toFloat()
+
+    private var animationArchesSparseness = 1f
+
+    private val individualArcDegreeLength
+        get() = calculateArcDegreeLength()
+
+    private val spaceBetweenArches
+        get() = calculateSpaceBetweenArches()
+
+    private val currentAnimationArchesArea
+        get() = animationArchesSparseness * totalArchesDegreeArea
+
     constructor(builder: Builder) : this(
         size = builder.size,
         backgroundColor = builder.backgroundColor,
@@ -150,20 +168,20 @@ class AvatarDrawable private constructor(
         }
     }
 
-    private fun calculateBounds(): RectF {
-        val availableWidth = size
-        val availableHeight = size
+    override fun setAlpha(alpha: Int) {
+    }
 
-        val sideLength = availableWidth.coerceAtMost(availableHeight)
+    override fun setColorFilter(colorFilter: ColorFilter?) {
+        iconColorFilter = colorFilter
+        invalidateSelf()
+    }
 
-        val left = (availableWidth - sideLength) / 2f
-        val top = (availableHeight - sideLength) / 2f
+    override fun getColorFilter(): ColorFilter? = iconColorFilter
 
-        return RectF(left, top, left + sideLength, top + sideLength)
+    override fun getOpacity(): Int {
+        return PixelFormat.TRANSLUCENT
     }
 
-    private var iconColorFilter: ColorFilter? = null
-
     override fun draw(canvas: Canvas) {
         canvas.save()
         canvas.translate(bounds.left.toFloat(), bounds.top.toFloat())
@@ -230,22 +248,18 @@ class AvatarDrawable private constructor(
         canvas.restore()
     }
 
-    private val totalArchesDegreeArea
-        get() = border.archesDegreeArea.toFloat()
 
-    private val animationLoopDegrees
-        get() = border.archesAngle.toFloat()
-
-    private var animationArchesSparseness = 1f
+    private fun calculateBounds(): RectF {
+        val availableWidth = size
+        val availableHeight = size
 
-    private val individualArcDegreeLength
-        get() = calculateArcDegreeLength()
+        val sideLength = availableWidth.coerceAtMost(availableHeight)
 
-    private val spaceBetweenArches
-        get() = calculateSpaceBetweenArches()
+        val left = (availableWidth - sideLength) / 2f
+        val top = (availableHeight - sideLength) / 2f
 
-    private val currentAnimationArchesArea
-        get() = animationArchesSparseness * totalArchesDegreeArea
+        return RectF(left, top, left + sideLength, top + sideLength)
+    }
 
     private fun drawBorder() {
         if (border.width > 0) {
@@ -296,20 +310,6 @@ class AvatarDrawable private constructor(
         }
     }
 
-    override fun setAlpha(alpha: Int) {
-    }
-
-    override fun setColorFilter(colorFilter: ColorFilter?) {
-        iconColorFilter = colorFilter
-        invalidateSelf()
-    }
-
-    override fun getColorFilter(): ColorFilter? = iconColorFilter
-
-    override fun getOpacity(): Int {
-        return PixelFormat.TRANSLUCENT
-    }
-
     private fun drawBitmap(isIconDrawable: Boolean, avatarBitmap: Bitmap) {
         if (isIconDrawable) {
             //Draw background

widget/.gitignore renamed to avatar-view/.gitignore

@@ -1,3 +1,3 @@
-include ':widget'
+include ':avatar-view'
 include ':app'
 rootProject.name = "AvatarView"