From 93f2abfb0efee0355eab2071cad60ba0280156ad Mon Sep 17 00:00:00 2001 From: Severiano Jaramillo Date: Wed, 21 Nov 2018 14:47:21 -0600 Subject: [PATCH] - Removed not needed stuff. - Created new MainActivity using a BottomNavigationBar and created all the necessary icons for such bar. --- app/src/main/AndroidManifest.xml | 24 +-- .../activities/MainActivity.kt | 102 ++++-------- .../fragments/BalancesFragment.kt | 15 -- .../fragments/TransactionsFragment.kt | 34 ---- .../bitsybitshareswallet/utils/Constants.kt | 2 +- .../viewmodels/TransactionsViewModel.kt | 7 - .../main/res/drawable/bts_logo_unselected.xml | 19 --- app/src/main/res/drawable/ic_balances.xml | 9 ++ app/src/main/res/drawable/ic_merchants.xml | 9 ++ app/src/main/res/drawable/ic_receive.xml | 9 ++ app/src/main/res/drawable/ic_send.xml | 9 ++ app/src/main/res/drawable/icon_camera.png | Bin 7552 -> 0 bytes app/src/main/res/drawable/icon_receive.png | Bin 13561 -> 0 bytes app/src/main/res/drawable/icon_send.png | Bin 18074 -> 0 bytes .../main/res/drawable/loader_homescreen.xml | 28 ---- .../main/res/drawable/tab_home_selector.xml | 5 - app/src/main/res/layout/activity_main.xml | 114 +++---------- app/src/main/res/layout/fragment_balances.xml | 152 ++---------------- .../main/res/layout/fragment_merchants.xml | 2 +- .../main/res/layout/fragment_transactions.xml | 14 -- app/src/main/res/menu/navigation.xml | 24 +++ app/src/main/res/values/strings.xml | 32 +--- 22 files changed, 143 insertions(+), 467 deletions(-) delete mode 100644 app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/TransactionsFragment.kt delete mode 100644 app/src/main/java/cy/agorise/bitsybitshareswallet/viewmodels/TransactionsViewModel.kt delete mode 100644 app/src/main/res/drawable/bts_logo_unselected.xml create mode 100644 app/src/main/res/drawable/ic_balances.xml create mode 100644 app/src/main/res/drawable/ic_merchants.xml create mode 100644 app/src/main/res/drawable/ic_receive.xml create mode 100644 app/src/main/res/drawable/ic_send.xml delete mode 100644 app/src/main/res/drawable/icon_camera.png delete mode 100644 app/src/main/res/drawable/icon_receive.png delete mode 100644 app/src/main/res/drawable/icon_send.png delete mode 100644 app/src/main/res/drawable/loader_homescreen.xml delete mode 100644 app/src/main/res/drawable/tab_home_selector.xml delete mode 100644 app/src/main/res/layout/fragment_transactions.xml create mode 100644 app/src/main/res/menu/navigation.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9a78e8d..7f0f6a7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -4,17 +4,17 @@ package="cy.agorise.bitsybitshareswallet"> - + android:roundIcon="@drawable/bts_logo" + android:supportsRtl="true" + android:theme="@style/Theme.Bitsy" + tools:ignore="GoogleAppIndexingWarning"> + @@ -22,8 +22,8 @@ + android:name=".activities.SettingsActivity" + android:label="@string/title_settings"> diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt index be29647..6ee7bc9 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt @@ -1,90 +1,54 @@ package cy.agorise.bitsybitshareswallet.activities -import android.content.Intent -import androidx.appcompat.app.AppCompatActivity - -import androidx.fragment.app.FragmentPagerAdapter import android.os.Bundle -import androidx.fragment.app.Fragment -import androidx.fragment.app.FragmentManager -import cy.agorise.bitsybitshareswallet.BuildConfig +import android.widget.Toast +import com.google.android.material.bottomnavigation.BottomNavigationView +import androidx.appcompat.app.AppCompatActivity import cy.agorise.bitsybitshareswallet.R import cy.agorise.bitsybitshareswallet.fragments.BalancesFragment import cy.agorise.bitsybitshareswallet.fragments.MerchantsFragment -import cy.agorise.bitsybitshareswallet.fragments.TransactionsFragment - import kotlinx.android.synthetic.main.activity_main.* class MainActivity : AppCompatActivity() { - /** - * The [androidx.fragment.app.FragmentPagerAdapter] that will provide - * fragments for each of the sections. We use a - * {@link FragmentPagerAdapter} derivative, which will keep every - * loaded fragment in memory. If this becomes too memory intensive, it - * may be best to switch to a - * [androidx.fragment.app.FragmentStatePagerAdapter]. - */ - private var mSectionsPagerAdapter: SectionsPagerAdapter? = null + private val mOnNavigationItemSelectedListener = BottomNavigationView.OnNavigationItemSelectedListener { item -> + when (item.itemId) { + R.id.navigation_receive -> { + Toast.makeText(this, "Receive Fragment", Toast.LENGTH_SHORT).show() + return@OnNavigationItemSelectedListener true + } + R.id.navigation_balances -> { + loadBalancesFragment() + return@OnNavigationItemSelectedListener true + } + R.id.navigation_merchants -> { + loadMerchantsFragment() + return@OnNavigationItemSelectedListener true + } + R.id.navigation_send -> { + Toast.makeText(this, "Send Fragment", Toast.LENGTH_SHORT).show() + return@OnNavigationItemSelectedListener true + } + } + false + } override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) - // Create the adapter that will return a fragment for each of the three - // primary sections of the activity. - mSectionsPagerAdapter = SectionsPagerAdapter(supportFragmentManager) - - // Set up the ViewPager with the sections adapter. - viewPager.adapter = mSectionsPagerAdapter - tabLayout.setupWithViewPager(viewPager) - - // Force first tab to show BTS icon - tabLayout.getTabAt(0)?.setIcon(R.drawable.tab_home_selector) - - initBottomBar() - - ivSettings.setOnClickListener { - val intent = Intent(this, SettingsActivity::class.java) - startActivity(intent) - } + navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener) } - private fun initBottomBar() { - // Show app version number in bottom bar - tvBuildVersion.text = String.format("v%s", BuildConfig.VERSION_NAME) - - // Show block number in bottom bar - tvBlockNumber.text = getString(R.string.block_number_bottom_bar, "-----") - - // TODO add listener to update block number + private fun loadBalancesFragment() { + val ft = supportFragmentManager.beginTransaction() + ft.replace(R.id.fragment_frame, BalancesFragment()) + ft.commit() } - /** - * A [FragmentPagerAdapter] that returns a fragment corresponding to - * one of the sections/tabs/pages. - */ - inner class SectionsPagerAdapter(fm: FragmentManager) : FragmentPagerAdapter(fm) { - - override fun getItem(position: Int): Fragment { - return when (position) { - 0 -> BalancesFragment() - 1 -> TransactionsFragment() - else -> MerchantsFragment() - } - } - - override fun getCount(): Int { - // Show 3 total pages. - return 3 - } - - override fun getPageTitle(position: Int): CharSequence? { - return when (position) { - 0 -> "" - 1 -> getString(R.string.title_transactions) - else -> getString(R.string.title_merchants) - } - } + private fun loadMerchantsFragment() { + val ft = supportFragmentManager.beginTransaction() + ft.replace(R.id.fragment_frame, MerchantsFragment()) + ft.commit() } } diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/BalancesFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/BalancesFragment.kt index 7d6f00e..ba0bed2 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/BalancesFragment.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/BalancesFragment.kt @@ -34,19 +34,4 @@ class BalancesFragment : Fragment() { viewModel = ViewModelProviders.of(this).get(BalancesViewModel::class.java) // TODO: Use the ViewModel } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - - btnReceive.setOnClickListener { - val intent = Intent(view.context, ReceiveTransactionActivity::class.java) - startActivity(intent) - } - - btnSend.setOnClickListener { - val intent = Intent(view.context, SendTransactionActivity::class.java) - startActivity(intent) - } - } - } diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/TransactionsFragment.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/TransactionsFragment.kt deleted file mode 100644 index 68f9083..0000000 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/TransactionsFragment.kt +++ /dev/null @@ -1,34 +0,0 @@ -package cy.agorise.bitsybitshareswallet.fragments - -import androidx.lifecycle.ViewModelProviders -import android.os.Bundle -import androidx.fragment.app.Fragment -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup - -import cy.agorise.bitsybitshareswallet.R -import cy.agorise.bitsybitshareswallet.viewmodels.TransactionsViewModel - -class TransactionsFragment : Fragment() { - - companion object { - fun newInstance() = TransactionsFragment() - } - - private lateinit var viewModel: TransactionsViewModel - - override fun onCreateView( - inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - return inflater.inflate(R.layout.fragment_transactions, container, false) - } - - override fun onActivityCreated(savedInstanceState: Bundle?) { - super.onActivityCreated(savedInstanceState) - viewModel = ViewModelProviders.of(this).get(TransactionsViewModel::class.java) - // TODO: Use the ViewModel - } - -} diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/utils/Constants.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/utils/Constants.kt index 728cbfb..6ace6c8 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/utils/Constants.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/utils/Constants.kt @@ -6,5 +6,5 @@ object Constants { /** * Key used to store the night mode setting into the shared preferences */ - val KEY_NIGHT_MODE_ACTIVATED = "key_night_mode_activated" + const val KEY_NIGHT_MODE_ACTIVATED = "key_night_mode_activated" } diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/viewmodels/TransactionsViewModel.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/viewmodels/TransactionsViewModel.kt deleted file mode 100644 index 12df4e4..0000000 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/viewmodels/TransactionsViewModel.kt +++ /dev/null @@ -1,7 +0,0 @@ -package cy.agorise.bitsybitshareswallet.viewmodels - -import androidx.lifecycle.ViewModel; - -class TransactionsViewModel : ViewModel() { - // TODO: Implement the ViewModel -} diff --git a/app/src/main/res/drawable/bts_logo_unselected.xml b/app/src/main/res/drawable/bts_logo_unselected.xml deleted file mode 100644 index 8173798..0000000 --- a/app/src/main/res/drawable/bts_logo_unselected.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_balances.xml b/app/src/main/res/drawable/ic_balances.xml new file mode 100644 index 0000000..326c11a --- /dev/null +++ b/app/src/main/res/drawable/ic_balances.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_merchants.xml b/app/src/main/res/drawable/ic_merchants.xml new file mode 100644 index 0000000..806e675 --- /dev/null +++ b/app/src/main/res/drawable/ic_merchants.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_receive.xml b/app/src/main/res/drawable/ic_receive.xml new file mode 100644 index 0000000..8b18a9d --- /dev/null +++ b/app/src/main/res/drawable/ic_receive.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_send.xml b/app/src/main/res/drawable/ic_send.xml new file mode 100644 index 0000000..9dd0116 --- /dev/null +++ b/app/src/main/res/drawable/ic_send.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/icon_camera.png b/app/src/main/res/drawable/icon_camera.png deleted file mode 100644 index 744d1dd0f7184dd6b819e83e01c983b737614ca3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7552 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 diff --git a/app/src/main/res/drawable/icon_send.png b/app/src/main/res/drawable/icon_send.png deleted file mode 100644 index 3896ad1a51a834c0da7f319bf5ef1f0e143e99d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18074 zcmX6^19T)^6P?)Hm>b)+ZQHiBv8_!u_HJx%Y;7>n#Civ$&f1fkw&77I8epOTV z*6n()V^x)9P!I_a0RRAsoUEie0004g3ju(K1rLVq71rPZ!Btkz0{}q!^4|*rkduc8 z03fQ^Nl2)w+PZkUc-XqQewCAu`0DEJVr}PW1pxT23Q53LV?>TaT!A|vD@h9f858#h zwCn%VVX6D+X!@gdS@^i-F25NF*AI`JA-j&Y7IaUG{AJy!h9c~$^(#fzPic$ezzgWdc0&E2U zH9+k+DS$330Lxlom=CbR1YniZv6cliv;+EQ(2<$|@W=pGwU|gc0JJ~Abew|17Z8yR zz>@x_BY4YDhki^Cj#PG&Up!WRB=kj>gwUa!HWE_xPjRpoxl&9L6d%+ zcgL3?!MCS}o!&jlPe=1Xjkp82Rc`foTQ$z&_v6lPp1^^gKQZj4)X%-oS2LL3CLg^dC2=52*82e#~ z24FS@klswWBg83(2gT9F5iLWA+)e3f!o+E#rW=UqO<5L2i8=e#Y@^a#QJDv|exnMx zqP?2I7YxvLhay0Wjl+L2BU_7sFptxvNP@@Bj(jE?kcGyKr~En*gQZ5Ukjf>?rXHvH zRZEumpO8BwU$migXR5$BfIaLjs#}IFJ+w(pXc4(pqN9R`AVRtXY1Yz{EhibLD0kMq zg+M5QyZCsv+7@jsSy*C>wf_VUj$_!7m3eeXypfj?A?;R##D1c}2G3D-k6p#u@?-0#tP zw5}{8#S&)n7Z!B?7>QvXO3YXZcAAb9NV&#en)8_R((}&h6sL@pxty{D6loJ{mJUsD zeCdo|8O9?I@(+d%I1UI8$o?51=9`PU{d(5eqgDT7FOPqSe#m(UYn8<=ru8#NeY2ui z6N4*RU%a-sO}$<%y5b9`R}SBFIF6h`X>G}m1p-@K+b6sF6VFbJ%^xJnnX@|clczE# znI};9KFBCh*x_R_HnjM;cyM?&_&#{`S&C)&3-S14nyfr*=UKm{F}&m9KiPL8xI!b)Z%A=SMdFuQQKQLz_vlw73;bqZMluJK>L{;Ju3_rN>D2&l`mU^Z z;;wk1s>)(M2@ZJIte#SS(rLx-x2 z%naRX*=n_Fne!g*y36wXvL2}}Jy0mB*qA(xA&rbp@(fJ=vBs*#W;tRxj*<}nLmhLK zLn&c#m!wahbNN+PL9cO0fuc+KmS4~DD^VcJyXL#oYx#o=vMy{hG9~Of@(iBf2$!3S zATi6>`mLIT(U7P_so4*+%-x98jyb`ff29+p(Gu)N4fiScokpETe^SFzlTj-uohe=A zs4I1p(Ul1(3Mh_EPfeFhFJ*J(3b8G-ALkzDF6VByo9g@OGqzQ<{kD>8I?ylEyK3up zj@0MVE7jG~H)@uy&99|e>Zq!gj3`~3%f9J$XpWwFr(q61er z_S?Qp(hb|?YveA-*x=f9c!b}@#K$UxO)_T+Gv^YHZjSdH$a_Ax8SQ?Xf5^{m&Ka}H1*LIq(1 z6&orRY5)m({uV&imn6c!ZuQu-dMTDr)FFl~mK;_ab~sQ=W;=e7QcL!9oHdg=V}}~4 z8g#NW3uks@7C#h(OcNO$sS_oV z#cVIQ#?#5!DKg4ztvB^oH(yuIQGtk$nZAzO*|B%~?eZ>qFMkhd-yb)NW!%WsuXtwg zKC&FAk{OecKSNY8MwvJLMhu<40w;m$-xnXMBt*YK;z1j7mO1XZm=y^_dJ^S-vh+&d zzF(wvbNNw@aFjA0c0|xrrgST!C~oHR7vSW0e|2IP;_qP#|DKxSCSFCRl-6c*W^-ii zJy~NF+4M2u9N*4D@&j(dp*f`nMvn=xO}y+xQ=fL39f^L56i2K+u3{l#!HG;q6+UTABs#IU< zWYz`sP=8Z$2sIw~6E@Ha;c$+mg?Jblc)qcGX{4gdqPN{@_8OH>D2yE&SBJHZn~5E~ zLc8I6NEq$%r!RXWy`{2xxWf`?J#T$_w8d0lfSOU2d6bFjjIz4cg0ijMa{2Hmwa$_` zO}pL|-X_uUvrq7Mw^jMX%(Q@r<}b~A%~wtCtNG1Vv*l;!xhq2d?nlmxzv~9wPw&DL zz3W;KT1tPd|5}0MK+R7gb+J{a&lw;mqgrJrx63i8d8l_d3e>jcj>W&k^Fo^H$x969 zGN@yuy&w74K1?XwC|Zemqk9ytl70uLPYByjBq;oA-Uu9vj= zA6v|9+oQQ$ccOdl&P#p99}9E~%ozUr?fI{1{qT#209=>vCL_`SfWU~Hq?o4f+C{#f zuccP@r^xY^e%hZc1{9@*)5zLY0##d0SS$i*x1clLvmIV`cK*1MJ=8el`1uP^FCu(c z47sAHn%JN@kH61?!ME+MW^MXPN-eLT;6^0X=gAHMBtzwM{) zYyXIJOcghG0;cC1w_UTFq($m@+0$(KX2ZX69?;J5x753p{C(6!fkOF6aL*Npuq_ltT5$v zCBG5dkqy81!uBm#NL)t9*!Ce5zd^krxIt_%7SaaK_Y@s=LWNs4n4Hxj!9;`D_51B> z)NPkj6nZ!0+cY|yRzeB1sdx#-GhV}ruTm~xSrF=3XCJ2Fi!GaRFuOSl*xOMiRLBn$ zUL;CCzz0AO)=_mx3ZdV(KXf$VNpFYOOMs}D&@JLihzVd4nar1H z<(G3ZW=La13fn@V1+s0iv)l~tk}ng4G0YVgbg|B6&Yl<*BsMNms6fbN|0ZR)U))=y z7~a#Z^M3D^8GLvcW=LEJ=`+iY(vai3OOfIXp<=>em;5N_KA$73Gh0D2*l39bwJS|S zoTa%!YbO-zhAOVtJ?&|la6|8ZID7y_XGGT|@469CdHNi@VA@swSr7H5hGuZRFbnmO~`0e|t=s>bIlF3r1b)yAHyIF|u za`emZFevUgPRB9=JVN_Y6saq90^kIhFMgs}yKh3z7unk?S%!q@e5&EA+;eVs~Mp!C1 z!bB?CQg+C@qU{SF`gbGs4^ZaHy_FLzAo}ePS-eeYL9#yH=zaIvkFIvBQ3c?nTxdNb zPysBU_+4RcD$G6@XtCnH?L75U?I&{VD*?nu!(Z8|urtNo$U+JsRFcbMtppMJgZdTv zMXDRCRK@cU-Zt@E^pFjpq|PgSi~OyvxG5H zdI(w}X6QOi3*}pr~o5F zeElf)hI9#JhAs&PQ~;Pg4@#eJYLz{R76^lQ?S&eUDI&@cBwzJ*eipGV6%p<~VNn4( zEFf+u?J3|Q8&L|`l5oM~sTLVDT1(I!AG;_v$fQvtHov?_TN#ERk5^kor3Kre4O zZmL$LMLRo7!iq2>E%Zu&AlSUp(bz%WQN2-K9Z1uGF^1DoTH17U5w6iLOaPQeNVKZM zJK`6pLA+~^bO2>|kV*;p2jUkbum0^0~l+{ zn7~8^xI$5Fz19&y-k|K5J}_cqxsML?`&sA#2twi)Jv3Fv2}MdH@S96%iZR61>Wlk z#Z|EiOLU*fS&dMbBIUzz;J;e9K}M5`m9U6U)0Ka@zM}R#JC$s6q<*^zj1lUZ<#ehs zocG+hILcV+stL9==(b&i-Vx+l#G*H|&V*6}pDNeg9KOaeL%#J_4s0RqfX1 zUmsj9Qh{*EV3CiPXmZZbo0kP)xY<4{4hH5AjMx)^5qZM${=hjt2a>K#3zKn6MMr6C zD<K2mel3g4CU5>(g_8r)M(TVPyl-RTIRXAaAe)NFVwe% zG^F=~HdR#Qfs4!Hv@HMy&kLf$3ag!49k0*2J9s7_s?DYJ=suYO1gd!LCyxLoUxz@= zou4mQKN>cG>VwVKuSry1jBHf!3YP^k3`14gnT$P+Jro?CY!Um9)f9pe`I-$w(%}n9 z`FKNIju_3md@%XF*kZSgt8fFMYpW2i7f*f5s6ZBoE^aydlu=Q(U5A}5+hhA~gQ@Vs z^|;A($&p=n(84nA4vlJG09yAyQ;3gIn*5&%vnfH*DpYgJGJkJrik27mvIViXFRTyx z0s3AQl*eE9-PW9Y3JQKqI(?EP-S0lVjDBahDV@U#S?!1WJF6{A(X|{;L@+222rJR$ zjjr#>&W=IjI=<`sv`$)EmeKzvA$Kn|drqh>a!zMN*xjo{xbij*Rdod8ly&vSoG-^ok}-1h<<)N@+6C7Mu;| zDoibX|DF;YA!F{Tj6yqAZ5aiB028ACQ&2dx(h0$~#ptoJq#qr3bK+#(pi7mVogq>9 zDwQ|ZMxn0T>AXmym?Xv_zj9n2R~_0Cf%fLdP7`a&KF%OzO3I#8u=gUph#j!FL|bjX zbKPJxa2;X+TJL#CXr6Z~-fC7)5|vK4S~ZFNA>Ca=W@Uus9f8ULaMNUS+sQb{Vd>A- zGx9-8CLNPDPVL*Wp3BP1dM5fGq{Mhd0z}sC7W=xso`n!~wB>*R@j0s+l}iHI8^!E6 zn|aIo9D=GOkyJ1wz{p5jxypY&o>HOmr(OLaj|BVF0gavXsAFP1wxH56^ExR0VRkR| zGlBxczN(txogGMD4&a0wqk~OsTs2yrv$wyU;RWnIX#{Q{P?o6KD}!vz1=_#xUch6f zZlzN3_Ov-qrEbRQ{>uETz)ZEZooRg}5G(rU*uw1_IYw2O*!>@79R4<^+Y;%bpG1%i zc(d50^jQ}qXoKfNA~qzk17hN&FSM~+tp7oHWor`}mq@9k9d{bu-7n`mRb#1sFe#Ix z-+>tU`O-?x8$dlI z1};s!x$-CPZ9yI7Du~=xOO9hnAW-`IMe*$KUY4HorH04R>a@uuu z1GEEwl)nhq5mz+@Xk+Om8u9XlgnlpsY*HNmrO}oGh+q`eG#Q~*6Jxr;W`@_F)bAQOVtu^P zUr+GIKZGHXlA?T(nbH*v9;OR8n5Uof$fyJgUWB>|gSlT!5P{lX`uk1iv2AOrs}~sx zA&C&Wwd5h58%nI{#;+t$QTGIFQ5!b}Duv$n!C;9Hep5?9c=I@>S=UwS&lc1f27z>g zL5UQ@xXK9`%#J)AaPH5w2y!lz;uTd@-#ws&4ecR#QQv<kxh8M{6d`iaDJlKK{S0#!Fg>O zp!DK%k{CJE9lWX%`y`cT6P&%eoH;biqX#+Yh)+qGzbT{%7k=_%na5Nlyqr*;3=qGV z!UY>Q7M?I7O}|s6@{ArEN~<+SR5(>t?b0vuscOj?w>4{SSyx;LZuTAW9eFMbCuGU*Z+j8sNxXu?C0h8AeiOMVbD5Inl z?}3^!)fI@)^h(ge@Pe9%5W2h{<=#IxTHBI*Rd_;&l0^eC5Zm3W@PUcGj zMy^EK8$dv&)l>h@hif9-6y}U!*9|h9at5NZ;NcgrIvTl@?<;G(=J&jXvR^q9uMV#pUQ*%U z>kXB!JGsUsAysIHFFb(zMIQ0Z@f)ftJPvi8dBd|Q?+H!?<4S6Q21s8uoI|Glp=TGq zl=0(Hs`4=nSE2OQF_!^|xJkxE9^i0kDDFQ!3BZs|!*=c2JxE}t`eqdP{bC4#=Z_CC zJ0;dOoheypII7D<>V*H+7AvIx9)Id}UT5XA*@SlO$*KF8`?by4o9m%gA#DClw^Sma z{|s_mlV$GP&Lj9T$~l^Hn-ORlkfvM@)e^pC*D?=sG~wyK)GBgp$Jnb#Sr7Ye{M&}| zz<)lgw`1FLcOQrn7*V3|Z%S!d4~L)Dea*s=B(#5eGdx*>qfvY|b7u5XN#@|9`wP+v zT>_JHBfpxtx~9ldiYqCh=vyWH915X{rvpSMJctoopZ&Vq1!cefjQ??MEE%CwYdXde zTmMd22W?^N^?OgfGj$_WhsOB%9zQS15LsbS7fnLB*citvgV^*4 zPDsbT)s6T26%RCS5Fq%@aO5CQ=^ZaHmwT@HpAff@FWTnhwwNsed#dbi5%gIyZ;k|W zZ`hhd+_?~{w|B$s*7^dkh@xyebOEP#E^svuHen>C(Ezcf6A|-1xyv_# z74ogftQ&dH*G9mxM7mE6-Ip=4V-XgUzE+Se1Z)< z|Ixt0=`|myzb5vZ!g2%y{d&)Q~V1!#Qyp;5DZVyZb-1t_Q_zF%R2WGB?qcQb9 zJRYfg3x7J=(~#QT-Zf^|<}3U1R*uQSDZ3Hpg@tm9AZfgj6~rtM#_l}$N(+dcgqS1r zf9yL;(qMWDz0eN)OfEh9{RL~tN%6h-%6ZU1yYcar%CirIBmVStpRFAsy=-5_^y7); zmvzwXgviR=Ox0wt^q{V`XU$_X$Lb~YAZIudT$*s?1^cExs}535F4{f8dVFFN1M3&x zdOS#0X9mF2RuI$zT2`dbn&-$js6Yd5jG$l`f0LlpT9r3`DXb0Z`O5PAiQP=&$Z|?8}Xi zV#f~oNPy{jTJqe-pY2nY@z{v36=jQMEI=+7qxi{QAj?&x=mYUtQ zQ~chyvGCFdF&R=odnkj_5U{XtvG)(VggrvAG`I=?>cnHQZP2m^hM+qcS9t-dc&=&$ zY2EBO*f^JtiL&oBJ(wlaCIj?z=e9RqHa+bGF4n2M@27ij)C)?+?Hu*)P-cV>rNxvTAjH%ueV%N`M{l~{lEvVybpSKG6p7s z6=a!@(`fqby`1uLHrRpemq?Z$>2Kke{(3%}EE?6mdDdnM94agA8Q1#TF64da86uOK zX(CLa<7NhAX0KNtp%7pRpZM@_7&Mg@M+HdB2Al*t& za}1ojiFm4B$}8wK<~cx9N9)I3BQ6uHDiB(1EZk?eFc^LSMkYDef#B?nlH}6n+=bNQ z{gQ{wGjVvQs5aY$XKDJgp8w`6xZ0@a;QZ(n2soZ!Uio(pcd6v5aKBXt56@G$J?he~ z^qR`6gMhdoVs7%In3WXx%!iZwB~}t17V_|dP*sN!0$v#lA|*WBb0e4r41Xsg!-QWJ zrw;#dZ2spHrx3$;g+ca${CbzmYLno5@uQ$)8BQWlXj9%t=Xt#%#rw?~2)_MS>`(T1 z6j8~u;|59qUyk4o$qj`>E7>e*;{4`R)?OU=2Lp}x&3LK$ABxg886L~Iyg`E`1bn&iE-Pfp{Ti+=1O^@)` z&$b1aVDzWl=ok-tI_Xd;Ggq^e291?KAP@p9B=nyJ!?H4PZZs~9h7{NY$=p;#TF@)7 zvhl{udU0=f5E_sMN9ek+NNgJ6+kD#<)>HSmDV}=2N=9bA*sg zgcw~A2|sCI3f=aL+em?h%ewv=n0ID)GMmnUOcV*Jv65wFZKpy^j0c4ux52wNCWg_p z7GjfInV-@!=i81n$LV)16gi4iw+$UGk53x#dBv`@RKJfcFV|y7Z;YW(U(;e}VkF5m zVZuviP-f%79Z#Iy;}6-Ll%Yzax7av=_Qa>{k-FmovQ7`UIU|9loJ*sOx+j#lGjvek zS@YD(($gRLkI>C7-M|rGEE@8afQ$p>79EtzuecD_TKHdCpUSvS`(NbL_hISg0#8ka zRsy!JLWj-SIy*bF1^qlV9Mb`op><4SbmrC-pI`DAGTd*} zn9`8=o}Xpko&w!=aDf9FM^2+WBEBl}m5r_r+lN@L98wQbQ5h!Qg=yY6sr`Y~Y^lQg zU7PzD1B67fSKNk1Mz@fxoNAkZkYeKXmB34EMbOKSpGySYE|b*Xw7X?M48iTSvtKL? z>)H}EO4ruH-ajAih@MM5kk)>(u%rfh;OCNbPxczrD=1uXrlw`o^(nJK;tNr6q?eXK? z<-ShuN2559X)979!QmO@j`^9bdFExUVq@ED`5n{T?btLDCAM@z(1&5Nm8#p%Zg!dq z6ZK#$XbA`d88f!;>E$)IxTqPozGlD(A*<-gBRU#&^7~jj0FG4pA?&BT^BL5Aozciy zHFLSmq5EE7>cJ5%D%3=+EYm{5L2d2+4ibymD~&K0{gd~d#M9ivs0e!+Ft6TaYlk8} zNyN^Q2SH38Z2;N2w{_KaNld<6LP0J#SY*z&1xq13)*L}J%Wd&X!&i-m4*__?Z(QHB z?B3c=>hkYhR)??pKI|;fgxC{Y+6^-l;im<%__n)4=*kO(`7{2`Tsr=K(LbgnaJ=1mwO zPSh89U?h!gi;uJRE8hD{1{DK;inD-0PI%Rmb_1F`UGJWoTlC4XZ6X-MG1nwrRJ`Nq z8#_qOW4C{DyN(Yw8zU`jF|p*SFEy~XSoiX!G1*qs?}{qaCY9$+6B+RuXNRS*@-86@ z-Ez&Us-h1NHkm_S0y8Ixlz*DVU&6BeqiTei{N#4FKHC>l8@R?TR)NBIsB`CD9CUpD zD?XH_nj@qIh^pLU*Jmr8Oq%-bQxa6Vg>z9V{})Wl?q%1hj%qGH$E>wHCq z)S$fai|139OY@xy zaK8C%(~-t$xy@&_`Vh@$}D$2wfN@F@xYL?V_Up8OU3VW~}eYSfi;8SMML zu6?@*wArq%_^zlhW7(iiEVFn6z$I7^`Cys)oEz~ym*FW`@ABqaCkY;2ijXrH%gi1T z%lZZ?f4NYu9b$Zv9lmjue zO+GlH_}8462u|DZqdigo$jN;xRxWE*O{H?XM2v3oHGWAE!RJZ2zrR=Ao>jFCQ|*d_ zNMFm`?1~m@-|i1paF)l7{>$*6tJ8f!Dd6Jgx*-8HQ!`WTUas~+Tljb}0V}U% z_!+$ScO!41CuAcR=1m!WN5s?%{=2mnI{6NpqfwIVSI8KmNG)E_^9!cPg3arHWiVV5 zJA>M=1+U**%FAXrqi;GX`pRnU_!FwwKc>dT0vOLS`*NiI*!?^xyDjA4S2r~>J)QbC zG|YPwZ({w()2s2=9kediohhNA)Y^yX9ubm~};)b$|RY~zKOx8R*WtoLP0?X1UTciME#RSTu5 z1vL=#5jpkxPlw@%8+_lW4cpbJp79v*MUANjV@Z-g;7(XWMnldxbj2Qf(rSH@)B29Le8@6#NE94`#~3lcgvlBoZhWpvEKL$VuIN{8WCm z;}&kKXa#LXaQx$59~osX(wGw*n%?M0%&D?>T@_szT(7Z#IS*+)%0tT?`Rj4Sek>qj zxrT3}H5Hh8%j?8rXy@`_dA72jA-j*6$3cUc==fpx6cn8mGFfOeVGvXLmDp1l6P3eq zVT2Egf1DhHHq$Y@HEu6^PSYe>=4k~L{oE9@LlG?_T<(t1E^Al|L^^&^pATG2W+rKE zvJ!CY1ZfX4WUlMX@RlCtIA@Kw2-{mFv$h_Ow){*s$P=^Xp*S`#vZ5eZjhWur`T8Ch zD4V^|UNdPw|7SPEDQ-(|LsiK_UV|csTAif9fZ9a+r_72@9}4L@j~zRli7&#!j9_)i z_;$OS5aD(ANDv)xln8eP`YG=Z(WSMM9R_mt>J|>W7ON$MgI&pE5(yR6wCvT-gI{oh+b>+Lw=&jG?TrN3A($ug|+W!nO#r2yLW z_BP2;o&4P-$?qA9&I<`sZ|$iuza!*G`67Q_`-a#@Oa7W0zRDe#i zs4N;GC;!IU-@*Yj-$DzD>x1;+OnUHa{>V6YeE0BJtM#;pu(o;49bU{6`0Coo{LgDv zLG;aW;(AG^p}wBQK*v<75yq5wV#yRyk9_AzLq{WR6OfMjQ9WH#=GUXhcj$@wy4GGH zT!CM#wbjey#A7VAJ^Da5=WE7&T{?0M>`&SiLaOP4h-J*8l)RE;jCde;@-dH39K5VM_Zd7*-dY}l%Q{%4 z9?{#!Ka1OD{ARPlzA1+?swgpeuspNf^#+?snVctWi-=w4{GD(}o2gSq6xdwa*~}r6 z^&$VUX4CFKnGUQeRM}zY=9K)kJcsC8s|h(Ev!X5JW~@hvW`0QU1>Fx`p81&8vF5uO zvNT+tVdxUL6AEh@UE&c`*S}ac8fau3F|GJ@AuznZ1>6Cv|NKui{qQ(0cDES1j$ZeH8AQ{%%3*V?K@7#|XUQUGpu!6w?)GsS&1R8lC z_FxJYqyINW(C7N9uf09}>zcR7Cu3LPOJEf#vr!DA6FdtNg`{xd7e35(yo^ZNz19)f zXm}r=<7r?3^p2I(;hUO{h6L*lkXOGOC6UN$e^XK9Tmw5;3Ea0s;W4_rNHE}j!aC~x z;9ERC&UH7iRV+&R3&&fZ9?c*h#QSGbJzHiLwylwTy#|tN#wu%lanY| z{LmyJy{7L_pWNyELZ+Fj#aVd^Lyvzb?2Y0=FCF9eOm~Usz_?W#u$n*JayvwpS1^z8 zM!gbdhuE~e#O>qegkK2-h1(4>QI7PL2KD^~JK~5~kh+el+n&mRv~#&PYQS)a#fkf3 z%DqJ)+dsROxU$Izk#VtS{2?$BnmIZ+Y0UiI+s6ySB~u@ODH>nmW>!&ISJp|-`wyC{ zFu4pZU-8awn~L)~h0P5Gyk@gx?1zBhQQH}NqHbx5f9l4E5ia49x-VSta+D%mPHV_Z&BeVp=M_=5&~idC)w4shND_3A#rH|9BBZ=5Vyr;b z?8;Ng!7g*OY{#=bCG_v+uLqZTlbuXTqOTPuGMVH|_x-`kg@J4t!CBnsi^MV~*dBVF zgXw@4Pln^roVuy$vNHFkn@3LlG6Ku_J@yRy`+BkS~e8(JZ=jlbTO}-N$UV6bU4}-02Li=0uJo8 zVu*wp?pm1Lz38Be&R<6(C$(KzG64X=+7kmx1=CCVC8iF>znOKWp56a2{Xbu6o`M4L zy$4(B(2w?marf$v_XrL;sU(C4WKwCs+f_7{A8`NqWkkaF@5gnHghpBJd=`}KxBgLS z#5+5)oVF67+QMDc8MbV%EccuX7o7BnZ!IWH9#8jpVa2Vsd$v(pzM^Xf)QE8*&=Eie zi3m9Bif^SfM`i9Equ@-g{Kg zQ6tRT`n~-q#lAD>+!mq#n|pf1RDpmI% z_76pP+DdG%Sh~gMudm=x_i^b%0&YS|oZQs7ctzJsaoHEO@N?Nl28A5E-(ht$L`dCv zsm2cY&oireX_q%X#D^IjAZ||j=nn3{tx=iKAgT4e!DeS{fr0?XMWDo}MT?OK%$$>f z6aHC?o?IJcI!wy%bR2QA!3-c5g1d?wP7WSsPSB7ok|@tjM2TZ6O#goI`9Rmn+t`V> z*}2~_legdtp$%O6g@WH5*8`H=9g}oj5AB=}_BW-@y1q`=)ia}?OaOon?H?S{zoCHj ztKW8uy&@#1R+lWnNu1mQOi^~ZDtaz$DE#^3Sqk{B#SSkckGGdeG%|0&K$J+5E^vo0 z&K}U>xN`iNVZ8% zos-G)Xbug76ae6??a3tUX=HQ50-W2@-x6jFBwTJj{19-mG0%o7{zrvXW$+{=dJNJlTCwr3zzN}eI0h}`HZf`M(8eHap4ScItyaEs&u;viC>-Yoy(v-HgM*v zok9X!JDMQn;p#&kL03f%tLIXD1&Wj_uREKbOo3d%g>ACUK4eQ`y@^82?~Y<4f`d&+ zE$f+U^;XoLn|JT#$)(`h%CDKKDyL>(FqDy7PqwsRbki8M_SE#UwI0tggw5-JeAlDw zEXSN7$LtS#a4$48+NI+;%;^d4GLj`u<&E0P_J@%3q)Ia2sG0 zr*8d{O>>#&jwG3}OwGj6`+{_-Uxk42*Yo{NJ+V+7Nfgetvc%2~gCJqv`;ZE}TJHY3 zu>`uNY$|55X&M)_c^79t`Bw=)rIY2}L!BLuNidwrE->=%x!Z@h*>QTQ5iH%>0o7Pa z3UEftv3*-P=6`I&uR#neA1n3py@f`_T-U29>bwCa!s{-F6qe+ZP>C(7xTsGf<}kK7 zZ3^(W;p$2G?(qHSuDvC8u|}b$DMmh<;@3G(9Kf<$yz`(J5A$7Dxd1P-FQl|uiv4xk z!rPmXh~&LfjEb1KPo19fx6c70f=7w1bB)XZ01!%rJ|_c5O9INVQ`jSQrLMf7==hSS ziRAvpxl0T6-y{*RIps>c?fA5b+txcxou7seMosY+VsrmxjLoHn?nS**d-V22sYqe2 z1-yp1fL@)^{8DE?L>MF4?o@htHfcndfK`1~t9iik3*^eIkfco2;S7gM{!X+2O(C%t zhE9HV`>jtmgH2=fwuAUN6dYLaP9odj1L1Ev>-7Xqo%_<}y9G6|;z^QpRx;ZGf1>VI zfA+V_Ps z`e<|Nd&+Y0cKMTz>?B~R`_g*P&;qJM8|sL#CXFv3y4qJ3u1k2~Hs3lR{ARwXu;gfN z85srjt;JE>B73Y1`h)NXnXWoK8NBC()j3qe0GYVi9m=xz(OIxp8pHu`${$p4?yN9wJ((jS{A{M{y;Y)rV6 z%FW;@xCNnCP|g({$o<6@K@{?toL=eo0lcSA)6pOj-o+W?pMpRs9~~m=cSTAZtSx`m zOf*!Q+i^!o@*zu}Adx&e+9~FUiC>uF_ov3&>&qCl@FL&D+{Z$U2M#39H@R76?)$A$vOdlupR2?W69|zu^4V3>|c{4 zKSloB*7X>&O+=}M96jaIjs+ivI#%9{=N%4Z<#t!T0S0 z4*Vay*2Og-GdKo(u-w2&Env?4$;miE#PYxa{_O+O=xodPCR9U|@vO9NVB!l~Xj9t_ z!$$bwi|=Lmxd8$lQ5xUW%HU{I3iow;%m8ag>GVVy49q3@N7)91*((W|WP4xd>jBux zwt?KfX!Y!E$6s`aR(4f-9Z~o*LP8AjmC;UjG8Z}>NOyXOHotJn9%+%w_aVw3WoLqo zF2LTF8j4)cEwiR_uMdognBcEi{2l|<3`^Q;ytDMa3B5Azey*x>t(-Tn0gH=E85;*I z+I;m68ltIJ`|IA9WSjNvpq_o}e4KOf6be&6K`;FK`1+L4lTjNnX2x{`6MECsv$c zEVOvB3+e4z+!({di-Uz}!bgtfbjTkJT8uNo+}Q}%{74VI0uTDD397OXtL&MK1RO|( zghTGGp2=EV3uhpc5%(>t0dAS&z%IM#x@GYJTd4?E=S|GA_Lk-Z(3p_I;+|w@J+7)W z^y*es!^DI&_Renghn%RRl9!!FfLR*SPD&3=9wT%YAo|c3Q=zVJWSjJZ2OaVKAK1i4 z(|lnMchu-@}MVcfAdwTO@sXLfQLr%1T z-*X?MzW!}O*Y|1-kFY!wN<__*3FVA{VAhL?1v4IUg{A4{R>nHe&SD8Ex+t8BNp~$i zeABN*HeqkEpy4&|7K_Nri{psq7>n@lp1T*~R;e3;r(wzG(`PF71CONo zDaDb2`@hDB_2J06D4W}Mg9Wpce#ev$0<;omj-l@&9{kSug zIb{s(UU8Y+XW+@?wIL66Z7-X!b}&jnp5<$Ucq43NncDISZxc>(eAlHU_j8iN?zW}BMS^Bj#-)(y5yX~UoMD~#-M3G@%0Gmc0 zLKuZUHZcibFi6eh$uIh=s}G+DKp9cf2Zac*3w+z zKzJt=5H|c4E`GgC|D2m^qUk!Jrlx^V)1)8i9`7m5Ev*wKsmwD0$8Z8z0z6G}mEZ(L z>)hb4sv;2WXP~donSjFK|1xzeEyt!B*7$&(;@Gw3mg&To)?=qM?x-P9Tl2c6>0fSc zX?=gf3Hk&c$L|9t0q3J?335hFeFM6#JD2rZXKtCnTzB|6r5-_M;paQJ{?;W*Zy-S3 z)M>p{_4Vg#nttL$B>zOU0Ib%)jlge#8-PzMYG+9*O(WFUNcWySw(I-D+hJKvb|JCv zsc-)KaD2d&ChTY}kbWHDa$Mc(rK+|LZy@j_LYzO5%zY&Q&e#Tg1~?hGj%2Vm9s`c!ObA;SC zYuk40!QMS^ck)xeSM%ruYHILThoVA=TYz6Qx3spaC#D1-TXX^6GhBk70AB%o>bBSn zBA<_{np*n0yX`j;u*~36W|1E3KzxzGthOHxtO*p%Koz#QO{>05j|nfk)%Jt;p6 ze8C{KQ>IWmb!wlls_Hf&#Qf%#)^ip4l?6}|G`F;_2fp66c+t;*|1n|&)6|_w77SI_ z)zjPAnNm_aoQNZw>hPWR`?J>Z8^_cnKhk@bkxEFYIJhkIe0x*7spcl9sxVvrfqFE%f z4F3%{cB0$^U$6>)wNWr+nfOQaU^q^oYbm4`ng+0pWLKxhn_F5ps!^o`V62M4M&N4T z>bAv;nhhcN7hoadd=;j;zJZ~E0TS_eO4AU5K=*s`1%h}3fn+A35DDN7;3?p-=9bnr zHF}f)j5jf81FitBXj{B!GH@DjhVk#@@pipJ(+D**(%asS$L~wNe11GW-|#HIhh(Rw z{{xqfbK;0NR|89~yHoZeKi1!MxUOm>b zPc+H`7^7HkydED~F_`ia30ThaeVWK^4`F+3; zf`fpWz*HlqFd1kB8i0C|LB}eU00000NkvXXu0mjf@3Tbx diff --git a/app/src/main/res/drawable/loader_homescreen.xml b/app/src/main/res/drawable/loader_homescreen.xml deleted file mode 100644 index 5abd1b9..0000000 --- a/app/src/main/res/drawable/loader_homescreen.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/tab_home_selector.xml b/app/src/main/res/drawable/tab_home_selector.xml deleted file mode 100644 index 0af9508..0000000 --- a/app/src/main/res/drawable/tab_home_selector.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ 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 603f11e..c2bbe0d 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,100 +1,30 @@ - - - - - - - - - - - - - - - - - - - - - - - + android:layout_height="match_parent" + tools:context=".activities.MainActivity"> - - - - - - - + app:layout_constraintBottom_toTopOf="@id/navigation"/> - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_balances.xml b/app/src/main/res/layout/fragment_balances.xml index d6b044c..f1a11d5 100644 --- a/app/src/main/res/layout/fragment_balances.xml +++ b/app/src/main/res/layout/fragment_balances.xml @@ -1,146 +1,14 @@ - - - + - - + - - + android:layout_height="match_parent" + android:text="@string/title_balances"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_merchants.xml b/app/src/main/res/layout/fragment_merchants.xml index bdd66aa..5c18a04 100644 --- a/app/src/main/res/layout/fragment_merchants.xml +++ b/app/src/main/res/layout/fragment_merchants.xml @@ -9,6 +9,6 @@ + android:text="@string/title_merchants"/> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_transactions.xml b/app/src/main/res/layout/fragment_transactions.xml deleted file mode 100644 index 743ce9d..0000000 --- a/app/src/main/res/layout/fragment_transactions.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/menu/navigation.xml b/app/src/main/res/menu/navigation.xml new file mode 100644 index 0000000..c6aff5f --- /dev/null +++ b/app/src/main/res/menu/navigation.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9d4109e..932a805 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,38 +2,14 @@ BiTSy - Transactions + MainActivity + Receive + Balances Merchants - Block: %1$s + Send Settings Night mode - CANCEL - - to - from - - accountId - - language - - NEXT - - From - To - - Amount - - Loyalty Points - Backup Asset - Memo - Donate 2 BTS to the Support Developers at - Send - v 1.0 beta - block# ------- - No amount requested - Amount -