fix: init project settings

msnodeve · Nov 30, 2020 · 9e3b0ec · 9e3b0ec
1 parent 9b84665
commit 9e3b0ec
Show file tree

Hide file tree

Showing 29 changed files with 218 additions and 147 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,12 +3,6 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android-extensions'
-
-// https://www.androidhuman.com/lecture/quality/2016/02/13/jacoco_unit_test_android/
-// https://jojoldu.tistory.com/275
-// https://medium.com/@android2ee/playing-with-gradle-3-and-some-few-code-coverage-on-android-with-jacoco-47df7c9328ae
-apply plugin: 'com.github.kt3k.coveralls'
-apply plugin: 'jacoco-android'
 // https://blog.yena.io/studynote/2018/09/08/Android-Kotlin-Room.html
 // https://kotlinlang.org/docs/reference/using-gradle.html
 
@@ -27,25 +21,9 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             testCoverageEnabled false
-            buildConfigField "String", "GITHUB_OAUTH_URL", GITHUB_OAUTH_URL
-            buildConfigField "String", "GITHUB_CLIENT_ID", GITHUB_CLIENT_ID
-            buildConfigField "String", "GITHUB_CLIENT_SECRET", GITHUB_CLIENT_SECRET
-            buildConfigField "String", "REDIRECT_CALLBACK_URL", REDIRECT_CALLBACK_URL
-            buildConfigField "String", "PREFERENCES_FILE", PREFERENCES_FILE
-            buildConfigField "String", "PREFERENCES_TOKEN_KEY", PREFERENCES_TOKEN_KEY
-            buildConfigField "String", "BASIC_AUTH_KEY", BASIC_AUTH_KEY
-            buildConfigField "String", "GFD_API_URL", GFD_API_URL
         }
         debug {
             testCoverageEnabled true
-            buildConfigField "String", "GITHUB_OAUTH_URL", GITHUB_OAUTH_URL
-            buildConfigField "String", "GITHUB_CLIENT_ID", GITHUB_CLIENT_ID
-            buildConfigField "String", "GITHUB_CLIENT_SECRET", GITHUB_CLIENT_SECRET
-            buildConfigField "String", "REDIRECT_CALLBACK_URL", REDIRECT_CALLBACK_URL
-            buildConfigField "String", "PREFERENCES_FILE", PREFERENCES_FILE
-            buildConfigField "String", "PREFERENCES_TOKEN_KEY", PREFERENCES_TOKEN_KEY
-            buildConfigField "String", "BASIC_AUTH_KEY", BASIC_AUTH_KEY
-            buildConfigField "String", "GFD_API_URL", GFD_API_URL
         }
     }
     compileOptions {
@@ -61,22 +39,17 @@ android {
     lintOptions {
         abortOnError false
     }
-}
-
-coveralls {
-    jacocoReportPath 'build/reports/jacoco/jacocoTestDebugUnitTestReport/jacocoTestDebugUnitTestReport.xml'
-}
-jacocoAndroidUnitTestReport {
-    excludes += ['**/views/**']
+    buildToolsVersion '28.0.3'
+    ndkVersion '20.1.5948944'
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'com.android.support:design:28.0.0'
-    implementation "androidx.recyclerview:recyclerview:1.0.0"
+    implementation "androidx.recyclerview:recyclerview:1.1.0"
 
     // test implementation
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'

diff --git a/app/build2.gradle b/app/build2.gradle
@@ -0,0 +1,153 @@
+//noinspection LifecycleAnnotationProcessorWithJava8
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-android-extensions'
+
+// https://www.androidhuman.com/lecture/quality/2016/02/13/jacoco_unit_test_android/
+// https://jojoldu.tistory.com/275
+// https://medium.com/@android2ee/playing-with-gradle-3-and-some-few-code-coverage-on-android-with-jacoco-47df7c9328ae
+apply plugin: 'com.github.kt3k.coveralls'
+apply plugin: 'jacoco-android'
+// https://blog.yena.io/studynote/2018/09/08/Android-Kotlin-Room.html
+// https://kotlinlang.org/docs/reference/using-gradle.html
+
+android {
+    compileSdkVersion 28
+    defaultConfig {
+        applicationId "com.seok.gfd"
+        minSdkVersion 26
+        targetSdkVersion 28
+        versionCode 10
+        versionName "3.20.12"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            testCoverageEnabled false
+            buildConfigField "String", "GITHUB_OAUTH_URL", GITHUB_OAUTH_URL
+            buildConfigField "String", "GITHUB_CLIENT_ID", GITHUB_CLIENT_ID
+            buildConfigField "String", "GITHUB_CLIENT_SECRET", GITHUB_CLIENT_SECRET
+            buildConfigField "String", "REDIRECT_CALLBACK_URL", REDIRECT_CALLBACK_URL
+            buildConfigField "String", "PREFERENCES_FILE", PREFERENCES_FILE
+            buildConfigField "String", "PREFERENCES_TOKEN_KEY", PREFERENCES_TOKEN_KEY
+            buildConfigField "String", "BASIC_AUTH_KEY", BASIC_AUTH_KEY
+            buildConfigField "String", "GFD_API_URL", GFD_API_URL
+        }
+        debug {
+            testCoverageEnabled true
+            buildConfigField "String", "GITHUB_OAUTH_URL", GITHUB_OAUTH_URL
+            buildConfigField "String", "GITHUB_CLIENT_ID", GITHUB_CLIENT_ID
+            buildConfigField "String", "GITHUB_CLIENT_SECRET", GITHUB_CLIENT_SECRET
+            buildConfigField "String", "REDIRECT_CALLBACK_URL", REDIRECT_CALLBACK_URL
+            buildConfigField "String", "PREFERENCES_FILE", PREFERENCES_FILE
+            buildConfigField "String", "PREFERENCES_TOKEN_KEY", PREFERENCES_TOKEN_KEY
+            buildConfigField "String", "BASIC_AUTH_KEY", BASIC_AUTH_KEY
+            buildConfigField "String", "GFD_API_URL", GFD_API_URL
+        }
+    }
+    compileOptions {
+        sourceCompatibility = '1.8'
+        targetCompatibility = '1.8'
+    }
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+            returnDefaultValues = true
+        }
+    }
+    lintOptions {
+        abortOnError false
+    }
+}
+
+coveralls {
+    jacocoReportPath 'build/reports/jacoco/jacocoTestDebugUnitTestReport/jacocoTestDebugUnitTestReport.xml'
+}
+jacocoAndroidUnitTestReport {
+    excludes += ['**/views/**']
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'com.android.support:design:28.0.0'
+    implementation "androidx.recyclerview:recyclerview:1.0.0"
+
+    // test implementation
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.robolectric:robolectric:4.3'
+    testImplementation 'org.powermock:powermock-api-mockito:1.4.12'
+    testImplementation 'org.powermock:powermock-module-junit4:1.6.2'
+    testImplementation 'org.mockito:mockito-core:2.28.2'
+    testImplementation 'androidx.arch.core:core-testing:2.1.0'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test:rules:1.2.0'
+    androidTestImplementation 'androidx.test:core:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
+
+    // Google Ads
+    implementation 'com.google.android.gms:play-services-ads:18.2.0'
+
+    // OkHttp && logger
+    implementation 'com.squareup.okhttp3:okhttp:3.12.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.4.2'
+
+    // Retrofit2
+    implementation 'com.squareup.retrofit2:retrofit:2.6.1'
+    implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
+    implementation 'com.google.code.gson:gson:2.8.5'
+
+    // room
+    implementation 'androidx.room:room-runtime:2.2.0'
+    kapt 'androidx.room:room-compiler:2.2.0'
+    kaptTest 'androidx.room:room-testing:2.2.0'
+
+    // Lifecycle components
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
+    implementation 'android.arch.lifecycle:viewmodel:1.1.1'
+    annotationProcessor 'androidx.lifecycle:lifecycle-compiler:2.1.0'
+
+    // Coroutines
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutine_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutine_version"
+
+    // Using the Glide Library for Image loading
+    implementation 'com.github.bumptech.glide:glide:4.9.0'
+    kapt 'com.github.bumptech.glide:compiler:4.9.0'
+
+    // jsoup, anko
+    implementation 'org.jsoup:jsoup:1.11.3'
+    implementation "org.jetbrains.anko:anko:$rootProject.anko_version"
+    implementation 'androidx.gridlayout:gridlayout:1.0.0'
+
+    // lombok
+    compileOnly 'org.projectlombok:lombok:1.18.8'
+    annotationProcessor 'org.projectlombok:lombok:1.18.8'
+
+    // ProgressBar
+    implementation 'com.wang.avi:library:2.1.3'
+
+    // NavigationBar
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.1.0'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.1.0'
+
+    // UI Scale
+    implementation 'com.ssomai:android.scalablelayout:2.1.6'
+
+    // Tab Layout
+    implementation 'com.ogaclejapan.smarttablayout:library:2.0.0@aar'
+    implementation 'com.ogaclejapan.smarttablayout:utils-v4:2.0.0@aar'
+}
diff --git a/app/src/main/java/com/seok/gfd/retrofit/RetrofitClient.kt b/app/src/main/java/com/seok/gfd/retrofit/RetrofitClient.kt
@@ -30,15 +30,15 @@ class RetrofitClient {
         fun userService() : UserService{
             val gson = GsonBuilder().setLenient().create()
             retrofit = Retrofit.Builder()
-                .baseUrl(BuildConfig.GFD_API_URL)
+                .baseUrl("")
                 .addConverterFactory(GsonConverterFactory.create(gson))
                 .build()
             return retrofit.create(UserService::class.java)
         }
         fun commitService() : CommitService{
             val gson = GsonBuilder().setLenient().create()
             retrofit = Retrofit.Builder()
-                .baseUrl(BuildConfig.GFD_API_URL)
+                .baseUrl("")
                 .addConverterFactory(GsonConverterFactory.create(gson))
                 .build()
             return retrofit.create(CommitService::class.java)

diff --git a/app/src/main/java/com/seok/gfd/utils/SharedPreference.kt b/app/src/main/java/com/seok/gfd/utils/SharedPreference.kt
@@ -9,7 +9,7 @@ import com.seok.gfd.retrofit.domain.User
 
 class SharedPreference(private val application: Application) {
     private val pref = application.getSharedPreferences(
-        BuildConfig.PREFERENCES_FILE,
+        "",
         AppCompatActivity.MODE_PRIVATE
     )
 

diff --git a/app/src/main/java/com/seok/gfd/viewmodel/RankFragmentViewModel.kt b/app/src/main/java/com/seok/gfd/viewmodel/RankFragmentViewModel.kt
@@ -33,7 +33,7 @@ class RankFragmentViewModel(application: Application) : AndroidViewModel(applica
 
         val getTodayRankListService = RetrofitClient.commitService()
         val getTodayRankListCall = getTodayRankListService.getTRCommitList(
-            BuildConfig.BASIC_AUTH_KEY,
+            "",
             dateFormat.format(Date())
         )
         getTodayRankListCall.enqueue(object : Callback<List<CommitResponse>> {
@@ -58,7 +58,7 @@ class RankFragmentViewModel(application: Application) : AndroidViewModel(applica
     fun updateTodayRankCommit(userId: String, dataCount: Int) {
         val updateTodayRankCommitService = RetrofitClient.commitService()
         val updateTodayRankCommitCall = updateTodayRankCommitService.enrollCommit(
-            BuildConfig.BASIC_AUTH_KEY,
+            "",
             CommitRequestDto(userId, dataCount)
         )
 //        updateTodayRankCommitCall.enqueue(object : Callback<String> {
@@ -77,7 +77,7 @@ class RankFragmentViewModel(application: Application) : AndroidViewModel(applica
         val dateFormat = SimpleDateFormat("yyyy-MM-dd")
         val getTodayRankListService = RetrofitClient.commitService()
         val getTodayRankListCall = getTodayRankListService.getTRCommitList(
-            BuildConfig.BASIC_AUTH_KEY,
+            "",
             dateFormat.format(Date()))
         getTodayRankListCall.enqueue(object : Callback<List<CommitResponse>>{
             override fun onResponse(

diff --git a/app/src/main/java/com/seok/gfd/viewmodel/UserViewModel.kt b/app/src/main/java/com/seok/gfd/viewmodel/UserViewModel.kt
@@ -37,7 +37,7 @@ class UserViewModel : ViewModel() {
     // User 인원 수 가져오기
     fun getUsersCount() {
         val userService = RetrofitClient.userService()
-        val userCall = userService.getUsersCount(BuildConfig.BASIC_AUTH_KEY)
+        val userCall = userService.getUsersCount("")
         userCall.enqueue(object : retrofit2.Callback<SingleResponseDto<Long>> {
             override fun onResponse(
                 call: Call<SingleResponseDto<Long>>,
@@ -56,8 +56,8 @@ class UserViewModel : ViewModel() {
     fun getAccessTokenFromGithubApi(code: String) {
         val githubAuthService = RetrofitClient.githubAuthService()
         val githubAuthCall = githubAuthService.getAccessTokenFromGithubApi(
-            BuildConfig.GITHUB_CLIENT_ID,
-            BuildConfig.GITHUB_CLIENT_SECRET,
+            "",
+            "",
             code
         )
         githubAuthCall.enqueue(object : retrofit2.Callback<Token> {
@@ -92,7 +92,7 @@ class UserViewModel : ViewModel() {
     fun signInUserInfo(user: User){
         val gfdSignInService = RetrofitClient.userService()
         val requestUserDto = GfdUser(user.login, user.html_url, user.avatar_url)
-        val gfdSignInCall = gfdSignInService.signUpUser(BuildConfig.BASIC_AUTH_KEY, requestUserDto)
+        val gfdSignInCall = gfdSignInService.signUpUser("", requestUserDto)
         gfdSignInCall.enqueue(object : retrofit2.Callback<SingleResponseDto<GfdUser>>{
             override fun onResponse(
                 call: Call<SingleResponseDto<GfdUser>>,
@@ -112,7 +112,7 @@ class UserViewModel : ViewModel() {
     fun getCommitsRank() {
         val dataDate = LocalDate.now().toString()
         val getCommitsService = RetrofitClient.commitService()
-        val getCommitCall = getCommitsService.getCommitList(BuildConfig.BASIC_AUTH_KEY, dataDate)
+        val getCommitCall = getCommitsService.getCommitList("", dataDate)
         getCommitCall.enqueue(object : retrofit2.Callback<MultiResponseDto<CommitResponse>> {
             override fun onResponse(call: Call<MultiResponseDto<CommitResponse>>, response: Response<MultiResponseDto<CommitResponse>>) {
                 _commitList.value = response.body()?.list
@@ -128,7 +128,7 @@ class UserViewModel : ViewModel() {
     // 금일 커밋 등록하기
     fun enrollCommit(commit: CommitRequestDto){
         val enrollCommitService = RetrofitClient.commitService()
-        val enrollCommitCall = enrollCommitService.enrollCommit(BuildConfig.BASIC_AUTH_KEY, commit)
+        val enrollCommitCall = enrollCommitService.enrollCommit("", commit)
         enrollCommitCall.enqueue(object : retrofit2.Callback<SingleResponseDto<Void>>{
             override fun onResponse(
                 call: Call<SingleResponseDto<Void>>,