Merge pull request #9 from hegocre/issue/8/multiple-score

Multiple scores

Author: hegocre

.github/workflows/android.yml

@@ -12,23 +12,23 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: set up JDK 11
-      uses: actions/setup-java@v1
-      with:
-        java-version: '11'
-
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    - name: Build mobile with Gradle
-      run: ./gradlew clean && ./gradlew assembleDebug
-    - uses: actions/upload-artifact@v2
-      with:
-        name: mobile-debug.apk
-        path: mobile/build/outputs/apk/debug/mobile-debug.apk
-    - name: Build wear with Gradle
-      run: ./gradlew clean && ./gradlew :wear:assembleDebug
-    - uses: actions/upload-artifact@v2
-      with:
-        name: wear-debug.apk
-        path: wear/build/outputs/apk/debug/wear-debug.apk
+      - uses: actions/checkout@v3
+      - name: set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'zulu'
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Build mobile with Gradle
+        run: ./gradlew clean && ./gradlew assembleDebug
+      - uses: actions/upload-artifact@v3
+        with:
+          name: mobile-debug.apk
+          path: mobile/build/outputs/apk/debug/mobile-debug.apk
+      - name: Build wear with Gradle
+        run: ./gradlew clean && ./gradlew :wear:assembleDebug
+      - uses: actions/upload-artifact@v3
+        with:
+          name: wear-debug.apk
+          path: wear/build/outputs/apk/debug/wear-debug.apk

README.md

@@ -1,13 +1,19 @@
 # Score Counter
-Simple app to keep track of two scores. Also available on Wear OS.
+
+Simple app to keep track of multiple scores, making it easy by allowing you to set player names .
+Also available on Wear OS.
+
+[<img src="screenshots/mobile00.png" width=180>](screenshots/mobile00.png)
+[<img src="screenshots/mobile01.png" width=180>](screenshots/mobile01.png)
 
 How to use:
+
 * Click on the upper part of a score to increment it.
 * Click on the lower part of a score to increment it.
 * Long press on a score to reset it back to `0`.
 
 The score is saved across sessions.
 
 [<img src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png"
-     alt="Get it on Google Play"
+alt="Get it on Google Play"
      height="80">](https://play.google.com/store/apps/details?id=es.hegocre.scorecounter)

build.gradle

@@ -1,15 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.8.0'
-    ext.lifecycle_version = '2.5.1'
-    ext.compose_version = '1.3.3'
+    ext.kotlin_version = '1.9.10'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -24,6 +22,6 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }

gradle.properties

@@ -11,12 +11,14 @@
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-android.enableJetifier=true
+android.enableJetifier=false
 android.useAndroidX=true
 android.enableR8.fullMode=true
-org.gradle.unsafe.configuration-cache=true
+org.gradle.unsafe.configuration-cache=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip

mobile/build.gradle

@@ -1,25 +1,26 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'
+plugins {
+    id 'com.android.application'
+    id 'org.jetbrains.kotlin.android'
+    id 'org.jetbrains.kotlin.plugin.serialization' version "$kotlin_version"
+}
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion '30.0.3'
+    namespace 'es.hegocre.scorecounter'
+    compileSdk 34
 
     defaultConfig {
         applicationId "es.hegocre.scorecounter"
-        minSdkVersion 24
-        targetSdkVersion 33
-        versionCode 331200000
-        versionName "1.2.0"
+        minSdk 24
+        targetSdk 34
+        versionCode 341400000
+        versionName "1.4.0"
         resConfigs 'ca', 'es', 'en'
     }
 
     buildTypes {
         release {
             shrinkResources true
             minifyEnabled true
-            zipAlignEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -29,35 +30,36 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion '1.4.1'
+        kotlinCompilerExtensionVersion '1.5.3'
     }
 
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
-    namespace 'es.hegocre.scorecounter'
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
     //Android dependencies
-    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.core:core-ktx:1.12.0'
 
     //Compose
-    implementation platform('androidx.compose:compose-bom:2023.04.00')
+    implementation platform('androidx.compose:compose-bom:2023.09.00')
     implementation 'androidx.compose.material3:material3'
     implementation 'androidx.compose.ui:ui'
 
-    implementation 'androidx.activity:activity-compose:1.7.0'
+    implementation 'androidx.activity:activity-compose:1.7.2'
+
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0'
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation "androidx.compose.ui:ui-test-junit4"
+    androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.5.1"
     debugImplementation 'androidx.compose.ui:ui-tooling'
     debugImplementation 'androidx.compose.ui:ui-test-manifest'
 }

mobile/src/main/AndroidManifest.xml

@@ -12,7 +12,7 @@
         android:theme="@android:style/Theme.Material.Light.NoActionBar"
         tools:targetApi="s">
         <activity
-            android:name="es.hegocre.scorecounter.MainActivity"
+            android:name="es.hegocre.scorecounter.ui.MainActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
             android:exported="true"
             android:theme="@android:style/Theme.Material.Light.NoActionBar">