tweaks from designer input
This commit is contained in:
Kevin Gorham
parent
949ed90659
commit
39355fec9a
|
|
@ -71,10 +71,6 @@ class MainActivity : DaggerAppCompatActivity() {
|
|||
}
|
||||
}
|
||||
|
||||
private fun fabVisibilityListener() {
|
||||
|
||||
}
|
||||
|
||||
private fun onFabClicked(view: View) {
|
||||
Snackbar.make(view, if (sanity.stillSane) "Your imaginary ZEC is in flight." else "You've lost your marbles.", Snackbar.LENGTH_LONG)
|
||||
.setAction("Action", null).show()
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ import android.view.LayoutInflater
|
|||
import android.view.View
|
||||
import android.view.ViewGroup
|
||||
import cash.z.android.wallet.R
|
||||
import cash.z.android.wallet.ui.activity.MainActivity
|
||||
|
||||
|
||||
// TODO: Rename parameter arguments, choose names that match
|
||||
|
|
@ -53,13 +54,9 @@ class HomeFragment : Fragment() {
|
|||
|
||||
override fun onAttach(context: Context) {
|
||||
super.onAttach(context)
|
||||
if (context is OnFragmentInteractionListener) {
|
||||
listener = context
|
||||
} else {
|
||||
// throw RuntimeException(context.toString() + " must implement OnFragmentInteractionListener")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
override fun onDetach() {
|
||||
super.onDetach()
|
||||
listener = null
|
||||
|
|
|
|||
|
|
@ -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,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM6,9h12v2L6,11L6,9zM14,14L6,14v-2h8v2zM18,8L6,8L6,6h12v2z"/>
|
||||
</vector>
|
||||
|
|
@ -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="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z"/>
|
||||
</vector>
|
||||
|
|
@ -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="M12,16.5l4,-4h-3v-9h-2v9L8,12.5l4,4zM21,3.5h-6v1.99h6v14.03L3,19.52L3,5.49h6L9,3.5L3,3.5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2v-14c0,-1.1 -0.9,-2 -2,-2z"/>
|
||||
</vector>
|
||||
|
|
@ -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="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
|
||||
</vector>
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 6.0 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 8.4 KiB |
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/layout_home_fragment"
|
||||
|
|
@ -7,15 +7,52 @@
|
|||
android:layout_height="match_parent"
|
||||
tools:context=".ui.fragment.HomeFragment">
|
||||
|
||||
<!-- TODO: Update blank fragment layout -->
|
||||
<TextView
|
||||
android:id="@+id/textView2"
|
||||
<com.google.android.material.appbar.AppBarLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:theme="@style/AppTheme.AppBarOverlay">
|
||||
|
||||
<androidx.appcompat.widget.Toolbar
|
||||
android:id="@+id/toolbar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="180dp"
|
||||
android:background="?attr/colorPrimary"
|
||||
app:popupTheme="@style/AppTheme.PopupOverlay" />
|
||||
|
||||
</com.google.android.material.appbar.AppBarLayout>
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
<ImageView
|
||||
android:id="@+id/image_empty_wallet"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/empty_wallet"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintVertical_bias="0.6"/>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:text="Your wallet is empty."
|
||||
android:textColor="#AAAAAA"
|
||||
app:layout_constraintTop_toBottomOf="@id/image_empty_wallet"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"/>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||
android:id="@+id/fab"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Home"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
android:layout_gravity="bottom|end"
|
||||
android:layout_margin="@dimen/fab_margin"
|
||||
android:backgroundTint="@color/colorPrimary"
|
||||
android:tint="@color/fab_icon_color"
|
||||
app:srcCompat="@drawable/ic_add_black_24dp" />
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||
|
|
@ -23,16 +23,15 @@
|
|||
|
||||
<ImageView
|
||||
android:id="@+id/image_nav_header_logo"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:layout_width="92dp"
|
||||
android:layout_height="92dp"
|
||||
android:contentDescription="@string/nav_header_desc"
|
||||
android:elevation="4dp"
|
||||
android:layout_marginBottom="8dp"
|
||||
app:srcCompat="@drawable/ic_zcash_logo_white"
|
||||
android:layout_marginBottom="16dp"
|
||||
app:srcCompat="@drawable/zcash_logo_with_shadow"
|
||||
app:layout_constraintTop_toBottomOf="@id/guideline_status_bar"
|
||||
app:layout_constraintLeft_toLeftOf="@id/text_nav_header_subtitle"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintBottom_toTopOf="@id/text_nav_header_title"
|
||||
app:layout_constraintHorizontal_bias="0.0"
|
||||
app:layout_constraintDimensionRatio="1:1"/>
|
||||
|
||||
<TextView
|
||||
|
|
|
|||
|
|
@ -1,38 +1,60 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
tools:showIn="navigation_view">
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
tools:showIn="navigation_view">
|
||||
|
||||
<group android:checkableBehavior="single">
|
||||
<group
|
||||
android:id="@+id/fab_actions"
|
||||
android:checkableBehavior="single">
|
||||
<!--<item-->
|
||||
<!--android:id="@+id/nav_home_fragment"-->
|
||||
<!--android:icon="@drawable/ic_home_black_24dp"-->
|
||||
<!--android:title="@string/destination_menu_label_home"/>-->
|
||||
<item
|
||||
android:id="@+id/nav_home_fragment"
|
||||
android:icon="@drawable/ic_home_black_24dp"
|
||||
android:title="@string/destination_menu_label_home"/>
|
||||
android:id="@+id/nav_send_fragment"
|
||||
android:icon="@drawable/ic_menu_send"
|
||||
android:title="@string/destination_menu_label_send" />
|
||||
<item
|
||||
android:id="@+id/nav_send_fragment"
|
||||
android:icon="@drawable/ic_menu_send"
|
||||
android:title="@string/destination_menu_label_send"/>
|
||||
android:id="@+id/nav_receive_fragment"
|
||||
android:icon="@drawable/ic_qrcode_24dp"
|
||||
android:title="@string/destination_menu_label_receive" />
|
||||
<item
|
||||
android:id="@+id/nav_receive_fragment"
|
||||
android:icon="@drawable/ic_qrcode_black_24dp"
|
||||
android:title="@string/destination_menu_label_receive"/>
|
||||
<item
|
||||
android:id="@+id/nav_request_fragment"
|
||||
android:icon="@drawable/ic_receipt_black_24dp"
|
||||
android:title="@string/destination_menu_label_request"/>
|
||||
android:id="@+id/nav_request_fragment"
|
||||
android:icon="@drawable/ic_receipt_24dp"
|
||||
android:title="@string/destination_menu_label_request" />
|
||||
</group>
|
||||
|
||||
<group
|
||||
android:id="@+id/misc_actions"
|
||||
android:checkableBehavior="single">
|
||||
<item
|
||||
android:id="@+id/nav_history_fragment"
|
||||
android:icon="@drawable/ic_history_24dp"
|
||||
android:title="@string/destination_menu_label_history" />
|
||||
<item
|
||||
android:id="@+id/nav_about_fragment"
|
||||
android:icon="@drawable/ic_chat_24dp"
|
||||
android:title="@string/destination_menu_label_about" />
|
||||
<item
|
||||
android:id="@+id/nav_import_fragment"
|
||||
android:icon="@drawable/ic_import"
|
||||
android:title="@string/destination_menu_label_import" />
|
||||
<item
|
||||
android:id="@+id/nav_settings_fragment"
|
||||
android:icon="@drawable/ic_settings_24dp"
|
||||
android:title="@string/destination_menu_label_settings" />
|
||||
</group>
|
||||
<!--<item android:title="Communicate" >-->
|
||||
<!--<menu>-->
|
||||
<!--<item-->
|
||||
<!--android:id="@+id/nav_share"-->
|
||||
<!--android:icon="@drawable/ic_menu_share"-->
|
||||
<!--android:title="Share"/>-->
|
||||
<!--<item-->
|
||||
<!--android:id="@+id/nav_send"-->
|
||||
<!--android:icon="@drawable/ic_menu_send"-->
|
||||
<!--android:title="Send"/>-->
|
||||
<!--</menu>-->
|
||||
<!--<menu>-->
|
||||
<!--<item-->
|
||||
<!--android:id="@+id/nav_share"-->
|
||||
<!--android:icon="@drawable/ic_menu_share"-->
|
||||
<!--android:title="Share"/>-->
|
||||
<!--<item-->
|
||||
<!--android:id="@+id/nav_send"-->
|
||||
<!--android:icon="@drawable/ic_menu_send"-->
|
||||
<!--android:title="Send"/>-->
|
||||
<!--</menu>-->
|
||||
<!--</item>-->
|
||||
|
||||
</menu>
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
<resources xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item name="ic_menu_camera" type="drawable">@android:drawable/ic_menu_camera</item>
|
||||
<item name="ic_menu_gallery" type="drawable">@android:drawable/ic_menu_gallery</item>
|
||||
<item name="ic_menu_slideshow" type="drawable">@android:drawable/ic_menu_slideshow</item>
|
||||
<item name="ic_menu_manage" type="drawable">@android:drawable/ic_menu_manage</item>
|
||||
<item name="ic_menu_share" type="drawable">@android:drawable/ic_menu_share</item>
|
||||
<item name="ic_menu_send" type="drawable">@android:drawable/ic_menu_send</item>
|
||||
</resources>
|
||||
|
|
@ -12,11 +12,13 @@
|
|||
<string name="destination_title_send">Send Zcash</string>
|
||||
<string name="destination_title_receive">Receive Zcash</string>
|
||||
<string name="destination_title_request">Request Zcash</string>
|
||||
|
||||
<string name="destination_menu_label_home">Home</string>
|
||||
<string name="destination_menu_label_send">Send</string>
|
||||
<string name="destination_menu_label_receive">Receive</string>
|
||||
<string name="destination_menu_label_request">Request</string>
|
||||
|
||||
<string name="destination_menu_label_about">About</string>
|
||||
<string name="destination_menu_label_history">History</string>
|
||||
<string name="destination_menu_label_import">Import</string>
|
||||
<string name="destination_menu_label_settings">Settings</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
Binary file not shown.
Loading…
Reference in New Issue