diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5313bd4..cb9f176 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,7 +12,6 @@ android:usesCleartextTraffic="true" android:theme="@style/AppTheme"> - diff --git a/build.gradle b/build.gradle index fa86f77..f5f6fbf 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { ANDROID_LIFECYCLE = '2.3.0' ANDROID_LIFECYCLE_EXTENSION = '2.2.0' - VIEW_MATERIAL_DESIGN = '1.4.0-alpha01' + VIEW_MATERIAL_DESIGN = '1.1.0' VIEW_SWIPE_REFRESH = '1.2.0-alpha01' VIEW_CONSTRAINT_LAYOUT = '2.0.4' VIEW_RECYCLER_VIEW = '1.1.0' diff --git a/features/feature-stock-share/src/main/java/com/mctech/stocktradetracking/feature/stock_share/add_position/StockShareBuyFragment.kt b/features/feature-stock-share/src/main/java/com/mctech/stocktradetracking/feature/stock_share/add_position/StockShareBuyFragment.kt index 91e97a8..8416a19 100644 --- a/features/feature-stock-share/src/main/java/com/mctech/stocktradetracking/feature/stock_share/add_position/StockShareBuyFragment.kt +++ b/features/feature-stock-share/src/main/java/com/mctech/stocktradetracking/feature/stock_share/add_position/StockShareBuyFragment.kt @@ -15,6 +15,8 @@ import com.mctech.library.view.ktx.getValue import com.mctech.stocktradetracking.domain.stock_share.entity.StockShare import com.mctech.stocktradetracking.feature.stock_share.StockShareNavigator import com.mctech.stocktradetracking.feature.stock_share.databinding.FragmentStockShareBuyBinding +import com.mctech.stocktradetracking.library.design_system.entension.getDoubleValue +import com.mctech.stocktradetracking.library.design_system.entension.getLongValue import org.koin.android.ext.android.inject import org.koin.androidx.viewmodel.ext.android.viewModel @@ -73,8 +75,8 @@ class StockShareBuyFragment : Fragment() { viewModel.interact( StockShareBuyInteraction.AddPosition( binding.etShareCode.getValue(), - binding.etShareAmount.getValue().toLong(), - binding.etSharePrice.getValue().toDouble() + binding.etShareAmount.getLongValue(), + binding.etSharePrice.getDoubleValue() ) ) @@ -89,8 +91,8 @@ class StockShareBuyFragment : Fragment() { private fun computeInvestment() { binding?.let { binding -> - val purchasePrice = binding.etSharePrice.getValue().toDoubleOrNull() ?: 0.0 - val shareAmount = binding.etShareAmount.getValue().toLongOrNull() ?: 0 + val purchasePrice = binding.etSharePrice.getDoubleValue() + val shareAmount = binding.etShareAmount.getLongValue() val stockShare = StockShare( code = binding.etShareCode.getValue(), diff --git a/features/feature-stock-share/src/main/java/com/mctech/stocktradetracking/feature/stock_share/edit_position/StockShareEditPositionFragment.kt b/features/feature-stock-share/src/main/java/com/mctech/stocktradetracking/feature/stock_share/edit_position/StockShareEditPositionFragment.kt index aef40c5..62b7afb 100644 --- a/features/feature-stock-share/src/main/java/com/mctech/stocktradetracking/feature/stock_share/edit_position/StockShareEditPositionFragment.kt +++ b/features/feature-stock-share/src/main/java/com/mctech/stocktradetracking/feature/stock_share/edit_position/StockShareEditPositionFragment.kt @@ -21,6 +21,8 @@ import com.mctech.stocktradetracking.feature.stock_share.R import com.mctech.stocktradetracking.feature.stock_share.StockShareNavigator import com.mctech.stocktradetracking.feature.stock_share.databinding.FragmentStockShareEditPriceBinding import com.mctech.stocktradetracking.feature.stock_share.stockShareFromBundle +import com.mctech.stocktradetracking.library.design_system.entension.getDoubleValue +import com.mctech.stocktradetracking.library.design_system.entension.getLongValue import org.koin.android.ext.android.inject import org.koin.androidx.viewmodel.ext.android.viewModel @@ -124,9 +126,9 @@ class StockShareEditPositionFragment : Fragment() { viewModel.interact( StockShareEditPositionInteraction.UpdateStockPrice( binding.etShareCode.getValue(), - binding.etShareAmount.getValue().toLong(), - binding.etSharePurchasePrice.getValue().toDouble(), - binding.etSharePrice.getValue().toDouble() + binding.etShareAmount.getLongValue(), + binding.etSharePurchasePrice.getDoubleValue(), + binding.etSharePrice.getDoubleValue() ) ) diff --git a/features/feature-timeline-balance/src/main/java/com/mctech/stocktradetracking/feature/timeline_balance/add_period/TimelineBalanceAddPeriodFragment.kt b/features/feature-timeline-balance/src/main/java/com/mctech/stocktradetracking/feature/timeline_balance/add_period/TimelineBalanceAddPeriodFragment.kt index f805715..2948cf8 100644 --- a/features/feature-timeline-balance/src/main/java/com/mctech/stocktradetracking/feature/timeline_balance/add_period/TimelineBalanceAddPeriodFragment.kt +++ b/features/feature-timeline-balance/src/main/java/com/mctech/stocktradetracking/feature/timeline_balance/add_period/TimelineBalanceAddPeriodFragment.kt @@ -12,6 +12,7 @@ import com.mctech.library.keyboard.visibilitymonitor.extentions.closeKeyboard import com.mctech.library.view.ktx.getValue import com.mctech.stocktradetracking.feature.timeline_balance.TimelineBalanceNavigator import com.mctech.stocktradetracking.feature.timeline_balance.databinding.FragmentTimelineAddPeriodBinding +import com.mctech.stocktradetracking.library.design_system.entension.getDoubleValue import org.koin.android.ext.android.inject import org.koin.androidx.viewmodel.ext.android.viewModel @@ -52,8 +53,8 @@ class TimelineBalanceAddPeriodFragment : Fragment() { viewModel.interact( TimelineBalanceAddInteraction.CreatePeriod( binding.etPeriodTag.getValue(), - binding.etInvestment.getValue().toDouble(), - binding.etProfit.getValue().toDouble() + binding.etInvestment.getDoubleValue(), + binding.etProfit.getDoubleValue() ) ) @@ -65,4 +66,6 @@ class TimelineBalanceAddPeriodFragment : Fragment() { } } } + + } diff --git a/features/feature-timeline-balance/src/main/java/com/mctech/stocktradetracking/feature/timeline_balance/edit_period/TimelineBalanceEditPeriodFragment.kt b/features/feature-timeline-balance/src/main/java/com/mctech/stocktradetracking/feature/timeline_balance/edit_period/TimelineBalanceEditPeriodFragment.kt index 3d8768f..648781a 100644 --- a/features/feature-timeline-balance/src/main/java/com/mctech/stocktradetracking/feature/timeline_balance/edit_period/TimelineBalanceEditPeriodFragment.kt +++ b/features/feature-timeline-balance/src/main/java/com/mctech/stocktradetracking/feature/timeline_balance/edit_period/TimelineBalanceEditPeriodFragment.kt @@ -16,6 +16,7 @@ import com.mctech.stocktradetracking.domain.timeline_balance.entity.TimelineBala import com.mctech.stocktradetracking.feature.timeline_balance.TimelineBalanceNavigator import com.mctech.stocktradetracking.feature.timeline_balance.databinding.FragmentTimelineEditPeriodBinding import com.mctech.stocktradetracking.feature.timeline_balance.timelinePeriodFromBundle +import com.mctech.stocktradetracking.library.design_system.entension.getDoubleValue import org.koin.android.ext.android.inject import org.koin.androidx.viewmodel.ext.android.viewModel @@ -73,9 +74,9 @@ class TimelineBalanceEditPeriodFragment : Fragment() { viewModel.interact( TimelineBalanceEditInteraction.EditPeriod( binding.etPeriodTag.getValue(), - binding.etInvestment.getValue().toDouble(), - binding.etProfit.getValue().toDouble(), - binding.etFinalBalance.getValue().toDouble() + binding.etInvestment.getDoubleValue(), + binding.etProfit.getDoubleValue(), + binding.etFinalBalance.getDoubleValue() ) ) diff --git a/libraries/library-design-system/src/main/java/com/mctech/stocktradetracking/library/design_system/entension/EditTextExtension.kt b/libraries/library-design-system/src/main/java/com/mctech/stocktradetracking/library/design_system/entension/EditTextExtension.kt new file mode 100644 index 0000000..84cfe05 --- /dev/null +++ b/libraries/library-design-system/src/main/java/com/mctech/stocktradetracking/library/design_system/entension/EditTextExtension.kt @@ -0,0 +1,11 @@ +package com.mctech.stocktradetracking.library.design_system.entension + +import android.widget.EditText + +fun EditText.getDoubleValue(): Double { + return text.toString().takeIf { it.isNotBlank() }?.toDouble() ?: 0.0 +} + +fun EditText.getLongValue(): Long { + return text.toString().takeIf { it.isNotBlank() }?.toLong() ?: 0 +} \ No newline at end of file