Merge pull request #3 from hegocre/feature/negative-score

Allow negative scores

Author: hegocre

build.gradle

@@ -2,12 +2,13 @@
 
 buildscript {
     ext.kotlin_version = '1.6.10'
+    ext.lifecycle_version = '2.5.1'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:7.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

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.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

mobile/build.gradle

@@ -3,15 +3,15 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
     buildToolsVersion '30.0.3'
 
     defaultConfig {
         applicationId "es.hegocre.scorecounter"
         minSdkVersion 24
-        targetSdkVersion 31
-        versionCode 311040000
-        versionName "1.0.4"
+        targetSdkVersion 33
+        versionCode 311050000
+        versionName "1.0.5"
     }
 
     buildTypes {
@@ -36,12 +36,16 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'es.hegocre.scorecounter'
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.preference:preference-ktx:1.1.1'
+    implementation 'androidx.preference:preference-ktx:1.2.0'
     testImplementation 'junit:junit:4.13.2'
-    implementation 'androidx.appcompat:appcompat:1.4.0'
-    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'androidx.core:core-ktx:1.9.0'
+    //noinspection KtxExtensionAvailable
+    implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
 }

mobile/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="es.hegocre.scorecounter">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"

mobile/src/main/java/es/hegocre/scorecounter/data/Score.kt

@@ -13,7 +13,7 @@ data class Score(
     }
 
     fun dec() {
-        if (score.get() > 0) score.set(score.get().dec())
+        score.set(score.get().dec())
         save()
     }
 

wear/build.gradle

@@ -3,14 +3,14 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "es.hegocre.scorecounter"
         minSdkVersion 25
-        targetSdkVersion 31
-        versionCode 311040100
-        versionName "1.0.4"
+        targetSdkVersion 33
+        versionCode 311050100
+        versionName "1.0.5"
     }
 
     buildTypes {
@@ -35,15 +35,20 @@ android {
     kotlinOptions {
         jvmTarget = '1.8'
     }
+    namespace 'es.hegocre.scorecounter'
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'com.google.android.support:wearable:2.8.1'
+    implementation 'com.google.android.support:wearable:2.9.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.wear:wear:1.2.0'
-    compileOnly 'com.google.android.wearable:wearable:2.8.1'
-    implementation 'androidx.core:core-ktx:1.7.0'
+    compileOnly 'com.google.android.wearable:wearable:2.9.0'
+    implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.wear:wear-input:1.1.0'
+    //noinspection KtxExtensionAvailable
+    implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
+
 }

wear/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="es.hegocre.scorecounter">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-feature android:name="android.hardware.type.watch" />
 
@@ -27,7 +26,6 @@
 
         <activity
             android:name="es.hegocre.scorecounter.MainActivity"
-            android:label="@string/app_name"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

wear/src/main/java/es/hegocre/scorecounter/data/Score.kt

@@ -13,7 +13,7 @@ data class Score(
     }
 
     fun dec() {
-        if (score.get() > 0) score.set(score.get().dec())
+        score.set(score.get().dec())
         save()
     }