Merge pull request #6 from hegocre/feature/rewrite

Allow portrait orientation

Author: hegocre

gradle.properties

@@ -18,4 +18,5 @@
 # org.gradle.parallel=true
 android.enableJetifier=true
 android.useAndroidX=true
-android.enableR8.fullMode=true
+android.enableR8.fullMode=true
+org.gradle.unsafe.configuration-cache=true

mobile/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "es.hegocre.scorecounter"
         minSdkVersion 24
         targetSdkVersion 33
-        versionCode 311100001
-        versionName "1.1.0"
+        versionCode 311110000
+        versionName "1.1.1"
         resConfigs 'ca', 'es', 'en'
     }
 

mobile/src/main/AndroidManifest.xml

@@ -15,7 +15,6 @@
             android:name="es.hegocre.scorecounter.MainActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:exported="true"
-            android:screenOrientation="sensorLandscape"
             android:theme="@android:style/Theme.Material.Light.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

mobile/src/main/java/es/hegocre/scorecounter/MainActivity.kt

@@ -1,12 +1,13 @@
 package es.hegocre.scorecounter
 
 import android.content.Context
+import android.content.res.Configuration
 import android.os.Build
 import android.os.Bundle
+import android.view.WindowManager
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.viewModels
-import androidx.compose.foundation.background
 import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.*
@@ -21,6 +22,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
@@ -36,6 +38,10 @@ class MainActivity : ComponentActivity() {
         val scoreViewModel by viewModels<ScoreViewModel>()
 
         WindowCompat.setDecorFitsSystemWindows(window, false)
+        val rotationAnimation = WindowManager.LayoutParams.ROTATION_ANIMATION_CROSSFADE
+        val winParams = window.attributes
+        winParams.rotationAnimation = rotationAnimation
+        window.attributes = winParams
 
         setContent {
             val darkTheme = isSystemInDarkTheme()
@@ -60,33 +66,52 @@ class MainActivity : ComponentActivity() {
                         )
                     }
 
-                    Row {
-                        ScoreView(
-                            score = scoreViewModel.score1,
-                            onScoreAdd = { scoreViewModel.score1++ },
-                            onScoreSub = { scoreViewModel.score1-- },
-                            onScoreReset = { scoreViewModel.score1 = 0 },
-                            modifier = Modifier
-                                .weight(1f)
-                                .fillMaxHeight()
-                        )
-                        Spacer(
-                            modifier = Modifier
-                                .fillMaxHeight()
-                                .width(4.dp)
-                                .background(MaterialTheme.colorScheme.onSurface)
-                        )
-                        ScoreView(
-                            score = scoreViewModel.score2,
-                            onScoreAdd = { scoreViewModel.score2++ },
-                            onScoreSub = { scoreViewModel.score2-- },
-                            onScoreReset = { scoreViewModel.score2 = 0 },
-                            modifier = Modifier
-                                .weight(1f)
-                                .fillMaxHeight()
-                        )
+                    val configuration = LocalConfiguration.current
+
+                    if (configuration.orientation == Configuration.ORIENTATION_PORTRAIT) {
+                        Column {
+                            ScoreView(
+                                score = scoreViewModel.score1,
+                                onScoreAdd = { scoreViewModel.score1++ },
+                                onScoreSub = { scoreViewModel.score1-- },
+                                onScoreReset = { scoreViewModel.score1 = 0 },
+                                modifier = Modifier.weight(1f)
+                            )
+                            Divider(thickness = 4.dp, color = MaterialTheme.colorScheme.onSurface)
+                            ScoreView(
+                                score = scoreViewModel.score2,
+                                onScoreAdd = { scoreViewModel.score2++ },
+                                onScoreSub = { scoreViewModel.score2-- },
+                                onScoreReset = { scoreViewModel.score2 = 0 },
+                                modifier = Modifier.weight(1f)
+                            )
+                        }
+                    } else {
+                        Row {
+                            ScoreView(
+                                score = scoreViewModel.score1,
+                                onScoreAdd = { scoreViewModel.score1++ },
+                                onScoreSub = { scoreViewModel.score1-- },
+                                onScoreReset = { scoreViewModel.score1 = 0 },
+                                modifier = Modifier.weight(1f)
+                            )
+                            Divider(
+                                color = MaterialTheme.colorScheme.onSurface,
+                                modifier = Modifier
+                                    .fillMaxHeight()
+                                    .width(4.dp)
+                            )
+                            ScoreView(
+                                score = scoreViewModel.score2,
+                                onScoreAdd = { scoreViewModel.score2++ },
+                                onScoreSub = { scoreViewModel.score2-- },
+                                onScoreReset = { scoreViewModel.score2 = 0 },
+                                modifier = Modifier.weight(1f)
+                            )
+                        }
                     }
 
+
                     if (showTutorialDialog) {
                         context.getSharedPreferences("preferences", Context.MODE_PRIVATE)
                             .edit().putBoolean("isFirstLaunch", false).apply()
@@ -134,14 +159,14 @@ fun ScoreView(
         )
         Column(modifier = Modifier.fillMaxSize()) {
             Box(modifier = Modifier
-                .fillMaxWidth()
+                .fillMaxSize()
                 .weight(1f)
                 .pointerInput(Unit) {
                     detectTapGestures(onTap = onScoreAdd, onLongPress = onScoreReset)
                 }
             )
             Box(modifier = Modifier
-                .fillMaxWidth()
+                .fillMaxSize()
                 .weight(1f)
                 .pointerInput(Unit) {
                     detectTapGestures(onTap = onScoreSub, onLongPress = onScoreReset)