Merge pull request #15 from monstar-lab-oss/feature/errorhandling

Feature/errorhandling

Author: johsoe

.gitignore

@@ -13,3 +13,5 @@
 .externalNativeBuild
 .cxx
 local.properties
+
+.idea/

.idea/.gitignore

@@ -2,7 +2,14 @@ plugins {
     id 'com.android.application'
     id 'kotlin-android'
     id 'kotlin-kapt'
-    id 'org.jetbrains.kotlin.plugin.serialization' version '1.4.20'
+    id 'org.jetbrains.kotlin.plugin.serialization' version '1.4.21'
+    id 'dk.nstack.translation.plugin'
+}
+
+translation {
+    appId = keys.appId
+    apiKey = keys.apiKey
+    acceptHeader = keys.acceptHeader
 }
 
 android {
@@ -17,6 +24,11 @@ android {
         versionCode 1
         versionName "1.0"
 
+        manifestPlaceholders = [
+                appId : keys.appId,
+                apiKey: keys.apiKey
+        ]
+
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildFeatures {
@@ -34,26 +46,29 @@ android {
             dimension "default"
             applicationIdSuffix ".dev"
             manifestPlaceholders = [
-                    APP_NAME: "MonstarlabDev"
+                    APP_NAME: "MonstarlabDev",
+                    env     : "staging"
             ]
-            buildConfigField "String", "API_URL", "\"https://jsonplaceholder.typicode.com\""
+            buildConfigField "String", "API_URL", "\"https://reqres.in/api/\""
         }
         staging {
             dimension "default"
             applicationIdSuffix ".staging"
             //signingConfig signingConfigs.staging
             manifestPlaceholders = [
-                    APP_NAME: "MonstarlabStaging"
+                    APP_NAME: "MonstarlabStaging",
+                    env     : "staging"
             ]
-            buildConfigField "String", "API_URL", "\"https://jsonplaceholder.typicode.com\""
+            buildConfigField "String", "API_URL", "\"https://reqres.in/api/\""
         }
         production {
             dimension "default"
             //signingConfig signingConfigs.production
             manifestPlaceholders = [
                     APP_NAME: "Monstarlab",
+                    env     : "production"
             ]
-            buildConfigField "String", "API_URL", "\"https://jsonplaceholder.typicode.com\""
+            buildConfigField "String", "API_URL", "\"https://reqres.in/api/\""
         }
     }
 
@@ -68,18 +83,17 @@ android {
 
 dependencies {
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$versions.kotlin"
-    def coroutinesVersion = "1.4.2"
+    implementation ("org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}")
 
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$coroutinesVersion"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.coroutines}"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:${versions.coroutines}"
     implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.0.1"
 
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    testImplementation 'junit:junit:4.+'
+    testImplementation 'junit:junit:4.13.1'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
@@ -95,11 +109,14 @@ dependencies {
     implementation("androidx.navigation:navigation-fragment-ktx:2.3.2")
     implementation("androidx.navigation:navigation-ui-ktx:2.3.2")
 
-    def lifecycle = "2.2.0"
-    implementation("androidx.lifecycle:lifecycle-livedata-core-ktx:$lifecycle")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle")
-    implementation("androidx.lifecycle:lifecycle-common-java8:$lifecycle")
-    implementation("androidx.lifecycle:lifecycle-extensions:$lifecycle")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle")
-    implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle")
+    implementation("androidx.lifecycle:lifecycle-livedata-core-ktx:${versions.lifecycle}")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:${versions.lifecycle}")
+    implementation("androidx.lifecycle:lifecycle-common-java8:${versions.lifecycle}")
+    implementation("androidx.lifecycle:lifecycle-extensions:${versions.lifecycle}")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:${versions.lifecycle}")
+    implementation("androidx.lifecycle:lifecycle-livedata-ktx:${versions.lifecycle}")
+
+    implementation "dk.nodes.nstack:nstack-kotlin:${versions.nodes_nstack_kotlin}"
+    implementation "com.jakewharton.timber:timber:${versions.timber}"
+
 }

.idea/.name

@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.monstarlab">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
+        android:name=".App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:name=".App"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Androidtemplate">
@@ -17,6 +20,22 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <!-- nstack app id and key from build.gradle manifest placeholder -->
+        <meta-data
+            android:name="dk.nodes.nstack.appId"
+            android:value="${appId}"
+            tools:replace="android:value" />
+        <meta-data
+            android:name="dk.nodes.nstack.apiKey"
+            android:value="${apiKey}"
+            tools:replace="android:value" />
+
+        <meta-data
+            android:name="dk.nodes.nstack.env"
+            android:value="${env}"
+            tools:replace="android:value" />
+
     </application>
 
 </manifest>