From 7bcc3453da5a528a3f68ea366c162f2661cd0e56 Mon Sep 17 00:00:00 2001 From: leiyun Date: Mon, 18 Sep 2023 18:34:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E6=98=9F=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 8 +- .../yzx/ebrand/fragment/ClassBrandFragment.kt | 3 +- .../java/com/yzx/ebrand/model/CBClassInfo.kt | 5 +- .../ebrand/presenter/ClassBrandPresenter.kt | 2 +- .../java/com/yzx/ebrand/widget/ClassStar.kt | 74 ++++++++++++++++++ app/src/main/res/drawable/gold_shadow.xml | 5 ++ app/src/main/res/layout/class_star.xml | 32 ++++++++ app/src/main/res/layout/class_star_item.xml | 7 ++ .../main/res/layout/fragment_class_brand.xml | 6 ++ .../res/layout/layout_time_table_item.xml | 4 +- app/src/main/res/mipmap-mdpi/icon_coppery.png | Bin 0 -> 2466 bytes app/src/main/res/mipmap-mdpi/icon_gold.png | Bin 0 -> 2391 bytes app/src/main/res/mipmap-mdpi/icon_silvery.png | Bin 0 -> 2461 bytes .../main/res/mipmap-xhdpi/icon_coppery.png | Bin 0 -> 2466 bytes app/src/main/res/mipmap-xhdpi/icon_gold.png | Bin 0 -> 2391 bytes .../main/res/mipmap-xhdpi/icon_silvery.png | Bin 0 -> 2461 bytes app/src/main/res/values/colors.xml | 1 + app/src/main/res/values/styles.xml | 6 ++ 18 files changed, 143 insertions(+), 10 deletions(-) create mode 100644 app/src/main/java/com/yzx/ebrand/widget/ClassStar.kt create mode 100644 app/src/main/res/drawable/gold_shadow.xml create mode 100644 app/src/main/res/layout/class_star.xml create mode 100644 app/src/main/res/layout/class_star_item.xml create mode 100644 app/src/main/res/mipmap-mdpi/icon_coppery.png create mode 100644 app/src/main/res/mipmap-mdpi/icon_gold.png create mode 100644 app/src/main/res/mipmap-mdpi/icon_silvery.png create mode 100644 app/src/main/res/mipmap-xhdpi/icon_coppery.png create mode 100644 app/src/main/res/mipmap-xhdpi/icon_gold.png create mode 100644 app/src/main/res/mipmap-xhdpi/icon_silvery.png diff --git a/app/build.gradle b/app/build.gradle index 1c486f1..e0cb3b2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,8 +19,8 @@ android { // minSdkVersion 26 minSdkVersion 21 targetSdkVersion 25 - versionCode 30001 - versionName "3.0.1" + versionCode 30003 + versionName "3.0.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" ndk { @@ -87,11 +87,11 @@ android { shrinkResources false // buildConfigField "String", "BASE_URL", '"http://192.168.69.99:9009"' // buildConfigField "String", "M_URL", '"http://192.168.69.112:8098"' - buildConfigField "String", "BASE_URL", '"https://oa.qbjjyyun.net/api"' +// buildConfigField "String", "BASE_URL", '"https://oa.qbjjyyun.net/api"' buildConfigField "String", "OA_URL", '"https://oa.live.educlouddata.com"' // buildConfigField "String", "OA_URL", '"http://192.168.69.114:3000"' buildConfigField "String", "M_URL", '"https://m.live.educlouddata.com/"' -// buildConfigField "String", "BASE_URL", '"https://oa.live.educlouddata.com/api"' + buildConfigField "String", "BASE_URL", '"https://oa.live.educlouddata.com/api"' buildConfigField "String", "APP_NAME", '"一体化平台(开发)"' buildConfigField "String", "MP_APPID", '"wxbb397ddae71bb14c"' // buildConfigField "String", "WS_URL", '"ws://192.168.69.114:9801/"' diff --git a/app/src/main/java/com/yzx/ebrand/fragment/ClassBrandFragment.kt b/app/src/main/java/com/yzx/ebrand/fragment/ClassBrandFragment.kt index 7e596fb..730ab5f 100644 --- a/app/src/main/java/com/yzx/ebrand/fragment/ClassBrandFragment.kt +++ b/app/src/main/java/com/yzx/ebrand/fragment/ClassBrandFragment.kt @@ -136,6 +136,7 @@ class ClassBrandFragment : BaseFragment(), ClassBrandView { getOtherData() dialog.dismiss() classNameTv.text = "${currClass.grade_name}${currClass.class_name}" + classStar.setStar(currClass.star_num) SPUtils.getInstance().put("local_class_id", currClass.class_id) } } @@ -216,7 +217,7 @@ class ClassBrandFragment : BaseFragment(), ClassBrandView { getClassInfo() mClassInfoHandler.postDelayed(mClassInfoRunnable,mClassInfoLoopTime) classNameTv.text = "${currClass.grade_name}${currClass.class_name}" - + classStar.setStar(currClass.star_num) classSwIcon.visibility = if (list.size > 1) { View.VISIBLE } else { diff --git a/app/src/main/java/com/yzx/ebrand/model/CBClassInfo.kt b/app/src/main/java/com/yzx/ebrand/model/CBClassInfo.kt index 49cfb2b..83ce4ca 100644 --- a/app/src/main/java/com/yzx/ebrand/model/CBClassInfo.kt +++ b/app/src/main/java/com/yzx/ebrand/model/CBClassInfo.kt @@ -18,8 +18,8 @@ data class ClassTeacher( ) data class UserPhoto( - val head_portrait: String = "", - val identity: String = "" + val head_portrait: String ?= "", + val identity: String ?= "" ) data class ClassTeaInfo( @@ -72,4 +72,5 @@ data class HeadClassInfo( val class_name: String = "", val grade_id: Int = 0, val grade_name: String = "", + val star_num: Int = 0, ) \ No newline at end of file diff --git a/app/src/main/java/com/yzx/ebrand/presenter/ClassBrandPresenter.kt b/app/src/main/java/com/yzx/ebrand/presenter/ClassBrandPresenter.kt index 12b4992..3eb4415 100644 --- a/app/src/main/java/com/yzx/ebrand/presenter/ClassBrandPresenter.kt +++ b/app/src/main/java/com/yzx/ebrand/presenter/ClassBrandPresenter.kt @@ -54,7 +54,7 @@ class ClassBrandPresenter(view: ClassBrandView) : BasePresenter( LogUtils.d(response) if (response?.isSuccessful == true) { val info = response.body().data - mView?.onAvatarSuccess(info.user_photo.identity,info.user_photo.head_portrait) + mView?.onAvatarSuccess(info.user_photo.identity?:"",info.user_photo.head_portrait?:"") mView?.onClassInfoSuccess(response.body().data) } } diff --git a/app/src/main/java/com/yzx/ebrand/widget/ClassStar.kt b/app/src/main/java/com/yzx/ebrand/widget/ClassStar.kt new file mode 100644 index 0000000..5b997bf --- /dev/null +++ b/app/src/main/java/com/yzx/ebrand/widget/ClassStar.kt @@ -0,0 +1,74 @@ +package com.yzx.ebrand.widget + +import android.annotation.SuppressLint +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import android.view.animation.AlphaAnimation +import android.view.animation.Animation +import android.view.animation.LinearInterpolator +import android.widget.FrameLayout +import android.widget.ImageView +import androidx.appcompat.widget.LinearLayoutCompat +import com.yzx.ebrand.R +import kotlinx.android.synthetic.main.view_time.view.* +import org.jetbrains.anko.dip + +class ClassStar(context: Context, attrs: AttributeSet) : + FrameLayout(context, attrs) { + + lateinit var p: LinearLayoutCompat + + init { + p = LayoutInflater.from(context).inflate(R.layout.class_star, null) as LinearLayoutCompat + addView(p) + +// setStar() + } + + @SuppressLint("SetTextI18n") + fun setStar(num: Int = 1) { + for (i in 0 until p.childCount) { + val child = p.getChildAt(i) + child.clearAnimation() + } + p.removeAllViews() + p.clearAnimation() + if (num <= 0) { + return + } + + + val resId = when { + num >= 6 -> R.mipmap.icon_gold + num == 5 -> R.mipmap.icon_silvery + else -> R.mipmap.icon_coppery + } + for (i in 1..num) { + val startView = ImageView(context) + val lp = LinearLayoutCompat.LayoutParams(dip(35), dip(32)) + lp.leftMargin = dip(15) + lp.setMargins(dip(15), 0, 0, 0) + startView.setImageResource(resId) + startView.clearAnimation() +// startView.setBackgroundResource(R.drawable.gold_shadow) +// (startView.background as AnimationDrawable).start() + if (num >= 6) { + flicker(startView, i, num) + } + p.addView(startView, lp) + } + p.requestLayout() + + } + + private fun flicker(startView: ImageView, index: Int, total: Int) { + val anim = AlphaAnimation(0.3f, 1f) + anim.duration = 200L + anim.interpolator = LinearInterpolator() + anim.repeatCount = Animation.INFINITE + anim.repeatMode = Animation.REVERSE + anim.startOffset = (index - 1) * (200L/total) + startView.animation = anim + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/gold_shadow.xml b/app/src/main/res/drawable/gold_shadow.xml new file mode 100644 index 0000000..97aa8ec --- /dev/null +++ b/app/src/main/res/drawable/gold_shadow.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/class_star.xml b/app/src/main/res/layout/class_star.xml new file mode 100644 index 0000000..1d9fe92 --- /dev/null +++ b/app/src/main/res/layout/class_star.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/class_star_item.xml b/app/src/main/res/layout/class_star_item.xml new file mode 100644 index 0000000..09152ec --- /dev/null +++ b/app/src/main/res/layout/class_star_item.xml @@ -0,0 +1,7 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_class_brand.xml b/app/src/main/res/layout/fragment_class_brand.xml index 61065cc..33a1f9b 100644 --- a/app/src/main/res/layout/fragment_class_brand.xml +++ b/app/src/main/res/layout/fragment_class_brand.xml @@ -67,6 +67,12 @@ android:layout_height="32dp" android:layout_marginStart="@dimen/d_20" android:src="@mipmap/icon_class_sw" /> + + + @@ -22,7 +22,7 @@ android:id="@+id/lessonNameTv" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_weight="1" + android:layout_weight="2" android:text="语文" android:textColor="@color/white" android:textSize="@dimen/d_20" /> diff --git a/app/src/main/res/mipmap-mdpi/icon_coppery.png b/app/src/main/res/mipmap-mdpi/icon_coppery.png new file mode 100644 index 0000000000000000000000000000000000000000..bf2b4fee3746e33aecc41555498d85fc4fd7e7df GIT binary patch literal 2466 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-mdpi/icon_gold.png b/app/src/main/res/mipmap-mdpi/icon_gold.png new file mode 100644 index 0000000000000000000000000000000000000000..fe549bff3c9962c666276a0889b43083e69a5a22 GIT binary patch literal 2391 zcmV-d38?moP)a zYm8k*9l(G8nK|d&$L`%XyDg=3p%iM1G`>nfqv54I;ulCnkdPQn2nmt+QQ?Ep1QYRt zCJ@8JM1d3`m>`b`2o-2}1Zqp6Ermi`x?Og+`?$OJc^)(4hjVQUy#+ov$>bz+=FI;$ z|M$J(;v+~n3`q*g<1l!o5Wj#*{s1IEkrRgpB!6%Fe@%GB?f9&-zuRzt;KQ>(dcZfa zUg2GUF(GOF5T@&Q-s5EeZ&oAz@4%@Y;h%z0A=t)kGS{fNfq`w_rr;N#9ra!p7K;<{+~*!T<> zm*2*(26rmBGPpi)6<`&_dv7M5xDZ`|G=^*lTF+ib{MJS2GP&<$N1tAzlS=vmFhXt~ zg_qOt6!DbsvI^YnFv;_GA-(zg)ZyDerl9%oL)Zi07Qs$}J%D#Hp71lZ@;NZav;)K7 zM}QGf!_a>AVXPKnEa(ZV~nwFbb3ct?~m*kT0im%Sd)zAv3>yk;RD; zX&=w=GbGqYKW0 zPbODM`~6Llymzr=Q(r}ntb=NRHZZGTX#si$AQ*%shOh`q=Z7~ALf~Ma7j!GnU-Y%S z8ry+c@g{{eFH#tPoxS-SAA~`CV3vibOd)G(4abNCIC|gQvn@8^KEGD1tJI{&>Cus`1&HgJ%K;4gY@j5 zZuaNjbDgxdT#grmn||(f)ogzwKf4G+Yl+rg0-1qY0|@iT(h7{~2-h8rn9d9!8UkH_ z_F-u3fyORK=b<22no{u_*~ghDAdhp9mEj9eSd-7x(C%-j!+ ztq|xuPUDINve`QHo!T;&J+l#9gS2B|4Mr8lj%A%JCR}&p_AJh> zsy}-Bld9~{z3}lPuaN2y#;&>+79HTAu^nn}KirfDB>-W4fa-2_(6HW5NMcBXINi>ps{t(hjPo}@Xpv$(_WulEsv zpuIsA1Z=A#)aB`3d59#Bv@FTnOCN*vNTAVW4WS@u2Cap27#-arh3>tL=?xaTkO-m; zvCIy)3!tr_m7q+PXXMP~)vc_cm609EFrxr+`QyI)4&@tH#8K+E8t?v@<0Z&EWYV<h?LYFdJ2GKASM!_|pz9Xe|&{A0G2um6f0Sh);7;G)>&o_0`4DBv3 zrihPgk;F^ORIi|dkoj#*vbv>j6%hR|f*odb{UI@{w!7xPzGLUxm9XpymVwiXc*-KD zcnW<6n+mWrU|Rctv^$JnoH`LEDC6tXBi6MC3q2)f-^uXKQCR_!fbM~C^`;lX@v9!x zt8aS9OiUzw>u($k77tw;?|$@0t&d*a6i7yC1RMsNfrJ_%8Ia^K9_el-WxM=PR{=I{ z^as6~#RF{?KS-$zL)h296rFYP=4kEr|HR0~9fU*R%eaNT=z&w_E9YHvxBJ%3cenPv zv?<>6z)k7l$9`a1&B!Yt(1=m}KG5Pt`#fWRa)^ENx-OdOL6XVKt6QIZx_SsI>%O+N z_nZqJ3{SuGQHIye<7?2U=GCpVhWXtuL#P=%{mT$W5G@BFncchGAKZL{|M>Ci{p^l& zML{%r<|xX{9Iao+!?gF^cj97km~7&iD;j%tUQ=3g^?l_Hm%W0@pjLw{h9CtW<^4-> z^)Z-L8#@0ogn9R0>ZJQP!Ogw+y>#DQKdvwAy2A$p+og+{{tKzxL~riFB|-oI002ov JPDHLkV1mPrhsXc` literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-mdpi/icon_silvery.png b/app/src/main/res/mipmap-mdpi/icon_silvery.png new file mode 100644 index 0000000000000000000000000000000000000000..3b0c7fa2a00fc8ebd729fbc269435507f0749a7e GIT binary patch literal 2461 zcmV;O31aq%P)a zNsJs<8OMKbskOUji6@SYoyE%-$1#u)a3Bb=qaZ~BiA_QR2{>^>fRqC_4hRGskdQ!v z142S93I`5|E$oCn5KOGZOUBEL$Fuaz^i)@Mt?xY!)iX>yV+9GmRvr3v)qDTCoI^^57u73#tufZ%E6wuS`iDk&@vsmA>m1u3=io({dQmW2bo-u% zkOCG5ADTRkNKq!uMNN|C@MGFhYp!%4m!UFJE8$x>ky^tXfhW z7;A~6h{hNM&@>IpYwO<=2t2KkJLdSW!E7zOb!~}VRo91xS@!6~tJi*0mX*{}VvIp4 ziN#@^BMf|^Fr+pHPir=k;RBbhEqrrxm_Ab1&FweOzn74To6piYM^To?(>#A|I?CTv zR@JM@sy@{iqofpAV=1eOF!1qxA8Q?+R!AXnI5vkV0`PqgW9|5Nod>@6bQA=C?Z)wM zyK(fVAPBDS!-85r-jK zdk6t?oD;s*46_kgp3~{XINNU27)w=GG+T2jWx_Bx+liv5dY#Twy-s{KFUocC)8GH` zi%FV(^0vtdx}6T;c(>NsmP$uk)>0r4D5bVVY^&V2%2qI@U$l9YTwNGto;wWlM64wG5pS86XDFs?f zw3OS)DWyUxg;I*p518&vaQDH3#9>ID7Z__%QWE$+##u&1$>wm#`RC_2w15A1PTX_% zm&Fr*{4>ru`Rt{+bJ-|A8HFK1;BjDPhI@}60|8Z8p_D?%@$N;-5<8Mn3W1VxyUd4K z#@b+${>BD*S<;PSg1~2KWtG7&rK)R^H09{wL%(>>BX4`F5CZYf=PnS2KErf0`RAwq zb)jyW{YptTlY}F89p>RzK0sAB)J=_65{YOJL`tL-NYUm}6a+{m86*iSYwPp}38P|! zrxk%8prm5{#u9@hAq)bVrUBeP4%|NTO6MF^RUvUM@ug(7QPk*`Kti|^{ zR@c_J@1?W6;h{4OvlQDHgir|8vfwFA9ELa?gW-^swGCF**QuL^(DPd+1$f$H;l?t9 zWRqT}!{#uh8%HZ)7#4sw(Z=`g6C;A)0E5C7VtfdF^00L`S82n_2`j15B&(BZW`EOFLYj(yA;^d zn%BSj!Ot)C*Jl5I?%9tX+`o@>lymOV^Gx(QR8>vj`#9$?*8ayp+17R#=Ws$$mL*Z( zp_FEIIOHu4zvkmd?mYCPmQ4r)zwKG$CZIQx;jSLxoMUEsiaQV9@%Lvh&3&}0YqV0W z0@GT8rfFIOWgX6ebzq&v7(-(WbyL&YjP~Ac6w!&IvzHeZ8IH168g2?**7dGI0SvQ@ zm9>rgS_TE4RtN-jWp=R99skP&F&JaEO_x>*DzF=G~-*mjD-IZR^!rsFVZpWh2i z9EH0EC4w*v0H%<#RamJIQlOQ@T0veGc;l?0!;HKr_Ozk8s;k|DT2oXNWmQdUr3l9Iec|~zvOGsiK@>&= zzE5K;!)$~Uf;b8>#*k$hMNtq%AzEp))cBsqs4Q;lZ){N4HE#E7A-X8{0AnmwRfWcw znIQ1-Jk5=jK6OwPW}4nnH)bjfLIz2K1j5i~kPMmVbvgag*`J?0cH~>9 zXJ@~YWSP1D-V^(mSJ&S6%*9I|oL^izQ#TFMlM_fOv19Er)=j7B2qzqS6^=G`cbPe- zDXZ#$=V_8*%Hq;8Q5bM=|Niw?z3lGqo;rT?tA`KV@yyo!{lS3gUU%i5Lx;Zd(ETs} z%G|Yu*FF8*`H#)b&%d`n82E7*(v4%Jlv4S7m`fI0- zAN`xdk&O!KrWHvkBuYs-QOuRaMLearV`g7#M}^q_eJidl-gx9+=P!O_bz|_^C=8z7 bD`)-iR6p=QRJ|qHBh=8_`1jivbu9MhKQ%~3S_4W0g&+v_VZywIcjh%Z;E3u^g zvd`XU{r7+U*YHX39uOcv0F(fbEw3>DwPzrBl#SS8ArO>7`HFgy|B3y?BfqP>CsgIu zvx5r+=V(sv!PJ`&-t`NJQ1;d^H@HbM*=GBXew6&3w@{6-tp`MKNsIc`6OTn_k3W_# zeRwgxf^FgPUFECAj<`fKXsOAj+KgUfQN<`n+uHxBjQe*LEk zAnUD@^}A&K4f5Uw-c{cV%l{1qf#5wpTpwefr(?YM_fJZz4MA|OA}<^|ZV+C4{^@LO z8E-7E=u`GPc;`^c+(;_lCzzoH7p`aK@IO2y-DTtJV*_z1$n%sU9z(A!w)K&JenN^8 zSzE^B8F8&a_+Ci9Uoh7`$zA-;Pq_bi;gFx$jw?!BmSdD47W$nHTx}biIP&ZM+*=RO z-i~ceAT}a+_x}VVf@p;{dUGp%;pwNVAQYvitV+^;pDL?pw#LZIK3P%VgP`7e`Po`) z0yEYgFlx-!jC{Yl>r(sOw7bSUP_C~{Rf}^UD&BngH{F{r9a7tN5L|__27&_=aihW7 z>M~_7W82g$wUAQ&!0mtQZ~Kv_qM6;t&3JoxWKj!YGqokWPn-d8t1Ekoh4T*-7v4GO zuADzmUY)$usz=SZ~Y)^FOKdtb8?Q}fq`r7HSJSX_u6^u>qpxzwEiGVQ#gt%U(vvh_2{CTWa1TomS4z9#!DWS;0CaCer z(oSuELrw2I8tvNmYO?bOU(c(2Nf!R)%a6K$|JoPFx9=Qi!&n@e(g$1!1ChD{=L0@? zloD#qZ6wWYAc|ltXbnms#-fvid}*Hkkvw!u~^6=LWjqU#cQLTnC2BQ?NEGfMQrBEh9MG+>7QOXd4Cuj{O0uv#T zMOlN25_F?UND@L>k)M8x^1_)xGKfKGgU91tMdbqBvnPn|dFZ*FpZ@(vHZ^nUZyx{V z#>-!SIN5VEB7&{e7@wI!DNPkXv{IA|X^mJ!^cCO`U!Gvv22%m)mw`7oGJL#%5;OfA_tVWratO zs0KCyV^B$g9-l@;4M3bZMSkuSKJTHMtpRxFh$2HLFG>43Nm3(pmgp*db@Jywx4$tt z(HWPN3o>6>rimIof9DoUIvq}IS}YZJVu zn4cp*dy3-HX+oZ2nk_KVKvTgH8^wCz>GV?SkwvBJKSd@a9vX|vLg0P~*Bz5K$b&wl9-{<<-{ zi{Kr3ufttG{fjhPZ8qLGLV0Blk$`Em2%?AWYbd_pQ3MKvxwSqDPa;rd8*ul>e{SNy zk3S#QuHe1Du0`As48ZAsdghOppL^o>8Z&z+i-M^}ji!deSLk|U@JD{YW(YD2HH6@> z3VLN=v6o?#K-$60-1OV_mIGf58%ucSw)83!Ts9Jj=!EHgx4gQhg%BLt8mu-D8;lI6 zMn9nVngNpc-X<8OFn|gkF$SyExAm2C_`E;Tr*Y}%Y2MT<{fp=CQbABkA;_?M57-E7 z#u+U_K&~0X1wWj5jWP^kSmH1rpwa#}Y;Cm9tf;o`3TRzYbbD>96iQ?;28h~pDj{H0 zzzbB)5gUV2LQw^L5JCtD0i$3b4WZ2PcG=00G9L}bm=Pn52ucZ|$i}s@2%v{!o))kw zkUP&t=_so}H!E>?CL0NjC?Yln|87PN!>E*CLe=&@N4P;Wj7>&hkwKL$^J!57fkZ|T zX`x$`bc>R_3V7$KX+evy+Arx96^+=^jANRyr4|{qR#d)1YYV>t^I-Ni&Ht!Q(a-Nqt3q-<=EfTMxXJ zpE>c7{)ICWaa?DtJp)FQ(s?zWJ3XLXd27LE`C zO>)Y`%lOs=V;?;5t=2scJ(Jw=;8&cD)7`E&zI^oXC)Zwo>6g=Yj(%w5vNxXr5Qzy^cEMkZ0aZ`U7WvZ`OANH))grmOAGj-N4$IgO6%^AK0A5;!%sH% z-F8f2DXWssrSr7+-n@B#^*hHNTz%zVKa-w3`UuO5^|;m`nVO;U?sB)2?h?^q)NF3l zh-?z8p-Ojm7S2&>A-Vmo!;|;@*i#c9I{4LEYjOji>Mar^!Z|>MD(|3ejHrl-Tkm~k z;?{d#>8~#SPUqYI^~vn`;a|z-P9E?@u_LL^OoJ?rWX2U+tD!P6>!*%<{OogI`c-@9 z!6)||{FxV9OX$!%&}vC g>TKhvR$Hn0UvdzdU{HQIGynhq07*qoM6N<$f{-%HU;qFB literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/icon_gold.png b/app/src/main/res/mipmap-xhdpi/icon_gold.png new file mode 100644 index 0000000000000000000000000000000000000000..fe549bff3c9962c666276a0889b43083e69a5a22 GIT binary patch literal 2391 zcmV-d38?moP)a zYm8k*9l(G8nK|d&$L`%XyDg=3p%iM1G`>nfqv54I;ulCnkdPQn2nmt+QQ?Ep1QYRt zCJ@8JM1d3`m>`b`2o-2}1Zqp6Ermi`x?Og+`?$OJc^)(4hjVQUy#+ov$>bz+=FI;$ z|M$J(;v+~n3`q*g<1l!o5Wj#*{s1IEkrRgpB!6%Fe@%GB?f9&-zuRzt;KQ>(dcZfa zUg2GUF(GOF5T@&Q-s5EeZ&oAz@4%@Y;h%z0A=t)kGS{fNfq`w_rr;N#9ra!p7K;<{+~*!T<> zm*2*(26rmBGPpi)6<`&_dv7M5xDZ`|G=^*lTF+ib{MJS2GP&<$N1tAzlS=vmFhXt~ zg_qOt6!DbsvI^YnFv;_GA-(zg)ZyDerl9%oL)Zi07Qs$}J%D#Hp71lZ@;NZav;)K7 zM}QGf!_a>AVXPKnEa(ZV~nwFbb3ct?~m*kT0im%Sd)zAv3>yk;RD; zX&=w=GbGqYKW0 zPbODM`~6Llymzr=Q(r}ntb=NRHZZGTX#si$AQ*%shOh`q=Z7~ALf~Ma7j!GnU-Y%S z8ry+c@g{{eFH#tPoxS-SAA~`CV3vibOd)G(4abNCIC|gQvn@8^KEGD1tJI{&>Cus`1&HgJ%K;4gY@j5 zZuaNjbDgxdT#grmn||(f)ogzwKf4G+Yl+rg0-1qY0|@iT(h7{~2-h8rn9d9!8UkH_ z_F-u3fyORK=b<22no{u_*~ghDAdhp9mEj9eSd-7x(C%-j!+ ztq|xuPUDINve`QHo!T;&J+l#9gS2B|4Mr8lj%A%JCR}&p_AJh> zsy}-Bld9~{z3}lPuaN2y#;&>+79HTAu^nn}KirfDB>-W4fa-2_(6HW5NMcBXINi>ps{t(hjPo}@Xpv$(_WulEsv zpuIsA1Z=A#)aB`3d59#Bv@FTnOCN*vNTAVW4WS@u2Cap27#-arh3>tL=?xaTkO-m; zvCIy)3!tr_m7q+PXXMP~)vc_cm609EFrxr+`QyI)4&@tH#8K+E8t?v@<0Z&EWYV<h?LYFdJ2GKASM!_|pz9Xe|&{A0G2um6f0Sh);7;G)>&o_0`4DBv3 zrihPgk;F^ORIi|dkoj#*vbv>j6%hR|f*odb{UI@{w!7xPzGLUxm9XpymVwiXc*-KD zcnW<6n+mWrU|Rctv^$JnoH`LEDC6tXBi6MC3q2)f-^uXKQCR_!fbM~C^`;lX@v9!x zt8aS9OiUzw>u($k77tw;?|$@0t&d*a6i7yC1RMsNfrJ_%8Ia^K9_el-WxM=PR{=I{ z^as6~#RF{?KS-$zL)h296rFYP=4kEr|HR0~9fU*R%eaNT=z&w_E9YHvxBJ%3cenPv zv?<>6z)k7l$9`a1&B!Yt(1=m}KG5Pt`#fWRa)^ENx-OdOL6XVKt6QIZx_SsI>%O+N z_nZqJ3{SuGQHIye<7?2U=GCpVhWXtuL#P=%{mT$W5G@BFncchGAKZL{|M>Ci{p^l& zML{%r<|xX{9Iao+!?gF^cj97km~7&iD;j%tUQ=3g^?l_Hm%W0@pjLw{h9CtW<^4-> z^)Z-L8#@0ogn9R0>ZJQP!Ogw+y>#DQKdvwAy2A$p+og+{{tKzxL~riFB|-oI002ov JPDHLkV1mPrhsXc` literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/icon_silvery.png b/app/src/main/res/mipmap-xhdpi/icon_silvery.png new file mode 100644 index 0000000000000000000000000000000000000000..3b0c7fa2a00fc8ebd729fbc269435507f0749a7e GIT binary patch literal 2461 zcmV;O31aq%P)a zNsJs<8OMKbskOUji6@SYoyE%-$1#u)a3Bb=qaZ~BiA_QR2{>^>fRqC_4hRGskdQ!v z142S93I`5|E$oCn5KOGZOUBEL$Fuaz^i)@Mt?xY!)iX>yV+9GmRvr3v)qDTCoI^^57u73#tufZ%E6wuS`iDk&@vsmA>m1u3=io({dQmW2bo-u% zkOCG5ADTRkNKq!uMNN|C@MGFhYp!%4m!UFJE8$x>ky^tXfhW z7;A~6h{hNM&@>IpYwO<=2t2KkJLdSW!E7zOb!~}VRo91xS@!6~tJi*0mX*{}VvIp4 ziN#@^BMf|^Fr+pHPir=k;RBbhEqrrxm_Ab1&FweOzn74To6piYM^To?(>#A|I?CTv zR@JM@sy@{iqofpAV=1eOF!1qxA8Q?+R!AXnI5vkV0`PqgW9|5Nod>@6bQA=C?Z)wM zyK(fVAPBDS!-85r-jK zdk6t?oD;s*46_kgp3~{XINNU27)w=GG+T2jWx_Bx+liv5dY#Twy-s{KFUocC)8GH` zi%FV(^0vtdx}6T;c(>NsmP$uk)>0r4D5bVVY^&V2%2qI@U$l9YTwNGto;wWlM64wG5pS86XDFs?f zw3OS)DWyUxg;I*p518&vaQDH3#9>ID7Z__%QWE$+##u&1$>wm#`RC_2w15A1PTX_% zm&Fr*{4>ru`Rt{+bJ-|A8HFK1;BjDPhI@}60|8Z8p_D?%@$N;-5<8Mn3W1VxyUd4K z#@b+${>BD*S<;PSg1~2KWtG7&rK)R^H09{wL%(>>BX4`F5CZYf=PnS2KErf0`RAwq zb)jyW{YptTlY}F89p>RzK0sAB)J=_65{YOJL`tL-NYUm}6a+{m86*iSYwPp}38P|! zrxk%8prm5{#u9@hAq)bVrUBeP4%|NTO6MF^RUvUM@ug(7QPk*`Kti|^{ zR@c_J@1?W6;h{4OvlQDHgir|8vfwFA9ELa?gW-^swGCF**QuL^(DPd+1$f$H;l?t9 zWRqT}!{#uh8%HZ)7#4sw(Z=`g6C;A)0E5C7VtfdF^00L`S82n_2`j15B&(BZW`EOFLYj(yA;^d zn%BSj!Ot)C*Jl5I?%9tX+`o@>lymOV^Gx(QR8>vj`#9$?*8ayp+17R#=Ws$$mL*Z( zp_FEIIOHu4zvkmd?mYCPmQ4r)zwKG$CZIQx;jSLxoMUEsiaQV9@%Lvh&3&}0YqV0W z0@GT8rfFIOWgX6ebzq&v7(-(WbyL&YjP~Ac6w!&IvzHeZ8IH168g2?**7dGI0SvQ@ zm9>rgS_TE4RtN-jWp=R99skP&F&JaEO_x>*DzF=G~-*mjD-IZR^!rsFVZpWh2i z9EH0EC4w*v0H%<#RamJIQlOQ@T0veGc;l?0!;HKr_Ozk8s;k|DT2oXNWmQdUr3l9Iec|~zvOGsiK@>&= zzE5K;!)$~Uf;b8>#*k$hMNtq%AzEp))cBsqs4Q;lZ){N4HE#E7A-X8{0AnmwRfWcw znIQ1-Jk5=jK6OwPW}4nnH)bjfLIz2K1j5i~kPMmVbvgag*`J?0cH~>9 zXJ@~YWSP1D-V^(mSJ&S6%*9I|oL^izQ#TFMlM_fOv19Er)=j7B2qzqS6^=G`cbPe- zDXZ#$=V_8*%Hq;8Q5bM=|Niw?z3lGqo;rT?tA`KV@yyo!{lS3gUU%i5Lx;Zd(ETs} z%G|Yu*FF8*`H#)b&%d`n82E7*(v4%Jlv4S7m`fI0- zAN`xdk&O!KrWHvkBuYs-QOuRaMLearV`g7#M}^q_eJidl-gx9+=P!O_bz|_^C=8z7 bD`)-#ffffff #CBCBCB #88000000 + #33fff87d diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 56ceb71..97a34c1 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -227,4 +227,10 @@ @dimen/d_28 bold + +