From af120ded097a47e84d8b0dad96f39e0a2e536c39 Mon Sep 17 00:00:00 2001
From: 20captainx12 <63267239+20captainx12@users.noreply.github.com>
Date: Fri, 4 Mar 2022 03:46:11 +0000
Subject: Added adaptive icons (#646)

Start adding adaptive icons for Android Tiramisu.
---
 .../drawable-night-v31/ic_launcher_background.xml  | 10 ++++
 .../drawable-night-v31/ic_launcher_foreground.xml  | 64 ++++++++++++++++++++++
 .../res/drawable-v31/ic_launcher_background.xml    | 10 ++++
 .../res/drawable-v31/ic_launcher_foreground.xml    | 64 ++++++++++++++++++++++
 app/src/main/res/values/strings.xml                |  2 +
 app/src/main/res/xml/theme_preferences.xml         |  6 ++
 6 files changed, 156 insertions(+)
 create mode 100644 app/src/main/res/drawable-night-v31/ic_launcher_background.xml
 create mode 100644 app/src/main/res/drawable-night-v31/ic_launcher_foreground.xml
 create mode 100644 app/src/main/res/drawable-v31/ic_launcher_background.xml
 create mode 100644 app/src/main/res/drawable-v31/ic_launcher_foreground.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable-night-v31/ic_launcher_background.xml b/app/src/main/res/drawable-night-v31/ic_launcher_background.xml
new file mode 100644
index 00000000..cf19ae34
--- /dev/null
+++ b/app/src/main/res/drawable-night-v31/ic_launcher_background.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:fillColor="@android:color/system_neutral1_800"
+      android:pathData="M0,0h108v108h-108z" />
+</vector>
diff --git a/app/src/main/res/drawable-night-v31/ic_launcher_foreground.xml b/app/src/main/res/drawable-night-v31/ic_launcher_foreground.xml
new file mode 100644
index 00000000..037bc939
--- /dev/null
+++ b/app/src/main/res/drawable-night-v31/ic_launcher_foreground.xml
@@ -0,0 +1,64 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="357.14285"
+    android:viewportHeight="357.14285">
+  <group android:translateX="-71.42857"
+      android:translateY="-71.42857">
+    <group>
+      <clip-path android:pathData="M0,0h500v500h-500z M 0,0"/>
+      <path
+          android:pathData="M219.748,296.993C219.408,300.87 214.329,303.591 208.405,303.071C202.48,302.552 197.953,298.988 198.293,295.111C198.633,291.234 203.712,288.513 209.637,289.033C215.561,289.553 220.089,293.117 219.748,296.993Z"
+          android:fillColor="@android:color/system_accent1_100"/>
+      <path
+          android:pathData="M262.901,299.84C262.901,304.319 256.949,307.95 249.606,307.95C242.263,307.95 236.311,304.319 236.311,299.84C236.311,295.361 242.263,291.73 249.606,291.73C256.949,291.73 262.901,295.361 262.901,299.84Z"
+          android:fillColor="@android:color/system_accent1_100"/>
+      <path
+          android:pathData="M301.779,294.703C302.331,297.737 298.143,302.337 292.075,303.44C286.007,304.543 280.355,301.732 279.803,298.698C279.252,295.664 283.724,292.31 289.793,291.206C295.861,290.103 301.227,291.668 301.779,294.703Z"
+          android:fillColor="@android:color/system_accent1_100"/>
+      <path
+          android:pathData="M339.357,284.694C339.357,284.694 330.183,264.955 266.958,256.022L250.001,256.443L233.044,256.022C169.817,264.955 160.643,284.694 160.643,284.694C160.643,284.694 199.105,298.247 250.001,297.934C300.896,298.247 339.357,284.694 339.357,284.694Z"
+          android:fillColor="@android:color/system_accent1_100"/>
+      <path
+          android:pathData="M320.769,279.308C321.229,281.009 319.246,283.025 316.339,283.811C313.433,284.596 310.705,283.854 310.245,282.153C309.785,280.452 311.768,278.436 314.674,277.65C317.581,276.865 320.309,277.607 320.769,279.308Z"
+          android:fillColor="@android:color/system_neutral1_800"/>
+      <path
+          android:pathData="M290.377,285.122C290.548,286.876 288.257,288.534 285.261,288.826C282.265,289.117 279.697,287.932 279.526,286.178C279.356,284.424 281.647,282.766 284.643,282.474C287.639,282.183 290.206,283.368 290.377,285.122Z"
+          android:fillColor="@android:color/system_neutral1_800"/>
+      <path
+          android:pathData="M254.778,287.907C254.79,289.669 252.359,291.114 249.348,291.134C246.338,291.155 243.887,289.742 243.876,287.98C243.864,286.218 246.295,284.773 249.305,284.753C252.316,284.733 254.766,286.145 254.778,287.907Z"
+          android:fillColor="@android:color/system_neutral1_800"/>
+      <path
+          android:pathData="M220.107,285.78C219.788,287.513 217.128,288.475 214.168,287.928C211.208,287.382 209.067,285.534 209.386,283.801C209.707,282.068 212.366,281.107 215.326,281.653C218.287,282.199 220.427,284.047 220.107,285.78Z"
+          android:fillColor="@android:color/system_neutral1_800"/>
+      <path
+          android:pathData="M189.639,278.445C189.409,280.192 186.802,281.29 183.818,280.896C180.832,280.503 178.6,278.767 178.83,277.02C179.061,275.273 181.666,274.176 184.652,274.57C187.636,274.963 189.868,276.698 189.639,278.445Z"
+          android:fillColor="@android:color/system_neutral1_800"/>
+      <path
+          android:pathData="M248.534,281.258C232.183,281.258 213.218,278.066 192.874,268.628L192.568,268.487L192.541,268.152C192.527,267.994 191.304,252.154 197.566,234.818C202.173,222.07 211.682,206.407 231.3,196.873C247.204,189.143 266.287,190.652 280.032,201.776C280.516,202.169 281,202.575 281.481,202.995C296.148,215.804 304.313,237.264 305.753,266.777L305.769,267.116L305.482,267.295C305.148,267.503 282.475,281.258 248.534,281.258Z"
+          android:strokeColor="@android:color/system_accent1_100"
+          android:strokeWidth="5"
+          />
+      <path
+          android:pathData="M296.362,255.201C294.633,250.501 292.334,245.185 289.329,240.008C291.131,239.316 292.416,237.581 292.416,235.535C292.416,232.883 290.265,230.732 287.612,230.732C286.234,230.732 285,231.321 284.124,232.251C275.905,221.721 263.963,213.701 246.792,216.025C231.714,218.066 221.252,224.167 214.005,232.01C213.149,231.224 212.018,230.732 210.764,230.732C208.112,230.732 205.962,232.883 205.962,235.535C205.962,237.258 206.876,238.756 208.237,239.604C201.819,249.913 199.329,261.683 198.473,271.07C216.697,278.612 233.694,281.258 248.534,281.258C273.703,281.258 292.665,273.698 300.926,269.703C299.76,265.319 298.268,260.388 296.362,255.201Z"
+          android:fillColor="@android:color/system_accent1_100"
+          android:strokeColor="@android:color/system_neutral1_800"
+          android:strokeWidth="5"/>
+      <path
+          android:pathData="M244.02,252.745C244.946,254.232 246.352,255.604 247.987,256.265C251.23,257.575 253.889,255.357 255.762,252.891C256.473,251.956 254.889,251.046 254.187,251.97C252.538,254.141 250.253,255.809 247.698,254.041C246.874,253.471 246.127,252.678 245.596,251.824C244.977,250.829 243.398,251.744 244.02,252.745Z"
+          android:fillColor="@android:color/system_neutral1_800"/>
+      <path
+          android:pathData="M238.328,242.062C238.328,243.211 237.396,244.143 236.248,244.143C235.099,244.143 234.167,243.211 234.167,242.062C234.167,240.913 235.099,239.981 236.248,239.981C237.396,239.981 238.328,240.913 238.328,242.062Z"
+          android:fillColor="@android:color/system_neutral1_800"/>
+      <path
+          android:pathData="M265.015,242.062C265.015,243.211 264.083,244.143 262.934,244.143C261.786,244.143 260.854,243.211 260.854,242.062C260.854,240.913 261.786,239.981 262.934,239.981C264.083,239.981 265.015,240.913 265.015,242.062Z"
+          android:fillColor="@android:color/system_neutral1_800"/>
+      <path
+          android:pathData="M236.941,250.877C236.941,252.915 235.065,254.567 232.751,254.567C230.437,254.567 228.561,252.915 228.561,250.877C228.561,248.839 230.437,247.188 232.751,247.188C235.065,247.188 236.941,248.839 236.941,250.877Z"
+          android:fillColor="@android:color/system_neutral1_800"/>
+      <path
+          android:pathData="M269.658,250.877C269.658,252.915 267.782,254.567 265.468,254.567C263.153,254.567 261.278,252.915 261.278,250.877C261.278,248.839 263.153,247.188 265.468,247.188C267.782,247.188 269.658,248.839 269.658,250.877Z"
+          android:fillColor="@android:color/system_neutral1_800"/>
+    </group>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable-v31/ic_launcher_background.xml b/app/src/main/res/drawable-v31/ic_launcher_background.xml
new file mode 100644
index 00000000..e4b20200
--- /dev/null
+++ b/app/src/main/res/drawable-v31/ic_launcher_background.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <path
+      android:fillColor="@android:color/system_accent1_100"
+      android:pathData="M0,0h108v108h-108z" />
+</vector>
diff --git a/app/src/main/res/drawable-v31/ic_launcher_foreground.xml b/app/src/main/res/drawable-v31/ic_launcher_foreground.xml
new file mode 100644
index 00000000..623c6a5e
--- /dev/null
+++ b/app/src/main/res/drawable-v31/ic_launcher_foreground.xml
@@ -0,0 +1,64 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="357.14285"
+    android:viewportHeight="357.14285">
+  <group android:translateX="-71.42857"
+      android:translateY="-71.42857">
+    <group>
+      <clip-path android:pathData="M0,0h500v500h-500z M 0,0"/>
+      <path
+          android:pathData="M219.748,296.993C219.408,300.87 214.329,303.591 208.405,303.071C202.48,302.552 197.953,298.988 198.293,295.111C198.633,291.234 203.712,288.513 209.637,289.033C215.561,289.553 220.089,293.117 219.748,296.993Z"
+          android:fillColor="@android:color/system_neutral1_800"/>
+      <path
+          android:pathData="M262.901,299.84C262.901,304.319 256.949,307.95 249.606,307.95C242.263,307.95 236.311,304.319 236.311,299.84C236.311,295.361 242.263,291.73 249.606,291.73C256.949,291.73 262.901,295.361 262.901,299.84Z"
+          android:fillColor="@android:color/system_neutral1_800"/>
+      <path
+          android:pathData="M301.779,294.703C302.331,297.737 298.143,302.337 292.075,303.44C286.007,304.543 280.355,301.732 279.803,298.698C279.252,295.664 283.724,292.31 289.793,291.206C295.861,290.103 301.227,291.668 301.779,294.703Z"
+          android:fillColor="@android:color/system_neutral1_800"/>
+      <path
+          android:pathData="M339.357,284.694C339.357,284.694 330.183,264.955 266.958,256.022L250.001,256.443L233.044,256.022C169.817,264.955 160.643,284.694 160.643,284.694C160.643,284.694 199.105,298.247 250.001,297.934C300.896,298.247 339.357,284.694 339.357,284.694Z"
+          android:fillColor="@android:color/system_neutral1_800"/>
+      <path
+          android:pathData="M320.769,279.308C321.229,281.009 319.246,283.025 316.339,283.811C313.433,284.596 310.705,283.854 310.245,282.153C309.785,280.452 311.768,278.436 314.674,277.65C317.581,276.865 320.309,277.607 320.769,279.308Z"
+          android:fillColor="@android:color/system_accent1_100"/>
+      <path
+          android:pathData="M290.377,285.122C290.548,286.876 288.257,288.534 285.261,288.826C282.265,289.117 279.697,287.932 279.526,286.178C279.356,284.424 281.647,282.766 284.643,282.474C287.639,282.183 290.206,283.368 290.377,285.122Z"
+          android:fillColor="@android:color/system_accent1_100"/>
+      <path
+          android:pathData="M254.778,287.907C254.79,289.669 252.359,291.114 249.348,291.134C246.338,291.155 243.887,289.742 243.876,287.98C243.864,286.218 246.295,284.773 249.305,284.753C252.316,284.733 254.766,286.145 254.778,287.907Z"
+          android:fillColor="@android:color/system_accent1_100"/>
+      <path
+          android:pathData="M220.107,285.78C219.788,287.513 217.128,288.475 214.168,287.928C211.208,287.382 209.067,285.534 209.386,283.801C209.707,282.068 212.366,281.107 215.326,281.653C218.287,282.199 220.427,284.047 220.107,285.78Z"
+          android:fillColor="@android:color/system_accent1_100"/>
+      <path
+          android:pathData="M189.639,278.445C189.409,280.192 186.802,281.29 183.818,280.896C180.832,280.503 178.6,278.767 178.83,277.02C179.061,275.273 181.666,274.176 184.652,274.57C187.636,274.963 189.868,276.698 189.639,278.445Z"
+          android:fillColor="@android:color/system_accent1_100"/>
+      <path
+          android:pathData="M248.534,281.258C232.183,281.258 213.218,278.066 192.874,268.628L192.568,268.487L192.541,268.152C192.527,267.994 191.304,252.154 197.566,234.818C202.173,222.07 211.682,206.407 231.3,196.873C247.204,189.143 266.287,190.652 280.032,201.776C280.516,202.169 281,202.575 281.481,202.995C296.148,215.804 304.313,237.264 305.753,266.777L305.769,267.116L305.482,267.295C305.148,267.503 282.475,281.258 248.534,281.258Z"
+          android:strokeColor="@android:color/system_neutral1_800"
+          android:strokeWidth="5"
+          />
+      <path
+          android:pathData="M296.362,255.201C294.633,250.501 292.334,245.185 289.329,240.008C291.131,239.316 292.416,237.581 292.416,235.535C292.416,232.883 290.265,230.732 287.612,230.732C286.234,230.732 285,231.321 284.124,232.251C275.905,221.721 263.963,213.701 246.792,216.025C231.714,218.066 221.252,224.167 214.005,232.01C213.149,231.224 212.018,230.732 210.764,230.732C208.112,230.732 205.962,232.883 205.962,235.535C205.962,237.258 206.876,238.756 208.237,239.604C201.819,249.913 199.329,261.683 198.473,271.07C216.697,278.612 233.694,281.258 248.534,281.258C273.703,281.258 292.665,273.698 300.926,269.703C299.76,265.319 298.268,260.388 296.362,255.201Z"
+          android:fillColor="@android:color/system_neutral1_800"
+          android:strokeColor="@android:color/system_accent1_100"
+          android:strokeWidth="2.5"/>
+      <path
+          android:pathData="M244.02,252.745C244.946,254.232 246.352,255.604 247.987,256.265C251.23,257.575 253.889,255.357 255.762,252.891C256.473,251.956 254.889,251.046 254.187,251.97C252.538,254.141 250.253,255.809 247.698,254.041C246.874,253.471 246.127,252.678 245.596,251.824C244.977,250.829 243.398,251.744 244.02,252.745Z"
+          android:fillColor="@android:color/system_accent1_100"/>
+      <path
+          android:pathData="M238.328,242.062C238.328,243.211 237.396,244.143 236.248,244.143C235.099,244.143 234.167,243.211 234.167,242.062C234.167,240.913 235.099,239.981 236.248,239.981C237.396,239.981 238.328,240.913 238.328,242.062Z"
+          android:fillColor="@android:color/system_neutral1_800"/>
+      <path
+          android:pathData="M265.015,242.062C265.015,243.211 264.083,244.143 262.934,244.143C261.786,244.143 260.854,243.211 260.854,242.062C260.854,240.913 261.786,239.981 262.934,239.981C264.083,239.981 265.015,240.913 265.015,242.062Z"
+          android:fillColor="@android:color/system_neutral1_800"/>
+      <path
+          android:pathData="M236.941,250.877C236.941,252.915 235.065,254.567 232.751,254.567C230.437,254.567 228.561,252.915 228.561,250.877C228.561,248.839 230.437,247.188 232.751,247.188C235.065,247.188 236.941,248.839 236.941,250.877Z"
+          android:fillColor="@android:color/system_neutral1_800"/>
+      <path
+          android:pathData="M269.658,250.877C269.658,252.915 267.782,254.567 265.468,254.567C263.153,254.567 261.278,252.915 261.278,250.877C261.278,248.839 263.153,247.188 265.468,247.188C267.782,247.188 269.658,248.839 269.658,250.877Z"
+          android:fillColor="@android:color/system_neutral1_800"/>
+    </group>
+  </group>
+</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e0a00dca..abfe25e0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -489,6 +489,8 @@
     <string name="settings_enable_material_you_summary">Personalize Infinity based on Your Wallpaper</string>
     <string name="settings_apply_material_you_title">Apply Material You</string>
     <string name="settings_apply_material_you_summary">In case Infinity did not change the theme</string>
+    <string name="settings_enable_themed_icon_title">Enable Themed Icon</string>
+    <string name="settings_enable_themed_icon_summary">If you have Material You enabled,\n this adapts the app icon to those colours.</string>
     <string name="settings_custom_theme_cannot_apply_to_settings_page_summary">Custom themes cannot be applied to settings page (except toolbar, status bar and navigation bar).</string>
     <string name="settings_advanced_master_title">Advanced</string>
     <string name="settings_delete_all_subreddits_data_in_database_title">Delete All Subreddits in Database</string>
diff --git a/app/src/main/res/xml/theme_preferences.xml b/app/src/main/res/xml/theme_preferences.xml
index 6c8b9504..ca7dc0ac 100644
--- a/app/src/main/res/xml/theme_preferences.xml
+++ b/app/src/main/res/xml/theme_preferences.xml
@@ -65,4 +65,10 @@
         app:title="@string/settings_apply_material_you_title"
         app:summary="@string/settings_apply_material_you_summary" />
 
+    <ml.docilealligator.infinityforreddit.customviews.CustomFontSwitchPreference
+        app:defaultValue="false"
+        app:key="enable-themed-icon"
+        app:title="@string/settings_enable_themed_icon_title"
+        app:summary="@string/settings_enable_themed_icon_summary" />
+
 </PreferenceScreen>
\ No newline at end of file
-- 
cgit v1.2.3