Aperture: Add new flip camera drawable
Change-Id: Id8a897171c1fec48fcf2b06340990be0b6540963
diff --git a/app/src/main/res/animator/rotate_180.xml b/app/src/main/res/animator/rotate_180.xml
deleted file mode 100644
index 301bc03..0000000
--- a/app/src/main/res/animator/rotate_180.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
- android:duration="500"
- android:propertyName="rotation"
- android:valueFrom="0"
- android:valueTo="-180" />
diff --git a/app/src/main/res/drawable/ic_flip_camera.xml b/app/src/main/res/drawable/ic_flip_camera.xml
index e455a62..8b212b3 100644
--- a/app/src/main/res/drawable/ic_flip_camera.xml
+++ b/app/src/main/res/drawable/ic_flip_camera.xml
@@ -1,15 +1,43 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="40dp"
- android:height="40dp"
- android:tint="#000000"
- android:viewportWidth="40"
- android:viewportHeight="40">
- <group
- android:name="rotationGroup"
- android:pivotX="20.0"
- android:pivotY="20.0">
- <path
- android:fillColor="@android:color/white"
- android:pathData="M20,36.667Q14.125,36.667 9.604,33.021Q5.083,29.375 3.792,23.625H6.625Q7.875,28.208 11.583,31.042Q15.292,33.875 20,33.875Q23.917,33.875 27.229,31.896Q30.542,29.917 32.375,26.458H27.125V23.625H36.667V33.333H33.917V29.208Q31.542,32.708 27.875,34.688Q24.208,36.667 20,36.667ZM20.042,24.458Q18.167,24.458 16.854,23.146Q15.542,21.833 15.542,19.958Q15.542,18.125 16.854,16.792Q18.167,15.458 20.042,15.458Q21.875,15.458 23.208,16.792Q24.542,18.125 24.542,19.958Q24.542,21.833 23.208,23.146Q21.875,24.458 20.042,24.458ZM3.333,16.333V6.667H6.125V10.75Q8.5,7.25 12.146,5.292Q15.792,3.333 20,3.333Q25.875,3.333 30.417,6.958Q34.958,10.583 36.208,16.333H33.375Q32.167,11.792 28.438,8.938Q24.708,6.083 20,6.083Q16.125,6.083 12.812,8.083Q9.5,10.083 7.625,13.542H12.875V16.333Z" />
- </group>
-</vector>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ SPDX-FileCopyrightText: 2022 The LineageOS Project
+ SPDX-License-Identifier: Apache-2.0
+-->
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:aapt="http://schemas.android.com/aapt">
+ <aapt:attr name="android:drawable">
+ <vector
+ android:width="32dp"
+ android:height="32dp"
+ android:viewportWidth="32"
+ android:viewportHeight="32">
+ <group
+ android:name="rotationGroup"
+ android:pivotX="16.0"
+ android:pivotY="16.0">
+ <path
+ android:fillColor="@android:color/white"
+ android:fillType="evenOdd"
+ android:pathData="M0 16C0 15.3278 0.0423017 14.6599 0.125431 14C0.567068 10.494 2.16104 7.21154 4.68629 4.68629C7.21155 2.16104 10.494 0.567068 14 0.125431C14.6599 0.0423017 15.3278 0 16 0H24L16 8V2.01934C12.2921 2.01934 8.73606 3.4923 6.11418 6.11418C3.4923 8.73606 2.01934 12.2921 2.01934 16H0Z" />
+ <path
+ android:fillColor="@android:color/white"
+ android:fillType="evenOdd"
+ android:pathData="M29.9807 16C29.9807 17.836 29.619 19.654 28.9164 21.3502C28.2139 23.0464 27.184 24.5876 25.8858 25.8858C24.5876 27.184 23.0464 28.2139 21.3502 28.9164C19.654 29.619 17.836 29.9807 16 29.9807L16 24L8 32H16C16.67 32 17.338 31.9579 18 31.8745C19.4139 31.6964 20.8008 31.3297 22.1229 30.7821C24.0641 29.978 25.828 28.7994 27.3137 27.3137C28.7994 25.828 29.978 24.0641 30.7821 22.1229C31.3297 20.8008 31.6964 19.4139 31.8745 18C31.9579 17.338 32 16.67 32 16H29.9807Z" />
+ <path
+ android:fillType="evenOdd"
+ android:pathData="M19 16C19 17.6569 17.6569 19 16 19C14.3431 19 13 17.6569 13 16C13 14.3431 14.3431 13 16 13C17.6569 13 19 14.3431 19 16Z"
+ android:strokeWidth="2"
+ android:strokeColor="#4D84E9" />
+ </group>
+ </vector>
+ </aapt:attr>
+ <target android:name="rotationGroup">
+ <aapt:attr name="android:animation">
+ <objectAnimator
+ android:duration="500"
+ android:propertyName="rotation"
+ android:valueFrom="0"
+ android:valueTo="-180" />
+ </aapt:attr>
+ </target>
+</animated-vector>
diff --git a/app/src/main/res/drawable/ic_flip_camera_anim.xml b/app/src/main/res/drawable/ic_flip_camera_anim.xml
deleted file mode 100644
index 8c7aa66..0000000
--- a/app/src/main/res/drawable/ic_flip_camera_anim.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:drawable="@drawable/ic_flip_camera">
- <target
- android:name="rotationGroup"
- android:animation="@animator/rotate_180" />
-</animated-vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index dcc1f5e..14b5408 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -238,14 +238,13 @@
<ImageButton
android:id="@+id/flipCameraButton"
- style="@style/ApertureFlipCameraButton"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_marginEnd="32dp"
android:background="@null"
android:contentDescription="@string/flip_camera_button_description"
android:scaleType="center"
- android:src="@drawable/ic_flip_camera_anim"
+ android:src="@drawable/ic_flip_camera"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index af19b30..8380294 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -44,9 +44,4 @@
<style name="ApertureShutterButton">
<item name="android:background">@drawable/shutter_button_background</item>
</style>
-
- <!-- Flip camera button theme -->
- <style name="ApertureFlipCameraButton">
- <item name="tint">?attr/colorPrimary</item>
- </style>
</resources>
\ No newline at end of file