From 5177788db55f93adf2da0f42e7a7f7dfaa5baa55 Mon Sep 17 00:00:00 2001 From: souravp712 Date: Sun, 3 May 2020 10:48:25 -0400 Subject: [PATCH] Text Resizing changed all sp to dp in order to ensure that user selected text size system-wide will not affect the UI of the app. --- .../executionHistory/executionHistory.bin | Bin 1174564 -> 1174564 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .gradle/5.6.4/fileHashes/fileHashes.bin | Bin 124433 -> 124483 bytes .gradle/5.6.4/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .../ui/yourworld/YourworldFragment.java | 85 +++++++----------- app/src/main/res/layout/activity_main.xml | 2 +- .../res/layout/fragment_yourrealcountry.xml | 56 ++++++------ .../main/res/layout/fragment_yourstate.xml | 40 ++++----- .../main/res/layout/fragment_yourworld.xml | 38 ++++---- app/src/main/res/layout/my_spinner_style.xml | 2 +- app/src/main/res/res/values/dimens.xml | 2 +- app/src/main/res/res/values/styles.xml | 2 +- app/src/main/res/values/dimens.xml | 2 +- app/src/main/res/values/styles.xml | 2 +- 15 files changed, 104 insertions(+), 127 deletions(-) diff --git a/.gradle/5.6.4/executionHistory/executionHistory.bin b/.gradle/5.6.4/executionHistory/executionHistory.bin index 6ccfb655240c51672ce2f66ba0020f7634b0d499..5a2eebc3a6f5f8fab80a84c0898c7ebd540c9343 100644 GIT binary patch delta 1912 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 a|7<@z>aKYsVt&KS%xTiP3@h1x>;DJ!*2H1} diff --git a/.gradle/5.6.4/executionHistory/executionHistory.lock b/.gradle/5.6.4/executionHistory/executionHistory.lock index 83e3b3afaf1f41b970a90d53cfd9c841c19d2515..43d463aa2e648d916185922c85ca36fb9db99ac5 100644 GIT binary patch literal 17 UcmZSn6YyG$|H4^+1_&?%05?wrf&c&j literal 17 UcmZSn6YyG$|H4^+1_)3C05?AbasU7T diff --git a/.gradle/5.6.4/fileHashes/fileHashes.bin b/.gradle/5.6.4/fileHashes/fileHashes.bin index 4f638c21455c276f5afd2b97cd32e522ff675dcc..7ddd75d97fc5f8e639fdae3705d539dfbe045752 100644 GIT binary patch delta 1264 zcmbPuhW+pv_6;TyjEb90B|ZxA``xU`3Az!^00NB91UJiSD|0YvPFE;mJiA%VBvVS_ zB}c4*P^d@eodWHYrHb4WfXWJQ{XTwSvUIGJ#6{oz|0*YbUjD)168omZ0h_^+-?n|2 ze15Ui=Ffg<91_vzZ0kMQpL<^|s@Z*m{oQl8_QG%}1+mD(Z``}|HeFk1{mF8Q{|A^P z*fk7{+a?zV2+OZ~QE*jg_xt(9n{_5SAFn}G$>;NxWaVA+mM3b#}+Rh%d{xE3Ae|Zax_)!YJW9bJ?L8d^4kV21j+j z>Aflnlb!rEs!rn8-u(A_uc~PV=cMaCyS2R)F4-Ne$8zht@rTWOqlI|wZauzr0qSr! zAgyN%Bs76o5rhTQcQQ`5vR*f#?_R3(gV@4{U_;o(y z(-pHBg*R`=TF;_T)6424v1GQJ{FMtS*Q`@#peSW$H{V>J-@~hLHC!R<`5}gevvNPH z4UhYnqo`uIo3>fI_8gPM3Y}w@qsunx+wa}JHbwguA57I|!3IALh5jA}Z5Orgt9KZt z$GlG0hJ^a>=K^3yv7~EGPV5!lJgH+NkA%e2nOtgrPl?V*cphPKMEES+oam{iSS02! z27F$Xb6!pVc+;MLZ`F6gWo>8mut}8vjyY7T%29Q3TGMt1d*>x^*@p`%7$yGP-?(k^ zo5h{H+qu5Z^|@;Wmn~fMja6cC+#$t8%O^L_SVqeFi@f;;m#trs!>n+B_x2MUC$}b@ z_)>VeKlXbYOcvt)r3IV0*F=>_BtAU%Rp?I4DQ)LWajvC^t=ho-F7LbV5j-Ni!oKblD2PH<+LlQQeKjq#ycs^>7nX~#e z-=)(Km;7s(Zu=By>GAH9$@_JU*_<`+weYU6`~{PRn6xrsdihgEPcR;+XZl>yk z4wlKnu}TvEqP9H|%bjR;`iIbNZuzUM3=E8g*Z(kbOg_I@YV&8mG!6;QN^!ZP!KWj> z#I`fs?}{b!szOu=>|W1*6YJ08Nh&X8<5g71`?V;tO&vae_rfj zU2-`~FtKLg4ufqwzM|^ze>c6+iBWj+hw$SP3vUbUck0lHF=TkEHL+SQ1*UTH`G`jn zXO^D)9kbKg=BBaXuU+%aSzwZzPezI`3RE3jX(v(jFzWQa0FzITtRp6`PF0%BADtqh zQxSICeD&K)%eNK0JK4px8K!M=ceEZ0$lsgyMho%U-AIqk0J;_k7~OybnimQii}NbG z#a?>eOm41qD?JG^1fhddeKK#R8nO}Im`1D%OzO?nTK{vO`2qW^$I@5OjPRLUn5o7B zGIR3mOeqCI7EU)5WfYc=yfL>Y`$g6SMtSMK;p7QR%zvddeKNdHknrr-98%6ZL@TD0@6zF`H3%^M`yb2bZuKYVDm-#~^|3b#5N2gp-R55z&*sNW9j!EKD zg-zy`&p+Rs%6jneVAuy?n5xZ!4SpO7o0cX%|M84ZZO-E@-!xuxpqjxN7C$+$S9tTJ zj*UDL2X=ng;F7DW@nKoFpVBn%i*R$Ir=DVwu;4L{P4vpM-&J>AZfoO(zYtkTgUza`rmg}o-}_r!^-rBdlO6+9H^`x zr#H?AhN9U;D diff --git a/.gradle/5.6.4/fileHashes/fileHashes.lock b/.gradle/5.6.4/fileHashes/fileHashes.lock index b430fc50d6261199fe196877227ca9ffc545b798..714d5b038f5ff93c7ee54472347e6fa3a55e07a1 100644 GIT binary patch literal 17 VcmZS9P?rsUmd|^J0Ss6!0stcJ1I7RV literal 17 VcmZS9P?rsUmd|^J0Ss6s0RSSe1BU" + recoveredWithCommas + "")); textView5.setText(Html.fromHtml("" + activeCasesWithCommas + "")); textView6.setText(Html.fromHtml("" + affectedCountriesData + "" + "/251")); - textView4.setText(Html.fromHtml("Updated on "+ date)); + textView4.setText(Html.fromHtml("Updated on " + date)); ImageView img1 = view.findViewById(R.id.image_level); double recov = world.recovered; double tcases = world.cases; - double percent = (recov/tcases)*100; + double percent = (recov / tcases) * 100; String percentlegible = df.format(percent); textView123.setText(Html.fromHtml("" + percentlegible + "%")); Log.d("dfdF", String.valueOf(world.recovered)); Log.d("dfdF", String.valueOf(world.cases)); Log.d("dfdF", String.valueOf(percent)); - int x= (int)percent; + int x = (int) percent; ClipDrawable drawable = (ClipDrawable) img1.getDrawable(); drawable.setLevel(100 * x); } @@ -146,41 +147,36 @@ public class YourworldFragment extends Fragment { String dailyRecoveredWithCommas = numberFormat.format(recovered[0] - yRecovered[0]); Log.d("foo", "I got here"); - if ((cases[0] - ycases[0]) >= 0){ - Spanned text = Html.fromHtml("Daily Increment: " + "" + "+" + dailyIncWithCommas + ""); + if ((cases[0] - ycases[0]) >= 0) { + Spanned text = Html.fromHtml("Daily Increment: " + "" + "+" + dailyIncWithCommas + ""); + SpannableString ss = new SpannableString(text); + ForegroundColorSpan fcsWhite = new ForegroundColorSpan(Color.WHITE); + @SuppressLint("ResourceAsColor") ForegroundColorSpan fcsGreen = new ForegroundColorSpan(R.color.just_cuz); + ss.setSpan(fcsWhite, 0, 16, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); + textView8.setText(ss); + } else { + Spanned text = Html.fromHtml("Daily Increment: " + "" + "-" + dailyIncWithCommas + ""); SpannableString ss = new SpannableString(text); ForegroundColorSpan fcsWhite = new ForegroundColorSpan(Color.WHITE); @SuppressLint("ResourceAsColor") ForegroundColorSpan fcsGreen = new ForegroundColorSpan(R.color.just_cuz); ss.setSpan(fcsWhite, 0, 16, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); textView8.setText(ss); } - else { - Spanned text = Html.fromHtml("Daily Increment: " + "" + "-" + dailyIncWithCommas + ""); SpannableString ss = new SpannableString(text); - ForegroundColorSpan fcsWhite = new ForegroundColorSpan(Color.WHITE); - @SuppressLint("ResourceAsColor") ForegroundColorSpan fcsGreen = new ForegroundColorSpan(R.color.just_cuz); - ss.setSpan(fcsWhite, 0, 16, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); - textView8.setText(ss); + if ((ACases[0] - yACases[0]) >= 0) { + textView9.setText(Html.fromHtml("" + "+" + dailyActWithCommas + "")); + } else { + textView9.setText(Html.fromHtml("" + "-" + dailyActWithCommas + "")); } - if((ACases[0] - yACases[0]) >= 0){ - textView9.setText(Html.fromHtml("" + "+" + dailyActWithCommas + "")); + if ((recovered[0] - yRecovered[0]) >= 0) { + textView10.setText(Html.fromHtml("" + "+" + dailyRecoveredWithCommas + "")); + } else { + textView10.setText(Html.fromHtml("" + "-" + dailyRecoveredWithCommas + "")); } - else { - textView9.setText(Html.fromHtml("" + "-" + dailyActWithCommas + "")); + if ((Toddeaths[0] - yDeaths[0]) >= 0) { + textView11.setText(Html.fromHtml("" + "+" + dailyDeathWithCommas + "")); + } else { + textView11.setText(Html.fromHtml("" + "-" + dailyDeathWithCommas + "")); } - if((recovered[0] - yRecovered[0]) >= 0){ - textView10.setText(Html.fromHtml("" + "+" + dailyRecoveredWithCommas + "")); - } - else { - textView10.setText(Html.fromHtml("" + "-" + dailyRecoveredWithCommas + "")); - } - if((Toddeaths[0] - yDeaths[0]) >= 0){ - textView11.setText(Html.fromHtml("" + "+" + dailyDeathWithCommas + "")); - } - else { - textView11.setText(Html.fromHtml("" + "-" + dailyDeathWithCommas + "")); - } - - //setData(vYourworldViewModel,world); @@ -209,12 +205,13 @@ public class YourworldFragment extends Fragment { vYourworldViewModel.postRequest(serviceRequest); } + @SuppressWarnings("deprecation") - public static Spanned fromHtml(String html){ - if(html == null){ + public static Spanned fromHtml(String html) { + if (html == null) { // return an empty spannable if the html is null return new SpannableString(""); - }else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { // FROM_HTML_MODE_LEGACY is the behaviour that was used for versions below android N // we are using this flag to give a consistent behaviour return Html.fromHtml(html, Html.FROM_HTML_MODE_LEGACY); @@ -222,24 +219,4 @@ public class YourworldFragment extends Fragment { return Html.fromHtml(html); } } - -} - - - - - - - - - - - - - - - - - - - +} \ 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 403ff10..4f8559b 100755 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -34,7 +34,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textColor="#423E3E" - android:textSize="13sp" + android:textSize="13dp" android:gravity="center" android:text="Sources: JHU, WHO, corona.lmao.ninja" /> diff --git a/app/src/main/res/layout/fragment_yourrealcountry.xml b/app/src/main/res/layout/fragment_yourrealcountry.xml index 50df985..76379d0 100644 --- a/app/src/main/res/layout/fragment_yourrealcountry.xml +++ b/app/src/main/res/layout/fragment_yourrealcountry.xml @@ -22,7 +22,7 @@ app:layout_constraintWidth_percent=".45" android:textAlignment="center" android:textColor="@color/unselected_header_background_color" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintEnd_toEndOf="@+id/text_affectedCountries" app:layout_constraintTop_toTopOf="@+id/text_totalTests" /> @@ -66,7 +66,7 @@ android:text="Total Tests" android:textAlignment="gravity" android:textColor="#2196F3" - android:textSize="17sp" + android:textSize="17dp" app:layout_constraintBottom_toBottomOf="@+id/text_totalTests" app:layout_constraintStart_toStartOf="@+id/text_activeCasesName6" app:layout_constraintTop_toTopOf="@+id/text_totalTests" @@ -104,7 +104,7 @@ android:gravity="center" android:textAlignment="center" android:textColor="@color/unselected_header_background_color" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -125,7 +125,7 @@ android:textAlignment="center" android:textColor="@color/unselected_header_background_color" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintEnd_toEndOf="@+id/text_totalCases" app:layout_constraintTop_toTopOf="@+id/text_activeCases" app:layout_constraintWidth_percent=".45" @@ -142,7 +142,7 @@ android:gravity="center" android:textAlignment="center" android:textColor="@color/unselected_header_background_color" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="@+id/text_totalCases" app:layout_constraintTop_toBottomOf="@+id/text_totalCases" @@ -162,7 +162,7 @@ android:textAlignment="center" android:textColor="@color/unselected_background_color" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/text_totalCases" app:layout_constraintTop_toTopOf="@+id/text_deaths" @@ -185,7 +185,7 @@ android:textAlignment="center" android:textColor="@color/unselected_header_background_color" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="@+id/text_totalCases" app:layout_constraintTop_toBottomOf="@+id/text_activeCases" @@ -214,7 +214,7 @@ android:gravity="start" android:text="@string/active_cases" android:textColor="#FFEB3B" - android:textSize="17sp" + android:textSize="17dp" app:layout_constraintBottom_toBottomOf="@+id/text_activeCases" app:layout_constraintStart_toStartOf="@+id/text_totalCasesName" app:layout_constraintTop_toTopOf="@+id/text_activeCases" @@ -226,7 +226,7 @@ android:layout_height="wrap_content" android:fontFamily="sans-serif-light" android:textColor="#44E372" - android:textSize="30sp" + android:textSize="30dp" app:layout_constraintBottom_toBottomOf="@+id/text_totalCases" app:layout_constraintEnd_toEndOf="@+id/text_totalCases" app:layout_constraintHorizontal_bias="0.87" @@ -241,7 +241,7 @@ android:fontFamily="sans-serif-light" android:gravity="end" android:textColor="#44E372" - android:textSize="15sp" + android:textSize="15dp" app:layout_constraintBottom_toBottomOf="@+id/text_totalCases" app:layout_constraintEnd_toEndOf="@+id/text_totalCases" app:layout_constraintHorizontal_bias="0.86" @@ -257,7 +257,7 @@ android:fontFamily="sans-serif-light" android:text="@string/total_confirmed_cases" android:textColor="#FFFFFF" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintBottom_toBottomOf="@+id/text_totalCases" app:layout_constraintEnd_toEndOf="@+id/text_totalCases" app:layout_constraintHorizontal_bias="0.2" @@ -274,7 +274,7 @@ android:text="@string/total_deceased" android:textAlignment="gravity" android:textColor="#ff0000" - android:textSize="17sp" + android:textSize="17dp" app:layout_constraintBottom_toBottomOf="@+id/text_deaths" app:layout_constraintStart_toStartOf="@+id/text_activeCasesName" app:layout_constraintTop_toTopOf="@+id/text_deaths" @@ -288,7 +288,7 @@ android:text="Tests Per Million" android:textAlignment="gravity" android:textColor="#FFEB3B" - android:textSize="13sp" + android:textSize="13dp" app:layout_constraintBottom_toBottomOf="@+id/text_testsPerOneMillion" app:layout_constraintStart_toStartOf="@+id/text_RecoveredName" app:layout_constraintTop_toTopOf="@+id/text_testsPerOneMillion" @@ -302,7 +302,7 @@ android:gravity="start" android:text="@string/recoveredName" android:textColor="#ffffff" - android:textSize="17sp" + android:textSize="17dp" app:layout_constraintBottom_toBottomOf="@+id/text_affectedCountries" app:layout_constraintStart_toStartOf="@+id/text_CriticalName" app:layout_constraintTop_toTopOf="@+id/text_affectedCountries" @@ -315,7 +315,7 @@ android:layout_marginTop="10dp" android:gravity="center" android:textColor="#000000" - android:textSize="15sp" + android:textSize="15dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" @@ -330,7 +330,7 @@ android:gravity="end" android:textAlignment="center" android:textColor="#4CAF50" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintBottom_toBottomOf="@+id/text_recovered" app:layout_constraintEnd_toEndOf="@+id/text_totalCasesData" app:layout_constraintTop_toTopOf="@+id/text_recovered" @@ -346,7 +346,7 @@ android:text="@string/critical" android:textAlignment="center" android:textColor="#4CAF50" - android:textSize="17sp" + android:textSize="17dp" app:layout_constraintBottom_toBottomOf="@+id/text_recovered" app:layout_constraintEnd_toEndOf="@+id/text_recovered" app:layout_constraintHorizontal_bias="0.2" @@ -362,7 +362,7 @@ android:fontFamily="sans-serif-light" android:gravity="end" android:textColor="#ff0000" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintBottom_toBottomOf="@+id/text_deaths" app:layout_constraintEnd_toEndOf="@+id/text_deaths" app:layout_constraintHorizontal_bias="0.734" @@ -377,7 +377,7 @@ android:fontFamily="sans-serif-light" android:gravity="end" android:textColor="#FFEB3B" - android:textSize="15sp" + android:textSize="15dp" app:layout_constraintBottom_toBottomOf="@+id/text_activeCases" app:layout_constraintEnd_toEndOf="@+id/text_activeCases" app:layout_constraintHorizontal_bias="0.8" @@ -392,7 +392,7 @@ android:fontFamily="sans-serif-light" android:gravity="end" android:textColor="#ff0000" - android:textSize="15sp" + android:textSize="15dp" app:layout_constraintBottom_toBottomOf="@+id/text_deaths" app:layout_constraintEnd_toEndOf="@+id/text_deaths" app:layout_constraintHorizontal_bias="0.8" @@ -407,7 +407,7 @@ android:fontFamily="sans-serif-light" android:gravity="end" android:textColor="#2196F3" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintBottom_toBottomOf="@+id/text_totalTests" app:layout_constraintEnd_toEndOf="@+id/text_totalTests" app:layout_constraintHorizontal_bias="0.734" @@ -421,7 +421,7 @@ android:layout_height="wrap_content" android:gravity="end" android:textColor="#4CAF50" - android:textSize="15sp" + android:textSize="15dp" app:layout_constraintBottom_toBottomOf="@+id/text_recovered" app:layout_constraintEnd_toEndOf="@+id/text_recovered" app:layout_constraintHorizontal_bias=".8" @@ -437,7 +437,7 @@ android:fontFamily="sans-serif-light" android:gravity="end" android:textColor="#FFEB3B" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintBottom_toBottomOf="@+id/text_activeCases" app:layout_constraintEnd_toEndOf="@+id/text_activeCases" app:layout_constraintHorizontal_bias="0.734" @@ -450,7 +450,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@android:color/white" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintBottom_toBottomOf="@+id/text_affectedCountries" app:layout_constraintEnd_toEndOf="@+id/text_CriticalData" app:layout_constraintTop_toTopOf="@+id/text_affectedCountries" @@ -463,7 +463,7 @@ android:fontFamily="sans-serif-light" android:gravity="start" android:textColor="#ffffff" - android:textSize="15sp" + android:textSize="15dp" app:layout_constraintBottom_toBottomOf="@+id/text_affectedCountries" app:layout_constraintEnd_toEndOf="@+id/text_affectedCountries" app:layout_constraintHorizontal_bias="0.8" @@ -477,7 +477,7 @@ android:layout_marginBottom="10dp" android:gravity="center" android:textAlignment="center" - android:textSize="15sp" + android:textSize="15dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" diff --git a/app/src/main/res/layout/fragment_yourstate.xml b/app/src/main/res/layout/fragment_yourstate.xml index 89abd25..c0f6fcb 100755 --- a/app/src/main/res/layout/fragment_yourstate.xml +++ b/app/src/main/res/layout/fragment_yourstate.xml @@ -22,7 +22,7 @@ android:src="@drawable/round_rect_shape" android:textAlignment="center" android:textColor="@color/unselected_header_background_color" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintEnd_toEndOf="@+id/text_totalCases" app:layout_constraintHeight_percent=".2" app:layout_constraintTop_toTopOf="@+id/text_activeCases" @@ -39,7 +39,7 @@ android:src="@drawable/round_rect_shape" android:textAlignment="center" android:textColor="@color/unselected_header_background_color" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintEnd_toEndOf="@+id/text_totalTests" app:layout_constraintHeight_percent=".2" app:layout_constraintTop_toTopOf="@+id/text_deaths" @@ -52,7 +52,7 @@ android:fontFamily="sans-serif-light" android:gravity="end" android:textColor="#FFEB3B" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintBottom_toBottomOf="@+id/text_testsPerOneMillion" app:layout_constraintEnd_toEndOf="@+id/text_testsPerOneMillion" app:layout_constraintHorizontal_bias="0.734" @@ -69,7 +69,7 @@ android:text="Total Tests" android:textAlignment="gravity" android:textColor="#2196F3" - android:textSize="17sp" + android:textSize="17dp" app:layout_constraintBottom_toBottomOf="@+id/text_totalTests" app:layout_constraintEnd_toEndOf="@+id/text_totalTests" app:layout_constraintHorizontal_bias="0.22" @@ -107,7 +107,7 @@ android:src="@drawable/round_rect_shape" android:textAlignment="center" android:textColor="@color/unselected_header_background_color" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHeight_percent=".165" @@ -127,7 +127,7 @@ android:src="@drawable/round_rect_shape" android:textAlignment="center" android:textColor="@color/unselected_header_background_color" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHeight_percent=".2" app:layout_constraintStart_toStartOf="@+id/text_totalCases" @@ -148,7 +148,7 @@ android:textAlignment="center" android:textColor="@color/unselected_header_background_color" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHeight_percent=".2" app:layout_constraintStart_toStartOf="@+id/text_totalCases" @@ -164,7 +164,7 @@ android:gravity="start" android:text="@string/active_cases" android:textColor="#FFEB3B" - android:textSize="17sp" + android:textSize="17dp" app:layout_constraintBottom_toBottomOf="@+id/text_activeCases" app:layout_constraintStart_toStartOf="@+id/text_totalCasesName" app:layout_constraintTop_toTopOf="@+id/text_activeCases" @@ -176,7 +176,7 @@ android:layout_height="wrap_content" android:fontFamily="sans-serif-light" android:textColor="#44E372" - android:textSize="30sp" + android:textSize="30dp" app:layout_constraintBottom_toBottomOf="@+id/text_totalCases" app:layout_constraintEnd_toEndOf="@+id/text_totalCases" app:layout_constraintHorizontal_bias="0.5" @@ -191,7 +191,7 @@ android:fontFamily="sans-serif-light" android:gravity="end" android:textColor="#44E372" - android:textSize="15sp" + android:textSize="15dp" app:layout_constraintBottom_toBottomOf="@+id/text_totalCases" app:layout_constraintEnd_toEndOf="@+id/text_totalCases" app:layout_constraintHorizontal_bias="0.5" @@ -207,7 +207,7 @@ android:fontFamily="sans-serif-light" android:text="@string/total_confirmed_cases" android:textColor="#FFFFFF" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintBottom_toBottomOf="@+id/text_totalCases" app:layout_constraintEnd_toEndOf="@+id/text_totalCases" app:layout_constraintHorizontal_bias="0.2" @@ -224,7 +224,7 @@ android:text="@string/total_deceased" android:textAlignment="gravity" android:textColor="#ff0000" - android:textSize="17sp" + android:textSize="17dp" app:layout_constraintBottom_toBottomOf="@+id/text_deaths" app:layout_constraintStart_toStartOf="@+id/text_activeCasesName" app:layout_constraintTop_toTopOf="@+id/text_deaths" @@ -240,7 +240,7 @@ android:text="Tests Per Million" android:textAlignment="gravity" android:textColor="#FFEB3B" - android:textSize="13sp" + android:textSize="13dp" app:layout_constraintBottom_toBottomOf="@+id/text_testsPerOneMillion" app:layout_constraintVertical_bias="0.115" app:layout_constraintStart_toStartOf="@+id/text_activeCasesName3" @@ -253,7 +253,7 @@ android:layout_marginTop="15dp" android:gravity="center" android:textColor="#000000" - android:textSize="15sp" + android:textSize="15dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" @@ -268,7 +268,7 @@ android:fontFamily="sans-serif-light" android:gravity="end" android:textColor="#ff0000" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintBottom_toBottomOf="@+id/text_deaths" app:layout_constraintEnd_toEndOf="@+id/text_deaths" app:layout_constraintHorizontal_bias="0.734" @@ -283,7 +283,7 @@ android:fontFamily="sans-serif-light" android:gravity="end" android:textColor="#FFEB3B" - android:textSize="15sp" + android:textSize="15dp" app:layout_constraintBottom_toBottomOf="@+id/text_activeCases" app:layout_constraintEnd_toEndOf="@+id/text_activeCases" app:layout_constraintHorizontal_bias="0.8" @@ -298,7 +298,7 @@ android:fontFamily="sans-serif-light" android:gravity="end" android:textColor="#ff0000" - android:textSize="15sp" + android:textSize="15dp" app:layout_constraintBottom_toBottomOf="@+id/text_deaths" app:layout_constraintEnd_toEndOf="@+id/text_deaths" app:layout_constraintHorizontal_bias="0.8" @@ -313,7 +313,7 @@ android:fontFamily="sans-serif-light" android:gravity="end" android:textColor="#2196F3" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintBottom_toBottomOf="@+id/text_totalTests" app:layout_constraintEnd_toEndOf="@+id/text_totalTests" app:layout_constraintHorizontal_bias="0.734" @@ -329,7 +329,7 @@ android:fontFamily="sans-serif-light" android:gravity="end" android:textColor="#FFEB3B" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintBottom_toBottomOf="@+id/text_activeCases" app:layout_constraintEnd_toEndOf="@+id/text_activeCases" app:layout_constraintHorizontal_bias="0.734" @@ -344,7 +344,7 @@ android:layout_marginBottom="10dp" android:gravity="center" android:textAlignment="center" - android:textSize="15sp" + android:textSize="15dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" diff --git a/app/src/main/res/layout/fragment_yourworld.xml b/app/src/main/res/layout/fragment_yourworld.xml index 4b54509..fe9ac66 100755 --- a/app/src/main/res/layout/fragment_yourworld.xml +++ b/app/src/main/res/layout/fragment_yourworld.xml @@ -24,7 +24,7 @@ android:gravity="center" android:textAlignment="center" android:textColor="@color/unselected_header_background_color" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintEnd_toEndOf="@+id/text_totalCases" app:layout_constraintTop_toTopOf="@+id/text_activeCases" app:layout_constraintWidth_percent=".45"/> @@ -41,7 +41,7 @@ android:gravity="center" android:textAlignment="center" android:textColor="@color/unselected_header_background_color" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="@+id/text_totalCases" app:layout_constraintTop_toBottomOf="@+id/text_totalCases" @@ -57,7 +57,7 @@ android:gravity="left" android:text="@string/active_cases" android:textColor="#FFEB3B" - android:textSize="17sp" + android:textSize="17dp" app:layout_constraintBottom_toBottomOf="@+id/text_activeCases" app:layout_constraintStart_toStartOf="@+id/text_totalCasesName" app:layout_constraintTop_toTopOf="@+id/text_activeCases" @@ -74,7 +74,7 @@ android:gravity="center" android:textAlignment="center" android:textColor="@color/unselected_header_background_color" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" @@ -104,7 +104,7 @@ android:layout_height="wrap_content" android:fontFamily="sans-serif-light" android:textColor="#44E372" - android:textSize="40sp" + android:textSize="40dp" app:layout_constraintBottom_toBottomOf="@+id/text_totalCases" app:layout_constraintEnd_toEndOf="@+id/text_totalCases" app:layout_constraintHorizontal_bias="0.87" @@ -119,7 +119,7 @@ android:fontFamily="sans-serif-light" android:gravity="right" android:textColor="#44E372" - android:textSize="15sp" + android:textSize="15dp" app:layout_constraintBottom_toBottomOf="@+id/text_totalCases" app:layout_constraintEnd_toEndOf="@+id/text_totalCases" app:layout_constraintHorizontal_bias="0.86" @@ -135,7 +135,7 @@ android:fontFamily="sans-serif-light" android:text="Total Confirmed Cases" android:textColor="#FFFFFF" - android:textSize="25sp" + android:textSize="25dp" app:layout_constraintBottom_toBottomOf="@+id/text_totalCases" app:layout_constraintEnd_toEndOf="@+id/text_totalCases" app:layout_constraintHorizontal_bias="0.200" @@ -151,7 +151,7 @@ android:layout_marginTop="5dp" android:gravity="center" android:textAlignment="center" - android:textSize="15sp" + android:textSize="15dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.5" @@ -171,7 +171,7 @@ android:scaleType="fitXY" android:textAlignment="center" android:textColor="@color/unselected_background_color" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="@+id/text_totalCases" app:layout_constraintTop_toBottomOf="@+id/text_recovered" @@ -191,7 +191,7 @@ android:gravity="center" android:textAlignment="center" android:textColor="@color/unselected_header_background_color" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="@+id/text_totalCases" app:layout_constraintTop_toBottomOf="@+id/text_activeCases" @@ -244,7 +244,7 @@ android:layout_marginTop="10dp" android:fontFamily="@font/cutive" android:gravity="center" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.500" app:layout_constraintStart_toStartOf="parent" @@ -259,7 +259,7 @@ android:gravity="right" android:textAlignment="center" android:textColor="#1B96F8" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintBottom_toBottomOf="@+id/text_recovered" app:layout_constraintEnd_toEndOf="@+id/text_totalCasesData" app:layout_constraintTop_toTopOf="@+id/text_recovered" @@ -275,7 +275,7 @@ android:text="@string/recoveredName" android:textAlignment="center" android:textColor="#1B96F8" - android:textSize="17sp" + android:textSize="17dp" app:layout_constraintBottom_toBottomOf="@+id/text_recovered" app:layout_constraintEnd_toEndOf="@+id/text_recovered" app:layout_constraintHorizontal_bias="0.22" @@ -291,7 +291,7 @@ android:fontFamily="sans-serif-light" android:gravity="center" android:textColor="#ffffff" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintBottom_toBottomOf="@+id/text_affectedCountries" app:layout_constraintEnd_toEndOf="@+id/text_affectedCountries" app:layout_constraintHorizontal_bias="0.8" @@ -306,7 +306,7 @@ android:fontFamily="sans-serif-light" android:gravity="right" android:textColor="#ff0000" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintBottom_toBottomOf="@+id/text_deaths" app:layout_constraintEnd_toEndOf="@+id/text_deaths" app:layout_constraintHorizontal_bias="0.734" @@ -321,7 +321,7 @@ android:fontFamily="sans-serif-light" android:gravity="right" android:textColor="#FFEB3B" - android:textSize="15sp" + android:textSize="15dp" app:layout_constraintBottom_toBottomOf="@+id/text_activeCases" app:layout_constraintEnd_toEndOf="@+id/text_activeCases" app:layout_constraintHorizontal_bias="0.8" @@ -336,7 +336,7 @@ android:fontFamily="sans-serif-light" android:gravity="right" android:textColor="#ff0000" - android:textSize="15sp" + android:textSize="15dp" app:layout_constraintBottom_toBottomOf="@+id/text_deaths" app:layout_constraintEnd_toEndOf="@+id/text_deaths" app:layout_constraintHorizontal_bias="0.8" @@ -350,7 +350,7 @@ android:layout_height="wrap_content" android:gravity="right" android:textColor="#1B96F8" - android:textSize="15sp" + android:textSize="15dp" app:layout_constraintBottom_toBottomOf="@+id/text_recovered" app:layout_constraintEnd_toEndOf="@+id/text_recovered" app:layout_constraintHorizontal_bias=".8" @@ -366,7 +366,7 @@ android:fontFamily="sans-serif-light" android:gravity="right" android:textColor="#FFEB3B" - android:textSize="20sp" + android:textSize="20dp" app:layout_constraintBottom_toBottomOf="@+id/text_activeCases" app:layout_constraintEnd_toEndOf="@+id/text_activeCases" app:layout_constraintHorizontal_bias="0.734" diff --git a/app/src/main/res/layout/my_spinner_style.xml b/app/src/main/res/layout/my_spinner_style.xml index e8df39c..c111d3a 100644 --- a/app/src/main/res/layout/my_spinner_style.xml +++ b/app/src/main/res/layout/my_spinner_style.xml @@ -3,7 +3,7 @@ android:layout_height="fill_parent" android:layout_width="fill_parent" android:gravity="center" - android:textSize="18sp" + android:textSize="18dp" android:scaleType="fitXY" android:textColor="#000000" android:textStyle="bold" diff --git a/app/src/main/res/res/values/dimens.xml b/app/src/main/res/res/values/dimens.xml index 03fd783..ba65f0e 100755 --- a/app/src/main/res/res/values/dimens.xml +++ b/app/src/main/res/res/values/dimens.xml @@ -2,5 +2,5 @@ 28dp 28dp - 11sp + 11dp diff --git a/app/src/main/res/res/values/styles.xml b/app/src/main/res/res/values/styles.xml index 82dc0d1..a7cc09a 100755 --- a/app/src/main/res/res/values/styles.xml +++ b/app/src/main/res/res/values/styles.xml @@ -17,6 +17,6 @@ diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 2f9d2c8..67c143b 100755 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -8,5 +8,5 @@ 28dp 28dp - 11spz + 11dpz \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 9c78559..5cd1456 100755 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -16,7 +16,7 @@