From 1ab4ee326e1ebca467d3cba9fafc263a0964d5e3 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Tue, 19 Apr 2022 16:05:57 -0500
Subject: [PATCH] Add Obsidian theme

---
 art/message_bubble_received_obsidian.svg      | 182 ++++++++++++++++++
 src/cheogram/res/values/themes.xml            |  40 ++++
 .../conversations/utils/ThemeHelper.java      |   9 +-
 .../message_bubble_received_obsidian.9.png    | Bin 0 -> 586 bytes
 .../message_bubble_received_obsidian.9.png    | Bin 0 -> 905 bytes
 .../message_bubble_received_obsidian.9.png    | Bin 0 -> 1268 bytes
 .../message_bubble_received_obsidian.9.png    | Bin 0 -> 1650 bytes
 src/main/res/values-v29/theme-settings.xml    |   2 +
 src/main/res/values/strings.xml               |   1 +
 src/main/res/values/theme-settings.xml        |   2 +
 10 files changed, 235 insertions(+), 1 deletion(-)
 create mode 100644 art/message_bubble_received_obsidian.svg
 create mode 100644 src/main/res/drawable-mdpi/message_bubble_received_obsidian.9.png
 create mode 100644 src/main/res/drawable-xhdpi/message_bubble_received_obsidian.9.png
 create mode 100644 src/main/res/drawable-xxhdpi/message_bubble_received_obsidian.9.png
 create mode 100644 src/main/res/drawable-xxxhdpi/message_bubble_received_obsidian.9.png

diff --git a/art/message_bubble_received_obsidian.svg b/art/message_bubble_received_obsidian.svg
new file mode 100644
index 000000000..a1e743733
--- /dev/null
+++ b/art/message_bubble_received_obsidian.svg
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="36"
+   height="26"
+   id="svg2"
+   version="1.1"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)"
+   sodipodi:docname="message_bubble_received_obsidian.svg">
+  <defs
+     id="defs4">
+    <filter
+       x="-0.25"
+       y="-0.25"
+       width="1.5"
+       height="1.5"
+       inkscape:label="Drop Shadow"
+       id="filter3811"
+       color-interpolation-filters="sRGB">
+      <feFlood
+         flood-opacity="0.25"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood3813" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite3815" />
+      <feGaussianBlur
+         stdDeviation="0.5"
+         result="blur"
+         id="feGaussianBlur3817" />
+      <feOffset
+         dx="0"
+         dy="1"
+         result="offset"
+         id="feOffset3819" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite3821" />
+    </filter>
+    <linearGradient
+       id="paint0_linear"
+       x1="1260"
+       y1="1570.41"
+       x2="618.987"
+       y2="488.325"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#7D01DD"
+         id="stop1226" />
+      <stop
+         offset="1"
+         stop-color="#8301E9"
+         id="stop1228" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="10.265754"
+     inkscape:cy="15.902718"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer"
+     showgrid="true"
+     inkscape:window-width="2354"
+     inkscape:window-height="1060"
+     inkscape:window-x="1478"
+     inkscape:window-y="1092"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     guidecolor="#000000"
+     guideopacity="0.49803922"
+     inkscape:document-rotation="0"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="4"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="1"
+       spacingy="1"
+       originx="0"
+       originy="0"
+       color="#0000ff"
+       opacity="0.03137255" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="20,26"
+       id="guide3060" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="24,26"
+       id="guide3062" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="36,22"
+       id="guide3064" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="36,6"
+       id="guide3066" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="26,0"
+       id="guide3068" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="18,0"
+       id="guide3070" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="0,10"
+       id="guide3074" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="0,8"
+       id="guide3076" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer"
+     inkscape:groupmode="layer"
+     id="layer"
+     transform="translate(0,-2)">
+    <g
+       id="g3759"
+       style="fill:#1e0036;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
+      <path
+         style="display:none;fill:#1e0036;fill-opacity:1"
+         d="m 8,6 c 2,2 4,6 4,10 L 16,6 z"
+         id="path3805"
+         inkscape:connector-curvature="0"
+         transform="translate(0,2)"
+         sodipodi:nodetypes="cccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2989"
+         d="M 4,4 16,16 16,4 z"
+         sodipodi:nodetypes="cccc"
+         style="fill:#1e0036;fill-opacity:1" />
+      <rect
+         ry="2"
+         y="4"
+         x="12"
+         height="20"
+         width="20"
+         id="rect2987"
+         style="fill:#1e0036;fill-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/src/cheogram/res/values/themes.xml b/src/cheogram/res/values/themes.xml
index 052fd01d3..1eac1a82c 100644
--- a/src/cheogram/res/values/themes.xml
+++ b/src/cheogram/res/values/themes.xml
@@ -304,6 +304,22 @@
         </item>
     </style>
 
+    <style name="ConversationsTheme.Obsidian" parent="ConversationsTheme.Dark">
+        <item name="colorPrimary">#1E0036</item>
+        <item name="colorPrimaryDark">#1E0036</item>
+        <item name="colorAccent">@color/yeller</item>
+
+        <item name="message_bubble_received_monochrome" type="reference">
+            @drawable/message_bubble_received_grey
+        </item>
+        <item name="message_bubble_sent" type="reference">@drawable/message_bubble_sent_grey</item>
+        <item name="message_bubble_received_green" type="reference">
+            @drawable/message_bubble_received_obsidian
+        </item>
+
+        <item name="unread_count">#1E0036</item>
+    </style>
+
     <style name="ConversationsTheme.Medium" parent="ConversationsTheme">
         <item name="TextSizeCaption">14sp</item>
         <item name="TextSizeBody1">16sp</item>
@@ -328,6 +344,18 @@
         <item name="IconSize">20sp</item>
     </style>
 
+    <style name="ConversationsTheme.Obsidian.Medium" parent="ConversationsTheme.Obsidian">
+        <item name="TextSizeCaption">14sp</item>
+        <item name="TextSizeBody1">16sp</item>
+        <item name="TextSizeBody2">16sp</item>
+        <item name="TextSizeSubhead">18sp</item>
+        <item name="TextSizeTitle">22sp</item>
+        <item name="TextSizeDisplay2">47sp</item>
+        <item name="TextSizeInput">18sp</item>
+        <item name="TextSeparation">6sp</item>
+        <item name="IconSize">20sp</item>
+    </style>
+
     <style name="ConversationsTheme.Dark.Large" parent="ConversationsTheme.Dark">
         <item name="TextSizeCaption">16sp</item>
         <item name="TextSizeBody1">18sp</item>
@@ -340,6 +368,18 @@
         <item name="IconSize">22sp</item>
     </style>
 
+    <style name="ConversationsTheme.Obsidian.Large" parent="ConversationsTheme.Obsidian">
+        <item name="TextSizeCaption">16sp</item>
+        <item name="TextSizeBody1">18sp</item>
+        <item name="TextSizeBody2">18sp</item>
+        <item name="TextSizeSubhead">20sp</item>
+        <item name="TextSizeTitle">24sp</item>
+        <item name="TextSizeDisplay2">48sp</item>
+        <item name="TextSizeInput">20sp</item>
+        <item name="TextSeparation">7sp</item>
+        <item name="IconSize">22sp</item>
+    </style>
+
     <style name="ConversationsTheme.Large" parent="ConversationsTheme">
         <item name="TextSizeCaption">16sp</item>
         <item name="TextSizeBody1">18sp</item>
diff --git a/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java b/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java
index 17311cb0c..a96aaa2f7 100644
--- a/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java
@@ -52,14 +52,18 @@ public class ThemeHelper {
 	public static int find(final Context context) {
 		final SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
 		final Resources resources = context.getResources();
+		final String setting = sharedPreferences.getString(SettingsActivity.THEME, resources.getString(R.string.theme));
 		final boolean dark = isDark(sharedPreferences, resources);
 		final String fontSize = sharedPreferences.getString("font_size", resources.getString(R.string.default_font_size));
 		switch (fontSize) {
 			case "medium":
+				if ("obsidian".equals(setting)) return R.style.ConversationsTheme_Obsidian_Medium;
 				return dark ? R.style.ConversationsTheme_Dark_Medium : R.style.ConversationsTheme_Medium;
 			case "large":
+				if ("obsidian".equals(setting)) return R.style.ConversationsTheme_Obsidian_Large;
 				return dark ? R.style.ConversationsTheme_Dark_Large : R.style.ConversationsTheme_Large;
 			default:
+				if ("obsidian".equals(setting)) return R.style.ConversationsTheme_Obsidian;
 				return dark ? R.style.ConversationsTheme_Dark : R.style.ConversationsTheme;
 		}
 	}
@@ -84,7 +88,7 @@ public class ThemeHelper {
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && "automatic".equals(setting)) {
 			return (resources.getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;
 		} else {
-			return "dark".equals(setting);
+			return "dark".equals(setting) || "obsidian".equals(setting);
 		}
 	}
 
@@ -93,6 +97,9 @@ public class ThemeHelper {
 			case R.style.ConversationsTheme_Dark:
 			case R.style.ConversationsTheme_Dark_Large:
 			case R.style.ConversationsTheme_Dark_Medium:
+			case R.style.ConversationsTheme_Obsidian:
+			case R.style.ConversationsTheme_Obsidian_Large:
+			case R.style.ConversationsTheme_Obsidian_Medium:
 				return true;
 			default:
 				return false;
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_obsidian.9.png b/src/main/res/drawable-mdpi/message_bubble_received_obsidian.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..7bf1c9609008de68a6a36ff206a7b0f230de22b3
GIT binary patch
literal 586
zcmeAS@N?(olHy`uVBq!ia0vp^YCtT*!3Gk!b2b%7v7|ftIx;Y9?C1WI$O_~uBzpw;
zGB8vD6*jamF#G}vHN0S8C^cYUc$L7wU^Rn*LA+qju0R{01Y44~y9<y8f}hU2>wy$!
zfk$L90|Vb-5N14{zaj-F$X?><>&pI&MOa)<TKQe&ZUzQM5l<J#kch)?r=87WG88yo
ze=_Wd_reR4o$fpB`Ih^OXRki1H^1#qwS6t=)t^FEY>LwQst}~<$6u#lxYqkliu1>M
zZ=*ARB%UdA*$X{hV{_CpTRpogKjU6=6^B6miU;qe#$B)R&^cChEF<9Ys#yV<m2A6N
zcFr}dI<~?)*D#Lpa?iiZlPZtbUkZ`kVW8*wKWQ(^rk?3#5<3o0x>PUG-gcTdOzV!}
zhD#4VHB4oiE}kR*&d_Xw?j033gNXAxH4Zkt;CaTRre6J#MQo|b#JcLm=Vml7IiRSW
ze0pgS<7C$PD>qc>Gh}T_n3a_2F#Xr11Ev=kR`uE4I8eiwe}Mg%TVd&{$oh8wTp7lF
zoLip#+uk)V@%T26cNO-6BH?RU)TX-wgG{x=HKHUXu_V<hxhNG#F&G&b8R;6B=o(sv
z7#Ulcm{}Q_Ya19?85n$@@ihWPLvDUbW?Cg~4Q)q#p8z#Tf@}!RPb(=;EJ|f4FE7{2
f%*!rLPAo{(%P&fw{mw=TsEEPS)z4*}Q$iB}j%w41

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_obsidian.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_obsidian.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a6feb60b28d9c23ebaf57dc1384bd87ae43c65c
GIT binary patch
literal 905
zcmeAS@N?(olHy`uVBq!ia0vp^UO;Td!3HD~4ERq2DVB6cUq=Rpjs4tz5?O(Kg=CK)
zUj~LMH3o);76yi2K%s^g3=E|P3=FRl7#OT(FffQ0%-I!a1C(G(@^*It(m?Rjd3QaK
z;w<opEM{PkZ3kh-{-+;Pfr9KMp1!W^&sc=T^`w>GRqkeBU<&qhaSX}0_x9HLtSb&O
z2R^<}Ib8NyUP~(|z~(p8*9T|6f6(0XLR!P=eAD^|7k6)$>#7K;7G${@wfe@{Z5vDf
zr`V_*bUpbjy?m15$@kpV5oWo@^Zh0-6m~Y=q&i>vzWR#HS<j45x?Z@G_F8a;`ab__
ziN_DTZut4wf6v{?HIDv8K1cq|KAq#od$9Jta>*5`g5yFqHy#{Y-O>DhDTnI(*>7fi
zHH^25c@iZgaPPCNS39rH-st2uea*-wkF=0JQ;TP>?^%WC^#6+m>Ymy-TkvqMLS)$-
z7OtRNZWi^L>iLPeKjoGzzNXZ6zCrTn=2L7=OC&!COE4~GzPERVfc<w{r}ow<cW$Tz
ze9*rZczT1^`+q?i8RpZ1fyA{-|HQehx=Q6VUMO6vT(}@PVzq-~`-ZUAroM!o4NZIr
zJDZxOCGTu$V$!+aToM>@@O#XWQ~y6-_z`n{#U7d0Q$*H$3}t22yfz2K;G7!1t@38a
ztA;FBE>)j}Et*pdT7{Mc91`)0aPYon8M@rqYlahNutp-|uLUbK<^}>Kfc(|0r;?KI
zGwa%!`?0jooVDQD?s>M;=G@L<Ke%W&-wKsy1<^ldueOx#y;0xAu<Dhp5c8LF67!`d
z-JQTayY0cQgJ1T3N_gDz@*KaNeUIfIk6#vFOC%$%W@|8iY2<yNRiIh@{<oSDyPD($
zL4$Mm#GOJnuHPQ9FL&zyn}3<umKfi>?qq&n*6Q?vB(F4K)46LD=Q=9B%;EZIzjzW)
z`l0#D8}~Zv{#$c&`uR8U`o5R9xIO>9DC){8@rdV-fAJ=*`(V_$j4=<G;#5mqBT7;d
zOH!?pi&B9UgOP!ek*<M>uAya!k+GGDnU#^bwt<0_fx-6~Un5X7<mRVjrd8tB(00`K
z2~dM1$cEtjw370~qEv?R@^Zb*yzJuS#DY}4{G#;P?`))iiWody{an^LB{Ts5>H2mQ

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_obsidian.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_obsidian.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..cdaf34dae255308c7a2cf740bd7e2509fffbe08f
GIT binary patch
literal 1268
zcmeAS@N?(olHy`uVBq!ia0vp^c|aV%!3HFMXgjC@DVB6cUq=Rpjs4tz5?O(Kg=CK)
zUj~LMpj<->1H&(%P{RubhEf9thF1v;3|2E37{m+a><Y92O0Xq)ySo5sAo%ILyB<h!
z7I;J!Gcf3QfiPovRSD222KEw9Usv{LEW+Y?(#r2DcQY_B@AGtV45_&FcCKyyWe16d
z`I{%NaOnCW<g;OOaO05!2hR8>w#GB?yipM2V%DlwuVeCvT_x73q_U(dNP}Z*=B;Ok
z&6<mS8^TWR+;(2SR{rG_p2AP}e!sAdpL6GCfsLn3e0~l48jY?+8eKt|pJwR3?8z>Q
zN#EQ)N%iG3F5~Y9Z9dIqZQR1EqpDKOD1F}UbEW=k>78B1&0;anZrM72I8d&(WYU2o
zmy-0})=;C6q!&M`j4hV!J9_JoiFkF}hiUIsJdPYtbuQTL`Dv5u>i1Q9x-Ft}6$99p
zZHtJvIr_8C;q9{bE<hzq8=m$1Uc0wbZuZhgJORv72SU2@Ppex>w_aKQ+pi@+FK3fk
z_u~Rdi#iXZ48aS`za0KdT`C@X%fBYwK_lGL-9TM@ooKlL8^^Yr5q1Y>YAi8)Y%RRW
zpx1YwjhZf7w8UeN7;U~b(d(>bjo%i$UAOtq9`D~P--mE4X?x6Lzj{aWlibChHVN^}
zn(ORS;vg0hx6eoC%%o766?<$7_cfJ@6fXF*r!WLWPH49Xs9ZXEI*6RK97Ims4k80u
zfMjd%6c8D-1VjdI0g(Z1KyqjBG!PlI3`7QQvyjlwzg8Zk67c!U&Tr2vwa-8Lv-?Wn
z(diaH!sjW<GS(bZVY~0S=~GfrrQ(H;GLt!Kx|>7de4+{kU&jBNV)$dm9GN!J8MnKp
z{hz7Txp~D7&J~L+Qkg>L1mHnTUv4e%*z%}l5fV!Jel4J7p{TkD5}MN0<y}_e9uVb!
zIn-<246iP454)dz3-|1EoB1oswa|0^-pc!qQ(Rrj=bbEXySqH=k&wdAlc!>QzFaIf
za1|C_|L4i!Y_A>f9VXuRTKKg?qo?DZpJDA`fjOULBLt7Q$k%VID(_$W{(#)ePe!}-
zKS!+6&|}H6y){?X?4C(R9&5{T-esK2-dUemJn_x3BigaI)|*xQ-{Ab(dV{mpy6(dh
zBA33N@-0n-_koH5uSuh3+wI-qn)h^WEKRWuioEU69TF$r-nIJBp<{tL%dL3an>#|5
z-PMd)WfSdN+csP54bQJz(qC$mR;lEb_*SGpsq7Dl>3Hn-Q1p;jx8%CY?a#MfEWUkY
z@)Rw#2mQr&JvKj5Nk013J<6qR>W)y6^vAdMKfUR(y6DVfiMuNfY-{1U|4>Ecpv)(Y
zsZS=jr!P@;irQ1Z_<v%kh-;w8)Bi5NbaG`}&p+Dp^u2ld$z4|SBlI@{Gq-AqYeY#(
zVo9o1a#1RfVlXl=GSW3L(KWOTF*3F?F|#r<*ETS)GBEf)<7)(phTQy=%(P0}8rqKf
zJ^^Zw1lbUrpH@<ySd_|8US6)3nU`IhoLG>mmtT}V`<;yxP!WTttDnm{r-UW|vfUt!

literal 0
HcmV?d00001

diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_obsidian.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_obsidian.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..26f4b8ac4d989b337c5bae3071f0b07c4bf4beae
GIT binary patch
literal 1650
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
SGd4&l1P}>F94qa8fBXagI@}5X

literal 0
HcmV?d00001

diff --git a/src/main/res/values-v29/theme-settings.xml b/src/main/res/values-v29/theme-settings.xml
index 5cd93386f..4d24fc1a4 100644
--- a/src/main/res/values-v29/theme-settings.xml
+++ b/src/main/res/values-v29/theme-settings.xml
@@ -6,11 +6,13 @@
         <item>@string/pref_theme_automatic</item>
         <item>@string/pref_theme_light</item>
         <item>@string/pref_theme_dark</item>
+        <item>@string/pref_theme_obsidian</item>
     </string-array>
     <string-array name="themes_values" tools:ignore="InconsistentArrays">
         <item>automatic</item>
 		<item>light</item>
 		<item>dark</item>
+		<item>obsidian</item>
 	</string-array>
 
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 3d15606ea..1c4ac3f1b 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -574,6 +574,7 @@
     <string name="pref_theme_automatic">Automatic</string>
     <string name="pref_theme_light">Light</string>
     <string name="pref_theme_dark">Dark</string>
+    <string name="pref_theme_obsidian">Obsidian</string>
     <string name="pref_use_green_background">Purple Background</string>
     <string name="pref_use_green_background_summary">Use purple background for received messages</string>
     <string name="unable_to_connect_to_keychain">Could not connect to OpenKeychain</string>
diff --git a/src/main/res/values/theme-settings.xml b/src/main/res/values/theme-settings.xml
index b770b1b26..22db43da6 100644
--- a/src/main/res/values/theme-settings.xml
+++ b/src/main/res/values/theme-settings.xml
@@ -5,10 +5,12 @@
     <string-array name="themes">
         <item>@string/pref_theme_light</item>
         <item>@string/pref_theme_dark</item>
+        <item>@string/pref_theme_obsidian</item>
     </string-array>
     <string-array name="themes_values">
 		<item>light</item>
 		<item>dark</item>
+		<item>obsidian</item>
 	</string-array>
 
 </resources>