From 57aa7405acf7db0ec874d9f3c51cd169d75b2c58 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Thu, 6 Oct 2022 19:42:51 +0200
Subject: [PATCH] use full alpha at ic_photo_full_vector + formatting

---
 .../res/drawable/ic_photo_full_vector.xml     |  2 +-
 app/src/main/res/drawable/ic_shutter.xml      | 19 -------------------
 .../main/res/drawable/ic_shutter_animated.xml |  4 ++--
 .../main/res/drawable/ic_shutter_vector.xml   |  6 ++++++
 .../drawable/shutter_pressed_to_unpressed.xml |  2 +-
 .../drawable/shutter_unpressed_to_pressed.xml |  2 +-
 app/src/main/res/layout/layout_top.xml        |  1 -
 7 files changed, 11 insertions(+), 25 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_shutter.xml
 create mode 100644 app/src/main/res/drawable/ic_shutter_vector.xml

diff --git a/app/src/main/res/drawable/ic_photo_full_vector.xml b/app/src/main/res/drawable/ic_photo_full_vector.xml
index b8c671eb..a42c3ff8 100644
--- a/app/src/main/res/drawable/ic_photo_full_vector.xml
+++ b/app/src/main/res/drawable/ic_photo_full_vector.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillAlpha="0.85" android:fillColor="#FFFFFFFF" android:fillType="evenOdd" android:pathData="M15 2.9h2.827l-4.464 4.464 1.273 1.272L19.1 4.173V7h1.8V2c0-0.497-0.403-0.9-0.9-0.9h-5v1.8zM6 2.1c-0.504 0-0.987 0.2-1.343 0.556C4.3 3.013 4.1 3.496 4.1 4v10h1.8V4c0-0.027 0.01-0.052 0.03-0.07C5.947 3.91 5.973 3.9 6 3.9h6V2.1H6zM19.9 20V10h-1.8v10c0 0.026-0.01 0.052-0.03 0.07-0.018 0.02-0.044 0.03-0.07 0.03h-6v1.8h6c0.504 0 0.987-0.2 1.343-0.556C19.7 20.986 19.9 20.503 19.9 20zm-15-0.173l4.463-4.463 1.273 1.272L6.173 21.1H9v1.8H4c-0.497 0-0.9-0.403-0.9-0.9v-5h1.8v2.827z"/>
+    <path android:fillColor="#FFFFFFFF" android:fillType="evenOdd" android:pathData="M15 2.9h2.827l-4.464 4.464 1.273 1.272L19.1 4.173V7h1.8V2c0-0.497-0.403-0.9-0.9-0.9h-5v1.8zM6 2.1c-0.504 0-0.987 0.2-1.343 0.556C4.3 3.013 4.1 3.496 4.1 4v10h1.8V4c0-0.027 0.01-0.052 0.03-0.07C5.947 3.91 5.973 3.9 6 3.9h6V2.1H6zM19.9 20V10h-1.8v10c0 0.026-0.01 0.052-0.03 0.07-0.018 0.02-0.044 0.03-0.07 0.03h-6v1.8h6c0.504 0 0.987-0.2 1.343-0.556C19.7 20.986 19.9 20.503 19.9 20zm-15-0.173l4.463-4.463 1.273 1.272L6.173 21.1H9v1.8H4c-0.497 0-0.9-0.403-0.9-0.9v-5h1.8v2.827z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_shutter.xml b/app/src/main/res/drawable/ic_shutter.xml
deleted file mode 100644
index 7c8a609d..00000000
--- a/app/src/main/res/drawable/ic_shutter.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="@dimen/icon_size"
-    android:height="@dimen/icon_size"
-    android:viewportWidth="512"
-    android:viewportHeight="512">
-    <path
-        android:fillColor="#ffffff"
-        android:fillType="evenOdd"
-        android:pathData="M256,485C382.47,485 485,382.47 485,256C485,129.53 382.47,27 256,27C129.53,27 27,129.53 27,256C27,382.47 129.53,485 256,485ZM256,465C370.32,465 463,371.43 463,256C463,140.57 370.32,47 256,47C141.68,47 49,140.57 49,256C49,371.43 141.68,465 256,465Z" />
-
-    <group
-        android:name="inner"
-        android:pivotX="256"
-        android:pivotY="256">
-        <path
-            android:fillColor="#ffffff"
-            android:pathData="M255.5,255.5m-170.5,0a170.5,170.5 0,1 1,341 0a170.5,170.5 0,1 1,-341 0" />
-    </group>
-</vector>
diff --git a/app/src/main/res/drawable/ic_shutter_animated.xml b/app/src/main/res/drawable/ic_shutter_animated.xml
index b1baee68..42081bc9 100644
--- a/app/src/main/res/drawable/ic_shutter_animated.xml
+++ b/app/src/main/res/drawable/ic_shutter_animated.xml
@@ -6,11 +6,11 @@
     android:viewportHeight="168">
     <item
         android:id="@+id/pressed"
-        android:drawable="@drawable/ic_shutter"
+        android:drawable="@drawable/ic_shutter_vector"
         android:state_pressed="true" />
     <item
         android:id="@+id/unpressed"
-        android:drawable="@drawable/ic_shutter" />
+        android:drawable="@drawable/ic_shutter_vector" />
 
     <transition
         android:drawable="@drawable/shutter_pressed_to_unpressed"
diff --git a/app/src/main/res/drawable/ic_shutter_vector.xml b/app/src/main/res/drawable/ic_shutter_vector.xml
new file mode 100644
index 00000000..ce39ab72
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shutter_vector.xml
@@ -0,0 +1,6 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="@dimen/icon_size" android:height="@dimen/icon_size" android:viewportWidth="512" android:viewportHeight="512">
+    <path android:fillColor="#FFFFFFFF" android:fillType="evenOdd" android:pathData="M256 485c126.47 0 229-102.53 229-229S382.47 27 256 27 27 129.53 27 256s102.53 229 229 229zm0-20c114.32 0 207-93.57 207-209S370.32 47 256 47 49 140.57 49 256s92.68 209 207 209z"/>
+    <group android:name="inner" android:pivotX="256" android:pivotY="256">
+        <path android:fillColor="#FFFFFFFF" android:pathData="M85 255.5a170.5 170.5 0 1 1 341 0 170.5 170.5 0 1 1-341 0"/>
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/shutter_pressed_to_unpressed.xml b/app/src/main/res/drawable/shutter_pressed_to_unpressed.xml
index eb8bdd91..53ac977e 100644
--- a/app/src/main/res/drawable/shutter_pressed_to_unpressed.xml
+++ b/app/src/main/res/drawable/shutter_pressed_to_unpressed.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
-    android:drawable="@drawable/ic_shutter">
+    android:drawable="@drawable/ic_shutter_vector">
 
     <target android:name="inner">
         <aapt:attr name="android:animation">
diff --git a/app/src/main/res/drawable/shutter_unpressed_to_pressed.xml b/app/src/main/res/drawable/shutter_unpressed_to_pressed.xml
index 7ebc744a..13f9bb4e 100644
--- a/app/src/main/res/drawable/shutter_unpressed_to_pressed.xml
+++ b/app/src/main/res/drawable/shutter_unpressed_to_pressed.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
-    android:drawable="@drawable/ic_shutter">
+    android:drawable="@drawable/ic_shutter_vector">
 
     <target android:name="inner">
         <aapt:attr name="android:animation">
diff --git a/app/src/main/res/layout/layout_top.xml b/app/src/main/res/layout/layout_top.xml
index 555085c5..0fa7f66e 100644
--- a/app/src/main/res/layout/layout_top.xml
+++ b/app/src/main/res/layout/layout_top.xml
@@ -21,7 +21,6 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-
     <com.google.android.material.button.MaterialButton
         android:id="@+id/change_resolution"
         style="@style/Widget.App.Button.OutlineButton.IconOnly"