From a813eae57c94aeb7cca624f52bf27386cbcc661f Mon Sep 17 00:00:00 2001 From: souravp712 Date: Sat, 9 May 2020 18:40:25 -0400 Subject: [PATCH] Revert "Revert "Design and Intent fix"" This reverts commit 4889a52caccdc376c2066a684ceb4ee6fbbc83b7. --- .../executionHistory/executionHistory.bin | Bin 2047092 -> 2193726 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .gradle/5.6.4/fileHashes/fileHashes.bin | Bin 231619 -> 232769 bytes .gradle/5.6.4/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../5.6.4/fileHashes/resourceHashesCache.bin | Bin 19075 -> 19211 bytes .gradle/5.6.4/javaCompile/classAnalysis.bin | Bin 285143 -> 340522 bytes .gradle/5.6.4/javaCompile/jarAnalysis.bin | Bin 552221 -> 765761 bytes .gradle/5.6.4/javaCompile/javaCompile.lock | Bin 17 -> 17 bytes .gradle/5.6.4/javaCompile/taskHistory.bin | Bin 66029 -> 66029 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .idea/caches/build_file_checksums.ser | Bin 535 -> 535 bytes .../com/josh/trackcovid19v2/LogsUtil.java | 30 ++++++++++++ .../trackcovid19v2/SendFeedbackFragment.java | 43 ++++++++++++++---- .../res/drawable-mdpi/btn_rounded_darker.xml | 5 ++ app/src/main/res/drawable/btn_rounded.xml | 5 ++ app/src/main/res/layout/activity_home.xml | 5 +- .../res/layout/fragment_send_feedback.xml | 1 + 17 files changed, 78 insertions(+), 11 deletions(-) create mode 100644 app/src/main/java/com/josh/trackcovid19v2/LogsUtil.java create mode 100644 app/src/main/res/drawable-mdpi/btn_rounded_darker.xml create mode 100644 app/src/main/res/drawable/btn_rounded.xml diff --git a/.gradle/5.6.4/executionHistory/executionHistory.bin b/.gradle/5.6.4/executionHistory/executionHistory.bin index 9d603973aa949ed3a486fe91443b443f90713b61..86ba3dda183f973344316e094cb1795fd19e8237 100644 GIT binary patch delta 5581 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 S`-nA!E4c2lJd9vgWc~|Ij)qeJ diff --git a/.gradle/5.6.4/executionHistory/executionHistory.lock b/.gradle/5.6.4/executionHistory/executionHistory.lock index 93fbe829ba5cc8483e109019b2a55488ade1ba13..30850ddd1fa8cf2a6faefa1eab30a523c7d763d3 100644 GIT binary patch literal 17 VcmZSn6YyG$|H4^+1~6c80RT5;1e5>( literal 17 VcmZSn6YyG$|H4^+1~6bM1pqga1j7IT diff --git a/.gradle/5.6.4/fileHashes/fileHashes.bin b/.gradle/5.6.4/fileHashes/fileHashes.bin index dff573d9a00d113d711ad25ebf218e69e7bd1c02..2ca1c352af9f582769fbea0d5b6140fea855515b 100644 GIT binary patch delta 5767 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

-gcfi?i3^J}DzeKWu0UKsWjBfn3?QRV zhe2dwCK@%u>CrmT0n$W|+dxE)wDH zPS&-_3I)ly8#9ovkp5ZIjITJgQ1pzvP-&C>{p(vhZa)_c%3C!(;o5l!BS{6q)4oxMh`e^_?u z&;IA-c+105yvOG}{PysM|Hi|QPW&0ZA?ikB3u#^4w&Tl1k=hVDQ-xe`0_KVhy_NCP zn~T@)T(5Th?c?6jT|77`6DIzyKpJU#Qme5od2Drin9DC>*G&mZ)itFENSvZ9uVg zjA|IQF^ZW&G>(7ofA71iryb{&FXGNs(HHj8xW$&rz)M3nVu!{l*v%70S2tpzK1P!^ zp)G+COiM#gZbB&-nQ1cN;_y_P(XkyIbm?X;35GI3OPe-JQb0Y7az20zeWsKFj#J_? zjV-%A0D;q)++gTs7)SjFfRz(t!K154~w6Z2}B<< zn{z&T!x?qV#D;8Vpi zZbULN`l11A-5X3AIPq*8 zKRE3oUE^ZOaPU&sCTwj+6N;uY(nUhZzgb93Dl8w#OK4+$gw#Dy4x>|yx)`;7Wm4X6 z#1fN@INJ8bI09+wT$b#I zXQQDvmr3DJx_cQ800t#KNU$j{Vq<}f-~(SnOD^J8n&M&E$d*paF?S)OJVy154qZa! zYmB(dXp8saHFVKstZ_WbBwFbe4u4KWVavABSS*N9TM+E3G#W$Vub?K3LqktoLCy2b z;TMA{>loEAYGc%R6{Q|ug>z#snE!_haS&3vxRpe>{{uIj7nY3TJx9>cSYmH2&QBh^ z(v1=VlP`=FkFYq_j^Qvf14PM7_}tUb`)t`4i~UTBLrP#&$w+z`I^$5~IXK{PV^vE^ znxW{dc=SibqZkZJLqB5Jh}^8OD^;!O=)V>D(3 zHWkXKfYAhRm{`jS+}agS6nMkP!wYTjGMVI0CZcF3BUKXG+$LjOn;XcNC82x?b2Q2X zr|vN$eX=9~wlp9Z2_86$?7<@$ORK#31ZwZYdkWD$d_EDL`tqLEw2%-_VeL$Ql{Kg7 zs@HisNS7=BW)s{r5EuaBLUP)+6WK@-c8);!Qz{qPQdSjAtn`MlQK=8(5=R?aY z$r?3Prtqd0c7k|U2Bh$&n+2{;(?rXF1R;gLv$S>V$9(@hzvWO>bdowhb&4e9T{%zAuzc`t zM)*Lv)yvP#GF)mh99nl@SuSPx_nE!|+ewFG&^N|~@RiYKVuE9DnoqCA>jSSYChx70 zQyyNEi;S{-x5%MGm9FU(&wPih`ZT6cxZ5mc=!d_c6+8Ld4_8^L&gcY-1z#-xW&D!N zSH-dyAE}ji8NId5ZT;T9>r!XG*>^;D%;SJ_IMa(P;&UB$tbXR`Z#gB(Y;^c)n<&fa zs7Jetc#Y$ppzGTbe_NTh%VOWJRU_ASvRvIRUX$0`Wp^aFYx>@xROQ1bFN2KemG@>F z@@_A22dj@d{wsa<&7n8#4=-^!gVp4WAq(EkICJ8}lQTCTjc9ex?$;e_Uo|LW7(^?d HiYfmCiWrgt diff --git a/.gradle/5.6.4/fileHashes/fileHashes.lock b/.gradle/5.6.4/fileHashes/fileHashes.lock index 3168bef015792417f228236d7dfa39df256e62de..38262ba35c5b9aa90cdd9e93910743e809ddae70 100644 GIT binary patch literal 17 VcmZS9P?rsUmd|^J0Sr`*0RST-1KR)q literal 17 UcmZS9P?rsUmd|^J0Ssgr0U}TX4*&oF diff --git a/.gradle/5.6.4/fileHashes/resourceHashesCache.bin b/.gradle/5.6.4/fileHashes/resourceHashesCache.bin index 664ae5c7353f23a79ab6cc42cf3b99f9a0ff6ed2..25df95822df7e23d023444e2cb8bcfa576f9a53e 100644 GIT binary patch delta 256 zcmZpk%Gf=Paf68jqv&K)i5nVn)#ATrR!^JF00v&o|DiyBWhG|_WVu{Xej{+187g>u@>)qPCMM2}ia*3R8VHDOcJy#!sy7D8 zN&>MU2n!fau0G(Y7`HA-zw^J}ceX^Jpd6}-Ed?vxR%=uk`Zi6C^IrX00#n7~OkTIM@yZ diff --git a/.gradle/5.6.4/javaCompile/classAnalysis.bin b/.gradle/5.6.4/javaCompile/classAnalysis.bin index ff980e11c920a02a5e6dab155a1377878454aa76..bba250370c737ebe67310ce837900693a2b12dce 100644 GIT binary patch delta 13959 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 A4*&oF delta 818 zcmY*VOH5Ny5akZ?G4X?m@>+rvL<&TBEs?JuDpA|VLI}jf70@Qe&j#W`sEdk;5q1ih z!04tdi!MO(B5$SCO>u=QDWDb+%Ad9%h!O?o8DrvI%$Iq3;Y-cRlun|wEy zS#hY$smkT$LcLpYL*ULSt7<>pE^zaVOKm>O^E|BdrR@GaadBC<;^G?8X)FwNbY%_< z)Tf7eJy_{lgS-SvE8qu?Ziy%?uA}Hit1S7p$1V06r7%(k^L91PcWI>%P z%o$x_j=aj8wpE6GdWh=56k)U`!stMR^|vBmC0msLhN6t7#`KC9NcTOqPLEA!9vi&v z5pK=?9?Avvj)9vxg3Qr^plH%K+!Hi7!PDhVLX+m5gbG2?4|?;{yEKNl zmoLOXP=97jao1~8JVam$Tx9#qYe>`3MZ?oDPJ>@`!5JpE%rH-zfhLk?ndh73+QcwR zwTHn$p)hn)=Nzm2F-@B1+W-8D=?0B!!%Og3P|FJVbVpcbl~vgc$3Gw5P+yc~q!{;f z=s~vtJ+?KG_a+cy2Y#X zeTO!Zf506~y)aC@+hEj2wjoKN=c0=oKf#Fy>=H%vB*$*0z%S^=4*v1(z#7Vq{vL`q a^o+zmf$X{$S^j;U^$GD>eZrmxmwyAzT49X< diff --git a/.gradle/5.6.4/javaCompile/jarAnalysis.bin b/.gradle/5.6.4/javaCompile/jarAnalysis.bin index 57b346ce793ac4ed6d9e3ced5c7baa8e00936389..64b91c7edef3ec85769ed566a2bc0d3ecd7b8f7c 100644 GIT binary patch delta 26764 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 U0;GP64Vc>dEjItO#fCupKV= Build.VERSION_CODES.JELLY_BEAN_MR1) { DisplayMetrics metrics = new DisplayMetrics(); diff --git a/app/src/main/res/drawable-mdpi/btn_rounded_darker.xml b/app/src/main/res/drawable-mdpi/btn_rounded_darker.xml new file mode 100644 index 0000000..ab68be2 --- /dev/null +++ b/app/src/main/res/drawable-mdpi/btn_rounded_darker.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/drawable/btn_rounded.xml b/app/src/main/res/drawable/btn_rounded.xml new file mode 100644 index 0000000..02df046 --- /dev/null +++ b/app/src/main/res/drawable/btn_rounded.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index b3de999..0086d62 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -31,8 +31,9 @@