Add App class. Update libs version

Author: zhukovme

.gitignore

@@ -1,23 +1,24 @@
-# built application files
+# Built application files
 *.apk
 *.ap_
 
-# files for the dex VM
+# Files for the dex VM
 *.dex
 
 # Java class files
 *.class
 
-# generated files
+# Generated files
 bin/**
 gen/**
 out/**
 gen-external-apklibs/**
+reports/**
 
 # Local configuration file (sdk path, etc)
 local.properties
 
-# AndroidStudio
+# Android Studio
 *.iml
 *.ipr
 *.iws
@@ -26,6 +27,9 @@ local.properties
 classes/**
 target/**
 
+# JNI
+.externalNativeBuild
+
 # Mac OS
 .DS_Store
 

app/build.gradle

@@ -25,7 +25,7 @@ kapt {
     generateStubs = true
 }
 
-ext.support_lib_version = '27.0.2'
+ext.support_lib_version = '27.1.0'
 ext.kotlinx_coroutines = '0.20'
 ext.leakcanary = '1.5'
 
@@ -34,7 +34,6 @@ dependencies {
 
     // Kotlin
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinx_coroutines"
 
     // Android
     implementation "com.android.support:appcompat-v7:$support_lib_version"
@@ -46,7 +45,7 @@ dependencies {
     testImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakcanary"
 
     // Logger
-    implementation 'com.jakewharton.timber:timber:4.6.0'
+    implementation 'com.jakewharton.timber:timber:4.6.1'
 
     // Unit tests
     testImplementation 'junit:junit:4.12'

app/src/main/AndroidManifest.xml

@@ -3,19 +3,21 @@
           package="com.zhukovme.player">
 
     <application
+        android:name=".App"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        android:theme="@style/AppTheme.Default">
+
+        <activity android:name=".ui.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
-
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+
     </application>
 
 </manifest>

app/src/main/java/com/zhukovme/player/App.kt

@@ -0,0 +1,41 @@
+package com.zhukovme.player
+
+import android.app.Application
+import android.content.Context
+import com.squareup.leakcanary.LeakCanary
+import com.squareup.leakcanary.RefWatcher
+import timber.log.Timber
+
+/**
+ * Created by Michael Zhukov on 25.12.2017.
+ * email: [email protected]
+ */
+class App : Application() {
+
+    companion object {
+        fun get(context: Context): App = context.applicationContext as App
+    }
+
+    lateinit var refWatcher: RefWatcher
+
+    override fun onCreate() {
+        super.onCreate()
+        if (setupLeakCanary()) return
+
+        debugInit()
+    }
+
+    private fun setupLeakCanary(): Boolean {
+        if (LeakCanary.isInAnalyzerProcess(this)) {
+            return true
+        }
+        refWatcher = LeakCanary.install(this)
+        return false
+    }
+
+    private fun debugInit() {
+        if (BuildConfig.DEBUG) {
+            Timber.plant(Timber.DebugTree())
+        }
+    }
+}

app/src/main/java/com/zhukovme/player/MainActivity.kt

@@ -0,0 +1,17 @@
+package com.zhukovme.player.ui
+
+import android.os.Bundle
+import com.zhukovme.player.R
+import com.zhukovme.player.ui.base.BaseActivity
+
+/**
+ * Created by Michael Zhukov on 05.03.2018.
+ * email: [email protected]
+ */
+class MainActivity : BaseActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+    }
+}

app/src/main/java/com/zhukovme/player/ui/MainActivity.kt

@@ -0,0 +1,9 @@
+package com.zhukovme.player.ui.base
+
+import android.support.v7.app.AppCompatActivity
+
+/**
+ * Created by Michael Zhukov on 05.03.2018.
+ * email: [email protected]
+ */
+abstract class BaseActivity : AppCompatActivity()

app/src/main/java/com/zhukovme/player/ui/base/BaseActivity.kt

@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.zhukovme.player.MainActivity">
+    tools:context="com.zhukovme.player.ui.MainActivity">
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"/>
+        android:text="@string/app_name"/>
 
 </android.support.constraint.ConstraintLayout>

app/src/main/res/layout/activity_main.xml

@@ -1,8 +1,6 @@
 <resources>
 
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
+    <style name="AppTheme.Default" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>

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

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlin_version = '1.2.0'
+    ext.kotlin_version = '1.2.30'
     repositories {
         google()
         jcenter()
@@ -11,7 +11,7 @@ buildscript {
 }
 
 plugins {
-    id "io.gitlab.arturbosch.detekt" version "1.0.0.RC5-6"
+    id "io.gitlab.arturbosch.detekt" version "1.0.0.RC6-3"
 }
 
 allprojects {
@@ -26,12 +26,10 @@ task clean(type: Delete) {
 }
 
 detekt {
-    debug = true
-    version = "1.0.0.RC5-6"
+    version = "1.0.0.RC6-3"
     profile("main") {
         input = "$rootDir/app/src/main/java"
         output = "$rootDir/reports"
-        config = "$rootDir/tools/detekt-config.yml"
-        filters = ".*test.*,.*/resources/.*"
+        filters = ".*test.*,.*/resources/.*,.*/tmp/.*"
     }
 }

build.gradle

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+run () {
+  echo -e "\n --- ${1} --- \n"
+  eval $2
+  result=$?
+  if [ $result -ne 0 ]
+  then
+    echo -e "\n --- ${1} failed --- \n"
+    echo "Commit rejected"
+    exit 1
+  fi
+}
+
+checkForSkipTestsSign () {
+  skip_tests_sign="!"
+  first_char=$(head -c 1 $1)
+  if [ "$first_char" == "$skip_tests_sign" ]
+  then
+    echo $(sed "s/^${first_char}//" $1) > $1
+    return 1
+  fi
+  return 0
+}
+
+# Detekt
+detekt_task_title="Detekt"
+detekt_task="./gradlew detektCheck --daemon"
+# Lint
+lint_task_title="Lint"
+lint_task="./gradlew lint --daemon"
+# Tests
+tests_task_title="Tests"
+tests_task="./gradlew test --daemon"
+
+checkForSkipTestsSign $1
+if [ $? -eq 0 ]
+then
+  run "$detekt_task_title" "$detekt_task"
+  run "$lint_task_title" "$lint_task"
+  run "$tests_task_title" "$tests_task"
+fi