Merge pull request #10 from nodes-android/new_resources

New resources

app/build.gradle

@@ -94,46 +94,49 @@ repositories {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+    androidTestImplementation("com.android.support.test.espresso:espresso-core:$espresso_core_version", {
+        exclude group: "com.android.support", module: "support-annotations"
     })
 
     // uncomment me if using multidex
-    //compile 'com.android.support:multidex:1.0.2'
+    // implementation "com.android.support:multidex:$multidex_version"
 
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
-    compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
-    compile 'org.jetbrains.kotlinx:kotlinx-coroutines-core:0.19.1'
-    compile 'org.jetbrains.kotlinx:kotlinx-coroutines-android:0.19.1'
-    compile 'com.android.support:appcompat-v7:26.1.0'
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinx_coroutines_version"
 
-    compile 'com.google.dagger:dagger:2.11'
-    kapt "com.google.dagger:dagger-compiler:2.11"
+    implementation "com.android.support:appcompat-v7:$support_library_version"
+    implementation "com.android.support:recyclerview-v7:$support_library_version"
+    implementation "com.android.support:design:$support_library_version"
+    implementation "com.android.support:cardview-v7:$support_library_version"
+    implementation "com.android.support.constraint:constraint-layout:$constraint_layout_version"
 
-    compile 'net.hockeyapp.android:HockeySDK:5.0.2'
-    compile 'com.jakewharton.timber:timber:4.5.1'
+    implementation "com.google.dagger:dagger:$dagger_version"
+    kapt "com.google.dagger:dagger-compiler:$dagger_version"
 
-    compile ('com.squareup.retrofit2:retrofit:2.3.0')
-    compile ('com.squareup.retrofit2:converter-gson:2.3.0') {
-        exclude module: 'retrofit:2.3.0'
+    implementation "net.hockeyapp.android:HockeySDK:$hockey_sdk_version"
+    implementation "com.jakewharton.timber:timber:$timber_version"
+
+    implementation ("com.squareup.retrofit2:retrofit:$retrofit_version")
+    implementation ("com.squareup.retrofit2:converter-gson:$retrofit_version") {
+        exclude module: "retrofit:$retrofit_version"
     }
-    compile 'com.squareup.okhttp3:okhttp:3.9.0'
-    compile 'com.squareup.okhttp3:logging-interceptor:3.9.0'
-    compile 'dk.nodes.nstack:nstack-kotlin:1.0'
-    compile 'dk.nodes.arch:base:1.0.1'
+    implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
+    implementation "com.squareup.okhttp3:logging-interceptor:$okhttp_version"
+    implementation "dk.nodes.nstack:nstack-kotlin:$nodes_nstack_kotlin_version"
+    implementation "dk.nodes.arch:base:$nodes_arch_version"
 
-    // ... more entries
-    testCompile 'junit:junit:4.12'
+    // Testing
+    testImplementation "junit:junit:$junit_version"
     // required if you want to use Mockito for unit tests
-    testCompile 'org.mockito:mockito-core:2.7.22'
+    testImplementation "org.mockito:mockito-core:$mockito_version"
     // required if you want to use Mockito for Android tests
-    androidTestCompile 'org.mockito:mockito-android:2.7.22'
-
+    androidTestImplementation "org.mockito:mockito-android:$mockito_version"
 
     //For Espresso UI testing
-    androidTestCompile 'com.android.support.test.espresso:espresso-core:3.0.1'
-    androidTestCompile("com.android.support.test.espresso:espresso-intents:3.0.1")
-    androidTestCompile 'com.android.support.test.espresso:espresso-contrib:3.0.1'
+    androidTestImplementation "com.android.support.test.espresso:espresso-core:$espresso_core_version"
+    androidTestImplementation("com.android.support.test.espresso:espresso-intents:$espresso_core_version")
+    androidTestImplementation "com.android.support.test.espresso:espresso-contrib:$espresso_core_version"
 }

app/src/main/res/menu/main.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/actionAppName"
+        android:icon="@null"
+        android:title="@string/app_name"
+        app:showAsAction="always"/>
+
+</menu>

app/src/main/res/values/attrs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="NavigationBarView">
+        <attr name="buttonIconTint" format="color" />
+    </declare-styleable>
+</resources>

app/src/main/res/values/dimens.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Common -->
+    <dimen name="screen_horizontal_margin">16dp</dimen>
+    <dimen name="screen_vertical_margin">16dp</dimen>
+    <dimen name="list_top_padding">8dp</dimen>
+</resources>

app/src/main/res/values/ids.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="action_open_dialog" type="id"/>
+</resources>

app/src/main/res/values/strings.xml

@@ -1,3 +1,3 @@
 <resources>
-    <string name="app_name">wt</string>
+    <string name="app_name">Kotlin template</string>
 </resources>

build.gradle

@@ -1,17 +1,56 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.1.51'
+
+//    ext.kotlin_version = '1.1.51'
+
+    ext {
+        // Plugins
+        gradle_version = '3.0.0'
+        kotlin_version = '1.1.60'
+        nodes_nstack_translation_version = '0.35'
+        bitrise_version = '0.93'
+        ribbonizer_version = '2.1.0'
+
+        // Dependencies
+        kotlinx_coroutines_version = '0.19.1'
+
+        support_library_version = '26.1.0'
+        constraint_layout_version = '1.0.2'
+        dagger_version = "2.11"
+        multidex_version = '1.0.2'
+        hockey_sdk_version = "5.0.2"
+        timber_version = "4.5.1"
+
+        junit_version = '4.12'
+        test_runner_version = '1.0.1'
+        espresso_core_version = '3.0.1'
+        mockito_version = '2.7.22'
+
+        nodes_nstack_kotlin_version = '1.0'
+        nodes_arch_version = '1.0.1'
+
+        rxkotlin_version = '2.1.0'
+        rxandroid_version = '2.0.1'
+
+        timberkt_version = '1.3.0'
+
+        retrofit_version = "2.3.0"
+        okhttp_version = "3.9.0"
+        gson_version = '2.8.2'
+        glide_version = '4.2.0'
+    }
+
     repositories {
         maven { url 'https://maven.google.com' }
         jcenter()
     }
     dependencies {
-        classpath 'dk.nodes.nstack:translation:0.35'
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath "com.android.tools.build:gradle:$gradle_version"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.github.gfx.ribbonizer:ribbonizer-plugin:2.1.0'
-        classpath 'dk.nodes.ci:bitrise:0.93'
+        classpath "dk.nodes.nstack:translation:$nodes_nstack_translation_version"
+        classpath "com.github.gfx.ribbonizer:ribbonizer-plugin:$ribbonizer_version"
+        classpath "dk.nodes.ci:bitrise:$bitrise_version"
     }
 }