diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..61a9130 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..a5f05cd --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 7bfef59..d5d35ec 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/.idea/modules.xml b/.idea/modules.xml index a374980..2f594d6 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,6 +3,7 @@ + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 7216623..cac9437 100644 --- 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 new file mode 100644 index 0000000..7216623 --- /dev/null +++ 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 index fc45e88..c4f6ac6 100644 --- a/app/src/main/java/com/seok/gfd/retrofit/RetrofitClient.kt +++ b/app/src/main/java/com/seok/gfd/retrofit/RetrofitClient.kt @@ -30,7 +30,7 @@ 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) @@ -38,7 +38,7 @@ class RetrofitClient { 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 index 7460347..8c50ba6 100644 --- 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 index 874a344..135bf48 100644 --- 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> { @@ -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 { @@ -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>{ 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 index 76ef572..41db488 100644 --- 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> { override fun onResponse( call: Call>, @@ -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 { @@ -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>{ override fun onResponse( call: Call>, @@ -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> { override fun onResponse(call: Call>, response: Response>) { _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>{ override fun onResponse( call: Call>, diff --git a/app/src/main/java/com/seok/gfd/views/LauncherActivity.kt b/app/src/main/java/com/seok/gfd/views/LauncherActivity.kt index 8346c91..d846e04 100644 --- a/app/src/main/java/com/seok/gfd/views/LauncherActivity.kt +++ b/app/src/main/java/com/seok/gfd/views/LauncherActivity.kt @@ -1,44 +1,25 @@ package com.seok.gfd.views -import android.annotation.SuppressLint import android.content.Intent import android.os.Bundle import android.os.Handler -import android.view.WindowManager import androidx.appcompat.app.AppCompatActivity import com.seok.gfd.R -import com.seok.gfd.utils.CommonUtils class LauncherActivity : AppCompatActivity() { - private lateinit var commonUtils : CommonUtils - - @SuppressLint("ResourceType") override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_launcher) - window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN) - - initSetUI() - startLoading() +// startLoading() } private fun startLoading(){ Handler().postDelayed({ val intent = Intent(this, LoginActivity::class.java) startActivity(intent) - overridePendingTransition(R.anim.fade_in, R.anim.fade_out) finish() - }, 1300) - } - - private fun initSetUI(){ - commonUtils = CommonUtils.instance - - // 디스플레이 해상도 가져오기 - val display = windowManager.defaultDisplay - commonUtils.setScreenHeight(display.height.toFloat()) - commonUtils.setScreenWidth(display.width.toFloat()) + }, 5500) } } diff --git a/app/src/main/java/com/seok/gfd/views/LoginActivity.kt b/app/src/main/java/com/seok/gfd/views/LoginActivity.kt index 7e533a8..51efdd1 100644 --- a/app/src/main/java/com/seok/gfd/views/LoginActivity.kt +++ b/app/src/main/java/com/seok/gfd/views/LoginActivity.kt @@ -47,7 +47,7 @@ class LoginActivity : AppCompatActivity() { }) // Github 접속을 위한 access_token 요청 userViewModel.accessToken.observe(this, Observer { - sharedPreference.setValue(BuildConfig.PREFERENCES_TOKEN_KEY, it) + sharedPreference.setValue("", it) userViewModel.getUserInfoAndSignInGithub(it) }) // Github 로그인 성공 코드 200 / 401 @@ -90,7 +90,7 @@ class LoginActivity : AppCompatActivity() { syncUI() val intent = Intent( Intent.ACTION_VIEW, - Uri.parse(BuildConfig.GITHUB_OAUTH_URL + BuildConfig.GITHUB_CLIENT_ID) + Uri.parse("") ) // onNewIntent() 리다이렉트 startActivityForResult(intent, HttpURLConnection.HTTP_OK) diff --git a/app/src/main/java/com/seok/gfd/views/MainSub.kt b/app/src/main/java/com/seok/gfd/views/MainSub.kt index 3587e9c..2a3dc42 100644 --- a/app/src/main/java/com/seok/gfd/views/MainSub.kt +++ b/app/src/main/java/com/seok/gfd/views/MainSub.kt @@ -66,7 +66,6 @@ class MainSub : Fragment() { val weekText = TextView(activity) weekText.textColor = activity!!.getColor(R.color.userRankPos) weekText.text = index.toString() + "W" - weekText.typeface = ResourcesCompat.getFont(context!!, R.font.spoqa_han_sans_regular) main_sub_scalable_layout.addView(weekText, 20f, weekPosTop, 100f, 50f) main_sub_scalable_layout.setScale_TextSize(weekText, 35f) weekPosTop += 55f @@ -75,7 +74,6 @@ class MainSub : Fragment() { for (index in 2..commitSize / 7 step 2) { val weekText = TextView(activity) weekText.textColor = activity!!.getColor(R.color.userRankPos) - weekText.typeface = ResourcesCompat.getFont(context!!, R.font.spoqa_han_sans_regular) weekText.text = index.toString() + "W" main_sub_scalable_layout.addView(weekText, 570f, weekPosTop, 100f, 50f) main_sub_scalable_layout.setScale_TextSize(weekText, 35f) diff --git a/app/src/main/res/font/font.xml b/app/src/main/res/font/font.xml index aebbf4e..4d707f5 100644 --- a/app/src/main/res/font/font.xml +++ b/app/src/main/res/font/font.xml @@ -3,7 +3,5 @@ xmlns:android="http://schemas.android.com/apk/res/android"> \ No newline at end of file diff --git a/app/src/main/res/font/spoqa_han_sans_regular.ttf b/app/src/main/res/font/spoqa_han_sans_regular.ttf deleted file mode 100644 index 41d7d15..0000000 Binary files a/app/src/main/res/font/spoqa_han_sans_regular.ttf and /dev/null differ diff --git a/app/src/main/res/font/spoqa_han_sans_thin.ttf b/app/src/main/res/font/spoqa_han_sans_thin.ttf deleted file mode 100644 index c183f4e..0000000 Binary files a/app/src/main/res/font/spoqa_han_sans_thin.ttf and /dev/null differ diff --git a/app/src/main/res/layout/activity_guest_main.xml b/app/src/main/res/layout/activity_guest_main.xml index 2e64896..bf94234 100644 --- a/app/src/main/res/layout/activity_guest_main.xml +++ b/app/src/main/res/layout/activity_guest_main.xml @@ -22,7 +22,6 @@ android:id="@+id/guest_main_search_edit" android:layout_width="match_parent" android:layout_height="match_parent" - android:fontFamily="@font/spoqa_han_sans_regular" android:hint="Github ID를 입력하세요" android:inputType="text" app:scale_height="130" @@ -36,7 +35,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/rounding_background" - android:fontFamily="@font/spoqa_han_sans_regular" android:text="검색" android:textColor="@color/userRankPos" android:textStyle="bold" @@ -50,71 +48,45 @@ android:id="@+id/guest_main_tv_username" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/spoqa_han_sans_regular" android:text="\@HelloGfd on Github" android:textColor="@color/colorText" android:textStyle="bold" - android:visibility="invisible" - app:scale_height="120" - app:scale_left="30" - app:scale_textsize="50" - app:scale_top="150" - app:scale_width="1020" /> + android:visibility="invisible"/> + android:orientation="vertical"/> + android:orientation="horizontal" /> + android:background="@color/ndCommit" /> + android:background="@color/thCommit"/> + android:background="@color/fiCommit"/> diff --git a/app/src/main/res/layout/activity_launcher.xml b/app/src/main/res/layout/activity_launcher.xml index eb7eed7..abf976d 100644 --- a/app/src/main/res/layout/activity_launcher.xml +++ b/app/src/main/res/layout/activity_launcher.xml @@ -2,7 +2,7 @@ @@ -17,6 +17,6 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:srcCompat="@drawable/gfd_launcher" /> + app:srcCompat="@drawable/icon_bio" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index bb01739..41bc827 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -35,7 +35,6 @@ android:id="@+id/login_tv_users_count" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/spoqa_han_sans_regular" android:text="@string/rank_view_sample_commit" android:textColor="@color/colorText" android:textSize="50sp" @@ -49,7 +48,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="50dp" - android:fontFamily="@font/spoqa_han_sans_thin" android:text="@string/app_tv_count_users" android:textColor="@color/colorText" android:textSize="20sp" @@ -76,7 +74,6 @@ android:id="@+id/login_tv_guest1" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/spoqa_han_sans_thin" android:shadowColor="#A8A8A8" android:shadowDx="0" android:shadowDy="0" @@ -89,7 +86,6 @@ android:id="@+id/login_tv_guest2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/spoqa_han_sans_regular" android:shadowColor="#A8A8A8" android:shadowDx="0" android:shadowDy="0" @@ -117,7 +113,6 @@ android:id="@+id/login_tv_1" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/spoqa_han_sans_thin" android:shadowColor="#A8A8A8" android:shadowDx="0" android:shadowDy="0" @@ -130,7 +125,6 @@ android:id="@+id/login_tv_2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/spoqa_han_sans_regular" android:shadowColor="#A8A8A8" android:shadowDx="0" android:shadowDy="0" diff --git a/app/src/main/res/layout/contributions_layout.xml b/app/src/main/res/layout/contributions_layout.xml index 41d916b..14f99b1 100644 --- a/app/src/main/res/layout/contributions_layout.xml +++ b/app/src/main/res/layout/contributions_layout.xml @@ -12,7 +12,6 @@ android:id="@+id/guest_year_contribution" android:layout_width="match_parent" android:layout_height="match_parent" - android:fontFamily="@font/spoqa_han_sans_thin" android:text="2019: 702 Contributions" android:textColor="@color/colorText" android:textStyle="italic" /> diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index c68c252..aa61f0a 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -30,7 +30,6 @@ android:id="@+id/main_tv_user_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/spoqa_han_sans_regular" android:textColor="@color/colorText" android:textStyle="bold" android:text="HelloGfd" @@ -44,7 +43,6 @@ android:id="@+id/main_tv_today" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/spoqa_han_sans_thin" android:gravity="right" android:textColor="@color/colorText" android:text="2020-01-01" @@ -68,7 +66,6 @@ android:id="@+id/main_tv_user_bio" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/spoqa_han_sans_regular" android:text="Selfie" android:textColor="@color/colorText" app:scale_height="70" diff --git a/app/src/main/res/layout/fragment_main3.xml b/app/src/main/res/layout/fragment_main3.xml index 896a1a2..7e89195 100644 --- a/app/src/main/res/layout/fragment_main3.xml +++ b/app/src/main/res/layout/fragment_main3.xml @@ -91,7 +91,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/spoqa_han_sans_regular" android:text="0" android:textColor="#FFFFFF" android:textSize="30sp" @@ -106,7 +105,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" - android:fontFamily="@font/spoqa_han_sans_regular" android:text="@string/today_contribution" android:textColor="#FFFFFF" android:textSize="18sp" @@ -134,7 +132,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/spoqa_han_sans_regular" android:text="0" android:textColor="#FFFFFF" android:textSize="30sp" @@ -149,7 +146,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" - android:fontFamily="@font/spoqa_han_sans_regular" android:text="@string/max_contribution" android:textColor="#FFFFFF" android:textSize="18sp" @@ -176,7 +172,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:fontFamily="@font/spoqa_han_sans_regular" android:text="0" android:textColor="#FFFFFF" android:textSize="30sp" @@ -191,7 +186,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="16dp" - android:fontFamily="@font/spoqa_han_sans_regular" android:text="@string/year_contribution" android:textColor="#FFFFFF" android:textSize="18sp" diff --git a/app/src/main/res/layout/fragment_option.xml b/app/src/main/res/layout/fragment_option.xml index 7a72fad..23864e9 100644 --- a/app/src/main/res/layout/fragment_option.xml +++ b/app/src/main/res/layout/fragment_option.xml @@ -26,7 +26,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="16dp" - android:fontFamily="@font/spoqa_han_sans_regular" android:text="@string/ot_tv_title" android:textSize="25sp" app:layout_constraintEnd_toEndOf="parent" @@ -64,7 +63,6 @@ android:layout_height="wrap_content" android:layout_marginStart="24dp" android:layout_marginTop="8dp" - android:fontFamily="@font/spoqa_han_sans_regular" android:text="TextView" app:layout_constraintBottom_toTopOf="@+id/ot_tv_user_github_1" app:layout_constraintStart_toEndOf="@+id/ot_img_user_1" @@ -75,7 +73,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="24dp" - android:fontFamily="@font/spoqa_han_sans_regular" android:text="TextView" app:layout_constraintBottom_toTopOf="@+id/ot_tv_user_etc_1" app:layout_constraintStart_toEndOf="@+id/ot_img_user_1" @@ -87,7 +84,6 @@ android:layout_height="wrap_content" android:layout_marginStart="24dp" android:layout_marginBottom="8dp" - android:fontFamily="@font/spoqa_han_sans_thin" android:text="TextView" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/ot_img_user_1" @@ -126,7 +122,6 @@ android:layout_height="wrap_content" android:layout_marginStart="24dp" android:layout_marginTop="8dp" - android:fontFamily="@font/spoqa_han_sans_regular" android:text="TextView" app:layout_constraintBottom_toTopOf="@+id/ot_tv_user_github_2" app:layout_constraintStart_toEndOf="@+id/ot_img_user_2" @@ -137,7 +132,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="24dp" - android:fontFamily="@font/spoqa_han_sans_regular" android:text="TextView" app:layout_constraintBottom_toTopOf="@+id/ot_tv_user_etc_2" app:layout_constraintStart_toEndOf="@+id/ot_img_user_2" @@ -149,7 +143,6 @@ android:layout_height="wrap_content" android:layout_marginStart="24dp" android:layout_marginBottom="8dp" - android:fontFamily="@font/spoqa_han_sans_thin" android:text="TextView" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/ot_img_user_2" @@ -187,7 +180,6 @@ android:layout_height="wrap_content" android:layout_marginStart="24dp" android:layout_marginTop="8dp" - android:fontFamily="@font/spoqa_han_sans_regular" android:text="TextView" app:layout_constraintBottom_toTopOf="@+id/ot_tv_user_github_3" app:layout_constraintStart_toEndOf="@+id/ot_img_user_3" @@ -198,7 +190,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="24dp" - android:fontFamily="@font/spoqa_han_sans_regular" android:text="TextView" app:layout_constraintBottom_toTopOf="@+id/ot_tv_user_etc_3" app:layout_constraintStart_toEndOf="@+id/ot_img_user_3" @@ -210,7 +201,6 @@ android:layout_height="wrap_content" android:layout_marginStart="24dp" android:layout_marginBottom="8dp" - android:fontFamily="@font/spoqa_han_sans_thin" android:text="TextView" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toEndOf="@+id/ot_img_user_3" diff --git a/app/src/main/res/layout/fragment_rank.xml b/app/src/main/res/layout/fragment_rank.xml index c3e7d29..08512e5 100644 --- a/app/src/main/res/layout/fragment_rank.xml +++ b/app/src/main/res/layout/fragment_rank.xml @@ -32,7 +32,6 @@ android:id="@+id/tv_rv_commit" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/spoqa_han_sans_regular" android:text="@string/rank_view_sample_commit" android:textColor="@color/colorText" android:textSize="30sp" @@ -45,7 +44,6 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="16dp" - android:fontFamily="@font/spoqa_han_sans_regular" android:text="@string/rank_view_today_rank" android:textColor="@color/colorText" android:textSize="16sp" @@ -59,7 +57,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="50dp" - android:fontFamily="@font/spoqa_han_sans_regular" android:text="@string/rank_view_commit_txt" android:textColor="@color/colorText" android:textSize="15sp" @@ -72,7 +69,6 @@ android:id="@+id/textView8" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/spoqa_han_sans_regular" android:textColor="@color/colorText" android:textSize="15sp" app:layout_constraintBaseline_toBaselineOf="@+id/tv_rv_rank" @@ -83,7 +79,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="50dp" - android:fontFamily="@font/spoqa_han_sans_regular" android:textColor="@color/colorText" android:textSize="30sp" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/rv_rank_item.xml b/app/src/main/res/layout/rv_rank_item.xml index 37d9a51..d2b1834 100644 --- a/app/src/main/res/layout/rv_rank_item.xml +++ b/app/src/main/res/layout/rv_rank_item.xml @@ -13,7 +13,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="16dp" - android:fontFamily="@font/spoqa_han_sans_regular" android:textColor="@color/colorText" android:textSize="26sp" app:layout_constraintBottom_toBottomOf="parent" @@ -34,7 +33,6 @@ android:id="@+id/tv_rv_rank_username" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:fontFamily="@font/spoqa_han_sans_regular" android:text="@string/rv_rank_user_name" android:textColor="@color/colorText" android:textSize="20sp" @@ -48,7 +46,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="16dp" - android:fontFamily="@font/spoqa_han_sans_regular" android:text="@string/rv_rank_commit" android:textColor="@color/colorText" android:textSize="36sp" diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index f02f63e..0eb88fe 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -6,7 +6,6 @@ @color/colorPrimary @color/colorPrimaryDark @color/colorAccent - diff --git a/app/src/main/res/xml/network_security_config.xml b/app/src/main/res/xml/network_security_config.xml index d77018f..4ec2e58 100644 --- a/app/src/main/res/xml/network_security_config.xml +++ b/app/src/main/res/xml/network_security_config.xml @@ -1,7 +1,6 @@ - 203.241.228.111 10.0.2.2 52.78.188.192 diff --git a/build.gradle b/build.gradle index 683ba18..17c138e 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.3' + classpath 'com.android.tools.build:gradle:4.1.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.2' classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 92a90e2..ad33aa9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Aug 25 13:33:58 KST 2019 +#Tue Dec 01 01:23:26 KST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip