Skip to content

Added the slider for fee selection #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thunderbiscuit merged 2 commits into from
Apr 7, 2022
Merged

Added the slider for fee selection #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2418223
Added the slider for fee selection
masterchief164 Apr 6, 2022
9e0879e
Feat: Add slider for fee selection
masterchief164 Apr 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions app/src/main/java/com/goldenraven/padawanwallet/wallet/wallet/WalletBuild.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,13 @@ import androidx.fragment.app.Fragment
import androidx.lifecycle.ViewModelProvider
import androidx.navigation.Navigation
import com.goldenraven.padawanwallet.R
import com.goldenraven.padawanwallet.data.Tx
import com.goldenraven.padawanwallet.data.Wallet
import com.goldenraven.padawanwallet.databinding.FragmentWalletBuildBinding
import com.goldenraven.padawanwallet.utils.*
import com.goldenraven.padawanwallet.utils.SnackbarLevel
import com.goldenraven.padawanwallet.utils.fireSnackbar
import com.goldenraven.padawanwallet.wallet.WalletViewModel
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import org.bitcoindevkit.PartiallySignedBitcoinTransaction
import org.bitcoindevkit.Transaction

private const val TAG = "WalletBuildFragment"

Expand Down Expand Up @@ -119,7 +118,7 @@ class WalletBuild : Fragment() {
private fun verifyInputs(): Boolean {
address = binding.sendAddress.text.toString().trim()
amount = binding.sendAmount.text.toString().trim()
feeRate = if (binding.feeRate.text.toString().isEmpty()) 0F else binding.feeRate.text.toString().toFloat()
feeRate = binding.feeRate.value

if (address == "") {
fireSnackbar(
Expand Down
40 changes: 23 additions & 17 deletions app/src/main/res/layout/fragment_wallet_build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
tools:ignore="TextContrastCheck" />

<Button
android:id="@+id/buttonScan"
Expand Down Expand Up @@ -114,25 +115,27 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/sendAmount" />

<EditText


<com.google.android.material.slider.Slider
android:id="@+id/feeRate"
android:layout_width="0dp"
android:layout_height="60dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:background="@color/bg0"
android:fontFamily="@font/share_tech_mono"
android:gravity="center"
android:hint="@string/satoshi_vbyte"
android:inputType="phone"
android:text=""
android:textColor="@color/fg1"
android:textColorHint="@color/fg2"
android:textSize="14sp"
android:layout_width="match_parent"
android:layout_marginTop="10dp"
android:layout_marginHorizontal="16dp"
android:layout_height="wrap_content"
app:trackColor="@color/bg2"
app:thumbColor="@color/fg1"
app:tickColor="@color/bg2"
android:valueFrom="1"
android:valueTo="20"
android:stepSize="0.1"
tools:layout_editor_absoluteX="157dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/feeText"
android:importantForAutofill="no" />
android:contentDescription="@string/fee_rate_slider"
tools:layout_editor_absoluteY="415dp" />


<Button
android:id="@+id/buttonVerify"
Expand Down Expand Up @@ -172,6 +175,9 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent" />
app:layout_constraintStart_toStartOf="parent"
tools:ignore="TextContrastCheck" />



</androidx.constraintlayout.widget.ConstraintLayout>
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,5 @@
<string name="privacyText">Padawan Wallet does not collect any information on its users, and does not use Firebase Crashlytics. Read our full privacy policy here:</string>
<string name="privacyLink">https://github.com/thunderbiscuit/padawan-wallet/blob/dev/PRIVACY</string>
<string name="send_coins_back_address">tb1qk5238eluqllq2wps67lkxme3x43wll4k282s8q</string>
<string name="fee_rate_slider">Fee Rate Slider</string>
</resources>