Merge pull request #35 from MarcelJurtz/dev

Dev
MarcelJurtz · Oct 17, 2020 · 3bf8204 · 3bf8204
2 parents fb76ae0 + 516af6a
commit 3bf8204
Show file tree

Hide file tree

Showing 82 changed files with 3,837 additions and 4,729 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,4 +1,6 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 28
@@ -25,6 +27,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     testImplementation 'junit:junit:4.12'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support:support-v4:28.0.0'
     implementation 'com.pes.materialcolorpicker:library:1.2.4'

diff --git a/app/src/main/java/com/marceljurtz/lifecounter/contracts/INavDrawerInteraction.java b/app/src/main/java/com/marceljurtz/lifecounter/contracts/INavDrawerInteraction.java
diff --git a/app/src/main/java/com/marceljurtz/lifecounter/contracts/INavDrawerInteraction.kt b/app/src/main/java/com/marceljurtz/lifecounter/contracts/INavDrawerInteraction.kt
@@ -0,0 +1,12 @@
+package com.marceljurtz.lifecounter.contracts
+
+interface INavDrawerInteraction {
+    fun onMenuEntryTwoPlayerTap()
+    fun onMenuEntryFourPlayerTap()
+    fun onMenuEntryDicingTap()
+    fun onMenuEntryCounterManagerTap()
+    fun onMenuEntrySettingsTap()
+    fun onMenuEntryAboutTap()
+    fun onMenuEntryEnergySaveTap()
+    fun onMenuEntryTogglePlayerTap()
+}
diff --git a/app/src/main/java/com/marceljurtz/lifecounter/contracts/base/IPresenter.java b/app/src/main/java/com/marceljurtz/lifecounter/contracts/base/IPresenter.java
diff --git a/app/src/main/java/com/marceljurtz/lifecounter/contracts/base/IPresenter.kt b/app/src/main/java/com/marceljurtz/lifecounter/contracts/base/IPresenter.kt
@@ -0,0 +1,10 @@
+package com.marceljurtz.lifecounter.contracts.base
+
+import com.marceljurtz.lifecounter.contracts.INavDrawerInteraction
+
+interface IPresenter : INavDrawerInteraction {
+    fun onCreate()
+    fun onPause()
+    fun onResume()
+    fun onDestroy()
+}
diff --git a/app/src/main/java/com/marceljurtz/lifecounter/contracts/base/IView.java b/app/src/main/java/com/marceljurtz/lifecounter/contracts/base/IView.java
diff --git a/app/src/main/java/com/marceljurtz/lifecounter/contracts/base/IView.kt b/app/src/main/java/com/marceljurtz/lifecounter/contracts/base/IView.kt
@@ -0,0 +1,6 @@
+package com.marceljurtz.lifecounter.contracts.base
+
+interface IView {
+    fun loadActivity(c: Class<*>)
+    fun startBrowserIntent(url: String)
+}
diff --git a/...urtz/lifecounter/enums/ClickTypeEnum.java → ...ljurtz/lifecounter/enums/ClickTypeEnum.kt b/...urtz/lifecounter/enums/ClickTypeEnum.java → ...ljurtz/lifecounter/enums/ClickTypeEnum.kt
@@ -1,9 +1,9 @@
-package com.marceljurtz.lifecounter.enums;
+package com.marceljurtz.lifecounter.enums
 
 /**
  * Enumeration to differentiate between long and regular clicks
  */
 
-public enum ClickTypeEnum {
+enum class ClickTypeEnum {
     SHORT, LONG
 }
diff --git a/app/src/main/java/com/marceljurtz/lifecounter/enums/CounterType.java b/app/src/main/java/com/marceljurtz/lifecounter/enums/CounterType.java
diff --git a/app/src/main/java/com/marceljurtz/lifecounter/enums/CounterType.kt b/app/src/main/java/com/marceljurtz/lifecounter/enums/CounterType.kt
@@ -0,0 +1,6 @@
+package com.marceljurtz.lifecounter.enums
+
+enum class CounterType {
+    Counter,
+    Planeswalker
+}
diff --git a/app/src/main/java/com/marceljurtz/lifecounter/enums/MagicColorEnum.java b/app/src/main/java/com/marceljurtz/lifecounter/enums/MagicColorEnum.java
diff --git a/app/src/main/java/com/marceljurtz/lifecounter/enums/MagicColorEnum.kt b/app/src/main/java/com/marceljurtz/lifecounter/enums/MagicColorEnum.kt
@@ -0,0 +1,5 @@
+package com.marceljurtz.lifecounter.enums
+
+enum class MagicColorEnum {
+    BLACK, BLUE, GREEN, RED, WHITE
+}
diff --git a/app/src/main/java/com/marceljurtz/lifecounter/enums/OperatorEnum.java b/app/src/main/java/com/marceljurtz/lifecounter/enums/OperatorEnum.java
diff --git a/app/src/main/java/com/marceljurtz/lifecounter/enums/OperatorEnum.kt b/app/src/main/java/com/marceljurtz/lifecounter/enums/OperatorEnum.kt
@@ -0,0 +1,5 @@
+package com.marceljurtz.lifecounter.enums
+
+enum class OperatorEnum {
+    ADD, SUBSTRACT
+}
diff --git a/app/src/main/java/com/marceljurtz/lifecounter/enums/PlayerIdEnum.java b/app/src/main/java/com/marceljurtz/lifecounter/enums/PlayerIdEnum.java
diff --git a/app/src/main/java/com/marceljurtz/lifecounter/enums/PlayerIdEnum.kt b/app/src/main/java/com/marceljurtz/lifecounter/enums/PlayerIdEnum.kt
@@ -0,0 +1,5 @@
+package com.marceljurtz.lifecounter.enums
+
+enum class PlayerIdEnum private constructor(val value: Int) {
+    ONE(1), TWO(2), THREE(3), FOUR(4)
+}
diff --git a/app/src/main/java/com/marceljurtz/lifecounter/models/AppDetails.java b/app/src/main/java/com/marceljurtz/lifecounter/models/AppDetails.java
diff --git a/app/src/main/java/com/marceljurtz/lifecounter/models/AppDetails.kt b/app/src/main/java/com/marceljurtz/lifecounter/models/AppDetails.kt
@@ -0,0 +1,5 @@
+package com.marceljurtz.lifecounter.models
+
+object AppDetails {
+    val CONTACT_MAIL = "mailto:[email protected]"
+}
diff --git a/app/src/main/java/com/marceljurtz/lifecounter/models/Color.java b/app/src/main/java/com/marceljurtz/lifecounter/models/Color.java