From 35db7792bbc8afa985aea0c4c32d5e3de48e39c5 Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Tue, 5 Jan 2021 08:29:29 -0700
Subject: [PATCH] Update album artist navigation

Make it so that when an album is navigated to from an artist, navigation to the parent artist is disabled.
---
 .../drawable-v24/ic_launcher_foreground.xml   |  27 ++++++++
 .../res/drawable/ic_launcher_background.xml   |  65 +++++++++---------
 .../res/mipmap-anydpi-v26/ic_launcher.xml     |   5 ++
 app/src/debug/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 2008 bytes
 app/src/debug/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 1592 bytes
 .../debug/res/mipmap-xhdpi/ic_launcher.png    | Bin 0 -> 2823 bytes
 .../debug/res/mipmap-xxhdpi/ic_launcher.png   | Bin 0 -> 4445 bytes
 .../debug/res/mipmap-xxxhdpi/ic_launcher.png  | Bin 0 -> 6271 bytes
 .../auxio/detail/AlbumDetailFragment.kt       |   4 +-
 .../oxycblt/auxio/detail/DetailViewModel.kt   |   1 +
 .../oxycblt/auxio/loading/LoadingFragment.kt  |   5 +-
 .../oxycblt/auxio/loading/LoadingViewModel.kt |   2 +-
 .../java/org/oxycblt/auxio/ui/ActionMenu.kt   |  16 +++--
 app/src/main/res/layout/item_album_header.xml |   3 -
 14 files changed, 80 insertions(+), 48 deletions(-)
 create mode 100644 app/src/debug/res/drawable-v24/ic_launcher_foreground.xml
 create mode 100644 app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
 create mode 100644 app/src/debug/res/mipmap-hdpi/ic_launcher.png
 create mode 100644 app/src/debug/res/mipmap-mdpi/ic_launcher.png
 create mode 100644 app/src/debug/res/mipmap-xhdpi/ic_launcher.png
 create mode 100644 app/src/debug/res/mipmap-xxhdpi/ic_launcher.png
 create mode 100644 app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png

diff --git a/app/src/debug/res/drawable-v24/ic_launcher_foreground.xml b/app/src/debug/res/drawable-v24/ic_launcher_foreground.xml
new file mode 100644
index 000000000..de78f6455
--- /dev/null
+++ b/app/src/debug/res/drawable-v24/ic_launcher_foreground.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:pathData="M54 29.83v28.333c-1.585-0.913-3.41-1.477-5.371-1.477-5.935 0-10.743 4.807-10.743 10.743 0 5.935 4.807 10.742 10.743 10.742 5.935 0 10.743-4.807 10.743-10.742V40.573h10.742V29.831z"
+        android:strokeWidth="0.890156"
+        android:strokeColor="#ffffff">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="64.75"
+                android:endY="28.5"
+                android:startX="60"
+                android:startY="61.5"
+                android:type="linear">
+                <item
+                    android:color="#2196f3"
+                    android:offset="0.0" />
+                <item
+                    android:color="#90caf9"
+                    android:offset="1.0" />
+            </gradient>
+        </aapt:attr>
+    </path>
+</vector>
diff --git a/app/src/debug/res/drawable/ic_launcher_background.xml b/app/src/debug/res/drawable/ic_launcher_background.xml
index c5c410485..8b589ff81 100644
--- a/app/src/debug/res/drawable/ic_launcher_background.xml
+++ b/app/src/debug/res/drawable/ic_launcher_background.xml
@@ -4,72 +4,71 @@
     android:width="108dp"
     android:viewportHeight="108"
     android:viewportWidth="108"
-    android:alpha="0.5"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#111111"
           android:pathData="M0,0h108v108h-108z"/>
     <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
     <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+          android:strokeColor="#15FFFFFF" android:strokeWidth="0.8"/>
 </vector>
diff --git a/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 000000000..bbd3e0212
--- /dev/null
+++ b/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/debug/res/mipmap-hdpi/ic_launcher.png b/app/src/debug/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ac18a10aab86665c1d429e04b7b3c7336efa7bc
GIT binary patch
literal 2008
zcmV;}2PgQ6P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!000M{Nkl<Zc-rlp
zXK++i6vqR?jD?c2>6>gxHd(TP&>^%46MB;_I)aKr$!<bI4M+zCMnbPqnuI1n5HN^<
z6w!~4IQqrW4<KWSFhUw1^5J;?Z{G{c^6q9fn}lTd-I?D^ZvOl3JLmt(J^RWA1!+xd
zTGN`=ntf}*wDL1r)R#Fe{dmK-thWKe!^1~}g@vuv>2#Z!O-w;lR8&E1Y-|DkRwFt(
zx>g<3Rma%1>4;J8Bj(M>0lCzNNz#HzNl7{m;u=Hl7>!0^ozyg7GMUI?u?Tgu*-Qxu
z2|^tjJ|ogGHr6515gTF@=+|OmVsv#ispk0Pfv$&ygb-8h4sV_6`1ts0HBHg=dc9ER
zv8#D23w3Dtj7Z1WScgbQY#wxC?WT)4UY(P05)0y8aunQF26RW+i_|p0TZlMFq0R<S
zTwI(`hlbCHbc~I4h;(J|5$G_FLPJ9*y5{VSK`r=r-RRE-L1Tlqxy;gD8Pt*u+7kc<
z9gq(*uMKL&3-9%JgMx#D54zMwUK_M801P@*XM-XlA_@%#14TwgN+&dTpkXRi(*OcY
zOiUE&$}}(1m1$n2V{EKLq$4)ODA22+@oD66oeg4#3sGzEmXro_2LYs}rjnWll9Q9k
zX0r)(tJO*=DJeDm{-dVSobBf*OD1P`3FYi6A^Z08<k<0qY_Rh@&D&c-jxEKM)@y+3
z_=rt0$sObbgLx-7?8_lm*qDb{#uNvwy;&u(?%OK*K;}bmtBTg&dQ2O@caLeK%-XB}
zlCAe3Uk<V6V^DuKXyx@PiB&hMXtm55AR8x{ck_vPt1g!YjzN7VJ80>(DtcdL8MFMl
zlNErCT6x21o@5{!wd_(Ur38vW>609^=$k59ER)YHky#2{j8n|ZzgS8gdIg9<y(c<o
z-jzz4FHuDcn1xrJECMdZDdsKsvXrcWVo=Ws4$AqulIF_fg3FbZ$IJsN=H*@}rR1K^
z$sn$O3gtSZT6DPsQ@N+h8J;eOpw7WmtMt>S<WbgFl@fNw0WMWiwv3v2j&uJ|YQJHs
z<0Cc?mpi1=B|JRbw>k(3;Iad@v^&sH=cs7_=Ah0I=|}*zkkaonbw153sg#%{GrOd`
zhB-{uMJIN~!OTAUH>G8aR2?6&Ax1R~Ibj1et2(I5I0wCZp;BUo%<Bh!q0GexX|T+Y
zd?!PhQOk>H*y8;ZXYCvq=b*IL>@@9Mg~W83%%#T~`ny>3F{sm6J54=XL2oc`e&J-`
zlB1eIN<Wnin)G=EO+Mpf3X_qq8C26x8Dpn$#T63cPgl?crvD<%pqhS%(RLdBSvidX
zrz&VH(`R85HVAc)d_ATbfw%(=)3llfFpXj=7wMRSQ3@#ij^lG__=$3f5hu%OB-3~C
z3E}b>8|x71hz&8SX{dv6%gCoX2nNXk;1&zH0}XYKng(D1f)wd62T3aZ)bV*V_*l8b
zkmF9$7o8L?kFl{1k&f69qnd`CV4hC~HTEHvIMPn97M0ULX3$Y5UGubaP)*-FB8vum
zS}u`s#7SDNW>8Jv#0I4wDx*G3-@{Hi&eaU6=^KV;QICUV)KjJx8<mn%6nF-OM#NBr
ztsfbBjUZ$9ObXMRows?0Wl@*?WfEPPZcK7^z!(%t;hhGOVMZZY*8fb&Tkeo`+db;A
z^)6XI`jry$&X8&50qXd18Fi9L`=pE#?L|$y4yuo7KGwvw&ct<OF1SO9yC0EdkCP;@
z_Yoy4?Ea5B?0Y1U!q^JS$dYrS=}z<YQ7BqFbtCia!(`fVpG><RJ%t&tVF@zNn8%nM
z$D3}U=<^{K8%K$6Z6f222hW(}3A2lN`dNN_4vI`0NC}(&@X8!_V*S~mn78-%WR71O
z6dIdA@you~3=$cnv!;__!*7~FLW4TKO2*Ci>cOBRP1hh_Zu`Xd7)qv1cYQNx=R-11
z-!8muggOV8OhkHv-}dq8#-X(v8CL)3^B$xhz0l)x(4L;7Ztxq2KFwlbI?`vK@yQ(X
zmOm-7OQ!!$^HCYoxq^OBXM-&HS1874@n3_YIXNU*7jujSTwrEQX^e+BpYOMMW0wJB
zSaaL!lXKMYJc^4q_`g9&A}pzgvuNbRYu$6U{6$g2a`_w<-dK+TH;wB-p|L#MOjtvP
zjlZ)I51-j%Oxy31KKBCYQZpzdG^{b7lWszf0dv5{lx~zT^gT*?XDiuqipZ9=pDdGC
zkg5A1G9+4`S{`){E?J1i$JkhhNN@1RfVBt7o7hGB=kzLqPX=l4YG`|qZ+p;Ie>bRo
z`}T!(Hi+Gw=I^g$wrSI5j+}36Z(r(t0q^wkO!kB5rCxj^_ViLO^oD+^*OQLeJm~l)
zf17jE%ei{}LjzbSm>tf*Ks?n;)1&Jp15A^iUi((2c~7s6d%9c!&C_e&$~5okwQ<Dg
z{(t1bIsL@B4ML9I9$v2PMJ9&n+_r7orS00aJIcrGY33AD%;%_LUQsdrR)cGdT6IuY
z9b?zFJYtmli1{>fKrYBh&g~^%f3xFdCW^5zHYT;1W0P}<WL~MS-|%QH?~3@Pf{130
qPR^xuPy@6UeuCDtrZufKi}pX}pVtgLf~9%@0000<MNUMnLSTaOe$vwb

literal 0
HcmV?d00001

diff --git a/app/src/debug/res/mipmap-mdpi/ic_launcher.png b/app/src/debug/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ec4d8e26fcc44d4cf18f401eed5267057e65f3a
GIT binary patch
literal 1592
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

literal 0
HcmV?d00001

diff --git a/app/src/debug/res/mipmap-xhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..5870e90298697f8937048c697fba67d211426d13
GIT binary patch
literal 2823
zcmZXWS5(v662_AlBqV^LCZURSrGr%Iks7)pkrsu6G?5~`{pny3=~4tix<RBR6g7ZA
z5K$0;Ls5EFBOp?Q19Ca%-gO`DeVCb-*?Y~JZ?A9vQY_64S>QZy5D3I#Y=pHwsf51+
zcKReQ<OQpOK=46htnQVNsqaPMzE{RDo!umpP7$dWp>&_!jA_><M5qshHxtQzZpf&n
z1`2x+3tz@p$KHcMYhBA25U{JHb6mO}WLdDij+e*rTIxv9l*jPYV6{8@`CQi~Klo(S
z5%tAtWnntK4ZqILy!!4??A`J}XhcWA#&p2O%1j>G3d?qx^FL|dI;ZOmGNxzlTYgBJ
zmDPcetiJwlO<dV9dU0`a1nDK=)-*X4X>TDSDrzi|QlXyHV~uN`+PD$UvkdqTo2Fe+
z;d5!QW6#XW`j#G?fiOb&ryOP1fBG&hDJdyk`YG(SyAs9jnXM1sji$-+5Ya&E+D!GD
z+oFLV?c8zGlmQoNr@xh98`JxouZpv-3T^d@t4NrklaoMsWhF$Gm4m^BmO4*ko1B~k
zPA$=_n0wFHWKC6SZ7#S=DTy%z7I#lHcy2Idnmv-_@t%8SRc4^8r}sK~bCs*SOx%~i
zuU=GF)^hxC_}dPD9>|Ap-d9!KH`i}bBJpO<sPSzZ!4N+sZXTPwybDs|KvMHw!x{C9
zd(ay8+7L!O%|J%@xPlfI=f)kx^ST##Iu7hRzCvTm&(8-=E&lH)=6uUb3gqWwo`Tm*
zfx{nPxj8o(#Y*DF=L@d@*}QMrXvdfU<wko};m1dJX?-z~G$=G4aALAd^KEqEQ}Zu3
zz5fb`3Psu~b2F}RK(d*Pa5!(`{rl48pKF8&o5^g#jq!jM(<Y0cR)oWwu~;wr=~94C
zsN_yK2)<d}pw1162MG~iws~<yJIgC8u_IrYTODLzhIl;2^^ZTmvV-4)^!@zgRnjD+
zr5QZ6@7f1Nfm?}UL0yUs5V4`Wz_Hz8iO1I&db50z=${YkZ;za)^HR&&r}}{{iELIj
zT>XNv1TQGv@23oPH;C7#a&{6G3*UeAUheHzL|$8Tq`Y@%U{UV)QQ9M%D&40Yds}?S
zRJ%oil3*Ep?oH6ru!?pfzqoedy|xS86lrI;)rTR_GE6&hhA*k)DVe2yu_!3TFq&gY
zL*dq^`GzKEBf9J8v2wCXeBx{*I15#aS_O=t@37!cQPVTV{4oj?#r6Rvu5C02_U3ud
z1RxoTa~=T|&Uz*pCbxXLfp8(ELew-YY2{OadO9MI$~qq)X|TCljMmMZd2Xce(Fe^c
zZz>X*0Z5W~2#a5WLI72cC0&|6bKRqscp#bKN}V_Gm-)Wvy7rh%LyV3PFXoJ#0JCt_
z-QvFw-OF*Z+q=-w6Gm%EvC&=E$MhUk#d)jppIgNtr@Ty7;9xc;3FrBQi+2v<4nLmp
z!pz>3$c*EhU4yW*v-`{8sm;wwCf5OW6zlc*0-V@fuho`EPCrq20^T%0d3*5%Vc9rZ
zoCM2mC=eRJ4`kR-d|f6e9)CagBWBAqOFerBhez!Y-%YI`4h@|Y1f!#quPR?Bv1|#&
z&F#Mkd(bB=y{F$|hHqia72IP~n@_r<U@O<2tZVz2jyLc9nAA-%b19YoabVO|%2z5E
z$nd#3spR9bQ|n(W+Ml~yA2!fK(wBwevlOG!R2i`%B_a7J>W`nwcIW1kDmq||zsN*6
zY7mF&fLl_p4H>poISO=X*}{^sI>WD=?0z*V+i||WS-xwhSZ<Lgv(AXM2N)UN9W#kJ
ztW@2u2j%aXC{7ULfocRg_yNk($t$j4{1ZXOMZkZ2*sY!kJdCmoX+crbAjvP#0qI|b
z-=~W~vCcqv4T`#3MloMM^h=*ivH}cY$?d>P(H-ADl2%?|t=R%8Rl~{iGzp1}1h+{L
zXcx5d`m4h(zDd<LBVe>63DenqSBoFm)?qLh@O4aLoKMNf(;SrHLzH{M05R*@lhLR(
z<)OE)<aUzJRPwVZ6v=<LR9rGI>U;KYuUV31*j$iM88syKK3O*l-M@~U#`fXSCHZL9
z0~yU}oz>pqK#l_ZOVwDPdri9<{f-CFD^z+`YmpAdCjD)k89_F`_di$tV_PRW3SRBt
zzFQ^`OOtw<wDmB;GHQa6E4ANf|EC#&M|==$g_^^H|Ipq(63muok_@k7vQ7Zj5N{mp
z&WOrV^!iI}C2}^qu;ojWVshN@lkW6}5`lZH6cb#!uF&NnrC429G8GhlTQfDhl$`Yg
zYJ%QtM*2EJCsxMwe+N99i_$UzcSn}6ZR>TCnLZTA&tD!Rv<D#UxapAbuc$8dTfFGE
z4|S~n#G)(4Vz?NV4okTFF`-a+|MV<Ol0i>rmciX1Zcq)3BR-DZKIn*bnPu?Rn*Nw#
zy1=d)91YuL5f`Cpjll6kr~BPpzk9_m#fZ#>N%dr=avRl5fjnk9;*NBPSaspJUr`8E
zbbcynx%oAkb3qSWQw(lK5)UepAL$u6|A5%-9U^Ki$VTP;^gCeQ?m?psnN=MXwQ$}p
zD|tZXGWI7jyZ8&_C{~j&y|*#A^fP^VA}qrtddtS>E-?UrfDPVMPr`FI94#M3i2B#Q
z&}ML?B0Im=&t#nO&={)8jld9*B{&_E`zVeeW7rxBJcX6JbDZ_H9|hrre^|kt9;ma3
z2Y$1stNIB=(GPL3HCb@K%{W$cUk|tm_9_$W{Jd%Lq5U4?pA|52N3l;Kxz2+4T+8ZM
zYXbhZ%~`zaIc?-^4r+YE+2R3B&>c-Absf0c+-21b+=vyD&iady%YQ4>@8~xp&#)@g
zgIQT_JQ~RlzQ9VXs*u1ZW3KVrID-WK^j5sa1U7++yr|Nh@(CP=P~L9<!UNJ!iFWiY
zT*CH6!!eERIW<x8&6E&=jkAp5t)+)LUlT{3@`YJH4c2Mw5`k{-<d!RsoT@1tbh6pn
zLF~ndsa?I)DD^S?b(tc(vvoJHe*Ng>ous0T;=cS2ekEgrAMaYdUP(S5wigOL2$LH-
zlE?N`ILW9eEtG!aT>Gp@7<HfSjCP;hiEza~kw$EDnRYeP&)T*8c53%<iCz#SeA-v3
z_X*>*Ue#umES@YGDXcqiY>$z#011pL@5G!e<bl+;jig<*CjZjbM!5ghR$IfU;l3&O
zQuXbxr)1X?L);&Scvt-Le1bd+g@K(blY&X-&t8MA{S>e)F93yMz^wEqC(40n(E_}@
z-)!}P!^3d?D9RBrBq62oTAn+3YESM~B09%u-9T27*k`gweE3TuJmpLsnALjlW;=E6
zdjT}H$MGphV~fp;t`L6zYKgeJt{&<2%x`Cd=i`iPTIXfcPF!`H9OA>*YxxhdoD7ym
z({q7y1SBlSyB&uHL8vVI_jn*{niAUvXZ0f@B3Ob}F5$Ul{lCG(Bge%3{QSuD%>dqk
zqVowe@T$x7Un$k>W*w>bBLM}OdCaWEt;k&)NY-3mK;p@NY(eNdQdK>nB;~@2|Dz;R
z7uuy}OBr8(fv(TEQodm|MT6yFlgxg5q^8%|@U;)6y{)9H!T}itmhKi`sL#YVM{?pb
z?Vj2gOZ8$&M*@_Q36eZYG@B!rS94&j1f7G3JlD=;tXFHKzJPU5Q8Uj)To`!&Ox`M@
zWAki~wLna&L1qT0+mV|{!ZJZ=pugVz-Qf(D`9@#c4HY$gyiA?x!sY)0<Y|L_!5U(;
V$_(7h_5^T2#+S{pb$W!@e*y9kB?$lk

literal 0
HcmV?d00001

diff --git a/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..2f55108b545edc21926c830ba52486c8943931e3
GIT binary patch
literal 4445
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

literal 0
HcmV?d00001

diff --git a/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..dee580c7ee318227f46e5d9c3e2337216cb4faad
GIT binary patch
literal 6271
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

literal 0
HcmV?d00001

diff --git a/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt b/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt
index 89209a94f..2448453d0 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt
@@ -86,9 +86,7 @@ class AlbumDetailFragment : DetailFragment() {
 
         detailModel.navToParent.observe(viewLifecycleOwner) {
             if (it) {
-                if (args.fromArtist) {
-                    findNavController().navigateUp()
-                } else {
+                if (!args.fromArtist) {
                     findNavController().navigate(
                         AlbumDetailFragmentDirections.actionShowParentArtist(
                             detailModel.currentAlbum.value!!.artist.id
diff --git a/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt b/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt
index e2ce1a406..49acac6b4 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt
@@ -12,6 +12,7 @@ import org.oxycblt.auxio.recycler.SortMode
 /**
  * ViewModel that stores data for the [DetailFragment]s, such as what they're showing & what
  * [SortMode] they are currently on.
+ * TODO: Preserve previous backstack when doing playing item navigation
  */
 class DetailViewModel : ViewModel() {
     private var mIsNavigating = false
diff --git a/app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt b/app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt
index 1389a0d2c..02ed51e80 100644
--- a/app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt
@@ -9,7 +9,7 @@ import android.view.ViewGroup
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
+import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.FragmentLoadingBinding
@@ -23,7 +23,8 @@ import org.oxycblt.auxio.music.processing.MusicLoader
  * @author OxygenCobalt
  */
 class LoadingFragment : Fragment(R.layout.fragment_loading) {
-    private val loadingModel: LoadingViewModel by activityViewModels {
+    // LoadingViewModel is scoped to this fragment only
+    private val loadingModel: LoadingViewModel by viewModels {
         LoadingViewModel.Factory(requireActivity().application)
     }
 
diff --git a/app/src/main/java/org/oxycblt/auxio/loading/LoadingViewModel.kt b/app/src/main/java/org/oxycblt/auxio/loading/LoadingViewModel.kt
index ce7eaff33..62400e9cf 100644
--- a/app/src/main/java/org/oxycblt/auxio/loading/LoadingViewModel.kt
+++ b/app/src/main/java/org/oxycblt/auxio/loading/LoadingViewModel.kt
@@ -86,7 +86,7 @@ class LoadingViewModel(private val app: Application) : ViewModel() {
      * Factory for [LoadingViewModel] instances.
      */
     class Factory(private val application: Application) : ViewModelProvider.Factory {
-        @Suppress("unchecked_cast")
+        @Suppress("UNCHECKED_CAST")
         override fun <T : ViewModel?> create(modelClass: Class<T>): T {
             if (modelClass.isAssignableFrom(LoadingViewModel::class.java)) {
                 return LoadingViewModel(application) as T
diff --git a/app/src/main/java/org/oxycblt/auxio/ui/ActionMenu.kt b/app/src/main/java/org/oxycblt/auxio/ui/ActionMenu.kt
index b0c955498..1be12518e 100644
--- a/app/src/main/java/org/oxycblt/auxio/ui/ActionMenu.kt
+++ b/app/src/main/java/org/oxycblt/auxio/ui/ActionMenu.kt
@@ -17,12 +17,13 @@ import org.oxycblt.auxio.playback.PlaybackViewModel
 import org.oxycblt.auxio.playback.state.PlaybackMode
 
 /**
- * A wrapper around [PopupMenu] that automates a ton of things across all the menus in Auxio
+ * A wrapper around [PopupMenu] that automates the menu creation for nearly every datatype in Auxio.
  * @param activity [AppCompatActivity] required as both a context and ViewModelStore owner.
  * @param anchor [View] This should be centered around
  * @param data [BaseModel] this menu corresponds to
- * @param flag Any extra flags to accompany the data.
+ * @param flag (Optional, defaults to [FLAG_NONE]) Any extra flags to accompany the data.
  * See [FLAG_NONE], [FLAG_IN_ALBUM], [FLAG_IN_ARTIST] and [FLAG_IN_GENRE] for more details.
+ * @throws IllegalArgumentException When there is no menu for this specific datatype/flag
  */
 class ActionMenu(
     activity: AppCompatActivity,
@@ -32,6 +33,7 @@ class ActionMenu(
 ) : PopupMenu(activity, anchor) {
     private val context = activity.applicationContext
 
+    // Get viewmodels using the activity as the store owner
     private val detailModel: DetailViewModel by lazy {
         ViewModelProvider(activity).get(DetailViewModel::class.java)
     }
@@ -43,7 +45,9 @@ class ActionMenu(
     init {
         val menuRes = determineMenu()
 
-        check(menuRes != -1) { "There is no menu associated with this configuration." }
+        check(menuRes != -1) {
+            "There is no menu associated with datatype ${data::class.simpleName} and flag $flag"
+        }
 
         inflate(menuRes)
         setOnMenuItemClickListener {
@@ -158,11 +162,11 @@ class ActionMenu(
     companion object {
         /** No Flags **/
         const val FLAG_NONE = -1
-        /** Flag for when an item is accessed from an artist **/
+        /** Flag for when a menu is opened from an artist (See [org.oxycblt.auxio.detail.ArtistDetailFragment]) **/
         const val FLAG_IN_ARTIST = 0
-        /** Flag for when an item is accessed from an album **/
+        /** Flag for when a menu is opened from an album (See [org.oxycblt.auxio.detail.AlbumDetailFragment]) **/
         const val FLAG_IN_ALBUM = 1
-        /** Flag or when an item is accessed from a genre **/
+        /** Flag for when a menu is opened from a genre (See [org.oxycblt.auxio.detail.GenreDetailFragment]) **/
         const val FLAG_IN_GENRE = 2
     }
 }
diff --git a/app/src/main/res/layout/item_album_header.xml b/app/src/main/res/layout/item_album_header.xml
index 1c45430a1..dbc0b1886 100644
--- a/app/src/main/res/layout/item_album_header.xml
+++ b/app/src/main/res/layout/item_album_header.xml
@@ -55,9 +55,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/margin_medium"
-            android:background="@drawable/ui_ripple"
-            android:clickable="true"
-            android:focusable="true"
             android:onClick="@{() -> detailModel.navToParent()}"
             android:text="@{album.artist.name}"
             android:textAppearance="?android:attr/textAppearanceListItem"