From ffd65cd8d634ec047d016859188d0a555be66386 Mon Sep 17 00:00:00 2001 From: Josh Patra Date: Sun, 3 May 2020 17:11:31 -0400 Subject: [PATCH] Watermarked in a few places. Also removed some useless files. --- .../executionHistory/executionHistory.bin | Bin 1940715 -> 1940715 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .gradle/5.6.4/fileHashes/fileHashes.bin | Bin 230319 -> 230419 bytes .gradle/5.6.4/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../5.6.4/fileHashes/resourceHashesCache.bin | Bin 18769 -> 18837 bytes .gradle/5.6.4/javaCompile/classAnalysis.bin | Bin 212533 -> 224688 bytes .gradle/5.6.4/javaCompile/jarAnalysis.bin | Bin 125229 -> 231965 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 .../josh/trackcovid19v2/SettingsFragment.java | 5 ++- .../yourcountries/YourcountriesViewModel.java | 29 ------------------ .../YourrealcountryFragment.java | 18 +++++------ .../YourrealcountryViewModel.java | 29 ------------------ .../ui/yourstate/YourstateViewModel.java | 29 ------------------ .../ui/yourworld/YourworldFragment.java | 2 -- .../ui/yourworld/YourworldViewModel.java | 24 --------------- app/src/main/res/layout/activity_home.xml | 22 ++++++++++--- app/src/main/res/layout/activity_main.xml | 4 ++- app/src/main/res/layout/app_bar_main.xml | 4 ++- app/src/main/res/layout/content_main.xml | 4 ++- .../main/res/layout/fragment_yourcountry.xml | 4 ++- .../res/layout/fragment_yourrealcountry.xml | 3 ++ .../main/res/layout/fragment_yourstate.xml | 8 +++-- app/src/main/res/layout/nav_header_main.xml | 4 ++- .../layout/tableview_column_header_layout.xml | 9 ++++-- .../res/layout/tableview_corner_layout.xml | 4 ++- .../layout/tableview_money_cell_layout.xml | 4 ++- .../layout/tableview_row_header_layout.xml | 4 ++- 29 files changed, 68 insertions(+), 142 deletions(-) delete mode 100644 app/src/main/java/com/josh/trackcovid19v2/ui/yourcountries/YourcountriesViewModel.java delete mode 100755 app/src/main/java/com/josh/trackcovid19v2/ui/yourrealcountry/YourrealcountryViewModel.java delete mode 100755 app/src/main/java/com/josh/trackcovid19v2/ui/yourstate/YourstateViewModel.java delete mode 100755 app/src/main/java/com/josh/trackcovid19v2/ui/yourworld/YourworldViewModel.java diff --git a/.gradle/5.6.4/executionHistory/executionHistory.bin b/.gradle/5.6.4/executionHistory/executionHistory.bin index b56d4721c4f3e963127b61652325c785ce9ecf7a..ef4b32e7f8495e863043e1a3cd13cda777cf839f 100644 GIT binary patch delta 3039 zcmc(gYfzJC7RPy$kVH(#^K#4W1rl5?3Mdf3L~doKP`q(lsyJQ6kPvDFBLtzA*UZS7JPxy=@F>um$>><2PC%nq}&@67+xbIzIb zKL2x`-%#teq1J7AO~i@ACbA*y882ace?x^_`4lfHr5|OOS-Vb_O`NcuxbOcmq9!A}kf?@YOQr=> zPBKkl?66=vto@QtV%>2%T8}Q)KS=C7heNXluZYMc_g)OLALra$xpn7*FeQ-D`izcpt^ksgOw1vH z#@K+q9S%Em_l$3S%Q5G>%Q`-P2YP9YN>n3lEAHN#8*zB`t(=5d_ZZl9oFh6^8Q}sq z>5OK><3%YZHgJx?(2x_>KiHO@%0A}gDoXU-u)K!=)VSLZp0P4Sx(02 z`(L!DtyF7ocFBW$QvKJoKyf(38~iIwd~wJ=);@cKyMc&Ip*IewFd=<(j)N?{*m}*= z%S5mF*m00kQah{hM$cj6Bq_zO4|4ag%!-|Vj9f65+yAJ@+HY;`T`_S04)>uL)G5fK z4U|WEvg&0?p?P;Jp!gAKkDZQkS24_HnnRSpIvOLz(2vghqyu)X;69@vnyUBV*{)Zn zIqUkeg>8*TVb>Tx7#fSX960zHmygSn7?_wF^3;8DYUVfJFOtmC^n?Y+UkEBvg|KinX`Ka{f4 z8}j}}+TxN^Tw}sAt*+&FzkVLLd1WtEc~!IR4Pj(t^$MivVxMz)Iwt~tc)`uXdsXul zp0FVUy$hAMNjsfeA6G9^?AFKIb8J>`IefSwA)}y2LVgDmS*U8AGFGOND?L486)G<; zuUJpDLcLV2Q79F1rQFM1q0)HD-Q*gXr%d53SE;=`ZLwCF zN=GB0eRNxO!EyN7l4Ysg7QHkeT`ASv%e%iVU%{yT#rwyo6Kw^t^HR%N@6do)VI73W zb|4QHd8a*O)z?ddh26zT`G2qann{De<2mj%-uOFl|sJcbvK%)cO8du&! zVj6k((~^hXWzWB9p6DFwVYD3kSH#9k9CK*s;F!RJbbYn#`)EIbY@Kgw+&+Heyg;4b zeZ#SEIoxuhGuw=Nbb0&^gPQQ>`BXO$-Dkn>s^BKeB?p$2_qvt{>sJe)2lU zF4ZGFZcAF4M|x81=Ix2`GA|EpY+Oo)cDv`>RW=R*_YpD*e>F<731}Q9=g*pAbmG5H z8Tfa~x=XXJH=%>P2D25q+y*nf%=NO+%M#}{SdAK^!u!{IuN0ma#QOE_ZYliBZk*F> zRZmB`!x?QmiY$H~b+Vwxmd#Yd7dFPWIJ(v9Lw9oh@ajd$1A9!1onP;^X*!eB4#m$| zvO{hiOl&e_Rh@vs1D|AGwCL;;EDeoFbHDr?c5P>gKoTHW37@RxQ`kS6FQ%g%pPjhv z(-kB6C~>&X>q69TI6FWv8fritP}cL~0hQ9Zc(h26$wV{x0}+2@iU4Kt{lM)k-)$U>ou3RPA_H;;XAnX|FZ!J$pq zl@IPGMX4<#!tio*o_}`y{Ym~4dR2bfpY2?oK$$Jt3g`=tBYs&Z!c4^6@3APyB;{2i zG)A57C7PiVL|KsB%CUwK33VEmM~E93h^|hwdv{<%N!%Dwq7(gzjrCEh7$|q`k@g4a z`_x^Rz6_PQhcCg_<)Rn7|64!r&FqITqRGc)Mnw4nD$Qz3DM>c|`ko#hD{CkPZq{jx^8bK++Ws8~QJE%<;Z@aVFdFx5));(UB2h zJ055fv*OKWdO=(RB{^S$B@~s%Ff@W#$d*nUf%QhbPdD%Yq;;nLQzm6XWe3LwhD$}} zc$q!*DPah5CEHjCjpM=q(!ev|)tfrwWJl^Jdi4Ja9)Mga^*eK|4q-0Trn&d{9|$zv zWAI#ijG3-J1%@Da{FSK`OBPd?d1xllAmUeH@Kk^|pnQbj=OI%e9Lzu|&k delta 2188 zcmcJQX;4#F6vuflFC>O6_a%gEj|wVc6%he(LC7#Ih-j%hZm3{IR8WW(0k_~5>Ow_< zgBocN3og}Aw#%Xdj*1<3X>luPi&7PhFm;=vPG7KPI`Dz^L*LB*%em*gGv|NL{BCPS zLTg2WzJ##Y_lsFEGRbF|SB$4_ajY&*7c+8Y^zz806-m(%Hk}{u2LqB5tVoRH9LXkF zmZqe!M>Z#$g2kCin#hB6xvf2zUfYVHEmN5cVMPiW8xC+#I8t4y)fCpAn;UXz&8vEk z(+XVh2PcmN%Mt+%q*xgUrgxkwc(+v0AFqGUiRGZ|&%DC*xYF}(irl5)?aOSSXDWlB z#wb!k+;V{oVn}KpIuU*%)KKns@!H|)svBqL%is=4nNZ^tw-~Ue=W6jM|b9FJ$aN6b(J!U`_61-9x0GP2zTdzj=0S`7J5DOOyZ z|J1f2vsZKM>T%9S-XJbY+gq38INH|llNO7&JN2tSq)(!Jz&}SY76+&DQeCVwBHSlO zFwWQD`k2Rx&#DhA0V_M~`dFAz&}%zV1Pfl%&iMT<(Pp0Xd;5kn1x&)eH^(mPLhsYJ zh#ipGgyy3OzECtn-w~QQtR?MO*sz0;-blOPL3>3LDQS0qi42%UQt>@4t-VbT#6xpL zuSm4Tyzc>#q2cP#+^<5e zbvz_~+7my)2lP+qzBnUa#3kgn-V)iSi$%)#;?2h^e?BvSu(5G?2hOWBzQuaOAOdc7 zi1c{tLc7u4FmE;b6iheheg=;w5i2qFXp(H+*Q>W;60SPY)8L8|eGy(Jp zvsg-yKo4aWS_1)4UMNo*}|D4e}O)5K%Q ztwZYog=jv8wkU}lkF7`LButEzSW9xRGwY#nAm0(28jyyh^Ro_zX8%&!H*uRK*ta53 z`B%n*YM~6wH9`U0UB&)l?QOK3K-7ehcldN=e~B^9-ajSdOSnFWiNfpdq7o8y-wX(7 zLdEj#d%>C*H6H@v#6zIw9&&)D`x1>|(LID0-J>rH`z4L=idz!1dXaZzq-R2OLS&p* z^2$UXpM>NkAHcwkfZ-N;8m@d!^9d+?M%(pTVx#}>CAD28v#NW&L}~@-&C(FV2D6lv zjFmkrIo@D)c+Q0&=D+7%n@vy ztT9uFyfZayK+d7?*c~JKesOBrS*AR?pF#`mEeQAWw3WY$pUnzFRPVUTkiIr6}OnIT| z4Eg}tgb+Mz6{}#^1{B#zFJS2<#ok)xWS$jasH~a6JS(u+7u!)C2u|S=KkKR}p`@MJ n0{81ws++FCZM%L4ewrX}GwZdBf>JEL`=H@hJEcXD)D3 diff --git a/.gradle/5.6.4/executionHistory/executionHistory.lock b/.gradle/5.6.4/executionHistory/executionHistory.lock index 60db7699cabc161ba88fa4135c21002f8c23a65f..fb084a8a7bec3084109fa0120ae2eb84dc571b89 100644 GIT binary patch literal 17 UcmZSn6YyG$|H4^+1_-zV05|moC;$Ke literal 17 UcmZSn6YyG$|H4^+1_;;#05{bI2mk;8 diff --git a/.gradle/5.6.4/fileHashes/fileHashes.bin b/.gradle/5.6.4/fileHashes/fileHashes.bin index 8544eca07bce8ff13b8e483faf8eb732c2e1e685..8a145234583e10adb72a0d675e0ca7317689f59c 100644 GIT binary patch delta 2614 zcmZXW2~bm46o&I&C}LRx4VVy(BvJuu!6GV9L`+r01rfy&Y*kR4smNl$1*##1$YP*s zs_nBUIUM}7moc6V9sKDGqcn+6G8U0@q}8&@ zY-mgy(^Q+Deam>-Gt*3g^~~fTh5lYk#|`}j>88+*-1GXLT!Da5o7c8w@^XQLH@oeoV5( zg(i6zyL_BN?mJjAQ06gkZ{G9hirp*qG?2(r-{y?D(C(MvY>QNp7t!nPr@vVc6{{S% z$YmYmwd;fvc&%;a2)BPD>t$nJCvfIEm5fYV(H)szzi6t};m2h=HJwojL@#jW^?nt_ z@a-1>AJgEi9DO@iC~FPP`P%5uBHOZ)H~DWIn_&_R0%|V6=Sz+O`7a(vzutSy$5)mz zcf*p~#KDXM_N3sEiv_v#zi#kciT$O@-7liw2A!`Ojwj>_;7=`zjE)aW3VInA6N=#&SY3Xif@J z8B!b4`Z+ZFAW{R6!~fYr71s~};ZA{!m^6872Mr%anz57C5|Ci8WL(uwx;EIb(L)BS zj2_)O+oG9oWxuW-PT^`|PIoZpaO>dud7uQVY@uA?UzgLv?jwd>+*Lk(BdkZ8g&L zY~BI7^+*Q^!Fn5zV8djbqm~|Dt%|m5MEV`6R!c+s2tky`$F#L*q^|d9L!t#VPlc3$ zv@C~uHAvM+JxD1FX-XL(SXLX>PUq5;P9#Sit%V_}k%kx1ycyw?;9oL&rof606M{Lm z?V~Bjky??MJUaTxV(PtwWJU6fprg;w;hRsr);HjU&B~`ItN{n)OL!Z!5rvdP2%0>L zwW0zVRYwRM{a8~L@}p3zT1xY}kzAJ1+7qIK7!E)Q?{4sI?kTj9Yt4|FVyn=x{W2~f!Gm79}s#(FG z!jdLaNHJSAOFH3H`lD@qy5hbk|AZ8Fb8s_+hXzo8-oQ@?wwVoVJPGJr%{NPz5j)KUn2y(ROzokcY0VygQLdy+7oox$+wLe(C)gzxVFDIpf{*X4ekVEj>+HkFU(Jcuc)&D%6Sz2sv13y$%?3*pi(@cR!`)w)yw delta 2214 zcmYk84NOy46vumCH%3wsYH8Lzh6VgUw?GHwyRgDk6cCKTOvi@eKBER%VWMnywXg|@ zgs+6la7uyxu(27ekPyMx;S;4v@u?tD)b3|2V5W_lI|Q?^p}GANRWnT zrPg{OpGZds$q#XTxx4QBOBNqtm#}QgV8ye&NYjeL* zqz6dfeZc)5Bbg5I*j`5FGxGL`)OAQ%4jjTBnbeH{+c~T+<)X1wM5JR0%EVAn^bQ<$ zmU87FtAm6G$)4zS>q%6mhU6@gbw6~DNaA+$hm}515`09V_$s=M5u6hz#{4Xb6=bc9 zKw(2VhqN~x##^xP{dJY`Wy~-Fnf628vMrgo-NYk(IiTyWlzci#0 zq%0@b+L3yYW|0ava+lMLU|HiByHL(urWnC~`&ICml@Y{j7<;^l`X&s{@yyYVMbfo?#gMIy=**k;`c3j7H&b+;Jj~7E9 NmFm53;m?99@?WlpROA2v diff --git a/.gradle/5.6.4/fileHashes/fileHashes.lock b/.gradle/5.6.4/fileHashes/fileHashes.lock index 50309b86731c679eb526e41d2734f053c8dc52e4..f35975bca102e19918132279acc4b34052ac2afc 100644 GIT binary patch literal 17 VcmZS9P?rsUmd|^J0SvgV0{|lc1JVEh literal 17 UcmZS9P?rsUmd|^J0SvhK0U|g93IG5A diff --git a/.gradle/5.6.4/fileHashes/resourceHashesCache.bin b/.gradle/5.6.4/fileHashes/resourceHashesCache.bin index 3215b8d34bec587df5a80a1992b5d4dfd378feb5..c4ea0bbfae17b804ffb99ce9a9f496e05daa36c0 100644 GIT binary patch delta 164 zcmcaOiE-*=#tkMCnp`tw+W!=+7MjNZ2A=x=q2Ty$gBuq`xj3QXfs6(xl? zG9HBr7Q+<7Xa)vG#*Kn6 f0|`kW76f5|@0w>9%{}`69D~kXre3c#(?BW!6>C7f delta 57 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 Bmc#%6 delta 213 zcmV;`04o2m+YPn+46rm90TZ(|7>EM1)f!<5vrZ&f0+YTbsIz`2Z~~JCDtD8WD)O_R zD<=Yz-YvkBwk}_jEiaL??k|7=lZG*1lm0Pyla4as0vXwtGS>n;mxk8@*q3(L0x`G0 z*a8RvgH|+$Rx|;(Rx|?dpaBlIM%4na0k;m<0=WXSRy3yrm$uyksk4qa2LYF^-vYst zK05H1kKqCsm%rfxUz3eH@wY$Y0?-AwC+PxE0kbAUumQJ+>;g9dm)7k9*|*2;0-*r{ P8DX&@uokyc1q0(aVPjf2 diff --git a/.gradle/5.6.4/javaCompile/jarAnalysis.bin b/.gradle/5.6.4/javaCompile/jarAnalysis.bin index e36bf355b9c557dad3353682ef2528abecd8c333..4e6cf1dd362980cdb36ff55d7b413396cdab3eac 100644 GIT binary patch delta 52055 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 delta 37 tcmbO`g>UU8_6;TyjEs|gC6pO8H!A)R-)Qhse4+t+v!lm$M-Rp~3jp{G4Qv1a diff --git a/.gradle/5.6.4/javaCompile/javaCompile.lock b/.gradle/5.6.4/javaCompile/javaCompile.lock index c6d5e9f5d2063e36c15374f3d1f370eef686a9c2..786ca71f82ae67565945b4c9e933267fba26793b 100644 GIT binary patch literal 17 VcmZSncV+#;iYlK91~6bs1pq+C1w#M; literal 17 VcmZSncV+#;iYlK91~6c<1^_^u1sMPU diff --git a/.gradle/5.6.4/javaCompile/taskHistory.bin b/.gradle/5.6.4/javaCompile/taskHistory.bin index 519f4319b820d141d5ed7f3336bd8ab45537735b..3cc9733e698b9e0bcc96d900323b2edf71ac522f 100644 GIT binary patch delta 36 ucmV+<0NelVg9Pn^1hC1|5rs(W87_*+hfi1`|GAfWkMNVhh%~bf)ZZ;x7ZTq9 delta 16 YcmaFc%<{IGWy8tKn?IE)>oHyi08DWRbpQYW diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index d552886256f3b312b6e507f2163c264135442c75..61386bd10a49f797b8d465336a2f3dbe3554a893 100644 GIT binary patch literal 17 VcmZR+ab2fDE%nW61~6cJ0023G1!4dI literal 17 VcmZR+ab2fDE%nW61~6dU2>>}-1v>x$ diff --git a/app/src/main/java/com/josh/trackcovid19v2/SettingsFragment.java b/app/src/main/java/com/josh/trackcovid19v2/SettingsFragment.java index 60a60d8..7f3535f 100644 --- a/app/src/main/java/com/josh/trackcovid19v2/SettingsFragment.java +++ b/app/src/main/java/com/josh/trackcovid19v2/SettingsFragment.java @@ -1,13 +1,12 @@ package com.josh.trackcovid19v2; import android.os.Bundle; - -import androidx.fragment.app.Fragment; - import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.fragment.app.Fragment; + /** * A simple {@link Fragment} subclass. diff --git a/app/src/main/java/com/josh/trackcovid19v2/ui/yourcountries/YourcountriesViewModel.java b/app/src/main/java/com/josh/trackcovid19v2/ui/yourcountries/YourcountriesViewModel.java deleted file mode 100644 index a702cbf..0000000 --- a/app/src/main/java/com/josh/trackcovid19v2/ui/yourcountries/YourcountriesViewModel.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.josh.trackcovid19v2.ui.yourcountries; - -import androidx.lifecycle.LiveData; -import androidx.lifecycle.ViewModel; - -import com.josh.trackcovid19v2.data.CountriesRepository; -import com.josh.trackcovid19v2.data.database.entity.Countries; -import com.josh.trackcovid19v2.model.ServiceRequest; - -import java.util.List; - -public class YourcountriesViewModel extends ViewModel { - - private final CountriesRepository mRepository; - private final LiveData> mCountriesData; - - public YourcountriesViewModel(CountriesRepository mRepository) { - this.mRepository = mRepository; - this.mCountriesData = mRepository.getCountriesList(); - } - - public LiveData> getCountriesList() { - return mCountriesData; - } - - public void postRequest(ServiceRequest serviceRequest) { - mRepository.postServiceRequest(serviceRequest); - } -} diff --git a/app/src/main/java/com/josh/trackcovid19v2/ui/yourrealcountry/YourrealcountryFragment.java b/app/src/main/java/com/josh/trackcovid19v2/ui/yourrealcountry/YourrealcountryFragment.java index 20f2837..e6451e2 100644 --- a/app/src/main/java/com/josh/trackcovid19v2/ui/yourrealcountry/YourrealcountryFragment.java +++ b/app/src/main/java/com/josh/trackcovid19v2/ui/yourrealcountry/YourrealcountryFragment.java @@ -28,9 +28,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import com.josh.trackcovid19v2.R; import com.josh.trackcovid19v2.model.ServiceRequest; -import com.josh.trackcovid19v2.ui.viewmodel.YourcountriesViewModel; import com.josh.trackcovid19v2.ui.viewmodel.YourrealcountryViewModel; -import com.josh.trackcovid19v2.ui.viewmodel.yourCountriesViewModelFactory; import com.josh.trackcovid19v2.ui.viewmodel.yourrealcountryViewModelFactory; import com.josh.trackcovid19v2.utility.InjectorUtils; import com.squareup.picasso.Picasso; @@ -64,7 +62,8 @@ public class YourrealcountryFragment extends Fragment { postRequest(); new Handler().postDelayed(new Runnable() { - @Override public void run() { + @Override + public void run() { // Stop animation (This will be after 3 seconds) mSwipeRefreshLayout.setRefreshing(false); } @@ -132,6 +131,7 @@ public class YourrealcountryFragment extends Fragment { spin.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override public void onItemSelected(AdapterView parent, View view, int position, long id) { + //Created by Josh Patra or souravp12 on Github.. This comment has been added to prevent people from stealing my work and publishing asdf it as their own. rememberLocation[0] = position; j[0] = 0; Picasso.get().load(countries.get(position).flag).into(imageView); @@ -163,7 +163,7 @@ public class YourrealcountryFragment extends Fragment { String testsWithCommas = numberFormat.format(countries.get(position).tests); String testsMilWithcommas = numberFormat.format(countries.get(position).testsPerMillion); Date date = new Date(countries.get(position).updated); - textView13.setText(Html.fromHtml("Updated on "+ date)); + textView13.setText(Html.fromHtml("Updated on " + date)); textView.setText(Html.fromHtml("
" + totalCasesWithCommas + "
")); textView3.setText(Html.fromHtml("" + deathWithCommas + "")); textView2.setText(Html.fromHtml("" + recoveredWithCommas + "")); @@ -227,16 +227,14 @@ public class YourrealcountryFragment extends Fragment { } }); - } - else{ - Log.d("lol", "didn't work something broken inside one." + ", name: "+"not found at all"); + } else { + Log.d("lol", "didn't work something broken inside one." + ", name: " + "not found at all"); } }); - } - else{ - Log.d("lol", "didn't work something broken outside one." + ", name: "+"not found at all"); + } else { + Log.d("lol", "didn't work something broken outside one." + ", name: " + "not found at all"); } }); postRequest(); diff --git a/app/src/main/java/com/josh/trackcovid19v2/ui/yourrealcountry/YourrealcountryViewModel.java b/app/src/main/java/com/josh/trackcovid19v2/ui/yourrealcountry/YourrealcountryViewModel.java deleted file mode 100755 index c68be95..0000000 --- a/app/src/main/java/com/josh/trackcovid19v2/ui/yourrealcountry/YourrealcountryViewModel.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.josh.trackcovid19v2.ui.yourrealcountry; - -import androidx.lifecycle.LiveData; -import androidx.lifecycle.ViewModel; - -import com.josh.trackcovid19v2.data.CountriesRepository; -import com.josh.trackcovid19v2.data.database.entity.Countries; -import com.josh.trackcovid19v2.model.ServiceRequest; - -import java.util.List; - -public class YourrealcountryViewModel extends ViewModel { - - private final CountriesRepository mRepository; - private final LiveData> mCountriesData; - - public YourrealcountryViewModel(CountriesRepository mRepository) { - this.mRepository = mRepository; - this.mCountriesData = mRepository.getCountriesList(); - } - - public LiveData> getCountriesList() { - return mCountriesData; - } - - public void postRequest(ServiceRequest serviceRequest) { - mRepository.postServiceRequest(serviceRequest); - } -} diff --git a/app/src/main/java/com/josh/trackcovid19v2/ui/yourstate/YourstateViewModel.java b/app/src/main/java/com/josh/trackcovid19v2/ui/yourstate/YourstateViewModel.java deleted file mode 100755 index 79c4a33..0000000 --- a/app/src/main/java/com/josh/trackcovid19v2/ui/yourstate/YourstateViewModel.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.josh.trackcovid19v2.ui.yourstate; - -import androidx.lifecycle.LiveData; -import androidx.lifecycle.ViewModel; - -import com.josh.trackcovid19v2.data.StateRepository; -import com.josh.trackcovid19v2.data.database.entity.States; -import com.josh.trackcovid19v2.model.ServiceRequest; - -import java.util.List; - -public class YourstateViewModel extends ViewModel { - - private final StateRepository mRepository; - private final LiveData> mStatesData; - - public YourstateViewModel(StateRepository mRepository) { - this.mRepository = mRepository; - this.mStatesData = mRepository.getStatesList(); - } - - public LiveData> getStatesList() { - return mStatesData; - } - - public void postRequest(ServiceRequest serviceRequest) { - mRepository.postServiceRequest(serviceRequest); - } -} diff --git a/app/src/main/java/com/josh/trackcovid19v2/ui/yourworld/YourworldFragment.java b/app/src/main/java/com/josh/trackcovid19v2/ui/yourworld/YourworldFragment.java index 67e245a..7133a76 100755 --- a/app/src/main/java/com/josh/trackcovid19v2/ui/yourworld/YourworldFragment.java +++ b/app/src/main/java/com/josh/trackcovid19v2/ui/yourworld/YourworldFragment.java @@ -34,8 +34,6 @@ import java.util.Locale; public class YourworldFragment extends Fragment { - private static YourworldFragment BdTimeUtils; - private YourworldViewModel yourworldViewModel; private com.josh.trackcovid19v2.ui.viewmodel.YourworldViewModel vYourworldViewModel; private static DecimalFormat df = new DecimalFormat("0.00"); diff --git a/app/src/main/java/com/josh/trackcovid19v2/ui/yourworld/YourworldViewModel.java b/app/src/main/java/com/josh/trackcovid19v2/ui/yourworld/YourworldViewModel.java deleted file mode 100755 index 10e6b80..0000000 --- a/app/src/main/java/com/josh/trackcovid19v2/ui/yourworld/YourworldViewModel.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.josh.trackcovid19v2.ui.yourworld; - -import androidx.lifecycle.LiveData; -import androidx.lifecycle.MutableLiveData; -import androidx.lifecycle.ViewModel; - -public class YourworldViewModel extends ViewModel { - - private MutableLiveData mText; - - public YourworldViewModel() { - mText = new MutableLiveData<>(); - mText.setValue("World Fragment"); - } - - public LiveData getText() { - return mText; - } - - public void setText(String str) { - mText.setValue(str); - } - -} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index a1c2f08..b3de999 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -43,17 +43,31 @@ android:layout_width="0dp" android:layout_height="0dp" android:background="@drawable/virus" + app:layout_constraintHeight_percent=".12" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintHeight_percent=".12" - app:layout_constraintWidth_percent=".20"/> + app:layout_constraintWidth_percent=".20" /> + app:layout_constraintTop_toTopOf="@+id/imageView3" + app:layout_constraintWidth_percent=".20" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4f8559b..11aaf48 100755 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -21,7 +21,9 @@ android:fitsSystemWindows="true" app:headerLayout="@layout/nav_header_main" app:menu="@menu/activity_main_drawer"> - + - + - + - + + - + - + - + - + - + - + - +