- Removed not needed stuff.

- Created new MainActivity using a BottomNavigationBar and created all the necessary icons for such bar.
This commit is contained in:
Severiano Jaramillo 2018-11-21 14:47:21 -06:00
parent fb1d6b89fa
commit 93f2abfb0e
22 changed files with 143 additions and 467 deletions

View file

@ -4,17 +4,17 @@
package="cy.agorise.bitsybitshareswallet"> package="cy.agorise.bitsybitshareswallet">
<application <application
android:allowBackup="true" android:allowBackup="true"
android:icon="@drawable/bts_logo" android:icon="@drawable/bts_logo"
android:label="@string/app_name"
android:roundIcon="@drawable/bts_logo"
android:supportsRtl="true"
android:theme="@style/Theme.Bitsy"
tools:ignore="GoogleAppIndexingWarning">
<activity
android:name=".activities.MainActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/Theme.Bitsy.NoActionBar"> android:roundIcon="@drawable/bts_logo"
android:supportsRtl="true"
android:theme="@style/Theme.Bitsy"
tools:ignore="GoogleAppIndexingWarning">
<activity
android:name=".activities.MainActivity"
android:label="@string/app_name"
android:theme="@style/Theme.Bitsy">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
@ -22,8 +22,8 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
android:name=".activities.SettingsActivity" android:name=".activities.SettingsActivity"
android:label="@string/title_settings"> android:label="@string/title_settings">
</activity> </activity>
<activity android:name=".activities.SendTransactionActivity"> <activity android:name=".activities.SendTransactionActivity">
</activity> </activity>

View file

@ -1,90 +1,54 @@
package cy.agorise.bitsybitshareswallet.activities package cy.agorise.bitsybitshareswallet.activities
import android.content.Intent
import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.FragmentPagerAdapter
import android.os.Bundle import android.os.Bundle
import androidx.fragment.app.Fragment import android.widget.Toast
import androidx.fragment.app.FragmentManager import com.google.android.material.bottomnavigation.BottomNavigationView
import cy.agorise.bitsybitshareswallet.BuildConfig import androidx.appcompat.app.AppCompatActivity
import cy.agorise.bitsybitshareswallet.R import cy.agorise.bitsybitshareswallet.R
import cy.agorise.bitsybitshareswallet.fragments.BalancesFragment import cy.agorise.bitsybitshareswallet.fragments.BalancesFragment
import cy.agorise.bitsybitshareswallet.fragments.MerchantsFragment import cy.agorise.bitsybitshareswallet.fragments.MerchantsFragment
import cy.agorise.bitsybitshareswallet.fragments.TransactionsFragment
import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.activity_main.*
class MainActivity : AppCompatActivity() { class MainActivity : AppCompatActivity() {
/** private val mOnNavigationItemSelectedListener = BottomNavigationView.OnNavigationItemSelectedListener { item ->
* The [androidx.fragment.app.FragmentPagerAdapter] that will provide when (item.itemId) {
* fragments for each of the sections. We use a R.id.navigation_receive -> {
* {@link FragmentPagerAdapter} derivative, which will keep every Toast.makeText(this, "Receive Fragment", Toast.LENGTH_SHORT).show()
* loaded fragment in memory. If this becomes too memory intensive, it return@OnNavigationItemSelectedListener true
* may be best to switch to a }
* [androidx.fragment.app.FragmentStatePagerAdapter]. R.id.navigation_balances -> {
*/ loadBalancesFragment()
private var mSectionsPagerAdapter: SectionsPagerAdapter? = null 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?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main) setContentView(R.layout.activity_main)
// Create the adapter that will return a fragment for each of the three navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener)
// 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)
}
} }
private fun initBottomBar() { private fun loadBalancesFragment() {
// Show app version number in bottom bar val ft = supportFragmentManager.beginTransaction()
tvBuildVersion.text = String.format("v%s", BuildConfig.VERSION_NAME) ft.replace(R.id.fragment_frame, BalancesFragment())
ft.commit()
// Show block number in bottom bar
tvBlockNumber.text = getString(R.string.block_number_bottom_bar, "-----")
// TODO add listener to update block number
} }
/** private fun loadMerchantsFragment() {
* A [FragmentPagerAdapter] that returns a fragment corresponding to val ft = supportFragmentManager.beginTransaction()
* one of the sections/tabs/pages. ft.replace(R.id.fragment_frame, MerchantsFragment())
*/ ft.commit()
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)
}
}
} }
} }

View file

@ -34,19 +34,4 @@ class BalancesFragment : Fragment() {
viewModel = ViewModelProviders.of(this).get(BalancesViewModel::class.java) viewModel = ViewModelProviders.of(this).get(BalancesViewModel::class.java)
// TODO: Use the ViewModel // 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)
}
}
} }

View file

@ -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
}
}

View file

@ -6,5 +6,5 @@ object Constants {
/** /**
* Key used to store the night mode setting into the shared preferences * 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"
} }

View file

@ -1,7 +0,0 @@
package cy.agorise.bitsybitshareswallet.viewmodels
import androidx.lifecycle.ViewModel;
class TransactionsViewModel : ViewModel() {
// TODO: Implement the ViewModel
}

View file

@ -1,19 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="255dp"
android:height="255dp"
android:viewportWidth="255"
android:viewportHeight="255" >
<path
android:fillColor="#BBFEFEFE"
android:pathData="M128 0c70 0 127 57 127 127 0 71-57 128-127 128C57 255 0 198 0 127 0 57 57 0 128 0z"/>
<path
android:fillColor="#2A8336"
android:pathData="M178 73c-15-16-36-22-57-21l12 10c31 3 56 29 56 61 0 34-27 61-61 61s-62-27-62-61c0-13 4-25 11-35V73c-28 28-28 73 0 101l51 51 50-51c28-28 28-73 0-101z"/>
<path
android:fillColor="#009FE3"
android:pathData="M99 155c7 6 15 10 25 11v-27c-2 0-4-1-6-2l-19 18zm31-16v27c9-1 18-5 24-11l-19-18c-1 1-3 2-5 2zm-18-12c0 2 1 4 2 6l-19 19c-6-7-9-16-10-25h27zm57 0c-1 9-5 17-10 24l-19-19c1-1 1-3 2-5h27zm-57-6H85V86l29 29c-1 2-2 4-2 6zm56 0h-26c-1-2-1-4-3-6l19-19c6 7 10 16 10 25zm-14-29c-6-5-15-9-24-10v27c2 0 4 1 5 2l19-19zM85 77c7 8 30 30 34 34 1-1 3-2 5-2V65L85 30v47z"/>
</vector>

View file

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M21,18v1c0,1.1 -0.9,2 -2,2L5,21c-1.11,0 -2,-0.9 -2,-2L3,5c0,-1.1 0.89,-2 2,-2h14c1.1,0 2,0.9 2,2v1h-9c-1.11,0 -2,0.9 -2,2v8c0,1.1 0.89,2 2,2h9zM12,16h10L22,8L12,8v8zM16,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
</vector>

View file

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M20,4L4,4v2h16L20,4zM21,14v-2l-1,-5L4,7l-1,5v2h1v6h10v-6h4v6h2v-6h1zM12,18L6,18v-4h6v4z"/>
</vector>

View file

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM12,17.5L6.5,12H10v-2h4v2h3.5L12,17.5zM5.12,5l0.81,-1h12l0.94,1H5.12z"/>
</vector>

View file

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M20.55,5.22l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.15,0.55L3.46,5.22C3.17,5.57 3,6.01 3,6.5V19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.49 -0.17,-0.93 -0.45,-1.28zM12,9.5l5.5,5.5H14v2h-4v-2H6.5L12,9.5zM5.12,5l0.82,-1h12l0.93,1H5.12z"/>
</vector>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

View file

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<rotate xmlns:android="http://schemas.android.com/apk/res/android"
android:fromDegrees="0"
android:pivotX="50%"
android:pivotY="50%"
android:duration="1"
android:toDegrees="360" >
<shape
android:innerRadiusRatio="3"
android:shape="ring"
android:thicknessRatio="8"
android:useLevel="false" >
<size
android:height="48dip"
android:width="48dip" />
<gradient
android:centerColor="#000"
android:centerY="0.50"
android:endColor="#ff56a9c7"
android:startColor="#000"
android:type="sweep"
android:useLevel="false" />
</shape>
</rotate>

View file

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bts_logo" android:state_selected="true" />
<item android:drawable="@drawable/bts_logo_unselected" />
</selector>

View file

@ -1,100 +1,30 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout <androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/main_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".activities.MainActivity">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/appbar_padding_top"
android:theme="@style/Theme.Bitsy.AppBarOverlay">
<!--<android.support.v7.widget.Toolbar-->
<!--android:id="@+id/toolbar"-->
<!--app:title="@string/app_name"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="?attr/actionBarSize"-->
<!--android:layout_weight="1"-->
<!--android:background="?attr/colorPrimary"-->
<!--app:popupTheme="@style/AppTheme.PopupOverlay"-->
<!--app:layout_scrollFlags="scroll|enterAlways">-->
<!--</android.support.v7.widget.Toolbar>-->
<com.google.android.material.tabs.TabLayout
android:id="@+id/tabLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:tabIndicatorHeight="0dp"
app:tabMode="scrollable"/>
</com.google.android.material.appbar.AppBarLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewPager"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_gravity="bottom" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="36dp" android:layout_height="match_parent"
android:background="#dddddd"> tools:context=".activities.MainActivity">
<TextView <FrameLayout
android:id="@+id/tvBuildVersion" android:id="@+id/fragment_frame"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="0dp"
android:layout_marginStart="24dp"
tools:text="v0.3"
android:textSize="16sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tvBlockNumber"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="Block: ----"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/ivSocketConnected"
android:layout_width="26dp"
android:layout_height="26dp"
android:layout_marginBottom="8dp"
android:layout_marginEnd="12dp"
android:layout_marginTop="8dp"
android:src="@drawable/ic_connected"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/ivSettings"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/ivSettings"
android:layout_width="28dp"
android:layout_height="28dp"
android:layout_marginEnd="24dp"
android:src="@drawable/ic_settings"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
android:contentDescription="@string/title_settings"/> app:layout_constraintBottom_toTopOf="@id/navigation"/>
</androidx.constraintlayout.widget.ConstraintLayout> <com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/navigation"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="0dp"
android:layout_marginStart="0dp"
android:background="?android:attr/windowBackground"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:menu="@menu/navigation"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.constraintlayout.widget.ConstraintLayout>

View file

@ -1,146 +1,14 @@
<ScrollView <?xml version="1.0" encoding="utf-8"?>
android:id="@+id/scrollViewBalances" <FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent"
android:fillViewport="true"
android:focusable="false"
android:nestedScrollingEnabled="true">
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginTop="@dimen/activity_horizontal_margin" tools:context=".fragments.MerchantsFragment">
android:orientation="vertical"
android:weightSum="3">
<LinearLayout
<TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:orientation="horizontal" android:text="@string/title_balances"/>
android:weightSum="3">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1.1"
android:orientation="vertical">
<LinearLayout
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_gravity="center"
android:gravity="center">
<ImageView </FrameLayout>
android:id="@+id/btnReceive"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:src="@drawable/icon_receive"
android:visibility="visible" />
</LinearLayout>
<ImageView
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_gravity="center"
android:gravity="center"
android:src="@drawable/icon_receive"
android:visibility="gone"/>
<TextView
android:layout_width="100dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:text="Receive"/>
</LinearLayout>
<ImageView
android:id="@+id/btnReadQR"
android:layout_width="0dp"
android:layout_height="75dp"
android:layout_gravity="center"
android:layout_weight="0.6"
android:src="@drawable/icon_camera"/>
<View android:id="@+id/backLine"
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_gravity="center"
android:layout_marginLeft="-14dp"
android:layout_weight="0.3"
android:background="#dc473a"/>
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="-31dp"
android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_gravity="center">
<ImageView
android:id="@+id/btnSend"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:src="@drawable/icon_send"/>
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="Send"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginTop="10dp"
android:background="#BFE5F5"
android:weightSum="3">
<TextView
android:id="@+id/tvBalances"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_weight="3"
android:gravity="center_vertical"
android:text="Balances"
android:textColor="@color/black"
android:textSize="17dp"
android:textStyle="bold"/>
<ProgressBar
android:id="@+id/progressBar1"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_gravity="center"
android:layout_marginRight="20dp"
android:indeterminateDrawable="@drawable/loader_homescreen"
android:visibility="gone"
style="?android:attr/progressBarStyleLarge">
</ProgressBar>
</LinearLayout>
<LinearLayout
android:id="@+id/llBalances"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
</LinearLayout>
<LinearLayout
android:id="@+id/whiteSpaceAfterBalances"
android:layout_width="match_parent"
android:layout_height="10dp"
android:background="#FFF"
android:orientation="vertical">
</LinearLayout>
</LinearLayout>
</ScrollView>

View file

@ -9,6 +9,6 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="Merchants"/> android:text="@string/title_merchants"/>
</FrameLayout> </FrameLayout>

View file

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".fragments.TransactionsFragment">
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="Transactions"/>
</FrameLayout>

View file

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/navigation_receive"
android:icon="@drawable/ic_receive"
android:title="@string/title_receive"/>
<item
android:id="@+id/navigation_balances"
android:icon="@drawable/ic_balances"
android:title="@string/title_balances"/>
<item
android:id="@+id/navigation_merchants"
android:icon="@drawable/ic_merchants"
android:title="@string/title_merchants"/>
<item
android:id="@+id/navigation_send"
android:icon="@drawable/ic_send"
android:title="@string/title_send"/>
</menu>

View file

@ -2,38 +2,14 @@
<string name="app_name">BiTSy</string> <string name="app_name">BiTSy</string>
<!-- Main Activity --> <!-- Main Activity -->
<string name="title_transactions">Transactions</string> <string name="title_activity_main">MainActivity</string>
<string name="title_receive">Receive</string>
<string name="title_balances">Balances</string>
<string name="title_merchants">Merchants</string> <string name="title_merchants">Merchants</string>
<string name="block_number_bottom_bar">Block: %1$s</string> <string name="title_send">Send</string>
<!-- Settings --> <!-- Settings -->
<string name="title_settings">Settings</string> <string name="title_settings">Settings</string>
<string name="night_mode">Night mode</string> <string name="night_mode">Night mode</string>
<string name="cancel">CANCEL</string>
<string name="to">to</string>
<string name="from">from</string>
<string name="account_id">accountId</string>
<string name="pref_language">language</string>
<string name="next">NEXT</string>
<string name="from_capital">From</string>
<string name="to_capital">To</string>
<string name="amount">Amount</string>
<string name="loyalty_points">Loyalty Points</string>
<string name="backup_asset">Backup Asset</string>
<string name="memo_capital">Memo</string>
<string name="checkbox_donate">Donate 2 BTS to the Support Developers at</string>
<string name="send_capital">Send</string>
<string name="v_1_0_beta" translatable="false">v 1.0 beta</string>
<string name="block_number" translatable="false">block# -------</string>
<string name="no_amount_requested">No amount requested</string>
<string name="request_amount_screen_name">Amount</string>
</resources> </resources>