diff --git a/.idea/modules.xml b/.idea/modules.xml index d71fbf4..c452b70 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,7 +3,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 57a6ccb..fd4397b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -78,6 +78,7 @@ dependencies { compile 'com.jakewharton:butterknife:8.6.0' testCompile 'junit:junit:4.12' // Retrofit + compile 'com.squareup.retrofit2:retrofit:2.1.0' compile 'com.squareup.picasso:picasso:2.5.2' compile 'de.hdodenhof:circleimageview:2.1.0' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 90e3be0..1ccf3ea 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,6 +12,7 @@ + = Build.VERSION_CODES.M) { + if ((ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) + == PackageManager.PERMISSION_GRANTED) && (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) + == PackageManager.PERMISSION_GRANTED)) { + checkRefreshToken(); + + } else { + // Requset permisson of device + if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission + .ACCESS_COARSE_LOCATION) + && ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest + .permission.ACCESS_FINE_LOCATION)) { + ActivityCompat.requestPermissions(this, + new String[]{Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION}, + PERMISSIONS_REQUEST); + + } else { + ActivityCompat.requestPermissions(this, + new String[]{Manifest.permission.ACCESS_COARSE_LOCATION, + Manifest.permission.ACCESS_FINE_LOCATION}, + PERMISSIONS_REQUEST); + } + } + + } else { + checkRefreshToken(); + } + } + + @Override + public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] + grantResults) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults); + + if (requestCode == PERMISSIONS_REQUEST) { + if (grantResults.length > 0) { + if (grantResults[0] == PackageManager.PERMISSION_GRANTED + && grantResults[1] == PackageManager.PERMISSION_GRANTED + && grantResults[2] == PackageManager.PERMISSION_GRANTED) { + checkRefreshToken(); + return; + } + } else { + Toast.makeText(this, "Permission was not granted ", Toast.LENGTH_SHORT).show(); + finish(); + } + } else { + super.onRequestPermissionsResult(requestCode, permissions, grantResults); + } + } } diff --git a/app/src/main/java/com/dinhcv/lifelogpedometer/adapter/RankingAdapter.java b/app/src/main/java/com/dinhcv/lifelogpedometer/adapter/RankingAdapter.java index 06749e6..fcf96b6 100644 --- a/app/src/main/java/com/dinhcv/lifelogpedometer/adapter/RankingAdapter.java +++ b/app/src/main/java/com/dinhcv/lifelogpedometer/adapter/RankingAdapter.java @@ -84,13 +84,13 @@ public class RankingAdapter extends RecyclerView.Adapter= android.os.Build.VERSION_CODES.HONEYCOMB) { + setLayerType(LAYER_TYPE_SOFTWARE, paintBorder); + } + paintBorder.setShadowLayer(shadowRadius, 0.0f, shadowRadius / 2, shadowColor); + } + + private void updateShader() { + if (image == null) + return; + + image = cropBitmap(image); + + BitmapShader shader = new BitmapShader(image, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP); + + Matrix matrix = new Matrix(); + matrix.setScale((float) canvasSize / (float) image.getWidth(), (float) canvasSize / (float) image.getHeight()); + shader.setLocalMatrix(matrix); + + paint.setShader(shader); + } + + private Bitmap cropBitmap(Bitmap bitmap) { + Bitmap bmp; + if (bitmap.getWidth() >= bitmap.getHeight()) { + bmp = Bitmap.createBitmap( + bitmap, + bitmap.getWidth() / 2 - bitmap.getHeight() / 2, + 0, + bitmap.getHeight(), bitmap.getHeight()); + } else { + bmp = Bitmap.createBitmap( + bitmap, + 0, + bitmap.getHeight() / 2 - bitmap.getWidth() / 2, + bitmap.getWidth(), bitmap.getWidth()); + } + return bmp; + } + + private Bitmap drawableToBitmap(Drawable drawable) { + if (drawable == null) { + return null; + } else if (drawable instanceof BitmapDrawable) { + return ((BitmapDrawable) drawable).getBitmap(); + } + + int intrinsicWidth = drawable.getIntrinsicWidth(); + int intrinsicHeight = drawable.getIntrinsicHeight(); + + if (!(intrinsicWidth > 0 && intrinsicHeight > 0)) + return null; + + try { + Bitmap bitmap = Bitmap.createBitmap(intrinsicWidth, intrinsicHeight, Bitmap.Config.ARGB_8888); + Canvas canvas = new Canvas(bitmap); + drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight()); + drawable.draw(canvas); + return bitmap; + } catch (OutOfMemoryError e) { + Log.e(getClass().toString(), "Encountered OutOfMemoryError while generating bitmap!"); + return null; + } + } + + @Override + protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { + int width = measureWidth(widthMeasureSpec); + int height = measureHeight(heightMeasureSpec); + setMeasuredDimension(width, height); + } + + private int measureWidth(int measureSpec) { + int result; + int specMode = MeasureSpec.getMode(measureSpec); + int specSize = MeasureSpec.getSize(measureSpec); + + if (specMode == MeasureSpec.EXACTLY) { + result = specSize; + } else if (specMode == MeasureSpec.AT_MOST) { + result = specSize; + } else { + result = canvasSize; + } + + return result; + } + + private int measureHeight(int measureSpecHeight) { + int result; + int specMode = MeasureSpec.getMode(measureSpecHeight); + int specSize = MeasureSpec.getSize(measureSpecHeight); + + if (specMode == MeasureSpec.EXACTLY) { + result = specSize; + } else if (specMode == MeasureSpec.AT_MOST) { + result = specSize; + } else { + result = canvasSize; + } + + return (result + 2); + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/back_ic.PNG b/app/src/main/res/drawable/back_ic.PNG index 926635825b66b119ced508fec2b57543af406405..cc1bf7320d65c486fb490cee00486325cd5537a3 100644 GIT binary patch literal 7903 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 D#PBM;P)z1^@s6QL>-m00001b5ch_0Itp) z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D3f4(PK~#8N?Og|G zRXr50d+)uq?uA9I;-o4S9L0$sDi$0lPMqKbC*oeXkSeIS75CmaaG|2&!oByluJiw2 zeqQO{@m|vVa&Ow40~bnP-c8>5a*~{xkdTlN;>QRc7%>Q*3@i=COhjV_V!KqNE+BH} z&P}1Ap;Vwi0m_geLs|kabpcVWS~VIwb}aSl*N=)7E5<;0wYNk?MbWKWx9G~1D-;nC z!9aKcM2;LeXxzAQ5N=3Cx^(Gi z(4avCrYA)^cI=?irArgqxiKD1eV8v1g$fm-EnBuE2?GB4@Zm!mK72S~GuOlL@>t>j)_nQkuo;-PI^yty_{rmSoIK+KEYt}3(T)40< zX6bydxj-~&(u7W&I6;{0vIObr)~%aPhUt2@xj+mYIFMpvV`VWA?Eu=URjb5tHkF;A z%me~f)^+RFDS_Z?{N%|K8Zcl00}+gw2s1Yrno`=gZy!~tP$4xbdFDw(-n@A!CMG7O z7>MsZfBszfEpq0}nOY>nEFjXSPcJO0mo8m$1O&c(`SN9|Q>PB$oxzY&&F?S^2+ZK+ z%aXwpQl^7p&e9YX7DlH}pQhixe+Lx^NJXDMeHaKCsmPcyBSl9? z)2C0Lf(nA~Wg9ncq;loTnGA**5&;u76gU-gh6-Xh&W;>8k^s2O#PFbv89?;t(Su&S zdZof!<+ewU9;NEltDCCic@G4vr3)7>RA#K|7v8;lCyuj-7W81o2kO&%AUb#MER-)d z=*Ep3)VOhD6T>yV1p@J_^XJdkwl^dM_uIE`G-u8nDpRIRpc(4+=iUJU(?fW8I2}87 z%nf0P>*Mj`$JD7)C$||Ls6X$3$d)Y|O`0@`UcY|rDiG*w<;s;*v0}wQ%yIK`?|^`r z8Xh<=2q8Fz`7FEv0@Bd4XHR9guR$TOP4M+ z!Drz<5I8#CxpPMw4zS)rUqJNVn>TL=OA!3u2x7i{`!+$TyL$Di@O$7{vt|t;Si$4v z$z33_X3Z+rY?#QsgO#^y*RIr|LkDWxwkZYJvj)SUQ@}AaWXKTe+qW-u>C%Pz_wP@8_wEfC`x;-o4j(>DEnBuEL<+*Llq*** z5k!zZdv>ugV=^GPIa8)g!WxUm0Kc}oK!73e3&0ABqa*%CFc|iYqD6}mLh$qD%O{wZ zB}*1ziU3eB*vZoV{riQ+?(tHi+P}L%s4@rcQ%H)6iTwES;}jVgsmchi+nWtU{`~pH z`VPmAEWzE{rcE2K8LQgA*+5`TA3S(4VFQ+>3l}a>`}XZs8R2z%|3E;|0W+}iVRpLt zAQj8ExvPX|Yoec9j7?GkVR zO5@O>LuHdJ69a)WHr$ucN|~H-05wAzHf$&pJ(3s*BoLy`#m}EVosELOElztQMvM@; zQGg{XF%a-vLF0uPg2@>NV78e#bEZtTYhobaD_F5&1xti848*r#5tu!Dwy+u~O9V_0 zkO*FyoFm~#B4mKTaT1$3Ob>WqH4XNI_riIES*5y6A|)8(!S{nbF1*k8yTNFG6IMGA z@N7ZkaKyzkefspEKX@-p*ozh|66SCf!qL%Z0@pP*9B42$e@A@nKp^J;rF&p4)%g@G zSdgkzsX_o=h2W2XE`;yv9AB+kwfx3qX$Jzc4EB6UtEuW|5b!xGsPB%L0((*X5^^$#z|7!AbOx%Y9XN2n9w1O0ONHPZl2D=?O%O

M zf{(y7*r`;P8hOFpNa0PZ>$0W+A*|b73UEA+{mkdcTQ!^S8Zz*5MWNddiDG|U=prb zD8PjzMcvi&tpfsuwUD4LOJBc!6{V?l-&JQF5C~M*x^=584kD2r&LrKXMy&$^4BfC{ zgESCG@!h_CyY}jq)&YUA7-XTU5S;qD>oQpf1TpkAYwy{yRXr znYv}d%uj9%ED-2nK>rO>FctPzrcyG7uC#z8V4w1HnMB9>IHrAyU9VFc7RqupVKc6d1KMAu`+K zFc-JRh6$HvA|OiYZp>qsKKENLKs zAQA;}s}!yPKtWr6z4(#jL3DI9MMg%7 zd$biad^2*<6b7vF<5E*w2Evd@z(6n%hMTxu28boXWrioWZ!r)I1TRhTrGq7cC4wb_ fCBhIXhy&su^-|CdNkQkq00000NkvXXu0mjfR|Fyd diff --git a/app/src/main/res/drawable/home_ic.PNG b/app/src/main/res/drawable/home_ic.PNG index 429b647689b21a28084a0be1f853a1962f38add6..71b32cf88de6100d421ce4feb4793e805d585e51 100644 GIT binary patch literal 11484 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 literal 1488 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 literal 786 zcmeAS@N?(olHy`uVBq!ia0vp^F+d#3!3HFcJZPQ(q!^2X+?^QKos)S9a~60+7BevL9R^{>Y zl$7i`6c#Bw`v3pfl-o&~OJA$yNvKqF?VD0^$FjQESUTfdvVnw%-B*bkhTU>G8`&zJ z@~~SRc)hG5*W2}>hD_^!8EN&&o-@y;rS6QG_O~wHZ+Y;}`|tPum~;O5dfWA3tBvNL z?~d4$8DvA=$5{!+B@xIMNZSdkcTU7*C|Bkh}~^mt@Qn-mQD5jyzO@z-qpK7^nR(pEei<{C1HrxHE2$^6h*1EXh*5)ng z%$pg!Ia@MU+Rkk>PC1j_2&CN3^Tj-R!!yTmV%Y=5W~J+|x30F${J3+Cq2l5I(+M`( z3trT=^8CKqk+$s7_S;<&tv#E=1QQMwSr-^?67e~@#qY%Rxyc#T#w8m!uDZ<<m@xq5r{dnR2mxeNU_!n`X}1OF}i`P84` u`PGCyQg2k(9}4>?&Nr=T>62|!{IvxpE=XGP)c}}|89ZJ6T-G@yGywnyiDPL1 diff --git a/app/src/main/res/drawable/next_ic.PNG b/app/src/main/res/drawable/next_ic.PNG index d1d05d906429294b5739f9cc56908c359cc2bee7..6c365f7c3042d054f236646f949e54576c062bf6 100644 GIT binary patch literal 7580 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,!?!ygU}ai1Wl*9ga=j~K1`AUH(s|2=R@)~EABuf zDVsxb5XuzFNM2Wbo~fm!bi5L}wZK?}d}uY!-`+DmvYzO*wRf`RV0}ejXF7aEBTPI( z8P)Q94LCM1PD@+h+3I$i?UnK_3&hM!ni;vC~1* zG`Al{7d=htRST{$zH?Y7Db`(nO^Y^dDQ$4~EG_Fmq32OMNxN+fx}boK@4kr2IgXj{ zbJHW-PvA`poSTT&H0kToHSb}pvNyB(K1u29(Hb~^8j%+VU1SeQ3=Dn`ungXm78^(<|T8q zt|&eBWpZUIbu32B+6O-DOgyIy_0=%2=IngsmzJ5fWTRJfL|z zV>poLH-%WNM~Hu!e@?ybJU5$Z@ufbDe5#}Tgz6}#PFoCL(Hq*VR$K9|!drj&Wtj{- z_1m_Wuy%=ZIyX^i!AxFmDRvDKnS_&S8~t>5(fR17`07ScE@q%^a73 z#NM}^bBipJgvEO)$`s)IUoGzR%lXd=qcZFE1#c`rvEGvK@bHU;g@tV6#|xmK%@HL& z!R&$}yx>dW!qzj*3keK;&K;NrR1nC9 zUVk4)N5@C%>gp^E#JIR(#k(H6LkWK>8yhc;8OE<)9XwfF*vu|hbSz84SBSC?4bV;k z>Th2O2Lvb*unc!8G)zQ(M7W2V2$Ujw1kHb(tomY&jBGDAIJMy8IybMZSgbDASOTrP z12QeA1XJ{Aj*i}X)6?a5)A-kA9vX=8l81J#eP@;LcO(c{3Lg47FfafPOR5W7ufuj} zqg-jHE0n1zD|2#yLPd?!CxJR!{-h^6PJ7WmC?e8jYyPpV+gFX(0{?gJkxYU-E797mq9MgAm8&qK#WcW+@1ik%NW$Nu)iAtipY4|XB2 z4pM=7-gBUbf+Y~3uX2}@*@)Tosf1x|6IyfYn$DCcxa9DJ5yi^x-eSf{ViCpE3EcjMI zMMuY5T2j*FxzbocKP%|}DVp5;w*!6IQD-d&L#Ic}+v=#yKg7O>pDYnWv29|O3Du(b zpj*1(78ZpDi_ zbo<+U782*;;Y}wbmEAc96Q|naecX&L24aiTExa(iTzfcQ4+~6SuOi$$kKrnsxv@oNq4Y z^!_lc{mRRa`(E&!U)DXpqrKhvbfYVBA{(d|biM8y^fo(N`oaXr=uBy*n#c#;tRNKQ zF~!4j$2xYaLGLOG)MU|hG6CHDrlqaTC}O6#jMLoKmWd`%MKS?5XX8?^gI~L7g(pt| zxJw;3h{a>lrZKdS)D-Db^t7}JpH-Q(P3Fq_ zX+SDUsR>Iu_%R^fXfGLw?5?_CaOm97t)Z`7_q-jmxtTB5Z z%8b|wv9+g4Vw&0B?livU?gY~nULwvcjPpbW`8^~pr?^9WDLo;_x7KRA20?tiUCs7G z@z_U4N5@~L@@&YpwUw~M1hRsLxsGytH|VmnvhJ=0yKi<35rn5)6ymfe%!4dOiS}YP zBITzy=yyr}Q&VoH3=+!D;jSN4#mRAjM9@BwkZ5+fyFAiSD|%nm&~UMbE)%8uU%to_ zgEV&-b`wYt23kOQh9*|(z~_xX_FBdWF1eJndVcwsLy=vIXsX&k&~@PBNL zJp#i-<^l!ny%5BGEm36*7rz{u$I=CDlml8vVcTBOD+WbssYR^&M;3iIZ3!J4MG$Z& zYz$q`UZVLlQ}U$0FyaX-E9*?JTj`Y_{{^UScbC&~y6urz%7Wc{Go(~M39TL$B$yT4 z9jrb1NggCIU7Xfqk&pCe+-QrSNqM}+HT wTYx9@!F5nAD4=Bdrw_|v597}uOgs!rdc+0O+fM<1|1Z^4)m5ogdJ+160M2?fz5oCK literal 2008 zcmV;}2PgQ6P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D2W?42K~#8N?VUep zCPfs$Q>ILrGG)pX7Qrf3rcqK@gsWm@nu8P;K@f6<1d9*^HF$-AD-sa7fWieWE?|*> zh=D5%S{Sgn6y9AlcjtF8-i`bMBXRR)=g+>G-EjNhBgHr0?(A>hym{}nTx?ai)W*>CW&YjF=a^C<2C_kgdqr_(JB9vd4oQ&UrBetzC8EiIjYwzs#< z&d$#NK3iK`|9w9h6wzrSyq%HH0dSzKH+FH^+zP@gbj*gl#b^iYF@X)NSt(nQm$u?n^1!tgl z(S>bwUce(GBj@&YFc`EB*LHxuFnQ9q%q|+&&j*+xi5-lU-Cs`4XLp~Te?I>9sd?w~ zKgEx2!{2+qoyFe992^`NMpjM+*#P4<9UmVDJ@ozK=jO}r2j<<46Z7hghvt>{A0&NV z`{1E@?~BLg>mQ#Pt{Ecqk-lbxtgpedv$H`aVdtk)bM4bVl3<3s1g_0Je1gfqm(B!P z7cf4kPk#9IZ}axed|<2aF)`fJC#$QgIUwr+W`?elpYNZU>$gs_X{=AHF+qpF|5MvX z+_~Z5VNK9FfPI>ajcsCIeegoRrw`xUdsYh>MNu>t%>iR`>ty+>C#`9%3p}1josbJr zg4_%+k(tZKJsG?>cdtUVt8_a&j?=RjB4?gS$-77gj1TF`CEzB#xpLfDxb|h@X`l#_ z;KC{R$!UOzf?U}zI(!x2TF7`bE=?vFX&CXP0mh|~gpPLEEV#@N9)?RAx^MA-NtU?m zE_SW7E!Dc;${l&)<5?Rdh~fdew0HfxztrHqvGT~^eXQJhV&3|woGr(ll!Q!RqE`_I znAHbKNYH3$($ekAvpY#2t?T=)LqH@6&z=A|4lt39Bw9HIwAD4?+`OwdLh2wh=}E$~ zX9euiUJ@!ktqA=dlTat6AiI)8EOkXf4%cAT(5iyAY1&8t`lJM8+)QaCCD`I{z*6#j zV^??B;^Ku!3CKKKRR}&JlR;sCUFIQ2K;fFns}Gxd;(PtWN1_%-hR|VvrED3qZK!RH zZO5uah~RO=UOT3}lt+#XJi-7=OYLN&Vmce!whNG@-~&?`G12(}6N^icTZvVPwjpBz zC5fo9@B^NinYnb22alg;)!vKR-Zo@u6=Y#yAykX~fJr`Ag^4J3$Tw-8mBc8XScy!@*+avY9@iC z6%JJ|qAPxI8*rKMvireZh~(OW3*hXLT-&*bHsJ!8a)hd=<|3qQ8ntIl{mYQww+)v* zO3V1F*);OOl4ve=O0c^Cw@5yih(&VMa;}Mm!qo~ST%$>{zY$?__%<$SqGP=(WSGac zp}s9da>J$HQhh|0H96O+GFzu&0oJvrCe2mZa}jz8xI}PLU$U$!V(tLy=C z3AiYMwBX6wWR|)J0J|!CG*W_At9_L{rQq^RQssL>eVRXAY14A-$B;y`y64&_?rQT= zaCzC%IvmfA%Nm%bwC%zHb785vQY&j^wYcr_RVqa#iO4@(d6NnMl*eF@p$TT9u4hox*zO{VyM-s6YZRZ4`AK*t|-m+pMWAV-%uCbHP>LE z*KH2B9mj#sousb=i@9A@{0bKDY+g3OQxU_Ag=q zGd7c^ufZ2VliG_tQW2jNtz(wAC;myRCTOSqp0*@~LJy;}VA)idur)RovYri=Oa{Ag zLhN#=wrjO3cp7V7z!o~1!tpF^3lmx7np&*J=JO&#GW|qHIS*xay+GWrgw=?qaP!(= z7jR~4w&rRaDefB)XslAmn+m&(iEzQj?*srgF?K?f;4*RHa&g#a!_%TtfwpTR>dXk5 z%`m3Oh5Uy7&jXT4VaVI>?SCsM;1Q%iZ&!mu?DiFJ(*w@@0(-zc;Ed=r?g3w68~iUJzmD^ToxKDA0000 + android:color="@color/bg_header" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/tab_color_selector.xml b/app/src/main/res/drawable/tab_color_selector.xml index 9be2e19..2a8c8e1 100644 --- a/app/src/main/res/drawable/tab_color_selector.xml +++ b/app/src/main/res/drawable/tab_color_selector.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/test_selector.xml b/app/src/main/res/drawable/test_selector.xml new file mode 100644 index 0000000..0ddbd74 --- /dev/null +++ b/app/src/main/res/drawable/test_selector.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/walking_ic.PNG b/app/src/main/res/drawable/walking_ic.PNG index 9698a2ec9ead9c9c153f9fe0144b80a5ae5f414f..51fe8b43527bd5733ed31f5f6ed7569360e1616e 100644 GIT binary patch literal 5768 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 OhBZ`lm8%qOBK`+|h@SWW literal 3114 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 Eg7?b4#Q*>R diff --git a/app/src/main/res/layout/activity_pedometer.xml b/app/src/main/res/layout/activity_pedometer.xml index 3069c01..d493f51 100644 --- a/app/src/main/res/layout/activity_pedometer.xml +++ b/app/src/main/res/layout/activity_pedometer.xml @@ -4,7 +4,8 @@ xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:background="@drawable/bg"> @@ -21,14 +22,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> + android:theme="@style/ThemeOverlay.AppCompat.Light"> diff --git a/app/src/main/res/layout/customtab.xml b/app/src/main/res/layout/customtab.xml new file mode 100644 index 0000000..f372f17 --- /dev/null +++ b/app/src/main/res/layout/customtab.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_history.xml b/app/src/main/res/layout/fragment_history.xml index 021189b..c3ffefd 100644 --- a/app/src/main/res/layout/fragment_history.xml +++ b/app/src/main/res/layout/fragment_history.xml @@ -2,7 +2,6 @@ xmlns:appNs="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_main" android:orientation="vertical"> + android:layout_height="match_parent"> - + + android:layout_marginTop="10dp" + android:orientation="vertical"> @@ -172,64 +171,55 @@ -