agorise/bitsy-wallet
agorise/bitsy-wallet
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Fixed the camera button's white border issue for Android Lollipop devices, also fixed the pie chart color for the same Android version and darkened the drop shadow of all three floating buttons in the Home Fragment.

Browse source
This commit is contained in:
Severiano Jaramillo 2019-03-20 20:58:56 -06:00
parent 6eb3e8c220
commit 8e752087e6
3 changed files with 74 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/cy/agorise/bitsybitshareswallet/fragments/HomeFragment.kt
View file

@ -6,7 +6,6 @@ import android.preference.PreferenceManager
import android.view.* import android.view.*
import androidx.appcompat.widget.Toolbar import androidx.appcompat.widget.Toolbar
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.core.graphics.drawable.DrawableCompat
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentManager
import androidx.fragment.app.FragmentPagerAdapter import androidx.fragment.app.FragmentPagerAdapter
@ -118,17 +117,6 @@ class HomeFragment : Fragment() {
tabLayout.setupWithViewPager(viewPager) tabLayout.setupWithViewPager(viewPager)
// Set the pie chart icon for the third tab // Set the pie chart icon for the third tab
tabLayout.getTabAt(2)?.setIcon(R.drawable.ic_pie_chart) tabLayout.getTabAt(2)?.setIcon(R.drawable.ic_pie_chart)
var icon = tabLayout.getTabAt(2)?.icon
if (icon != null) {
val colors = context?.let {context ->
ContextCompat.getColorStateList(
context, R.color.tab_icon_selector)
}
icon = DrawableCompat.wrap(icon)
DrawableCompat.setTintList(icon, colors)
}
} }
/** /**

96
app/src/main/res/layout/fragment_home.xml
View file

@ -29,9 +29,26 @@
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintGuide_percent="0.5"/> app:layout_constraintGuide_percent="0.5"/>
<!-- This Dummy FAB is used to create a darker drop shadow -->
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fabReceiveDummy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:fabSize="auto"
app:fabCustomSize="120dp"
app:maxImageSize="70dp"
app:elevation="@dimen/fab_elevation"
app:borderWidth="0dp"
android:backgroundTint="?attr/themedColorBackgroundFloating"
app:layout_constraintHorizontal_bias="0.6"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/centeredVerticalGuideline"
app:layout_constraintBottom_toTopOf="@+id/tvReceiveTransaction"
app:layout_constraintVertical_chainStyle="packed"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fabReceiveTransaction" android:id="@+id/fabReceiveTransaction"
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:fabSize="auto" app:fabSize="auto"
@ -41,27 +58,41 @@
app:borderWidth="0dp" app:borderWidth="0dp"
app:srcCompat="@drawable/ic_receive" app:srcCompat="@drawable/ic_receive"
android:backgroundTint="@color/colorReceive" android:backgroundTint="@color/colorReceive"
app:layout_constraintHorizontal_bias="0.6" app:layout_constraintTop_toTopOf="@id/fabReceiveDummy"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="@id/fabReceiveDummy"/>
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/centeredVerticalGuideline"
app:layout_constraintBottom_toTopOf="@+id/tvReceiveTransaction"
app:layout_constraintVertical_chainStyle="packed"/>
<TextView <TextView
android:id="@+id/tvReceiveTransaction" android:id="@+id/tvReceiveTransaction"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="8dp" android:layout_marginTop="8dp"
android:text="@string/title_receive" android:text="@string/title_receive"
android:textAllCaps="true" android:textAllCaps="true"
android:textAppearance="@style/TextAppearance.Bitsy.Body1" android:textAppearance="@style/TextAppearance.Bitsy.Body1"
android:textAlignment="center" android:textAlignment="center"
app:layout_constraintTop_toBottomOf="@+id/fabReceiveTransaction" app:layout_constraintTop_toBottomOf="@+id/fabReceiveDummy"
app:layout_constraintStart_toStartOf="@id/fabReceiveTransaction" app:layout_constraintStart_toStartOf="@id/fabReceiveDummy"
app:layout_constraintEnd_toEndOf="@id/fabReceiveTransaction" app:layout_constraintEnd_toEndOf="@id/fabReceiveDummy"
app:layout_constraintBottom_toBottomOf="parent"/> app:layout_constraintBottom_toBottomOf="parent"/>
<!-- This Dummy FAB is used to create a darker drop shadow -->
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fabSendDummy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:fabSize="auto"
app:fabCustomSize="120dp"
app:maxImageSize="70dp"
app:elevation="@dimen/fab_elevation"
app:borderWidth="0dp"
android:backgroundTint="?attr/themedColorBackgroundFloating"
app:layout_constraintHorizontal_bias="0.4"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toEndOf="@id/centeredVerticalGuideline"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@+id/tvSendTransaction"
app:layout_constraintVertical_chainStyle="packed"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fabSendTransaction" android:id="@+id/fabSendTransaction"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -73,15 +104,13 @@
app:borderWidth="0dp" app:borderWidth="0dp"
app:srcCompat="@drawable/ic_send" app:srcCompat="@drawable/ic_send"
android:backgroundTint="@color/colorSend" android:backgroundTint="@color/colorSend"
app:layout_constraintHorizontal_bias="0.4" app:layout_constraintTop_toTopOf="@id/fabSendDummy"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="@id/fabSendDummy"/>
app:layout_constraintStart_toEndOf="@id/centeredVerticalGuideline"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@+id/tvSendTransaction"
app:layout_constraintVertical_chainStyle="packed"/>
<!-- This Dummy FAB is used to show a white border around the Camera FAB and
also to create a darker drop shadow -->
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fabSendTransactionCamera" android:id="@+id/fabCameraDummy"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="52dp" android:layout_marginTop="52dp"
@ -90,26 +119,40 @@
app:fabCustomSize="64dp" app:fabCustomSize="64dp"
app:maxImageSize="40dp" app:maxImageSize="40dp"
app:elevation="@dimen/fab_elevation" app:elevation="@dimen/fab_elevation"
app:borderWidth="2dp" app:borderWidth="0dp"
app:srcCompat="@drawable/ic_camera" android:backgroundTint="?attr/themedColorBackgroundFloating"
app:backgroundTint="?attr/themedColorBackgroundFloating"
android:backgroundTint="@color/colorSend"
app:layout_constraintTop_toTopOf="@id/fabSendTransaction" app:layout_constraintTop_toTopOf="@id/fabSendTransaction"
app:layout_constraintBottom_toBottomOf="@id/fabSendTransaction" app:layout_constraintBottom_toBottomOf="@id/fabSendTransaction"
app:layout_constraintEnd_toEndOf="@id/fabSendTransaction"/> app:layout_constraintEnd_toEndOf="@id/fabSendTransaction"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fabSendTransactionCamera"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:fabSize="auto"
app:fabCustomSize="60dp"
app:maxImageSize="40dp"
app:elevation="@dimen/fab_elevation"
app:borderWidth="0dp"
app:srcCompat="@drawable/ic_camera"
android:backgroundTint="@color/colorSend"
app:layout_constraintTop_toTopOf="@id/fabCameraDummy"
app:layout_constraintBottom_toBottomOf="@id/fabCameraDummy"
app:layout_constraintStart_toStartOf="@id/fabCameraDummy"
app:layout_constraintEnd_toEndOf="@id/fabCameraDummy"/>
<TextView <TextView
android:id="@+id/tvSendTransaction" android:id="@+id/tvSendTransaction"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="8dp" android:layout_marginTop="8dp"
android:text="@string/title_send" android:text="@string/title_send"
android:textAllCaps="true" android:textAllCaps="true"
android:textAppearance="@style/TextAppearance.Bitsy.Body1" android:textAppearance="@style/TextAppearance.Bitsy.Body1"
android:textAlignment="center" android:textAlignment="center"
app:layout_constraintTop_toBottomOf="@+id/fabSendTransaction" app:layout_constraintTop_toBottomOf="@+id/fabSendDummy"
app:layout_constraintStart_toStartOf="@id/fabSendTransaction" app:layout_constraintStart_toStartOf="@id/fabSendDummy"
app:layout_constraintEnd_toEndOf="@id/fabSendTransaction" app:layout_constraintEnd_toEndOf="@id/fabSendDummy"
app:layout_constraintBottom_toBottomOf="parent"/> app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
@ -147,6 +190,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:background="@color/semiTransparent" android:background="@color/semiTransparent"
app:tabIconTint="@color/tab_icon_selector"
app:tabTextColor="?android:colorControlNormal" app:tabTextColor="?android:colorControlNormal"
app:tabSelectedTextColor="?android:textColorPrimary" app:tabSelectedTextColor="?android:textColorPrimary"
app:tabIndicatorColor="?attr/themedColorBackgroundFloating" app:tabIndicatorColor="?attr/themedColorBackgroundFloating"

2
app/src/main/res/values/dimens.xml
View file

@ -13,7 +13,7 @@
<dimen name="spacing_different_section">40dp</dimen> <dimen name="spacing_different_section">40dp</dimen>
<!-- Home --> <!-- Home -->
<dimen name="fab_elevation">16dp</dimen> <dimen name="fab_elevation">10dp</dimen>
<!-- Initial setup --> <!-- Initial setup -->
<dimen name="logo_size">180dp</dimen> <dimen name="logo_size">180dp</dimen>