Refactoring to use XYPair + moving loader to a separate file.

app/build.gradle

@@ -4,6 +4,9 @@ plugins {
 
 apply plugin: "androidx.navigation.safeargs"
 
+//This is needed for SVG->PNG
+//apply plugin: 'com.trello.victor'
+
 //
 //	Convert SVG images from art directory into PNG files.
 //
@@ -19,7 +22,7 @@ apply plugin: "androidx.navigation.safeargs"
 //}
 //preBuild.dependsOn generateDrawablesFromArt
 
-String gitVersion() {
+static String gitVersion() {
     def versionP = 'git describe --tags --long --dirty=-x --always --abbrev=8'
             .execute()
     versionP.waitFor()
@@ -28,15 +31,15 @@ String gitVersion() {
     return versionP.text.trim()
 }
 
-String gitHash() {
-    def githashP = 'git rev-parse HEAD'.execute()
-    githashP.waitFor()
-    if (githashP.exitValue())
+static String gitHash() {
+    def hashP = 'git rev-parse HEAD'.execute()
+    hashP.waitFor()
+    if (hashP.exitValue())
         throw new GradleException("Couldn't extract git_hash. Git exited unexpectedly.")
-    return githashP.text.trim()
+    return hashP.text.trim()
 }
 
-Integer gitVersionCode() {
+static Integer gitVersionCode() {
     def gitP = 'git rev-list v2..HEAD --count'.execute()
     gitP.waitFor()
     if (gitP.exitValue())
@@ -44,19 +47,26 @@ Integer gitVersionCode() {
     return gitP.text.trim().toInteger()
 }
 
-String buildDate() {
-    def builddate = new Date()
-    return builddate.toString()
+static String buildDate() {
+    def date = new Date()
+    return date.toString()
 }
 
 android {
     signingConfigs {
         release {
-            storeFile file('/Users/vahagnk/devel/banvor/keys/signing_key')
+            storeFile file('keys/signing_key')
+            keyAlias 'key0'
         }
     }
     compileSdk 31
 
+//    sourceSets {
+//        main {
+//            svg.srcDir 'src/main/art'
+//        }
+//    }
+
     defaultConfig {
         applicationId "org.vostan.banvor"
         minSdk 21
@@ -106,6 +116,8 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+
+    // This is for unit tests.
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'