Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
/.idea
.DS_Store
/build
/captures
Expand Down
3 changes: 0 additions & 3 deletions .idea/.gitignore

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/AndroidProjectSystem.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/compiler.xml

This file was deleted.

10 changes: 0 additions & 10 deletions .idea/deploymentTargetDropDown.xml

This file was deleted.

10 changes: 0 additions & 10 deletions .idea/deploymentTargetSelector.xml

This file was deleted.

19 changes: 0 additions & 19 deletions .idea/gradle.xml

This file was deleted.

77 changes: 0 additions & 77 deletions .idea/inspectionProfiles/Project_Default.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/kotlinc.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/ktlint.xml

This file was deleted.

10 changes: 0 additions & 10 deletions .idea/migrations.xml

This file was deleted.

9 changes: 0 additions & 9 deletions .idea/misc.xml

This file was deleted.

17 changes: 0 additions & 17 deletions .idea/runConfigurations.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

80 changes: 44 additions & 36 deletions app/src/main/java/net/youapps/calcyou/ui/CalculatorScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,12 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalLayoutDirection
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.LayoutDirection
import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel
import net.youapps.calcyou.ui.components.CalculatorDisplay
Expand All @@ -28,45 +31,50 @@ fun CalculatorScreen(
) {
val orientation = LocalConfiguration.current.orientation
if (orientation == ORIENTATION_LANDSCAPE) {
Row(
modifier = Modifier
.padding(8.dp)
.fillMaxWidth()
) {
Column(modifier = Modifier.weight(1f)) {
SideKeypadHorizontal(
onEvent = calculatorViewModel::onEvent,
square = false,
textStyle = MaterialTheme.typography.headlineSmall,
trigonometricMode = calculatorViewModel.trigonometricMode.value,
)
}
Column(modifier = Modifier.weight(1f)) {
CalculatorDisplay(
calculatorViewModel,
primaryTextStyle = MaterialTheme.typography.headlineMedium,
secondaryTextStyle = MaterialTheme.typography.headlineSmall
)
CenterKeypadHorizontal(
calculatorViewModel::onEvent,
textStyle = MaterialTheme.typography.headlineSmall,
iconSize = 32.dp
)
CompositionLocalProvider(LocalLayoutDirection provides LayoutDirection.Ltr) {

Row(
modifier = Modifier
.padding(8.dp)
.fillMaxWidth()
) {
Column(modifier = Modifier.weight(1f)) {
SideKeypadHorizontal(
onEvent = calculatorViewModel::onEvent,
square = false,
textStyle = MaterialTheme.typography.headlineSmall,
trigonometricMode = calculatorViewModel.trigonometricMode.value,
)
}
Column(modifier = Modifier.weight(1f)) {
CalculatorDisplay(
calculatorViewModel,
primaryTextStyle = MaterialTheme.typography.headlineMedium,
secondaryTextStyle = MaterialTheme.typography.headlineSmall
)
CenterKeypadHorizontal(
calculatorViewModel::onEvent,
textStyle = MaterialTheme.typography.headlineSmall,
iconSize = 32.dp
)
}
}
}
} else {
Column(
modifier = Modifier
.padding(8.dp)
.fillMaxWidth()
.then(modifier),
verticalArrangement = Arrangement.spacedBy(8.dp)
) {
CalculatorDisplay(calculatorViewModel)
Keypad(
onEvent = calculatorViewModel::onEvent,
trigonometricMode = calculatorViewModel.trigonometricMode.value
)
CompositionLocalProvider(LocalLayoutDirection provides LayoutDirection.Ltr) {
Column(
modifier = Modifier
.padding(8.dp)
.fillMaxWidth()
.then(modifier),
verticalArrangement = Arrangement.spacedBy(8.dp)
) {
CalculatorDisplay(calculatorViewModel)
Keypad(
onEvent = calculatorViewModel::onEvent,
trigonometricMode = calculatorViewModel.trigonometricMode.value
)
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.text.BasicTextField
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.material3.surfaceColorAtElevation
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
Expand All @@ -41,11 +43,18 @@ fun ColumnScope.CalculatorDisplay(
.clip(RoundedCornerShape(24.dp))
.background(MaterialTheme.colorScheme.surfaceColorAtElevation(10.dp))
) {
val listState = rememberLazyListState()

LaunchedEffect(calculatorViewModel.history.toList()) {
if (calculatorViewModel.history.isNotEmpty())
listState.animateScrollToItem(calculatorViewModel.history.size - 1);
}
LazyColumn(
Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp, vertical = 8.dp)
.weight(1f),
state = listState,
horizontalAlignment = Alignment.End,
verticalArrangement = Arrangement.spacedBy(8.dp, alignment = Alignment.Bottom)
) {
Expand Down Expand Up @@ -81,7 +90,7 @@ fun ColumnScope.CalculatorDisplay(
maxLines = 1,
textStyle = primaryTextStyle.plus(
TextStyle(
textAlign = TextAlign.End,
textAlign = TextAlign.Left,
color = MaterialTheme.colorScheme.onSurface
)
)
Expand Down
Loading
Loading