Merge remote-tracking branch 'refs/remotes/origin/develop' into 1218-…

…delay-when-inputting-key-events-through-input-method-on-android-14
keymapperorg · Jun 30, 2024 · 24cfa60 · 24cfa60
2 parents ef28660 + 8e5d7e2
commit 24cfa60
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 4 deletions.
diff --git a/app/src/main/res/drawable/profile_pic_jambl3r.jpg b/app/src/main/res/drawable/profile_pic_jambl3r.jpg
diff --git a/app/src/main/res/drawable/profile_pic_jambl3r.png b/app/src/main/res/drawable/profile_pic_jambl3r.png
diff --git a/app/src/main/res/drawable/profile_pic_sds100.jpeg b/app/src/main/res/drawable/profile_pic_sds100.jpeg
diff --git a/app/src/main/res/drawable/profile_pic_sds100.png b/app/src/main/res/drawable/profile_pic_sds100.png
diff --git a/app/src/main/res/layout/list_item_about_item.xml b/app/src/main/res/layout/list_item_about_item.xml
@@ -60,7 +60,7 @@
                 tools:visibility="visible" />
         </LinearLayout>
 
-        <androidx.appcompat.widget.AppCompatImageView
+        <com.google.android.material.imageview.ShapeableImageView
             android:id="@+id/imageView"
             android:layout_width="40dp"
             android:layout_height="40dp"
@@ -72,6 +72,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/layoutDescription"
             app:layout_constraintVertical_bias="0.0"
+            app:shapeAppearanceOverlay="@style/circularImageView"
             tools:srcCompat="@mipmap/ic_launcher"
             tools:visibility="visible" />
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1348,9 +1348,9 @@
     <string name="about_team_sds100_role">Developer</string>
     <string name="about_team_sds100_url" translatable="false">https://github.com/sds100</string>
 
-    <string name="about_team_jambl3r_name" translatable="false">Jambl3r</string>
+    <string name="about_team_jambl3r_name" translatable="false">Jack Ambler (jambl3r)</string>
     <string name="about_team_jambl3r_role">Community moderator/support</string>
-    <string name="about_team_jambl3r_url" translatable="false">https://gitlab.com/jambl3r</string>
+    <string name="about_team_jambl3r_url" translatable="false">https://linkedin.com/in/jambl3r</string>
 
     <string name="about_team_gl513_name" translatable="false">GL513</string>
     <string name="about_team_gl513_role">Community moderator/support</string>

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -37,6 +37,10 @@
         <item name="colorPrimaryInverse">@color/md_theme_primaryInverse</item>
     </style>
 
+    <style name="circularImageView" parent="">
+        <item name="cornerSize">50%</item>
+    </style>
+
     <style name="Theme.App.Starting" parent="Theme.SplashScreen">
         <item name="windowSplashScreenBackground">?android:colorBackground</item>
         <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>

diff --git a/docs/index.md b/docs/index.md
@@ -30,7 +30,7 @@ This wiki aims to provide users with a comprehensive guide to using and setting
 
 ### Community moderators/support
 
-- [Jambl3r](https://gitlab.com/jambl3r)
+- [Jack Ambler (jambl3r)](https://linkedin.com/in/jambl3r)
 - [GL513](https://gl513.github.io/)
 
 ### Translators