replace-autofit-text-view & replace-circular-image-view & kofi & updated bluesky icon

Donnnno · connyduck · Donnnno · commit 5f00cadf5f47 · 2024-04-21T19:45:41.000+02:00
https: //github.com/zixpo/candybar/commit/0f734156e17bf84841addf8161b03e58e4334c2d
https: //github.com/zixpo/candybar/commit/21245de7b52e2a8d63f461cd9ef577c229e52274
https: //github.com/zixpo/candybar/commit/7e48748a35c1698b62cd9ea584f2e0b6a80f26a4
Co-Authored-By: Konrad Pozniak &lt;10157047+connyduck@users.noreply.github.com&gt;
diff --git a/app/src/main/res/values/dashboard_configurations.xml b/app/src/main/res/values/dashboard_configurations.xml
@@ -94,14 +94,17 @@
         ]]>
     </string>
     <string-array name="about_social_links">
-        <item>https://www.instagram.com/_u/yourusername</item>
+        <item>https://instagram.com/_u/yourusername</item>
         <item>https://twitter.com/</item>
-        <item>https://www.behance.net/</item>
+        <item>https://behance.net/</item>
         <item>https://matrix.to/</item>
         <item>http://github.com/yourusername</item>
-        <item>http://www.yourwebsite.com</item>
+        <item>http:/yourwebsite.com</item>
         <item>your@email.com</item>
         <item>https://t.me/yourname</item>
+        <item>https://ko-fi.com/yourname</item>
+        <item>https://bsky.app/yourname</item>
+        <item>https://threads.net/yourname</item>
     </string-array>
     <bool name="show_contributors_dialog">true</bool>
     <string name="privacy_policy_link">https://app-privacy-policy-generator.firebaseapp.com/</string>
diff --git a/library/build.gradle b/library/build.gradle
@@ -116,9 +116,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:okhttp:4.3.0'
     implementation 'com.afollestad.material-dialogs:core:0.9.6.0'
     implementation 'com.afollestad.material-dialogs:commons:0.9.6.0'
-    implementation 'com.mikhaellopez:circularimageview:3.0.2'
     implementation 'com.github.chrisbanes:PhotoView:1.3.1'
-    implementation 'me.grantland:autofittextview:0.2.1'
     implementation 'com.github.KeepSafe:TapTargetView:1.9.1'
     implementation 'com.github.sarsamurmu:AdaptiveIconBitmap:1.0.1'
     implementation 'com.github.zixpo:recycler-fast-scroll:6add4dff39'
diff --git a/library/src/main/java/candybar/lib/adapters/AboutAdapter.java b/library/src/main/java/candybar/lib/adapters/AboutAdapter.java
@@ -33,7 +33,6 @@
 import com.danimahardhika.android.helpers.core.DrawableHelper;
 import com.danimahardhika.android.helpers.core.utils.LogUtil;
 import com.google.android.material.card.MaterialCardView;
-import com.mikhaellopez.circularimageview.CircularImageView;
 
 import java.util.HashMap;
 
@@ -194,7 +193,7 @@ public int getItemViewType(int position) {
     private class HeaderViewHolder extends RecyclerView.ViewHolder {
 
         private final ImageView image;
-        private final CircularImageView profile;
+        private final ImageView profile;
 
         HeaderViewHolder(View itemView) {
             super(itemView);
@@ -255,8 +254,7 @@ private class HeaderViewHolder extends RecyclerView.ViewHolder {
             if (!Preferences.get(mContext).isCardShadowEnabled()) {
                 if (card != null) card.setCardElevation(0);
 
-                profile.setShadowRadius(0f);
-                profile.setShadowColor(Color.TRANSPARENT);
+                profile.setElevation(0);
             }
 
             subtitle.setText(HtmlCompat.fromHtml(
diff --git a/library/src/main/java/candybar/lib/adapters/HomeAdapter.java b/library/src/main/java/candybar/lib/adapters/HomeAdapter.java
@@ -35,6 +35,7 @@
 import androidx.core.graphics.drawable.RoundedBitmapDrawable;
 import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
 import androidx.core.text.HtmlCompat;
+import androidx.core.widget.TextViewCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 
@@ -78,7 +79,6 @@
 import candybar.lib.utils.AsyncTaskBase;
 import candybar.lib.utils.CandyBarGlideModule;
 import candybar.lib.utils.views.HeaderView;
-import me.grantland.widget.AutofitTextView;
 
 /*
  * CandyBar - Material Dashboard
@@ -182,7 +182,7 @@ public void onViewRecycled(@NonNull RecyclerView.ViewHolder holder) {
 
             contentViewHolder.title.setSingleLine(false);
             contentViewHolder.title.setMaxLines(10);
-            contentViewHolder.title.setSizeToFit(false);
+            TextViewCompat.setAutoSizeTextTypeWithDefaults(contentViewHolder.title, TextViewCompat.AUTO_SIZE_TEXT_TYPE_NONE);
             contentViewHolder.title.setGravity(Gravity.CENTER_VERTICAL);
             contentViewHolder.title.setIncludeFontPadding(true);
             contentViewHolder.title.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
@@ -288,13 +288,12 @@ public boolean onResourceReady(Bitmap bitmap, Object model, Target<Bitmap> targe
                     contentViewHolder.title.setVisibility(View.VISIBLE);
                 }
 
-                contentViewHolder.title.setSingleLine(true);
-                contentViewHolder.title.setMaxLines(1);
+                contentViewHolder.title.setLines(1);
                 contentViewHolder.title.setTextSize(TypedValue.COMPLEX_UNIT_PX,
                         mContext.getResources().getDimension(R.dimen.text_max_size));
                 contentViewHolder.title.setGravity(Gravity.END | Gravity.CENTER_VERTICAL);
                 contentViewHolder.title.setIncludeFontPadding(false);
-                contentViewHolder.title.setSizeToFit(true);
+                TextViewCompat.setAutoSizeTextTypeWithDefaults(contentViewHolder.title, TextViewCompat.AUTO_SIZE_TEXT_TYPE_UNIFORM);
 
                 contentViewHolder.subtitle.setGravity(Gravity.END | Gravity.CENTER_VERTICAL);
             } else {
@@ -641,7 +640,7 @@ protected void postRun(boolean ok) {
     private class ContentViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
 
         private final TextView subtitle;
-        private final AutofitTextView title;
+        private final TextView title;
         private final ProgressBar progressBar;
         private final boolean quickApply;
 
diff --git a/library/src/main/java/candybar/lib/helpers/UrlHelper.java b/library/src/main/java/candybar/lib/helpers/UrlHelper.java
@@ -57,6 +57,8 @@ public static Drawable getSocialIcon(@NonNull Context context, @NonNull Type typ
                 return getTintedDrawable(context, R.drawable.ic_toolbar_googleplay, color);
             case INSTAGRAM:
                 return getTintedDrawable(context, R.drawable.ic_toolbar_instagram, color);
+            case KOFI:
+                return getTintedDrawable(context, R.drawable.ic_toolbar_kofi, color);
             case MASTODON:
                 return getTintedDrawable(context, R.drawable.ic_toolbar_mastodon, color);
             case MATRIX:
@@ -103,6 +105,8 @@ public static Type getType(String url) {
             return Type.GOOGLEPLAY;
         } else if (url.contains("instagram.")) {
             return Type.INSTAGRAM;
+        } else if (url.contains("ko-fi.")) {
+            return Type.KOFI;
         } else if (url.contains("mastodon.")|| url.contains("mstdn.")|| url.contains("mas.")|| url.contains("todon.")|| url.contains("fosstodon.")|| url.contains("troet.")|| url.contains("chaos.")|| url.contains("floss.")) {
             return Type.MASTODON;
         } else if (url.contains("matrix.")) {
@@ -133,6 +137,7 @@ public enum Type {
         GITLAB,
         GOOGLEPLAY,
         INSTAGRAM,
+        KOFI,
         MASTODON,
         MATRIX,
         PINTEREST,
diff --git a/library/src/main/res/drawable/ic_launcher_kiss.png b/library/src/main/res/drawable/ic_launcher_kiss.png
diff --git a/library/src/main/res/drawable/ic_toolbar_bluesky.xml b/library/src/main/res/drawable/ic_toolbar_bluesky.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="#FF000000"
-      android:pathData="m4.5448,18.5285h13.5262c7.3424,0 6.1144,-11.0486 -1.2495,-8.5987 0,-6.1352 -11.0486,-6.1352 -11.0486,1.2286 -6.142,-1.2286 -6.142,7.3701 -1.2281,7.3701Z"
-      android:strokeWidth="0"/>
+      android:pathData="M12,16.4c0,-0.1 0,0 0.1,0.3 0.5,1.4 2.3,6.8 6.5,2.5 2.2,-2.3 1.2,-4.6 -2.9,-5.3 2.3,0.4 4.9,-0.3 5.6,-2.8 0.2,-0.7 0.6,-5.3 0.6,-5.9 0,-3.1 -2.7,-2.1 -4.3,-0.9 -2.3,1.7 -4.8,5.2 -5.7,7.1 -0.9,-1.9 -3.4,-5.4 -5.7,-7.1 -1.7,-1.2 -4.3,-2.2 -4.3,0.9s0.4,5.1 0.6,5.9c0.7,2.6 3.3,3.2 5.6,2.8 -4,0.7 -5.1,3 -2.9,5.3 4.2,4.3 6.1,-1.1 6.5,-2.5 0,-0.3 0.1,-0.4 0.1,-0.3h0Z"
+      android:strokeWidth="0"
+      android:fillColor="#000"/>
 </vector>
diff --git a/library/src/main/res/drawable/ic_toolbar_kofi.xml b/library/src/main/res/drawable/ic_toolbar_kofi.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M22.9,9.2c-0.3,-1.6 -1.2,-2.6 -2.1,-3.2 -0.9,-0.6 -2,-1 -3.1,-1H1.8c-0.6,0 -0.8,0.6 -0.8,0.8 0,0 0,0.2 0,0.2 0,0 0,7 0,10.8 0.1,2.2 2.4,2.2 2.4,2.2 0,0 7.2,0 10.7,0 0.2,0 0.3,0 0.5,0 2,-0.5 2.2,-2.4 2.2,-3.4 4,0.2 6.8,-2.6 6.1,-6.4ZM12.8,12.4c-1.2,1.3 -3.7,3.6 -3.7,3.6 0,0 0,0 -0.2,0 0,0 0,0 -0.1,0 -0.4,-0.3 -3.2,-2.9 -3.7,-3.7 -0.6,-0.9 -1,-2.5 0,-3.4 0.9,-0.9 2.8,-1 4,0.4 0,0 1.4,-1.6 3.2,-0.9 1.7,0.7 1.7,2.7 0.6,3.9ZM18.4,12.8c-0.8,0 -1.5,0 -1.5,0v-5.2s1.1,0 1.1,0c0.7,0 1.3,0.3 1.8,0.8 0.3,0.4 0.6,0.9 0.6,1.6 0,1.7 -0.9,2.4 -1.9,2.7Z"
+      android:strokeWidth="0"
+      android:fillColor="#000"/>
+</vector>
diff --git a/library/src/main/res/layout-land/fragment_about_item_header.xml b/library/src/main/res/layout-land/fragment_about_item_header.xml
@@ -27,17 +27,15 @@
             app:heightRatio="7"
             app:widthRatio="16" />
 
-        <com.mikhaellopez.circularimageview.CircularImageView
+        <com.google.android.material.imageview.ShapeableImageView
             android:id="@+id/profile"
             android:layout_width="@dimen/about_profile"
             android:layout_height="@dimen/about_profile"
-            android:layout_marginTop="@dimen/about_profile_margin_top"
             android:layout_gravity="center_horizontal"
-            app:civ_border_color="?cb_cardBackground"
-            app:civ_border_width="@dimen/about_profile_border"
-            app:civ_shadow="true"
-            app:civ_shadow_radius="12"
-            app:civ_shadow_color="#22000000" />
+            android:layout_marginTop="@dimen/about_profile_margin_top"
+            android:background="?cb_cardBackground"
+            android:elevation="4dp"
+            app:shapeAppearanceOverlay="@style/ShapeAppearance.Material3.Corner.Full" />
 
         <TextView
             android:layout_width="match_parent"
diff --git a/library/src/main/res/layout/fragment_about_item_header.xml b/library/src/main/res/layout/fragment_about_item_header.xml
@@ -14,17 +14,15 @@
         app:heightRatio="7"
         app:widthRatio="16" />
 
-    <com.mikhaellopez.circularimageview.CircularImageView
+    <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/profile"
         android:layout_width="@dimen/about_profile"
         android:layout_height="@dimen/about_profile"
-        android:layout_marginTop="@dimen/about_profile_margin_top"
         android:layout_gravity="center_horizontal"
-        app:civ_border_color="?cb_cardBackground"
-        app:civ_border_width="@dimen/about_profile_border"
-        app:civ_shadow="true"
-        app:civ_shadow_radius="12"
-        app:civ_shadow_color="#22000000" />
+        android:layout_marginTop="@dimen/about_profile_margin_top"
+        android:background="?cb_cardBackground"
+        android:elevation="4dp"
+        app:shapeAppearanceOverlay="@style/ShapeAppearance.Material3.Corner.Full" />
 
     <TextView
         android:layout_width="match_parent"
diff --git a/library/src/main/res/layout/fragment_home_item_content.xml b/library/src/main/res/layout/fragment_home_item_content.xml
@@ -30,15 +30,16 @@
             android:layout_gravity="end"
             android:visibility="gone" />
 
-        <me.grantland.widget.AutofitTextView
+        <TextView
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:drawablePadding="@dimen/button_margin"
             android:gravity="center_vertical"
-            android:textColor="?android:attr/textColorPrimary"
             android:textSize="@dimen/text_max_size"
-            app:minTextSize="@dimen/text_content_title" />
+            android:textColor="?android:attr/textColorPrimary"
+            app:autoSizeMaxTextSize="@dimen/text_max_size"
+            app:autoSizeMinTextSize="@dimen/text_content_title" />
 
         <TextView
             android:id="@+id/subtitle"
diff --git a/library/src/main/res/xml/dashboard_licenses.xml b/library/src/main/res/xml/dashboard_licenses.xml
@@ -121,22 +121,6 @@
         limitations under the License.
     </license>
 
-    <license name="Circular ImageView">
-        Copyright (c) 2016 Lopez Mikhael
-
-        Licensed under the Apache License, Version 2.0 (the "License");
-        you may not use this file except in compliance with the License.
-        You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-        See the License for the specific language governing permissions and
-        limitations under the License.
-    </license>
-
     <license name="DrawMe">
         Copyright (c) 2016 Rafał Kobyłko
 
@@ -153,22 +137,6 @@
         limitations under the License.
     </license>
 
-    <license name="Autofit TextView">
-        Copyright (c) 2014 Grantland Chew
-
-        Licensed under the Apache License, Version 2.0 (the "License");
-        you may not use this file except in compliance with the License.
-        You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-        Unless required by applicable law or agreed to in writing, software
-        distributed under the License is distributed on an "AS IS" BASIS,
-        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-        See the License for the specific language governing permissions and
-        limitations under the License.
-    </license>
-
     <license name="TapTargetView">
         Copyright (c) 2016 Keepsafe Software Inc.
 
