From af7b94ff4c58788261b5f6a4c626aae227e104e2 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 31 Jul 2018 14:15:17 +0200 Subject: [PATCH 1/4] add Latest view to basic flavor This is a quick hack to reuse the Latest view with a slightly simpler layout. It makes the "basic" flavor fully functional as an fdroid client. The goal here is just to have something simpler with as little new code as possible. It is essential that the whitelabeling and "Light" aka "basic" flavor does not increase the maintenance load. closes fdroid/fdroidclient#48 fdroid/fdroidclient!692 fdroid/fdroidclient!695 --- .../fdroid/fdroid/views/hiding/HidingManager.java | 5 +++++ .../fdroid/fdroid/views/main/MainViewController.java | 5 ++++- app/src/basic/res/menu/main_activity_screens.xml | 5 +++++ .../org/fdroid/fdroid/views/main/MainActivity.java | 3 ++- .../fdroid/fdroid/views/main/WhatsNewViewBinder.java | 0 .../fdroid/views/whatsnew/WhatsNewAdapter.java | 12 +++++++++++- .../{full => main}/res/layout/main_tab_whats_new.xml | 0 7 files changed, 27 insertions(+), 3 deletions(-) rename app/src/{full => main}/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java (100%) rename app/src/{full => main}/res/layout/main_tab_whats_new.xml (100%) diff --git a/app/src/basic/java/org/fdroid/fdroid/views/hiding/HidingManager.java b/app/src/basic/java/org/fdroid/fdroid/views/hiding/HidingManager.java index 6a574e0fb..02387a5a8 100644 --- a/app/src/basic/java/org/fdroid/fdroid/views/hiding/HidingManager.java +++ b/app/src/basic/java/org/fdroid/fdroid/views/hiding/HidingManager.java @@ -29,4 +29,9 @@ public class HidingManager { public static boolean isHidden(Context context) { return false; } + + public static void showHideDialog(final Context context) { + throw new IllegalStateException("unimplemented"); + } + } diff --git a/app/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java b/app/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java index ba85cd1dc..d2f2ae9c8 100644 --- a/app/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java +++ b/app/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java @@ -48,8 +48,11 @@ class MainViewController extends RecyclerView.ViewHolder { this.frame = frame; } + /** + * @see WhatsNewViewBinder + */ public void bindWhatsNewView() { - throw new IllegalStateException("unimplemented"); + new WhatsNewViewBinder(activity, frame); } /** diff --git a/app/src/basic/res/menu/main_activity_screens.xml b/app/src/basic/res/menu/main_activity_screens.xml index 4785bd5c0..b4a139661 100644 --- a/app/src/basic/res/menu/main_activity_screens.xml +++ b/app/src/basic/res/menu/main_activity_screens.xml @@ -1,6 +1,11 @@ + { @Override public int getItemViewType(int position) { + int relativePositionInCycle = position % 5; + + if (BuildConfig.FLAVOR.startsWith("basic")) { + if (relativePositionInCycle > 0) { + return R.id.whats_new_small_tile; + } else { + return R.id.whats_new_regular_list; + } + } + if (position == 0) { return R.id.whats_new_feature; } else { - int relativePositionInCycle = position % 5; switch (relativePositionInCycle) { case 1: case 2: diff --git a/app/src/full/res/layout/main_tab_whats_new.xml b/app/src/main/res/layout/main_tab_whats_new.xml similarity index 100% rename from app/src/full/res/layout/main_tab_whats_new.xml rename to app/src/main/res/layout/main_tab_whats_new.xml From 49e1e0bf1702e1024ef048debe0b86dc9166c3d4 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 31 Jul 2018 16:09:45 +0200 Subject: [PATCH 2/4] add separate, rough icon for F-Droid Basic --- app/src/basic/res/drawable-hdpi/ic_launcher.png | Bin 0 -> 3861 bytes app/src/basic/res/drawable-ldpi/ic_launcher.png | Bin 0 -> 1788 bytes app/src/basic/res/drawable-mdpi/ic_launcher.png | Bin 0 -> 2370 bytes app/src/basic/res/drawable-xhdpi/ic_launcher.png | Bin 0 -> 5205 bytes .../basic/res/drawable-xxhdpi/ic_launcher.png | Bin 0 -> 8000 bytes .../basic/res/drawable-xxxhdpi/ic_launcher.png | Bin 0 -> 8196 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/src/basic/res/drawable-hdpi/ic_launcher.png create mode 100644 app/src/basic/res/drawable-ldpi/ic_launcher.png create mode 100644 app/src/basic/res/drawable-mdpi/ic_launcher.png create mode 100644 app/src/basic/res/drawable-xhdpi/ic_launcher.png create mode 100644 app/src/basic/res/drawable-xxhdpi/ic_launcher.png create mode 100644 app/src/basic/res/drawable-xxxhdpi/ic_launcher.png diff --git a/app/src/basic/res/drawable-hdpi/ic_launcher.png b/app/src/basic/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..baefde612b7196bcc6f3ddc694c30b61c78884c4 GIT binary patch literal 3861 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 G5dD8op<);S literal 0 HcmV?d00001 diff --git a/app/src/basic/res/drawable-ldpi/ic_launcher.png b/app/src/basic/res/drawable-ldpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..8cbd1453a0a2e1ff78fca2e5e38d43633101a620 GIT binary patch literal 1788 zcmV004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 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 literal 0 HcmV?d00001 diff --git a/app/src/basic/res/drawable-xxhdpi/ic_launcher.png b/app/src/basic/res/drawable-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..4e2940d5c0c1bef3404ac7268ea4025b58f42b03 GIT binary patch literal 8000 zcmb7pS2P@6)bFS>7%_wBWt5N*3=+KzM*ZuZL>L4?5WUwSdM7$jLqaBc?=3P)Nc1jx zjWSwreQSL$_u)R=b=En1oqhH`59jQ?*KhrHl(wcaIVl4v001CYRYB_B%f$bgAmaOV zQ)#vFUJ%;KX~+Qp-xA3Fp@{DHFe?>Z4FJHG3jhd40{~a|s^BdEzyl5d>{tK*5*Yvh ztxHa`j@11DvE_ftNWk6yjDohZlzR=(T~$L7xC&%_0DLavbjkt%upm{Da{Au0`vDG# zjz%7f4LF&EgS^0DzXOLVbm*hV&J6}k&a@$j6J4BBozks86vazCK<$~6IGxt5Pj6JA z+ZrAHWG=lO znw2tdO`P)Xq97`G!Gev=xA=GCk_QffEQs#HImXp<)*r2J)}?M(NOA}OB6h#kE{ZbQ zZ+EpSr_G`IiyapT1@>7F1y)(Jm#g`Qi9i6lvuXY0v{OOLX0fxCVd7brJ4e=k8wUQT z-cM`a{AV|rfcYU_s%@2^lABK z!xCfx21PbdfB|D=c}sykdqUEjd|z1FL+M?Fz2^qnQ=0QH(_%%UaJ`_Pdfm>b2vFv$ z1h#JaHxtfz;^t4;m4ejZbp<68GoiKHqERlTn~G@l-X!jGZ;nD)2p*>5Q74`EO`f%6 z4f}*gi^#A(52F?2pjNU{za3mooz*jToUVB~vzb;F{^}G`j0}NU59A9;nE#0JS zkRbMk{oeCDbb)67sU~UE87|>p5 zI7*#pNHGxi(!@~ayRd)-b1%0Sb*nJ28AX)LSsR1 zhQmW@E=GVy8yz<^Hx2~9m>x(;)wX=^zzOg_O^@QwKW*fs!^helCB?M#HNCz{++VHS zIyt7oqX<$9-0Hcb403GgO8;45UF!s|A?`e0PTQ}GjAcv8=I|K(e0lH-oPK>8UK~!g z4IaL07@cZA9xOBP9uG^gfPn-kY6O~${0Ci+$mkGxLn3+qj#+wax&byeHm|3j@hKa0oRYY0Qyo5JeeC?x3y4!$9uAxc?0W^IQs)5ycD37c2p6Tc zR*z}gucOYRDg3voHj>vrRiGxUHz3$~k?v-$?8rfOHr?@R8-=C3ptaE`vW|irp=m3Z~s*Tz$hPKE%JI;r4AN^gQ8{ZB^$q*Q#~xi0S}Y! zHi81?U)CWy2zyjQ^$IPIc|Cc%5eZ z*uQupkveKu&16w3$&e>(mF%%~-YaJ~^E)q!2#RU`V{T~}Nj&SvgdO0L{mpUT``=!w zpZF>bGUNVAaQVGt6z>fn$Aih~^Rjtw6Rq~SUC2>lG_Qc%Vq6dl@V~MwonGMG*S6%-Rg=K*M3N{c;3vo;RYG(^`(geB zclPr-q71b;Ya=>H!^Dz)G&Ow>c8G3)THdH`yoJ@bB&HXoBn^qoP%6vW|HvnuyurWqAVQrY!sW+Dp0A)2|%i@*>ko1R<{`B9Ax#+o9 zV=F9U-@sgHl#*>bUrl007;J2Y`!AGsO}9QDH{3C4!Fy!4@l@a}87o1%yx#1m2AOqL z-vs4kOD^H@tNT_qb~ZRXz0r{@8lBb6OixINTTLlRhJ^4nmM%-GQwM}Z<03MN)f3ff z^7ni-WFv$1BLWIId~oMY5nV@w(UbDT%8M#&=T>r*>Z0h_jnty1J{|eA1PppXh1Lr3 z{p$IR1=7uDtwB@)zm7w8_MEFI$qvy#KnHJTCarH!^w0yjbG*o)BH!}F%l^4Go01Vj zXvM~+9r`U1^0>=b1(a&>l#@^mPD6?Rh>naTgfcc9jUeflmoNDLF~hfrt#IW4{?^l- zKgR(Sn@~j}tk1c!JV2ESwVGGw+;kKY$p6aQth+g=wn2nKh*Vl)_GL2GwcHqr2?f=V z@NFWf%U_h#X3g2R{g9S=*gc=jbIpXFv=`6%agjlEHxtWZR`_9RjC zFI&0L9NKn{uO0tnu=^sk1)YTu9Hk=(Wv46&PZf_a&<{xqnsM0Hmr(X8`i`GMh)`uX{a&!Ygn~G* znbg_8Y&oUtuoJIP(tcg!@f&GitPty6)!9hJJ6jTL#`Y&RQE1?4H8Pbe^gkpGAVluI z=FW4%3E?EN?HjIeUM*qMO({}E!$XS#K zK3MI+NaJr*Y4hJc698H`ZHCsSTZSzu5oD7 zVA7Y4yBZ>YvtGk&(*x0}v)t0!B&%JVe4fW%-{+45nuKLB>(V#thvg|S?G_LRUcq|M z>8)t=i7Za8IND32CQta&W-fkcn@s7zIk0~hX_3K3v=T9EW$620X5FZ%>>#kzbNk1g zbB;_rN66OeuXi&BmjupN6kIi@S#!BkMfJ2d@gmJc1q9z1{Ju&9s>f?QC4?m%8g54q z(*FCcb0}+%pvS|Q{*d+UP!*WZPvmCd*2rsY_Y91u1`j=L)y(x<&;npwV*Z=|nfc*X zo9(&Yg`bjGc?wI0&d-30hvetmzi*c-;WLb3Sb#}+ZT9!JciZtFXqEO4ernErdkX`T z1Y?&jdz$9QcX;cyd^wd6Q@sx4Me;6m-DtL2R%G&fpTkxih+H#2`fZpanYCnaWYAq< z?uKe9g@sshRd{&K*Jobs5-pcEWxN2o`eD#}S^sN0!e}RTKymsuwQjhNH@7skGJ@NF zC?oQ599Oq5dGk7+X;>UFFL{x^qZ`Tu_5|;VoIIjb4^!xV9g;&9aKsFAKq3Kfk6ZFk#MQ@- zf6Y`yS-Fm&sl1>cuhDTz=e;bio5byg08l)e>b8~7^aSp zdl9vmZN)MPm%tAp1T2VCKhRgadT%cRO;vND zrLmxmNyPoRG9&>Q9~xC`jx-Et7WAa;WJ*YE^oG!*O7NZi$SMpIihJ3}c&aoujVPgL z5A8zX*l|&{s#oXs0%pxK$dlRU#_K}5F)*8qhJBXD;}rycnu0~g4mm8O>Uls+d?<^B!ZUMbuA z5S5oGf_8BdHaOhnb0j?P{p1zHzi}sLqI7x)es{G6Eh)xLd@z*^CFwV5z$6g^VI(kQ z_=5i_eadj~bJF@`lDpvOsmLS>pLJWWjD5k5lzI>4G6zu+&9*b^h$t}K^~=RtFH@6Z zHaB3*-0WDnm^Yohl+eL?z(9n$?J{-DG92Ad6Nk|acRCxavsTjP=^|vC*W-0@ZHh`= zR_@cM`Xu}tRYw}MuZWIYv<3V~B`Xsnvkk->m;Mt#r^rw{mk5DPDQ=w7Z(R~yNJ@e{ zy-@!y)~pRGN%yap-8PqL$n>-d%Q?pu-Kn~sWgktwLTWqr@|1HD<}{f!lEq+zGP7p| zGS%4JuAc45bh=HAc#m#aaPfb}gJt*GII~|LUEk9}= zczsi&do(!((YIoUX0R~xv;*WPpCMI}M+Y^yo@ra(mD2#4ML;K>5A#1o4 z(xQ_6>${R@jK2M03_WJ0%I|%h>9a0QgnVaSZkX9%&xkc5{kKuVJ2Ic69iQ4&m0oa= z6|*N7d6}`)_KK{~{e@wjYF$f<(d4J>19DgMGa-LaHe0^Tw<9BqrS|8;%_Vq@#1L_+ zn_+Uo66Wb}{P`wv;~7VDt(q5u1hylE9{W5ON6CG$lan-m)M>`^s-9$4EwWQyRu~>$ z<)IP2uj!pWPPYg`)#{0+E|l!a13NaoH7Spdn$HkvG>ubp$#blFmV zuuu~Gi)==_mu>h9_GkZ?k?3FD_+P}58N&+n<+m~;aVLe z{fFK<4MP;-+V9uGlcyXHXJh2vKTE2jYFn2pVG;<4u6fIi!lsanDyISE>Ir37wmY{zVe51Z9!kC6WRu{tR9ux&(*L@GU~16=F#DwF~hA2D(Vg# z(7|Sp-4EaHFC?$Lbz*z`!TEBOg!f^sh$w0`kXHChDp`v*VC#t5<&W+dhe1xudgB{I z;)hut144rpak)x==!nok@g_YaYU57$x4putmmbm9n|p+`(C)O0I6T zlA!5+^4$1TOUeAOl!T?j>dg)4-ky8rS@TRVsr>ZzcM96}a+`lHoU0+@v(K^@+Nog4 zGMW_IMbBGvb3az{C296#<|^0+%Ban4BjK(s2@zeqyhjo(`-{QusUv|?nk0r?1Z*we zEm|H}^HbElX#RGH)gI>BJN+}DpU{d{9C9_vaQIiYDNR>O;ZsORB5(Y;pJ&vNe~JST zTfm_4$=>7f@qL(9do4y`%O8RU7QH~n?W%}Sc7gM9y}?Bv+uDC%e5ih1C}sw^_nDLM z%gd^3KdXY>22EQ=;Mz7~UhD5d3n3Of(caH=;nMn(x{s4ek*eGywZUV{a$5qU>(n}s zK_03`#I;4`I(v|7_88`d+e?y{{-REtS+g0z4&@EU=n}b|lOd3piS5U#fBRVh`#xj# z$7cmEDv$#@UsCY>6Q2Q}pt> z&U8(Z322^6jt-gS>pN@|RuJ>tla8GnlY{@&?0eCk1}!mAjBf}rAw@33V>JfY2JlS& zs&T1Con{IrRWpW-=#$Jvq>aQfCE3-TagCbq`cYVcyVGg27Zt`sU2+)7o;5rY_zXc% z+)bjF(;;>V&%}=8$+sU1^AK99oBkvTPA~(Kcm_slKd^8NijkB}u<#=*HJ51;gjdoe z9!`3psT1qNdn(1jMIt?0rreR=KER_dBXO>r5BUBoQnA_xF0AH1o~&rX%UuP9$*esn zcrCX9R2Op7`dnG#KY&|`HMl!Yx3I?d&>bvSNF>O&Qk);DPt{3X;zU4tVMICfOufJv zVSvhK+mZy;0hP8z0Yw)fhD8mwolgOHa)W=L;Z^e?)Y~WE4<=Nvqwuv_OWcJ8(+GDq zy_(kp@UD2rdgeLwgERf}wV1f_5%1!=Jp-?h1y-oIBgx?Uqj7s4>J2e<@&V(pE*|IOWQ(&m!&fT_r)*lP6clK$PBK z1iuZ{lFEBK2-MH@0zL48bAND1+kmSZYJ|nU{s)S5Z!IaU3yCJ%X?Uw`e@u3(B@&WR z^zUGpmSc>Q5iTA`9AR#K2bEn$t9UO-&)|zHx^|P4zU7pe*HB zW;vf%)E--Y1aqb}HPSoy(CKp&!&#MIWc*i$>PulF!epV@J*j7%T%ZCefyJLH_?~R6 zL}>EhiqxO2o|Vk5f=u0>XMzUh;P&Zii%l}=wqYKS)kK~m57Cb-|D~~BD$o}5IhEns z8X6FB54(nFBTTdOOJe&^1PYq!A26eJj_5GTrb?;$pTYofb|Q5 zT+Gc4=7>)$MA9325|7L?{fmq1O8&%bY1s|2u_Xg6pSO5I(813|fqqJe@&M`W2VjC^%8@<)^IrNejP8CpAsKt|hx75y*-M&mGn^U?veKWYnH~u6;ZW}CA zrgaX!01AiZGG|P(k;T)ee(xL}QODZ+g{cEWGT2_ydVZtZ%_aBrg8pKZo*U99y~iG_ z1k(xhshM&+zup*cFMg~FtYj%MX5EN{=%8GuG$_du7?Cgd76cR<}f|50+^BI;J!uU-Q{!7$x7V&RrvRV##6zRg3yxoTaR z`3Y(AsFK)8oaUj~l_$d~w#m&UJslD6CdFw<%ml=Z3sryqj1k_>y9W%l^_~T5{+j!R z2AZ?E-kU3O>fsMPAqRU;yVZ!UTuLhhk3>Zf^>M%U921&}!Ef$=L?RCU;l256NR^=# z-^UfD(NOIA%E)NXcN>oICL>=eg359J&`R$ZZLIam$nXQ-)n3#Ni1RJucAw&}-LtBw zWq7dHjj6s&gBH0B8_0>x^(Z`!>%J&g=p{FtL^*>ZKlSE59Z@3sVJjqkBjtC4KgMIU z+~F-9cpVPfF6k>5T%fSr0TBW`+W}raM7RCE9}N0Y!INpc0K*j;(l#>@EJU|^cyswr zHJtYc=mm>=4ZZleWj*cV?3jv)GCfG{=_ami>{<}&Q}qh(Gb~+dWL#)ZF65Fbx||b2 zB5(f=+J6pZ8R7+kzTns1n`8^`uYc)KRYxY)Gq1m0cLSs+l;mS$4c~|+OYtCH+C>@U z#Hp=mpu!C;vQoDc66+r_zf6uhIi(Z>Et|E(Pxjj^E!Sid6;Wp~W*>bukKw6d;i3>8 z^h`7{$!zY<0t&WC11(B)U5qq8u3s;#yG3>Kpc~qWf7^GNy$sGCUYsv_Ja>+B*ynjY zY~wH9hLbU|_jrCxt07pLg#h#nZ+31Pu9&q^z8GZeN9?B;Fp__oVb8hrnHJrCJcOb5 z=?hzM9hJgJALqPKw9k;=qKbdQtz8Q*jwV9P;|0CtBOQsBa~J6&zW;8|j{pZJmik?U zd%R!w*Z}$l%yv$%9#Ir zFcYZ$nP}kI2HK?DZ-KJzExpBC~(tA>Q!ZaTBHk!-iMy(7W z^vmi~p)$=bwGz0&Vz*2qABZ{xRic|A?)89gN^y)AUBvg+_{o+lNu}$PXh6<)`9}UP z@jm>OkFBWpTlp#rhfp6wx6vOT_+1G@bJkxM(|(vGJ=vFIS*~Z-CVXQu_$4PaH#4N6 z?xDdI12v!@toOP5SFm(`E#!K;U&%|7_WcZ>GnH^#ElAQl!&I-0Rf%0&Ifrp0>XZN^ z=VBX^m!DF zU}n5r8bY6L#nDoYF3?73KT$SV&eoW3eS}5`3u9_b#A<3>N?}h8o{&o`8SZV>I8$55 z15$!!^HScS%F;i^C|<GPi8Z#7(hLXR9e)p zV@XL+s*(Dnu3T#Bwak(dBCQHJPhb=P2rwGE)yEc(C}3RDbULt`n4ekyH*~D}n?yn= zqbN^}gqvf% z7N~uYHfz6qN^{r_bahSZ{Yc!E9Gt79KjxZY_LoD9nVZS}d`EZ%XYR|~>2~$-(7wU{BK_>DCx|bD4lZN7xMt>6nJR4J0oC52nj|hnFJ~SC&Nz3$(Oym z`}8R<#%6ShSJ-VLDJB~Lu-M6VICBm-mOIRR-_bW-C0H}XUlzpqKLn%wR66I6diCva zQq{Sdjf2LRJ@@$1TH`VJt!h%Ud1klW zvJC6&cXmJYoE--8w&I4%LWei`8B3Xq&f+I4?itI@FYm}m2m${~Sh7``$i0Lh#gq7{ z9}DLvmFH;4lft=Ix2!w4?C6UACB8^2b=o(~&=FRDSY$9`XZF0`8_Q&goO7LzdWhsy z1sQ?FIf}6)Z1I;H-r8zMX}4LhxvT$Tzr?{> zdG(#T9g>|r2JI4sjE;Os*^Sp#_*h4jZRC3}y^!tF5gkS8P6NaHh@vxx0oNfD;m37qugIhSh>Ew7XTr+pco%q zluuYtUrE+`=+$O{*efWx=K%a#5whqunwZ)|-2-wv76(EsUo15_0?kyY{*q5lU7 CHxmv3 literal 0 HcmV?d00001 diff --git a/app/src/basic/res/drawable-xxxhdpi/ic_launcher.png b/app/src/basic/res/drawable-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..91b78f52e94740e276467468255ee1000677871a GIT binary patch literal 8196 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 literal 0 HcmV?d00001 From cdf419d1fee31e2f1a903c7a17e3066a8a044123 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 31 Jul 2018 16:20:07 +0200 Subject: [PATCH 3/4] set Basic to use auto-download by default This will give us a nice testing ground for how this will work for the main build flavor. fdroid/fdroidclient#932 --- app/src/basic/res/xml/preferences.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/basic/res/xml/preferences.xml b/app/src/basic/res/xml/preferences.xml index c4d8280cb..24066bd1d 100644 --- a/app/src/basic/res/xml/preferences.xml +++ b/app/src/basic/res/xml/preferences.xml @@ -50,7 +50,7 @@ Date: Tue, 31 Jul 2018 16:20:31 +0200 Subject: [PATCH 4/4] set basic flavor app name to "F-Droid Basic" --- app/src/basic/res/values/strings.xml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 app/src/basic/res/values/strings.xml diff --git a/app/src/basic/res/values/strings.xml b/app/src/basic/res/values/strings.xml new file mode 100644 index 000000000..781dd65e1 --- /dev/null +++ b/app/src/basic/res/values/strings.xml @@ -0,0 +1,5 @@ + + + F-Droid Basic + About F-Droid Basic +