Format all files. And fix Round unit test (that now fails...)

2022-11-01 18:35:20 +01:00
parent ed28d054ec
commit b8ad540b57
7 changed files with 397 additions and 278 deletions
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,22 +1,6 @@
 <component name="ProjectCodeStyleConfiguration">
  <code_scheme name="Project" version="173">
    <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
    </JetCodeStyleSettings>
    <codeStyleSettings language="XML">
--- a/app/src/main/java/me/zobrist/tichucounter/Extensions.kt
+++ b/app/src/main/java/me/zobrist/tichucounter/Extensions.kt
@@ -5,6 +5,7 @@ fun Int.isMultipleOf5(): Boolean
    return (this % 5) == 0
 }

-fun Int.isMultipleOf100(): Boolean {
+fun Int.isMultipleOf100(): Boolean
+{
    return (this % 100) == 0
 }
--- a/app/src/main/java/me/zobrist/tichucounter/History.kt
+++ b/app/src/main/java/me/zobrist/tichucounter/History.kt
@@ -1,55 +1,65 @@
 package me.zobrist.tichucounter

-class History {
-    private var scores: ArrayList<Round> = ArrayList()
+class History
+{
+    private var scores=ArrayList<Round>()

-    fun getScoreA(): Int {
-        var tempScore = 0
+    fun getScoreA(): Int
+    {
+        var tempScore=0
        scores.forEach {
-            tempScore += it.scoreA
+            tempScore+=it.scoreA
        }
        return tempScore
    }

-    fun getScoreB(): Int {
-        var tempScore = 0
+    fun getScoreB(): Int
+    {
+        var tempScore=0
        scores.forEach {
-            tempScore += it.scoreB
+            tempScore+=it.scoreB
        }
        return tempScore
    }

-    fun getHistoryA(): String {
-        var tempHistory = String()
+    fun getHistoryA(): String
+    {
+        var tempHistory=String()
        scores.forEach {
-            tempHistory += it.scoreA.toString() + "\n"
+            tempHistory+=it.scoreA.toString() + "\n"
        }
        return tempHistory
    }

-    fun getHistoryB(): String {
-        var tempHistory = String()
+    fun getHistoryB(): String
+    {
+        var tempHistory=String()
        scores.forEach {
-            tempHistory += it.scoreB.toString() + "\n"
+            tempHistory+=it.scoreB.toString() + "\n"
        }
        return tempHistory
    }

-    fun logRound(round: Round) {
+    fun logRound(round: Round)
+    {
        scores.add(round)
    }

-    fun revertLastRound() {
-        if (scores.isNotEmpty()) {
+    fun revertLastRound()
+    {
+        if (scores.isNotEmpty())
+        {
            scores.removeAt(scores.size - 1)
        }
    }

-    fun clearAll() {
+    fun clearAll()
+    {
        scores.clear()
    }

-    fun isEmpty(): Boolean {
+    fun isEmpty(): Boolean
+    {
        return scores.isEmpty()
    }
 }
--- a/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt
+++ b/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt
@@ -1,12 +1,12 @@
 package me.zobrist.tichucounter

 import android.app.AlertDialog
-import android.content.Context
-import android.content.ContextWrapper
 import android.content.Intent
 import android.os.Bundle
 import android.text.InputType
-import android.view.*
+import android.view.Menu
+import android.view.MenuItem
+import android.view.WindowManager
 import android.view.inputmethod.InputMethodManager
 import android.widget.ScrollView
 import androidx.appcompat.app.AppCompatActivity
@@ -17,21 +17,23 @@ import com.google.gson.Gson
 import me.zobrist.tichucounter.databinding.ActivityMainBinding
 import java.util.*

-class MainActivity : AppCompatActivity() {
+class MainActivity : AppCompatActivity()
+{

-    private var updateOnChange: Boolean = true
+    private var updateOnChange: Boolean=true

    private lateinit var history: History
-    private var currentRound = Round()
-    private var systemLocale = Locale.getDefault()
+    private var currentRound=Round()
+    private var systemLocale=Locale.getDefault()


    private lateinit var binding: ActivityMainBinding


-    override fun onCreate(savedInstanceState: Bundle?) {
+    override fun onCreate(savedInstanceState: Bundle?)
+    {
        super.onCreate(savedInstanceState)
-        binding = ActivityMainBinding.inflate(layoutInflater)
+        binding=ActivityMainBinding.inflate(layoutInflater)
        setContentView(binding.root)

        setSupportActionBar(binding.toolbar)
@@ -40,17 +42,22 @@ class MainActivity : AppCompatActivity() {
        binding.contentMain.inputTeamB.setRawInputType(InputType.TYPE_NULL)
        binding.contentMain.inputTeamA.requestFocus()
        disableSubmitButton()
-        updateTheme(this.getSharedPreferences("Settings", MODE_PRIVATE).getInt("Theme", 2))
+        updateTheme(this.getSharedPreferences("Settings" , MODE_PRIVATE).getInt("Theme" , 2))
        keepScreenOn(
-            this.getSharedPreferences("Settings", MODE_PRIVATE)
-                .getBoolean("Screen_On", false)
+            this.getSharedPreferences("Settings" , MODE_PRIVATE)
+                .getBoolean("Screen_On" , false)
        )


-        val json = this.getSharedPreferences("Settings", MODE_PRIVATE).getString("history", "{\"scores\":[]}")
-        history = Gson().fromJson(json, History::class.java)
-        binding.contentMain.nameTeamA.setText(this.getSharedPreferences("Settings", MODE_PRIVATE).getString("nameTeamA", "TeamA"))
-        binding.contentMain.nameTeamB.setText(this.getSharedPreferences("Settings", MODE_PRIVATE).getString("nameTeamB", "TeamB"))
+        val json=this.getSharedPreferences("Settings" , MODE_PRIVATE)
+            .getString("history" , "{\"scores\":[]}")
+        history=Gson().fromJson(json , History::class.java)
+        binding.contentMain.nameTeamA.setText(
+            this.getSharedPreferences("Settings" , MODE_PRIVATE).getString("nameTeamA" , "TeamA")
+        )
+        binding.contentMain.nameTeamB.setText(
+            this.getSharedPreferences("Settings" , MODE_PRIVATE).getString("nameTeamB" , "TeamB")
+        )
        updateView()

        this.setListenes()
@@ -60,70 +67,98 @@ class MainActivity : AppCompatActivity() {

    private fun setListenes()
    {
-        binding.contentMain.inputTeamA.setOnFocusChangeListener { _, b ->
-            if (b) {
+        binding.contentMain.inputTeamA.setOnFocusChangeListener { _ , b ->
+            if (b)
+            {
                hideKeyboard()
            }
        }

-        binding.contentMain.inputTeamB.setOnFocusChangeListener { _, b ->
-            if (b) {
+        binding.contentMain.inputTeamB.setOnFocusChangeListener { _ , b ->
+            if (b)
+            {
                hideKeyboard()
            }
        }

-        binding.contentMain.inputTeamA.doOnTextChanged { text, _, _, _ ->
-            if (binding.contentMain.inputTeamA.isFocused) {
-                if (binding.contentMain.inputTeamA.text.isNotEmpty()) {
-                    if (updateOnChange) {
-                        currentRound = try {
-                            Round(text.toString().toInt(), true)
+        binding.contentMain.inputTeamA.doOnTextChanged { text , _ , _ , _ ->
+            if (binding.contentMain.inputTeamA.isFocused)
+            {
+                if (binding.contentMain.inputTeamA.text.isNotEmpty())
+                {
+                    if (updateOnChange)
+                    {
+                        currentRound=try
+                        {
+                            Round(text.toString().toInt() , true)

-                        } catch (e: java.lang.Exception) {
-                            Round(1, 1)
+                        }
+                        catch (e: java.lang.Exception)
+                        {
+                            Round(1 , 1)
                        }
                        binding.contentMain.inputTeamB.setText(currentRound.scoreB.toString())
-                    } else {
-                        updateOnChange = true
                    }
-                } else {
+                    else
+                    {
+                        updateOnChange=true
+                    }
+                }
+                else
+                {
                    binding.contentMain.inputTeamA.text.clear()
                    binding.contentMain.inputTeamB.text.clear()
                }
            }

-            if (currentRound.isValidRound() && binding.contentMain.inputTeamA.text.isNotEmpty() && binding.contentMain.inputTeamB.text.isNotEmpty()) {
+            if (currentRound.isValidRound() && binding.contentMain.inputTeamA.text.isNotEmpty() && binding.contentMain.inputTeamB.text.isNotEmpty())
+            {
                enableSubmitButton()
-            } else {
+            }
+            else
+            {
                disableSubmitButton()
            }
        }

-        binding.contentMain.inputTeamB.doOnTextChanged { text, _, _, _ ->
-            if (binding.contentMain.inputTeamB.isFocused) {
-                if (binding.contentMain.inputTeamB.text.isNotEmpty()) {
-                    if (updateOnChange) {
-                        currentRound = try {
-                            Round(text.toString().toInt(), false)
+        binding.contentMain.inputTeamB.doOnTextChanged { text , _ , _ , _ ->
+            if (binding.contentMain.inputTeamB.isFocused)
+            {
+                if (binding.contentMain.inputTeamB.text.isNotEmpty())
+                {
+                    if (updateOnChange)
+                    {
+                        currentRound=try
+                        {
+                            Round(text.toString().toInt() , false)

-                        } catch (e: java.lang.Exception) {
-                            Round(1, 1)
+                        }
+                        catch (e: java.lang.Exception)
+                        {
+                            Round(1 , 1)
                        }
                        binding.contentMain.inputTeamA.setText(currentRound.scoreA.toString())

-                    } else {
-                        updateOnChange = true
+                    }
+                    else
+                    {
+                        updateOnChange=true
                    }

-                } else {
+                }
+                else
+                {
                    binding.contentMain.inputTeamA.text.clear()
                    binding.contentMain.inputTeamB.text.clear()
                }
            }

-            if (currentRound.isValidRound() && binding.contentMain.inputTeamA.text.isNotEmpty() && binding.contentMain.inputTeamB.text.isNotEmpty()) {
+            if (currentRound.isValidRound() && binding.contentMain.inputTeamA.text.isNotEmpty() && binding.contentMain.inputTeamB.text.isNotEmpty())
+            {
                enableSubmitButton()
-            } else {
+            }
+            else
+            {
                disableSubmitButton()
            }
        }
@@ -131,29 +166,37 @@ class MainActivity : AppCompatActivity() {
        binding.contentMain.buttonAdd100.setOnClickListener {
            giveFocusToAIfNone()

-            if (binding.contentMain.inputTeamA.isFocused) {
+            if (binding.contentMain.inputTeamA.isFocused)
+            {

-                currentRound.scoreA = try {
+                currentRound.scoreA=try
+                {
                    binding.contentMain.inputTeamA.text.toString().toInt() + 100
-                } catch (e: Exception) {
-                    currentRound.scoreB = 0
+                }
+                catch (e: Exception)
+                {
+                    currentRound.scoreB=0
                    binding.contentMain.inputTeamB.setText(currentRound.scoreB.toString())
                    100
                }
-                updateOnChange = false
+                updateOnChange=false
                binding.contentMain.inputTeamA.setText(currentRound.scoreA.toString())
            }

-            if (binding.contentMain.inputTeamB.isFocused) {
-                currentRound.scoreB = try {
+            if (binding.contentMain.inputTeamB.isFocused)
+            {
+                currentRound.scoreB=try
+                {
                    binding.contentMain.inputTeamB.text.toString().toInt() + 100
-                } catch (e: Exception) {
-                    currentRound.scoreA = 0
+                }
+                catch (e: Exception)
+                {
+                    currentRound.scoreA=0
                    binding.contentMain.inputTeamA.setText(currentRound.scoreA.toString())
                    100

                }
-                updateOnChange = false
+                updateOnChange=false
                binding.contentMain.inputTeamB.setText(currentRound.scoreB.toString())

            }
@@ -162,27 +205,35 @@ class MainActivity : AppCompatActivity() {
        binding.contentMain.buttonSub100.setOnClickListener {
            giveFocusToAIfNone()

-            if (binding.contentMain.inputTeamA.isFocused) {
-                currentRound.scoreA = try {
+            if (binding.contentMain.inputTeamA.isFocused)
+            {
+                currentRound.scoreA=try
+                {
                    binding.contentMain.inputTeamA.text.toString().toInt() - 100
-                } catch (e: Exception) {
-                    currentRound.scoreB = 0
+                }
+                catch (e: Exception)
+                {
+                    currentRound.scoreB=0
                    binding.contentMain.inputTeamB.setText(currentRound.scoreB.toString())
                    -100
                }
-                updateOnChange = false
+                updateOnChange=false
                binding.contentMain.inputTeamA.setText(currentRound.scoreA.toString())
            }

-            if (binding.contentMain.inputTeamB.isFocused) {
-                currentRound.scoreB = try {
+            if (binding.contentMain.inputTeamB.isFocused)
+            {
+                currentRound.scoreB=try
+                {
                    binding.contentMain.inputTeamB.text.toString().toInt() - 100
-                } catch (e: Exception) {
-                    currentRound.scoreA = 0
+                }
+                catch (e: Exception)
+                {
+                    currentRound.scoreA=0
                    binding.contentMain.inputTeamA.setText(currentRound.scoreA.toString())
                    -100
                }
-                updateOnChange = false
+                updateOnChange=false
                binding.contentMain.inputTeamB.setText(currentRound.scoreB.toString())
            }
        }
@@ -242,29 +293,42 @@ class MainActivity : AppCompatActivity() {

            giveFocusToAIfNone()

-            if (binding.contentMain.inputTeamA.isFocused) {
-                if (binding.contentMain.inputTeamA.text.toString().equals("-")) {
+            if (binding.contentMain.inputTeamA.isFocused)
+            {
+                if (binding.contentMain.inputTeamA.text.toString().equals("-"))
+                {
                    binding.contentMain.inputTeamA.text.clear()
-                } else if (binding.contentMain.inputTeamA.text.isNotEmpty()) {
-                    tempInt = binding.contentMain.inputTeamA.text.toString().toInt() * -1
+                }
+                else if (binding.contentMain.inputTeamA.text.isNotEmpty())
+                {
+                    tempInt=binding.contentMain.inputTeamA.text.toString().toInt() * -1
                    binding.contentMain.inputTeamA.setText(tempInt.toString())
-                } else {
-                    updateOnChange = false
+                }
+                else
+                {
+                    updateOnChange=false
                    appendToFocusedInput('-')
-                    currentRound = Round(1,1)
+                    currentRound=Round(1 , 1)
                }


-            } else if (binding.contentMain.inputTeamB.isFocused) {
-                if (binding.contentMain.inputTeamB.text.toString().equals("-")) {
+            }
+            else if (binding.contentMain.inputTeamB.isFocused)
+            {
+                if (binding.contentMain.inputTeamB.text.toString().equals("-"))
+                {
                    binding.contentMain.inputTeamB.text.clear()
-                } else if (binding.contentMain.inputTeamB.text.isNotEmpty()) {
-                    tempInt = binding.contentMain.inputTeamB.text.toString().toInt() * -1
+                }
+                else if (binding.contentMain.inputTeamB.text.isNotEmpty())
+                {
+                    tempInt=binding.contentMain.inputTeamB.text.toString().toInt() * -1
                    binding.contentMain.inputTeamB.setText(tempInt.toString())
-                } else {
-                    updateOnChange = false
+                }
+                else
+                {
+                    updateOnChange=false
                    appendToFocusedInput('-')
-                    currentRound = Round(1,1)
+                    currentRound=Round(1 , 1)
                }
            }
        }
@@ -272,16 +336,21 @@ class MainActivity : AppCompatActivity() {
        binding.contentMain.buttonBack.setOnClickListener {
            giveFocusToAIfNone()

-            if (binding.contentMain.inputTeamA.isFocused) {
-                if (binding.contentMain.inputTeamA.text.isNotEmpty()) {
-                    val string = binding.contentMain.inputTeamA.text.toString()
-                    binding.contentMain.inputTeamA.setText(string.substring(0, string.length - 1))
+            if (binding.contentMain.inputTeamA.isFocused)
+            {
+                if (binding.contentMain.inputTeamA.text.isNotEmpty())
+                {
+                    val string=binding.contentMain.inputTeamA.text.toString()
+                    binding.contentMain.inputTeamA.setText(string.substring(0 , string.length - 1))
                }

-            } else if (binding.contentMain.inputTeamB.isFocused) {
-                if (binding.contentMain.inputTeamB.text.isNotEmpty()) {
-                    val string = binding.contentMain.inputTeamB.text.toString()
-                    binding.contentMain.inputTeamB.setText(string.substring(0, string.length - 1))
+            }
+            else if (binding.contentMain.inputTeamB.isFocused)
+            {
+                if (binding.contentMain.inputTeamB.text.isNotEmpty())
+                {
+                    val string=binding.contentMain.inputTeamB.text.toString()
+                    binding.contentMain.inputTeamB.setText(string.substring(0 , string.length - 1))
                }
            }
        }
@@ -289,11 +358,12 @@ class MainActivity : AppCompatActivity() {
        binding.contentMain.submit.setOnClickListener {
            giveFocusToAIfNone()

-            if (binding.contentMain.inputTeamA.text.isNotEmpty() && binding.contentMain.inputTeamB.text.isNotEmpty()) {
+            if (binding.contentMain.inputTeamA.text.isNotEmpty() && binding.contentMain.inputTeamB.text.isNotEmpty())
+            {

                history.logRound(
                    Round(
-                        binding.contentMain.inputTeamA.text.toString().toInt(),
+                        binding.contentMain.inputTeamA.text.toString().toInt() ,
                        binding.contentMain.inputTeamB.text.toString().toInt()
                    )
                )
@@ -309,60 +379,69 @@ class MainActivity : AppCompatActivity() {
        }
    }

-    override fun onSaveInstanceState(outState: Bundle) {
+    override fun onSaveInstanceState(outState: Bundle)
+    {
        super.onSaveInstanceState(outState)

-        val prefs = this.getSharedPreferences("Settings", MODE_PRIVATE).edit()
-        prefs.putString("history", Gson().toJson(history))
-        prefs.putString("nameTeamA", binding.contentMain.nameTeamA.text.toString())
-        prefs.putString("nameTeamB", binding.contentMain.nameTeamB.text.toString())
+        val prefs=this.getSharedPreferences("Settings" , MODE_PRIVATE).edit()
+        prefs.putString("history" , Gson().toJson(history))
+        prefs.putString("nameTeamA" , binding.contentMain.nameTeamA.text.toString())
+        prefs.putString("nameTeamB" , binding.contentMain.nameTeamB.text.toString())
        prefs.apply()

    }

-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+    override fun onCreateOptionsMenu(menu: Menu): Boolean
+    {
        // Inflate the menu; this adds items to the action bar if it is present.
-        menuInflater.inflate(R.menu.menu_main, menu)
+        menuInflater.inflate(R.menu.menu_main , menu)

-        menu.findItem(R.id.action_screenOn).isChecked =
-            this.getSharedPreferences("Settings", MODE_PRIVATE)
-                .getBoolean("Screen_On", false)
+        menu.findItem(R.id.action_screenOn).isChecked=
+            this.getSharedPreferences("Settings" , MODE_PRIVATE)
+                .getBoolean("Screen_On" , false)
        return true
    }


-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return when (item.itemId) {
-            R.id.action_clear -> {
-                val builder = AlertDialog.Builder(this)
+    override fun onOptionsItemSelected(item: MenuItem): Boolean
+    {
+        return when (item.itemId)
+        {
+            R.id.action_clear ->
+            {
+                val builder=AlertDialog.Builder(this)
                builder.setMessage(getString(R.string.confirmClear))
                    .setTitle(R.string.clear)
                    .setCancelable(false)
-                    .setPositiveButton(getString(R.string.yes)) { dialog, _ ->
+                    .setPositiveButton(getString(R.string.yes)) { dialog , _ ->
                        dialog.dismiss()
                        clearAll()
                    }
-                    .setNegativeButton(getString(R.string.no)) { dialog, _ ->
+                    .setNegativeButton(getString(R.string.no)) { dialog , _ ->
                        dialog.cancel()
                    }

                builder.create().show()
                true
            }
-            R.id.action_undo -> {
+            R.id.action_undo ->
+            {
                undoLastRound()
                true
            }
-            R.id.action_theme -> {
+            R.id.action_theme ->
+            {
                chooseThemeDialog()
                true
            }
-            R.id.action_language -> {
+            R.id.action_language ->
+            {
                chooseLanguageDialog()
                true
            }
-            R.id.action_screenOn -> {
-                item.isChecked = !item.isChecked
+            R.id.action_screenOn ->
+            {
+                item.isChecked=!item.isChecked
                keepScreenOn(item.isChecked)
                true
            }
@@ -370,75 +449,92 @@ class MainActivity : AppCompatActivity() {
        }
    }

-    private fun hideKeyboard() {
-        val imm: InputMethodManager =
+    private fun hideKeyboard()
+    {
+        val imm: InputMethodManager=
            getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
-        imm.hideSoftInputFromWindow(currentFocus!!.windowToken, 0)
+        imm.hideSoftInputFromWindow(currentFocus!!.windowToken , 0)
    }

-    private fun giveFocusToAIfNone() {
-        if (!binding.contentMain.inputTeamA.isFocused && !binding.contentMain.inputTeamB.isFocused) {
+    private fun giveFocusToAIfNone()
+    {
+        if (!binding.contentMain.inputTeamA.isFocused && !binding.contentMain.inputTeamB.isFocused)
+        {
            binding.contentMain.inputTeamA.requestFocus()
        }
    }

-    private fun undoLastRound() {
+    private fun undoLastRound()
+    {
        history.revertLastRound()
        updateView()
    }

-    private fun updateView() {
-        binding.contentMain.scoreA.text = history.getScoreA().toString()
-        binding.contentMain.scoreB.text = history.getScoreB().toString()
+    private fun updateView()
+    {
+        binding.contentMain.scoreA.text=history.getScoreA().toString()
+        binding.contentMain.scoreB.text=history.getScoreB().toString()

-        binding.contentMain.historyA.text = history.getHistoryA()
-        binding.contentMain.historyB.text = history.getHistoryB()
+        binding.contentMain.historyA.text=history.getHistoryA()
+        binding.contentMain.historyB.text=history.getHistoryB()
    }

-    private fun clearAll() {
-        binding.contentMain.historyA.text = ""
-        binding.contentMain.historyB.text = ""
+    private fun clearAll()
+    {
+        binding.contentMain.historyA.text=""
+        binding.contentMain.historyB.text=""
        binding.contentMain.inputTeamA.text.clear()
        binding.contentMain.inputTeamB.text.clear()
-        binding.contentMain.scoreA.text = "0"
-        binding.contentMain.scoreB.text = "0"
+        binding.contentMain.scoreA.text="0"
+        binding.contentMain.scoreB.text="0"

        history.clearAll()
    }

-    private fun appendToFocusedInput(toAppend: Char) {
-        if (binding.contentMain.inputTeamA.isFocused) {
+    private fun appendToFocusedInput(toAppend: Char)
+    {
+        if (binding.contentMain.inputTeamA.isFocused)
+        {
            binding.contentMain.inputTeamA.text.append(toAppend)
-        } else if (binding.contentMain.inputTeamB.isFocused) {
+        }
+        else if (binding.contentMain.inputTeamB.isFocused)
+        {
            binding.contentMain.inputTeamB.text.append(toAppend)
        }
    }

-    private fun enableSubmitButton() {
-        binding.contentMain.submit.imageAlpha = 255 // 0 being transparent and 255 being opaque
-        binding.contentMain.submit.isEnabled = true
+    private fun enableSubmitButton()
+    {
+        binding.contentMain.submit.imageAlpha=255 // 0 being transparent and 255 being opaque
+        binding.contentMain.submit.isEnabled=true
    }

-    private fun disableSubmitButton() {
-        binding.contentMain.submit.imageAlpha = 60 // 0 being transparent and 255 being opaque
-        binding.contentMain.submit.isEnabled = false
+    private fun disableSubmitButton()
+    {
+        binding.contentMain.submit.imageAlpha=60 // 0 being transparent and 255 being opaque
+        binding.contentMain.submit.isEnabled=false
    }

-    private fun chooseThemeDialog() {
+    private fun chooseThemeDialog()
+    {

-        val builder = AlertDialog.Builder(this)
+        val builder=AlertDialog.Builder(this)
        builder.setTitle(getString(R.string.choose_theme_text))
-        val styles = arrayOf(getString(R.string.light), getString(R.string.dark), getString(R.string.android_default_text))
+        val styles=arrayOf(
+            getString(R.string.light) ,
+            getString(R.string.dark) ,
+            getString(R.string.android_default_text)
+        )

-        val checkedItem =
-            this.getSharedPreferences("Settings", MODE_PRIVATE).getInt("Theme", 2)
+        val checkedItem=
+            this.getSharedPreferences("Settings" , MODE_PRIVATE).getInt("Theme" , 2)

-        val prefs = this.getSharedPreferences("Settings", MODE_PRIVATE).edit()
+        val prefs=this.getSharedPreferences("Settings" , MODE_PRIVATE).edit()


-        builder.setSingleChoiceItems(styles, checkedItem) { dialog, which ->
+        builder.setSingleChoiceItems(styles , checkedItem) { dialog , which ->

-            prefs.putInt("Theme", which)
+            prefs.putInt("Theme" , which)
            prefs.apply()

            updateTheme(which)
@@ -446,48 +542,53 @@ class MainActivity : AppCompatActivity() {
            dialog.dismiss()
        }

-        val dialog = builder.create()
+        val dialog=builder.create()
        dialog.show()
    }

-    private fun chooseLanguageDialog() {
+    private fun chooseLanguageDialog()
+    {

-        val builder = AlertDialog.Builder(this)
+        val builder=AlertDialog.Builder(this)
        builder.setTitle(getString(R.string.choose_language_text))

-        val languages_map = mapOf(
-            getString(R.string.english) to "en",
-            getString(R.string.german) to "de")
+        val languages_map=mapOf(
+            getString(R.string.english) to "en" ,
+            getString(R.string.german) to "de"
+        )

-        val languages_display_keys = languages_map.keys.toTypedArray()
-        val languages_display_values = languages_map.values.toTypedArray()
+        val languages_display_keys=languages_map.keys.toTypedArray()
+        val languages_display_values=languages_map.values.toTypedArray()

-        val checkedItem = AppCompatDelegate.getApplicationLocales()[0].toString()
-        var checkedItemIndex = languages_display_values.indexOf(checkedItem)
+        val checkedItem=AppCompatDelegate.getApplicationLocales()[0].toString()
+        var checkedItemIndex=languages_display_values.indexOf(checkedItem)

-        if(checkedItemIndex == -1)
+        if (checkedItemIndex == -1)
        {
-            checkedItemIndex = 0
+            checkedItemIndex=0
        }

-        builder.setSingleChoiceItems(languages_display_keys, checkedItemIndex) { dialog, which ->
+        builder.setSingleChoiceItems(languages_display_keys , checkedItemIndex) { dialog , which ->

-            val newLocale = LocaleListCompat.forLanguageTags(languages_map[languages_display_keys[which]])
+            val newLocale=
+                LocaleListCompat.forLanguageTags(languages_map[languages_display_keys[which]])

            AppCompatDelegate.setApplicationLocales(newLocale)

-            startActivity(Intent(this, MainActivity::class.java))
+            startActivity(Intent(this , MainActivity::class.java))
            finish()

            dialog.dismiss()
        }

-        val dialog = builder.create()
+        val dialog=builder.create()
        dialog.show()
    }

-    private fun updateTheme(which: Int) {
-        when (which) {
+    private fun updateTheme(which: Int)
+    {
+        when (which)
+        {
            0 -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
            1 -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
            2 -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
@@ -495,15 +596,19 @@ class MainActivity : AppCompatActivity() {
        delegate.applyDayNight()
    }

-    private fun keepScreenOn(keepOn: Boolean) {
-        if (keepOn) {
+    private fun keepScreenOn(keepOn: Boolean)
+    {
+        if (keepOn)
+        {
            window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-        } else {
+        }
+        else
+        {
            window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
        }

-        val prefs = this.getSharedPreferences("Settings", MODE_PRIVATE).edit()
-        prefs.putBoolean("Screen_On", keepOn)
+        val prefs=this.getSharedPreferences("Settings" , MODE_PRIVATE).edit()
+        prefs.putBoolean("Screen_On" , keepOn)
        prefs.apply()
    }
 }
--- a/app/src/main/java/me/zobrist/tichucounter/Round.kt
+++ b/app/src/main/java/me/zobrist/tichucounter/Round.kt
@@ -2,33 +2,46 @@ package me.zobrist.tichucounter

 import java.io.Serializable

-class Round() : Serializable {
-    var scoreA: Int = 0
-    var scoreB: Int = 0
+class Round() : Serializable
+{
+    var scoreA: Int=0
+    var scoreB: Int=0

-    constructor(score: Int, isScoreA: Boolean) : this() {
-        if (isScoreA) {
-            scoreA = score
-            scoreB = calculateOtherScore(scoreA)
-        } else {
-            scoreB = score
-            scoreA = calculateOtherScore(scoreB)
+    constructor(score: Int , isScoreA: Boolean) : this()
+    {
+        if (isScoreA)
+        {
+            scoreA=score
+            scoreB=calculateOtherScore(scoreA)
+        }
+        else
+        {
+            scoreB=score
+            scoreA=calculateOtherScore(scoreB)
        }
    }

-    constructor(scoreA: Int, scoreB: Int) : this() {
-        this.scoreA = scoreA
-        this.scoreB = scoreB
+    constructor(scoreA: Int , scoreB: Int) : this()
+    {
+        this.scoreA=scoreA
+        this.scoreB=scoreB
    }

-    private fun calculateOtherScore(score: Int): Int {
-        if (score.isMultipleOf100() && score != 0) {
+    private fun calculateOtherScore(score: Int): Int
+    {
+        if (score.isMultipleOf100() && score != 0)
+        {
            return 0
        }
+        if (score in 101 ..125)
+        {
+            return 0 - (score % 100)
+        }
        return 100 - (score % 100)
    }

-    fun isValidRound(): Boolean {
+    fun isValidRound(): Boolean
+    {
        return (scoreA.isMultipleOf5()) && scoreB.isMultipleOf5() && (scoreA + scoreB).isMultipleOf100()
    }
 }
--- a/app/src/test/java/me/zobrist/tichucounter/HistoryUnitTest.kt
+++ b/app/src/test/java/me/zobrist/tichucounter/HistoryUnitTest.kt
@@ -9,10 +9,12 @@ import org.junit.Test
 *
 * See [testing documentation](http://d.android.com/tools/testing).
 */
-class HistoryUnitTest {
+class HistoryUnitTest
+{
    @Test
-    fun calculation_isCorrect() {
-        val history = History()
+    fun calculation_isCorrect()
+    {
+        val history=History()

        history.revertLastRound()
        history.getHistoryA()
@@ -20,34 +22,34 @@ class HistoryUnitTest {
        history.getScoreA()
        history.getScoreB()

-        history.logRound(Round(10, 10))
-        history.logRound(Round(10, 10))
-        history.logRound(Round(10, 10))
-        history.logRound(Round(10, 10))
-        history.logRound(Round(10, 10))
-        history.logRound(Round(10, 10))
-        history.logRound(Round(10, 10))
-        history.logRound(Round(10, 10))
-        history.logRound(Round(10, 10))
-        history.logRound(Round(10, 10))
+        history.logRound(Round(10 , 10))
+        history.logRound(Round(10 , 10))
+        history.logRound(Round(10 , 10))
+        history.logRound(Round(10 , 10))
+        history.logRound(Round(10 , 10))
+        history.logRound(Round(10 , 10))
+        history.logRound(Round(10 , 10))
+        history.logRound(Round(10 , 10))
+        history.logRound(Round(10 , 10))
+        history.logRound(Round(10 , 10))

-        assertEquals(100, history.getScoreA())
-        assertEquals(100, history.getScoreB())
+        assertEquals(100 , history.getScoreA())
+        assertEquals(100 , history.getScoreB())

        history.revertLastRound()

-        assertEquals(90, history.getScoreA())
-        assertEquals(90, history.getScoreB())
+        assertEquals(90 , history.getScoreA())
+        assertEquals(90 , history.getScoreB())

-        assertNotEquals("", history.getHistoryA())
-        assertNotEquals("", history.getHistoryB())
+        assertNotEquals("" , history.getHistoryA())
+        assertNotEquals("" , history.getHistoryB())

        history.clearAll()
-        assertEquals(0, history.getScoreA())
-        assertEquals(0, history.getScoreB())
+        assertEquals(0 , history.getScoreA())
+        assertEquals(0 , history.getScoreB())


-        assertEquals("", history.getHistoryA())
-        assertEquals("", history.getHistoryB())
+        assertEquals("" , history.getHistoryA())
+        assertEquals("" , history.getHistoryB())
    }
 }
--- a/app/src/test/java/me/zobrist/tichucounter/RoundUnitTest.kt
+++ b/app/src/test/java/me/zobrist/tichucounter/RoundUnitTest.kt
@@ -8,85 +8,89 @@ import org.junit.Test
 *
 * See [testing documentation](http://d.android.com/tools/testing).
 */
-class RoundUnitTest {
+class RoundUnitTest
+{
    @Test
-    fun calculation_isCorrect() {
+    fun calculation_isCorrect()
+    {

-        var inputScoreA = 125
-        var inputScoreB = -25
+        var inputScoreA=125
+        var inputScoreB=-25
        var temp: Round

        // Normal round range -25 to 125 as input
-        while (inputScoreB >= 125) {
-            temp = Round(inputScoreA, true)
-            assertEquals(inputScoreB, temp.scoreB)
+        while (inputScoreB <= 125)
+        {
+            temp=Round(inputScoreA , true)
+            assertEquals(inputScoreB , temp.scoreB)
            assertTrue(temp.isValidRound())

-            temp = Round(inputScoreA, false)
-            assertEquals(inputScoreB, temp.scoreA)
+            temp=Round(inputScoreA , false)
+            assertEquals(inputScoreB , temp.scoreA)
            assertTrue(temp.isValidRound())

-            inputScoreA -= 5
-            inputScoreB += 5
+            inputScoreA-=5
+            inputScoreB+=5
        }

        // Team a +100 points for Tichu
-        inputScoreA = 125 + 100
-        inputScoreB = -25
+        inputScoreA=125 + 100
+        inputScoreB=-25

        // Normal round range -25 to 125 as input
-        while (inputScoreB >= 125) {
-            temp = Round(inputScoreA, true)
-            assertEquals(inputScoreB, temp.scoreB)
+        while (inputScoreB <= 125)
+        {
+            temp=Round(inputScoreA , true)
+            assertEquals(inputScoreB , temp.scoreB)
            assertTrue(temp.isValidRound())

-            temp = Round(inputScoreA, false)
-            assertEquals(inputScoreB, temp.scoreA)
+            temp=Round(inputScoreA , false)
+            assertEquals(inputScoreB , temp.scoreA)
            assertTrue(temp.isValidRound())

-            inputScoreA -= 5
-            inputScoreB += 5
+            inputScoreA-=5
+            inputScoreB+=5
        }

        // Double win
-        temp = Round(200, true)
-        assertEquals(0, temp.scoreB)
+        temp=Round(200 , true)
+        assertEquals(0 , temp.scoreB)
        assertTrue(temp.isValidRound())

-        temp = Round(200, false)
-        assertEquals(0, temp.scoreA)
+        temp=Round(200 , false)
+        assertEquals(0 , temp.scoreA)
        assertTrue(temp.isValidRound())

        // Double win with Tichu
-        temp = Round(300, true)
-        assertEquals(0, temp.scoreB)
+        temp=Round(300 , true)
+        assertEquals(0 , temp.scoreB)
        assertTrue(temp.isValidRound())

-        temp = Round(300, false)
-        assertEquals(0, temp.scoreA)
+        temp=Round(300 , false)
+        assertEquals(0 , temp.scoreA)
        assertTrue(temp.isValidRound())

        // Double win with Grand Tichu
-        temp = Round(400, true)
-        assertEquals(0, temp.scoreB)
+        temp=Round(400 , true)
+        assertEquals(0 , temp.scoreB)
        assertTrue(temp.isValidRound())

-        temp = Round(400, false)
-        assertEquals(0, temp.scoreA)
+        temp=Round(400 , false)
+        assertEquals(0 , temp.scoreA)
        assertTrue(temp.isValidRound())

        //Good rounds
-        temp = Round(0, 0)
+        temp=Round(0 , 0)
        assertTrue(temp.isValidRound())

        //Bad rounds
-        temp = Round(5, 12)
+        temp=Round(5 , 12)
        assertFalse(temp.isValidRound())

-        temp = Round(12, 5)
+        temp=Round(12 , 5)
        assertFalse(temp.isValidRound())

-        temp = Round(5, 55)
+        temp=Round(5 , 55)
        assertFalse(temp.isValidRound())
    }
 }