Skip to content

.idea 파일제거 ,코틀린 파일 추가 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

.idea 파일제거 ,코틀린 파일 추가 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3094ce7
.idea 파일 제거
chonamdoo Jul 21, 2017
eca0d86
-리소스 머지
chonamdoo Jul 21, 2017
fb1cd4a
-AAApp , MainActivity 코틀린 파일 변환
chonamdoo Jul 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,8 @@ captures/

# Intellij
*.iml
.idea/
.idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
.idea/dictionaries
.idea/libraries
/.idea/


# Keystore files
*.jks
Expand All @@ -53,4 +49,4 @@ google-services.json
# Freeline
freeline.py
freeline/
freeline_project_description.json
freeline_project_description.json
22 changes: 0 additions & 22 deletions .idea/compiler.xml
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions .idea/copyright/profiles_settings.xml
View file
Open in desktop

This file was deleted.

71 changes: 0 additions & 71 deletions .idea/markdown-navigator.xml
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions .idea/markdown-navigator/profiles_settings.xml
View file
Open in desktop

This file was deleted.

88 changes: 0 additions & 88 deletions .idea/misc.xml
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions .idea/modules.xml
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/runConfigurations.xml
View file
Open in desktop

This file was deleted.

16 changes: 16 additions & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
apply plugin: 'kotlin-android-extensions'

repositories {
mavenCentral()
}

android {
compileSdkVersion 25
Expand All @@ -17,6 +24,9 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
kapt {
generateStubs = true
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://blog.jetbrains.com/kotlin/2015/06/better-annotation-processing-supporting-stubs-in-kapt/

Note that generating stubs requires relatively much work, because all declarations must be resolved, and sometimes knowing return types requires analysis of expression (bodies of functions or property initializers after the = sign). So, using stubs in kapt slows your build down somewhat. That’s why stubs are off by default, and to enable them you need to write the following in your build.gradle file:

}

dataBinding {
enabled = true
Expand All @@ -27,6 +37,7 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}


}

dependencies {
Expand Down Expand Up @@ -60,5 +71,10 @@ dependencies {

//ui
compile rootProject.ext.picasso
compile rootProject.ext.kotlin

kapt rootProject.ext.databindingCompiler
kapt rootProject.ext.roomCompiler
kapt rootProject.ext.daggerCompiler
kapt rootProject.ext.daggerAndroidProcessor
}
39 changes: 0 additions & 39 deletions app/src/main/java/iammert/com/androidarchitecture/AAApp.java
View file
Open in desktop

This file was deleted.

32 changes: 32 additions & 0 deletions app/src/main/java/iammert/com/androidarchitecture/AAApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package iammert.com.androidarchitecture

import android.app.Activity
import android.app.Application
import dagger.android.AndroidInjector
import dagger.android.DispatchingAndroidInjector
import dagger.android.HasActivityInjector
import iammert.com.androidarchitecture.di.DaggerAppComponent
import javax.inject.Inject

/**
* Created by chonamdoo on 2017. 7. 21..
*/
class AAApp : Application(), HasActivityInjector {

@Inject
lateinit var activityDispatchingInjector: DispatchingAndroidInjector<Activity>

override fun onCreate() {
super.onCreate()
initializeComponent()
}
override fun activityInjector(): AndroidInjector<Activity> = activityDispatchingInjector

private fun initializeComponent() {
DaggerAppComponent.builder()
.application(this)
.build()
.inject(this)
}

}
2 changes: 1 addition & 1 deletion app/src/main/java/iammert/com/androidarchitecture/data/remote/ApiConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ public class ApiConstants {

public static final String ENDPOINT = "https://api.themoviedb.org/3/";
public static final String IMAGE_ENDPOINT_PREFIX = "https://image.tmdb.org/t/p/w500/";
public static final String API_KEY = "";
public static final String API_KEY = "8476a7ab80ad76f0936744df0430e67c";
public static final int TIMEOUT_IN_SEC = 15;
}
Loading