From 694e6a75d672d662713785d0f66dd71ecadc8134 Mon Sep 17 00:00:00 2001 From: pavan-08 Date: Thu, 8 Mar 2018 20:23:01 +0530 Subject: [PATCH] style fix and logout --- .../group1/vta/activities/LoginActivity.kt | 2 ++ .../group1/vta/activities/MapsActivity.kt | 21 +++++++++++++++-- .../group1/vta/activities/SplashScreen.kt | 4 ++++ .../vta/helpers/InputStreamVolleyRequest.java | 1 + .../src/main/res/drawable-hdpi/ic_back.png | Bin 0 -> 270 bytes .../src/main/res/drawable-hdpi/ic_logout.png | Bin 0 -> 879 bytes .../src/main/res/drawable-mdpi/ic_back.png | Bin 0 -> 175 bytes .../src/main/res/drawable-mdpi/ic_logout.png | Bin 0 -> 598 bytes .../src/main/res/drawable-xhdpi/ic_back.png | Bin 0 -> 248 bytes .../src/main/res/drawable-xhdpi/ic_logout.png | Bin 0 -> 1158 bytes .../src/main/res/drawable-xxhdpi/ic_back.png | Bin 0 -> 440 bytes .../main/res/drawable-xxhdpi/ic_logout.png | Bin 0 -> 1849 bytes .../src/main/res/layout/activity_login.xml | 22 ++++++++++++++++-- .../app/src/main/res/layout/activity_maps.xml | 10 ++++++++ .../src/main/res/layout/activity_sign_up.xml | 11 ++++++++- .../res/layout/activity_splash_screen.xml | 12 ++++++++++ .../app/src/main/res/values/colors.xml | 10 ++++---- .../app/src/main/res/values/strings.xml | 1 + .../app/src/main/res/values/styles.xml | 15 ++++++++++++ 19 files changed, 99 insertions(+), 10 deletions(-) create mode 100644 vta-android/app/src/main/res/drawable-hdpi/ic_back.png create mode 100644 vta-android/app/src/main/res/drawable-hdpi/ic_logout.png create mode 100644 vta-android/app/src/main/res/drawable-mdpi/ic_back.png create mode 100644 vta-android/app/src/main/res/drawable-mdpi/ic_logout.png create mode 100644 vta-android/app/src/main/res/drawable-xhdpi/ic_back.png create mode 100644 vta-android/app/src/main/res/drawable-xhdpi/ic_logout.png create mode 100644 vta-android/app/src/main/res/drawable-xxhdpi/ic_back.png create mode 100644 vta-android/app/src/main/res/drawable-xxhdpi/ic_logout.png diff --git a/vta-android/app/src/main/java/com/beproject/group1/vta/activities/LoginActivity.kt b/vta-android/app/src/main/java/com/beproject/group1/vta/activities/LoginActivity.kt index af3ca69..3a2280c 100644 --- a/vta-android/app/src/main/java/com/beproject/group1/vta/activities/LoginActivity.kt +++ b/vta-android/app/src/main/java/com/beproject/group1/vta/activities/LoginActivity.kt @@ -243,6 +243,7 @@ class LoginActivity : AppCompatActivity(), LoaderCallbacks { } private fun syncWekaAndLaunchApp(intent: Intent, accessToken: String) { + sync_message.visibility = View.VISIBLE apiController.downloadFile("${WekaPredictor.model_name}.zip", accessToken, Response.Listener { response -> try { if (response != null) { @@ -254,6 +255,7 @@ class LoginActivity : AppCompatActivity(), LoaderCallbacks { Toast.makeText(this, "WEKA Download complete.", Toast.LENGTH_LONG).show() val b = unpackZip("${filesDir.absolutePath}/", name) Toast.makeText(this, "WEKA unzip: $b.", Toast.LENGTH_LONG).show() + sync_message.visibility = View.GONE this@LoginActivity.startActivity(intent) this@LoginActivity.finish() } diff --git a/vta-android/app/src/main/java/com/beproject/group1/vta/activities/MapsActivity.kt b/vta-android/app/src/main/java/com/beproject/group1/vta/activities/MapsActivity.kt index 430af7b..37a7367 100644 --- a/vta-android/app/src/main/java/com/beproject/group1/vta/activities/MapsActivity.kt +++ b/vta-android/app/src/main/java/com/beproject/group1/vta/activities/MapsActivity.kt @@ -3,7 +3,9 @@ package com.beproject.group1.vta.activities import android.Manifest.permission.ACCESS_COARSE_LOCATION import android.Manifest.permission.ACCESS_FINE_LOCATION import android.content.Context +import android.content.Intent import android.content.IntentSender +import android.content.SharedPreferences import android.content.pm.PackageManager import android.content.res.Resources import android.graphics.Color @@ -27,6 +29,7 @@ import android.os.SystemClock import android.support.v4.content.ContextCompat import android.view.animation.LinearInterpolator import com.beproject.group1.vta.R +import com.beproject.group1.vta.VTAApplication import com.beproject.group1.vta.helpers.ETA import com.beproject.group1.vta.helpers.Geofence import com.beproject.group1.vta.helpers.TFPredictor @@ -178,6 +181,17 @@ class MapsActivity : AppCompatActivity(), OnMapReadyCallback, SensorEventListene }) + logout.setOnClickListener({_ -> + val sp = getSharedPreferences(VTAApplication.PREF_FILE, Context.MODE_PRIVATE) + val spe = sp.edit() + spe.remove("email") + spe.remove("password") + spe.apply() + val intent = Intent(this@MapsActivity, LoginActivity::class.java) + startActivity(intent) + finish() + }) + /* val country:String = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { resources.configuration.locales[0].country } else { @@ -386,7 +400,7 @@ class MapsActivity : AppCompatActivity(), OnMapReadyCallback, SensorEventListene val c = Calendar.getInstance() val tfPredictor = TFPredictor(this) - val wekaPredictor = WekaPredictor(this) +// val wekaPredictor = WekaPredictor(this) Log.d("Total routes", ""+results.routes.size) for(i in 0 until route.size) { @@ -532,6 +546,7 @@ class MapsActivity : AppCompatActivity(), OnMapReadyCallback, SensorEventListene } if(Geofence.containsCoordinates(source.latitude, source.longitude) && Geofence.containsCoordinates(destination.latitude, destination.longitude)) { + Log.d("not ignore", "true") getDirectionsDetails(source.latitude.toString() + "," + source.longitude.toString(), destination.latitude.toString() + "," + destination.longitude.toString(), TravelMode.DRIVING, callback) } else { Snackbar.make(mapFragment.view!!,R.string.out_of_service_region, Snackbar.LENGTH_SHORT) @@ -601,7 +616,9 @@ class MapsActivity : AppCompatActivity(), OnMapReadyCallback, SensorEventListene } } route.clear() - timeBar!!.dismiss() + if(timeBar != null) { + timeBar!!.dismiss() + } locateMe() } diff --git a/vta-android/app/src/main/java/com/beproject/group1/vta/activities/SplashScreen.kt b/vta-android/app/src/main/java/com/beproject/group1/vta/activities/SplashScreen.kt index f07ca2a..7663875 100644 --- a/vta-android/app/src/main/java/com/beproject/group1/vta/activities/SplashScreen.kt +++ b/vta-android/app/src/main/java/com/beproject/group1/vta/activities/SplashScreen.kt @@ -8,6 +8,7 @@ import android.content.Intent import android.content.SharedPreferences import android.os.Handler import android.util.Log +import android.view.View import android.widget.Toast import com.android.volley.Response import com.beproject.group1.vta.VTAApplication @@ -15,6 +16,7 @@ import com.beproject.group1.vta.helpers.APIController import com.beproject.group1.vta.helpers.TFPredictor.Companion.model_name import com.beproject.group1.vta.helpers.VolleyService import com.beproject.group1.vta.helpers.WekaPredictor +import kotlinx.android.synthetic.main.activity_splash_screen.* import org.json.JSONObject import java.io.* import java.text.SimpleDateFormat @@ -124,6 +126,7 @@ class SplashScreen : AppCompatActivity() { } private fun syncWekaAndLaunchApp(intent: Intent, accessToken: String) { + splash_message.visibility = View.VISIBLE apiController.downloadFile("${WekaPredictor.model_name}.zip", accessToken, Response.Listener {response -> try { if (response != null) { @@ -135,6 +138,7 @@ class SplashScreen : AppCompatActivity() { Toast.makeText(this, "WEKA Download complete.", Toast.LENGTH_LONG).show() val b = unpackZip("${filesDir.absolutePath}/", name) Toast.makeText(this, "WEKA unzip: $b.", Toast.LENGTH_LONG).show() + splash_message.visibility = View.GONE this@SplashScreen.startActivity(intent) this@SplashScreen.finish() } diff --git a/vta-android/app/src/main/java/com/beproject/group1/vta/helpers/InputStreamVolleyRequest.java b/vta-android/app/src/main/java/com/beproject/group1/vta/helpers/InputStreamVolleyRequest.java index ff9b3d2..91b667b 100644 --- a/vta-android/app/src/main/java/com/beproject/group1/vta/helpers/InputStreamVolleyRequest.java +++ b/vta-android/app/src/main/java/com/beproject/group1/vta/helpers/InputStreamVolleyRequest.java @@ -51,4 +51,5 @@ protected Response parseNetworkResponse(NetworkResponse response) { //Pass the response data here return Response.success( response.data, HttpHeaderParser.parseCacheHeaders(response)); } + } diff --git a/vta-android/app/src/main/res/drawable-hdpi/ic_back.png b/vta-android/app/src/main/res/drawable-hdpi/ic_back.png new file mode 100644 index 0000000000000000000000000000000000000000..0cce3cd9b61e737b22fc1f317fd35903b82a78b4 GIT binary patch literal 270 zcmV+p0rCEcP)hR_%NiJSzdOR z5g~*SLULjKJO+-o?TPUVsr3AeTgEdOy5@~uVnS_ohNDf|e2CS()Xf-2o3weOJ2A}& zPn+(^Lo`oqs13EDHq_=rZ4OfViEOU@Y{{lgj6204a;4I(tZswvYxApAdX)8j_~!$_ zD^$cKhJTF~^C2tZSAsfGC+b9qWzUG9b&YPp;01i4-(gb;$l17PC# UR+DaB82|tP07*qoM6N<$f|q}C{r~^~ literal 0 HcmV?d00001 diff --git a/vta-android/app/src/main/res/drawable-hdpi/ic_logout.png b/vta-android/app/src/main/res/drawable-hdpi/ic_logout.png new file mode 100644 index 0000000000000000000000000000000000000000..00b22838708821e7c7a5ccb45cce46b81eeeb0a6 GIT binary patch literal 879 zcmV-#1CacQP)+wVKeW|_szVYyPj9W7z_rVf*|;i7GB?I;Atl`H{RIe`N~;6qb+fMh-jm<~AS zNjay*e@zikxXu|}=?z?DB0GZV>@;0Ukj?MrVk6}z!s*{{ngB2ew{Y@zL8sGsL@{=m zUC`_G-nvrEk?cDrFD!u_R}>22>V+!=fJMLYIl~dN*%#OP z0bpVr`3Qf^Oxk~41b~UrIrBIVr#W_w05CB+&poc@pl7jzCKNL|7q^1IoC#06t`Xoe zGJ1qsoR}290bqUNSzS(i%rN`x+N&C1Vh9}LYTlbpWHk&nkpVjrSs+w<&s{+eEMlV- z$MIv+#hmHE**`D?`zmUjGWK;=wwyLOR5^Xd;5*gB-k$IpW$3_r)}erH??yvUS8~ZY zbD5UX;OTF1&I_#nH1@IuyY&RHm2^=yO3o?LJNMqrifZ6Ywf zpwrm4c=FraVJa*WQ7}o8d$eFG2+nPgP~hhRhAA+vRY1=1OnNtoQ>oLOpnJ{9r@*#} zqATGo@enp4TXkX-)mI10vt&3B}_>4KF>o(GF1!XV5p#eb`g^AyIhX3+TTeo>*{-zvzT4ZAr z6MGeQ*rG#)*ohP+3;{=yn&gJcip3Q&cEZ(8WhZn&r!e0*PC1jz4 z{o-PCps_%Agcc8dDw=KeRdJyvK3LE2AJ$;)bu&_N`~idzn;bP!(dYmG002ovPDHLk FV1mK!j#B^t literal 0 HcmV?d00001 diff --git a/vta-android/app/src/main/res/drawable-mdpi/ic_back.png b/vta-android/app/src/main/res/drawable-mdpi/ic_back.png new file mode 100644 index 0000000000000000000000000000000000000000..6e8c491b07daa055ebd8a2c1ad678fe6289cbefc GIT binary patch literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJGEW!BkcwN$2@X#g> zIG{8C$14Q^`J@?Ng6bFO*fSs0?`AvqiBo@-#J~UPGFxk|d=gCfxn%lkiC^)%418)H z`iQBmJaFj5^D76|TenYOX0zd9b5)WlJ+eZ%ZHltmUJZ#8YBvuy=8E&pc)B=2B!H8F ZVP literal 0 HcmV?d00001 diff --git a/vta-android/app/src/main/res/drawable-mdpi/ic_logout.png b/vta-android/app/src/main/res/drawable-mdpi/ic_logout.png new file mode 100644 index 0000000000000000000000000000000000000000..7ce7e12b5d1162e02919bf0858dfcaa35e3eb9a8 GIT binary patch literal 598 zcmV-c0;&CpP)4qH5RGkxLTPCc+Fp9j&1y7y(VBly5Il%_>|dyYSdxAmL=RG^wEwpA(oGpAHYR4b zlrF4<&Fp*6nVq+>tR08rIQR8>{R0!v)^CshEuh!y?dukh1~VM4>s}JzbEDC?)+GQ~ zzyx+8d8^erqrf>pYqi>2l8CedfB`HOHwVYYK+p3IC}I&U#|D>7Qz=T5B7Y_F3teXbwFf4{M|n#eY`_)LhK}wo zpg50nfHSJop->n2zQ3ni05JJ^04KODdT_)c@k|+!%mTPkpCJQ!w{82_lmK9ZgOz%S z42+qg2h&yz4#qde!jdVvGc5odOu*9O?MJh3S^zkBJN^j)yOv-8Vl@YON-$vyGt=J@ z;9z`{SR0nhc*c{kYs5s@3X^DFMJ1mhZ-_7*{aG77XwgfE}}9buvfdqG%iV zhHMMVAMx6plcF_Kx5Apn+5>;Z@YgYXQrHz2MUeJh*yjJh5*hApYL6mskw`?IOsIbz z2+SF{k~S>FhLt)KSq^3adwALv)?(`)qRzOIBBJg<8zuP!-l{S@WTrGs26=t=K7_lRrtsFY0`!$BRL~xVg kI#m~)y|t0^kb{idN9{L9 zLS+sI=ENNGx*(#)H{np>5yvZsB|{cXa0)uM;{W~T{wwbti&*qjfqEZ&7Fk}ndBdlx zOY_9^oV4p}^xj{#@^3n|e_OA>LhpTdl{VDqUHW9EpMd(1$1z5Q|t*DT?~v zcD`dHX}rwrUG9?IGz$wt_IBs{c4l^Fc6FQ{w`?}MME$ZuUvdV$4G9<$FeG3|z>ol2 z2}mRo4^1Z^3K{*Ho5^IV)PGM;Pd_u20LTUzAuD8#1bL&;xIu!gG==Pzgt!Q3f^V5? z1+qtBv&-#*c0)oO1o(h&_GPC_mHOC8*svr-O#lPl>%b5Sd^(*@(!}SCupSAMlamkn zMF6e;m;R(=-<*at?AfO%np?NX_9%Txl? z2JQ$L=6ydNA0NL%1CE)GPwC_5ria303NIilv&J#7`l-*Hz}y#Gk|DzKRdC{Se(JN$ zo%f{rcWohHc6Rn2cZ>t;KOf}t`B$Or#^7|AcKH*B37D@2r&6iUob4x*$@{hu0GT;o z0L-mIZ85w5!`6ZbX~8P9*49NOIAv7aq^d%)I5)pOT&1wi2L@_Ks!% z>{1B1ZhK7-7?_ZL0Rw7`{a0-#02r9{Y7nT-3@8kM1{9d}>R@P>8ITwN0uqdd?>bz> zM0xg0+X(;$u22F3&N>aCVB)Fm1ONj=z!^&bdC4cX695b>0Td7%{jVkf>=0;=2^3!2 zP5>}48t|*<#~>~GMv-u>sjj|mI{{oM4D3+Jv`_~eu@yXI z=aL~{_wLh$ba=vI^`GF<;j6ahJY<86p*5LoXHZm@|l&R))`)FFJ z+M4EqmnsA;N0~sWOU|+o-nRF($V^j_Pz$iQmqj8SMNS?@E7WdJU=AUx^WFJ4{F1Bd z6a35rr72aPE1*(~ay4uj9e=CpZ9$D$51{6LHt)vffZ$Q3BeEYIGKKc`A-(X1Dc~VX zKN2+;p`}Ld5a+HRs_@oz`qhwJ;Aj$3>8N-7NFBMO#v~)ivDH!4h!H&IE=TofGfp3Y z8e;{OSFYr)vC|i-VqLjb!?UHK_Ks{#MR15E>bR7I8smBzU763Gx~Hru^-jn2KY*?6 YFCrIDiF@w|ga7~l07*qoM6N<$f(DfrcmMzZ literal 0 HcmV?d00001 diff --git a/vta-android/app/src/main/res/drawable-xxhdpi/ic_back.png b/vta-android/app/src/main/res/drawable-xxhdpi/ic_back.png new file mode 100644 index 0000000000000000000000000000000000000000..4478ed9c134ded97275f68d3b7c7f9eff214ae4b GIT binary patch literal 440 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>V669aaSW-r_4baT*Wm<-hKKP- zT?1VBAC$(}Hc#GB!4kfFmc+!S$;tT&7CWT&G&d_P3$$^{3EC*K^wEVs%WU{-0*<`= zJ^8wshcnPfAV^!aYH34eNl`e%9Skmt_4!jDBE|Ie*k z>Uwfw{>9#zi|>5*IDR_t-k&p5<(1tx37Z4)Prrhv%%H$JkZ;Ej)1_*8h2{Jq5Z}|) K&t;ucLK6V3k;X9q literal 0 HcmV?d00001 diff --git a/vta-android/app/src/main/res/drawable-xxhdpi/ic_logout.png b/vta-android/app/src/main/res/drawable-xxhdpi/ic_logout.png new file mode 100644 index 0000000000000000000000000000000000000000..588602f5e65f28df36b07ca4f48c3b7ac77f3081 GIT binary patch literal 1849 zcmV-92gdk`P)~9j27dy@0oqCXQYu3+TEFZ&di-VckWy}PD)CtR2rR_nD|#x@vLKuCBPD3 zizUDkV2dTd5@3rZz!G4KCBPDp#WFrV{?XLb)Ih%x0GT0stl$?4g$rY2V}GiS+z*?C zBoUy&zYp1gK`h{x%jM5iCz>sx!zLjq1hl|+$=w7NQGYt2U0@a%0ZPB!U^}5Z^1E7`K1?eC zs{fzB)HIPDm<6`zs*W5QbYgR8Xy~1^s~`*@CI3T%!FT9;QC1&$UDX`}@bAse&YsK4 zB8-7#sET%gp&!*#Gtv9`eEyA$nxWeUs;K72-ale>evoP>X&bSbnVI*MjDL^>92u!1 zs1XwUXR4u(v+jz(!mQf(i&e=i_`@vAc&A^SajK1?!MZ5MC&z5KGyy;Mn>$*yag)># zTfkN_#U@GcfAh7{r<8!f!NE6K^Ay-h2-sj$Po+}%ED9%J5>LbwR+kt<1=#kqd`P|a zb5t(yq#j8s0+t!fx>`i)fhFQ&2SK?R(o6u3B~^V%;I`!Tp|@1sC)CeEl!rh`K9pB& z{y?aqePG>5{d_}wd_XS}AD2?Ac6GTjS>LY}evoft|Q0<%=x4QU^Nxm&mzq5r?L1bC{U?}|PM0>|y+m#Wq3tFUT>>Sr&|v(AhW0BnGf)RF}D$KizpYri-#m9zxs z!a^k0feUz{L@dD9Edf2%&~>7pC9K@@#0>b_63~-?5yCAoPdSsK^!=oj0ANIDlx0{z zYr@h0w-aMY(*+G+CB$?M57&i)J+=ghH)M~61k|B|9*G~e1W0EFBt-ESpvia+!7N&Y@Jsv0b&AHrLG-3yeo}%wgiZ+ zpiSYR-gTrwScvqs1c+zAjyPCL{jn}ROm-xZU6z0x5!|p&xgtWlfF>JN=K-vw;@PfE|)aG z6qhjKT!>RpumC@k1~#AEqa!?`urMxKoINeIi-h{AyDf|=p@!xx)Sl{Rjv%0V@*;DL zhD!++YEM)7Az^}!xNX+~Cb%^6{5UBnz=XNPeI|v2)Q7FvTeOg$F2IB!V6D>!t}&N0 z;@oW}Q1zS#Cd2@~)@chpKz?MwLVq%N7ns58nL&n$>Vm^5pU=PD@8AOi=4MgXyA=i( zv=^=V8UHEB3)?v+#@#p%LU#N(B zDY#+M5m*dqG*Pvw`P5M6jlfl~&WqDD?9d@LE@{{?>$|=;46_9v$NY!((YiL{d!OyI2ZMI60b{-A-nF;O_B8fFPC{M~ zTcd-&f{eh+>7c1OlT`HGW^rU{r^mwF3`!_>7$o8>5$uYHV;veVAti@r@s19ZU6FPFB)dSo2L?UPO1!@^}aU03!0c7mLd-R%6>e?_m;W(~VPzl(E{t6pqt ziS~18-_c$M!QTtaw-be34L58SW`mYtDU~5OIEY|R){<1wcjLp9B>7fw9?Bl{#|%9B zI-RL#4+x_}UK$AozkxnxJc4lj n#kH=VoyWWQM$o_N7i9SlSIqh@jnS1P00000NkvXXu0mjfO~q-& literal 0 HcmV?d00001 diff --git a/vta-android/app/src/main/res/layout/activity_login.xml b/vta-android/app/src/main/res/layout/activity_login.xml index c109fed..1ca9d6d 100644 --- a/vta-android/app/src/main/res/layout/activity_login.xml +++ b/vta-android/app/src/main/res/layout/activity_login.xml @@ -8,16 +8,28 @@ android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" + android:background="@color/colorPrimary" tools:context="com.beproject.group1.vta.activities.LoginActivity"> + /> + + diff --git a/vta-android/app/src/main/res/layout/activity_sign_up.xml b/vta-android/app/src/main/res/layout/activity_sign_up.xml index 7655d37..c353846 100644 --- a/vta-android/app/src/main/res/layout/activity_sign_up.xml +++ b/vta-android/app/src/main/res/layout/activity_sign_up.xml @@ -7,6 +7,7 @@ android:paddingBottom="@dimen/activity_vertical_margin" android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin" + android:background="@color/colorPrimary" android:paddingTop="@dimen/activity_vertical_margin" tools:context="com.beproject.group1.vta.activities.SignUpActivity"> @@ -32,6 +33,7 @@ @@ -47,12 +50,14 @@ diff --git a/vta-android/app/src/main/res/layout/activity_splash_screen.xml b/vta-android/app/src/main/res/layout/activity_splash_screen.xml index 3314866..43ec3ef 100644 --- a/vta-android/app/src/main/res/layout/activity_splash_screen.xml +++ b/vta-android/app/src/main/res/layout/activity_splash_screen.xml @@ -24,4 +24,16 @@ android:indeterminate="true" android:layout_centerHorizontal="true" /> + diff --git a/vta-android/app/src/main/res/values/colors.xml b/vta-android/app/src/main/res/values/colors.xml index 61e8e26..39c6247 100644 --- a/vta-android/app/src/main/res/values/colors.xml +++ b/vta-android/app/src/main/res/values/colors.xml @@ -1,13 +1,13 @@ - #3F51B5 - #303F9F - #FF4081 + #000 + #000 + #0091EA #84ca50 #f07d02 #e60000 #9e1313 - #1e6a1b9a - #6a1b9a + #367492a8 + #7492a8 #b4363636 diff --git a/vta-android/app/src/main/res/values/strings.xml b/vta-android/app/src/main/res/values/strings.xml index 1266afc..e99a6d2 100644 --- a/vta-android/app/src/main/res/values/strings.xml +++ b/vta-android/app/src/main/res/values/strings.xml @@ -29,4 +29,5 @@ Source We do not serve this region yet Currently offline + Synchronizing...\nThis may take time diff --git a/vta-android/app/src/main/res/values/styles.xml b/vta-android/app/src/main/res/values/styles.xml index 22f79fb..abe0dd9 100644 --- a/vta-android/app/src/main/res/values/styles.xml +++ b/vta-android/app/src/main/res/values/styles.xml @@ -6,6 +6,21 @@ @color/colorPrimary @color/colorPrimaryDark @color/colorAccent + @style/AppTheme.ActionBarStyle + @style/AppTheme.ActionBarStyle + @color/colorAccent + @color/colorAccent + + + + +