From fa2355b25f2f233b872e2f4bd76710fb361fe38d Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Tue, 20 Dec 2022 17:39:27 +0100
Subject: [PATCH] Release 3.12.1

---
 app/build.gradle                                             | 4 ++--
 app/src/main/assets/release_notes/notes.json                 | 5 +++++
 .../android/imageeditor/tools/EditingToolsAdapter.java       | 2 +-
 app/src/main/res/drawable/ic_eraser.xml                      | 1 +
 app/src/main/res/drawable/ic_insert_emoticon.xml             | 1 +
 app/src/main/res/drawable/ic_oval.xml                        | 1 +
 app/src/main/res/drawable/ic_text.xml                        | 1 +
 app/src/main/res/layout/activity_edit_image.xml              | 1 +
 src/fdroid/fastlane/metadata/android/en/changelogs/451.txt   | 1 +
 9 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 773416633..445efddd8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdk 21
         targetSdk 32
-        versionCode 450
-        versionName "3.12.0"
+        versionCode 451
+        versionName "3.12.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     flavorDimensions "default"
diff --git a/app/src/main/assets/release_notes/notes.json b/app/src/main/assets/release_notes/notes.json
index a98bff249..5c35915a2 100644
--- a/app/src/main/assets/release_notes/notes.json
+++ b/app/src/main/assets/release_notes/notes.json
@@ -1,4 +1,9 @@
 [
+  {
+    "version": "3.12.1",
+    "code": "451",
+    "note": "Added:\n- Post random quotes\n- Group reblogs in home timeline\n\nChanged:\n- Display translate button only when language is different\n- Respect blank spaces between words in messages\n- Focus button more accessible when editing media\n\nFixed:\n- Behavior with cw toggle\n- Truncated gimini links"
+  },
   {
     "version": "3.12.0",
     "code": "450",
diff --git a/app/src/main/java/app/fedilab/android/imageeditor/tools/EditingToolsAdapter.java b/app/src/main/java/app/fedilab/android/imageeditor/tools/EditingToolsAdapter.java
index 5415c24cf..845b47df0 100644
--- a/app/src/main/java/app/fedilab/android/imageeditor/tools/EditingToolsAdapter.java
+++ b/app/src/main/java/app/fedilab/android/imageeditor/tools/EditingToolsAdapter.java
@@ -27,12 +27,12 @@ public class EditingToolsAdapter extends RecyclerView.Adapter<EditingToolsAdapte
     public EditingToolsAdapter(OnItemSelected onItemSelected) {
         mOnItemSelected = onItemSelected;
         mToolList.add(new ToolModel("Crop", R.drawable.ic_crop, ToolType.CROP));
+        mToolList.add(new ToolModel("Focus", R.drawable.ic_baseline_filter_center_focus_24, ToolType.FOCUS));
         mToolList.add(new ToolModel("Shape", R.drawable.ic_oval, ToolType.SHAPE));
         mToolList.add(new ToolModel("Text", R.drawable.ic_text, ToolType.TEXT));
         mToolList.add(new ToolModel("Eraser", R.drawable.ic_eraser, ToolType.ERASER));
         mToolList.add(new ToolModel("Filter", R.drawable.ic_photo_filter, ToolType.FILTER));
         mToolList.add(new ToolModel("Emoji", R.drawable.ic_insert_emoticon, ToolType.EMOJI));
-        mToolList.add(new ToolModel("Focus", R.drawable.ic_baseline_filter_center_focus_24, ToolType.FOCUS));
     }
 
     @NonNull
diff --git a/app/src/main/res/drawable/ic_eraser.xml b/app/src/main/res/drawable/ic_eraser.xml
index 212d2ae16..08b7074cc 100644
--- a/app/src/main/res/drawable/ic_eraser.xml
+++ b/app/src/main/res/drawable/ic_eraser.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="511.999"
     android:viewportHeight="511.999">
     <path
diff --git a/app/src/main/res/drawable/ic_insert_emoticon.xml b/app/src/main/res/drawable/ic_insert_emoticon.xml
index 4622233c0..b5f25188d 100644
--- a/app/src/main/res/drawable/ic_insert_emoticon.xml
+++ b/app/src/main/res/drawable/ic_insert_emoticon.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_oval.xml b/app/src/main/res/drawable/ic_oval.xml
index b516ac230..f98eb2cf9 100644
--- a/app/src/main/res/drawable/ic_oval.xml
+++ b/app/src/main/res/drawable/ic_oval.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ic_text.xml b/app/src/main/res/drawable/ic_text.xml
index f01eeaeb6..65e9895fa 100644
--- a/app/src/main/res/drawable/ic_text.xml
+++ b/app/src/main/res/drawable/ic_text.xml
@@ -1,6 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/layout/activity_edit_image.xml b/app/src/main/res/layout/activity_edit_image.xml
index 7c426da8a..5fa402db2 100644
--- a/app/src/main/res/layout/activity_edit_image.xml
+++ b/app/src/main/res/layout/activity_edit_image.xml
@@ -32,6 +32,7 @@
 
         <app.fedilab.android.helper.CirclesDrawingView
             android:id="@+id/focus_circle"
+            android:elevation="5dp"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="gone" />
diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/451.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/451.txt
index 85356eedd..649057a9d 100644
--- a/src/fdroid/fastlane/metadata/android/en/changelogs/451.txt
+++ b/src/fdroid/fastlane/metadata/android/en/changelogs/451.txt
@@ -5,6 +5,7 @@ Added:
 Changed:
 - Display translate button only when language is different
 - Respect blank spaces between words in messages
+- Focus button more accessible when editing media
 
 Fixed:
 - Behavior with cw toggle