Merge pull request #5 from msnodeve/develop

[Merge] develop->master : release 완료

Author: msnodeve

.gitignore

@@ -70,5 +70,9 @@ fastlane/readme.md
 .DS_Store
 .idea/runConfigurations.xml
 
-# font
-spoqa_han_sans_*.ttf
+.settings
+release
+.project
+.classpath
+
+network_security_config.xml

Makefile

@@ -5,4 +5,5 @@ set_env:
 	echo "PREFERENCES_FILE=\"file_name\"" >> app/gradle.properties
 	echo "PREFERENCES_TOKEN_KEY=\"token_key\"" >> app/gradle.properties
 	echo "BASIC_AUTH_KEY=\"basic_auth_key\"" >> app/gradle.properties
-	echo "GFD_API_URL=\"gfd_api_url\"" >> app/gradle.properties
+	echo "GFD_API_URL=\"gfd_api_url\"" >> app/gradle.properties
+	echo "GITHUB_OAUTH_URL=\"gfd_oauth_url\"" >> app/gradle.properties

README.md

@@ -7,12 +7,13 @@
 
 # Release
 
-v1.10.3 릴리즈 [Google Paly Store](https://play.google.com/store/apps/details?id=com.seok.gitfordeveloper)
+v2.17.7 릴리즈 [Google Paly Store](https://play.google.com/store/apps/details?id=com.seok.gfd)
 
 # Preview
 
-<img src="./img/preview01.png" width="40%" height="40%">
-<img src="./img/preview02.png" width="40%" height="40%">
+<img src="./img/preview05.png" width="40%" height="40%">
+<img src="./img/preview04.png" width="40%" height="40%">
+<img src="./img/preview03.png" width="40%" height="40%">
 
 
 # Notice
@@ -30,3 +31,7 @@ v2.16.6 릴리즈 작업 완료
 - 대대적인 UI/UX 개선
 - 도움을 주신 분 탭 추가
 - 앱 성능 최적화
+
+v.2.17.7
+- Github Contribution 그래프 UI 변경
+- 랭킹 서비스 오류로 인해 수정 진행 중

app/build.gradle

@@ -16,17 +16,18 @@ android {
     compileSdkVersion 28
     defaultConfig {
         applicationId "com.seok.gfd"
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 28
-        versionCode 5
-        versionName "1.10.3"
+        versionCode 7
+        versionName "2.17.7"
         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
@@ -37,6 +38,7 @@ android {
         }
         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
@@ -141,4 +143,12 @@ dependencies {
     // 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'
+
 }

app/release/output.json

@@ -0,0 +1,102 @@
+package com.seok.gfd.adapter
+
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.LayoutRes
+import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.RequestOptions
+import com.seok.gfd.R
+import com.seok.gfd.retrofit.domain.resopnse.CommitResponse
+import kotlinx.android.synthetic.main.rv_rank_item.view.*
+
+class CommitsAdapter(private val commit: ArrayList<CommitResponse>) :
+    RecyclerView.Adapter<CommitsAdapter.CommitsHolder>() {
+    private var index = 1
+    override fun getItemCount() = commit.size
+    override fun onCreateViewHolder(
+        parent: ViewGroup,
+        viewType: Int
+    ): CommitsHolder {
+        val inflatedView = parent.inflate(R.layout.rv_rank_item, false)
+        return CommitsHolder(inflatedView)
+    }
+
+    fun ViewGroup.inflate(@LayoutRes layoutRes: Int, attachToRoot: Boolean = false): View {
+        return LayoutInflater.from(context).inflate(layoutRes, this, attachToRoot)
+    }
+
+    override fun onBindViewHolder(holder: CommitsHolder, position: Int) {
+        val itemCommit = commit[position]
+        holder.bindCommit(itemCommit)
+    }
+
+    class CommitsHolder(v: View) : RecyclerView.ViewHolder(v), View.OnClickListener {
+        private var view: View = v
+        private var commit: CommitResponse? = null
+        init {
+            v.setOnClickListener(this)
+        }
+
+        override fun onClick(v: View) {
+            Log.d("RecyclerView", v.id.toString())
+        }
+
+        companion object {
+            private val COMMIT_KEY = "COMMIT"
+        }
+
+        fun bindCommit(commitResponse: CommitResponse) {
+            this.commit = commitResponse
+            view.tv_rank_commit.text = commitResponse.data_count.toString()
+            view.tv_rv_rank_username.text = commitResponse.user_id
+            Glide.with(view).load(commitResponse.user_image).apply(RequestOptions.circleCropTransform()).into(view.img_rv_user_profile)
+//            view.tv_rv_rank_username.text = commitResponse.uid
+//            view.tv_rv_rank_num.text = rank
+//            Glide.with(view).load(commitResponse.profile_image)
+//                .apply(RequestOptions.circleCropTransform()).into(view.img_rv_user_profile)
+        }
+    }
+
+}
+//class CommitsAdapter(private val application: Application, private val items: List<TRCommitResponseDto>, private val fragment: Fragment) :
+//    RecyclerView.Adapter<CommitsAdapter.TRCommitRankViewHolder>() {
+//
+//    private lateinit var sharedPreferencesForUser: SharedPreferencesForUser
+//
+//    override fun getItemCount() = items.size
+//
+//    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TRCommitRankViewHolder {
+//        sharedPreferencesForUser = SharedPreferencesForUser(application)
+//        val inflatedView = LayoutInflater.from(parent.context).inflate(R.layout.rv_rank_item, parent, false)
+//        return TRCommitRankViewHolder(inflatedView)
+//    }
+//
+//    override fun onBindViewHolder(holder: TRCommitRankViewHolder, position: Int) {
+//        val item = items[position]
+//        val rank = (position+1).toString()
+//        if(item.uid == sharedPreferencesForUser.getValue(application.getString(R.string.user_id))){
+//            fragment.tv_rv_rank.text = rank
+//            fragment.tv_rv_commit.text = item.data_count.toString()
+//            Glide.with(fragment).load(item.profile_image).apply(RequestOptions.circleCropTransform()).into(fragment.img_rv_profile)
+//        }
+//        holder.apply {
+//            bind(rank, item, sharedPreferencesForUser.getValue(application.getString(R.string.user_id)))
+//            itemView.tag = item
+//        }
+//    }
+//
+//    class TRCommitRankViewHolder(private var view: View) : RecyclerView.ViewHolder(view) {
+//        fun bind(rank: String, item: TRCommitResponseDto, userId: String) {
+//            view.tv_rv_rank_num.text = rank
+//            view.tv_rv_rank_username.text = item.uid
+//            view.tv_rank_commit.text = item.data_count.toString()
+//            Glide.with(view.context).load(item.profile_image).apply(RequestOptions.circleCropTransform()).into(view.img_rv_user_profile)
+//            if(item.uid == userId){
+//                view.layout_rv_back.setBackgroundResource(R.color.nonCommit)
+//            }
+//        }
+//    }
+//}

app/src/androidTest/java/com/seok/gfd/GithubRetrofitTest.kt

@@ -2,45 +2,54 @@ package com.seok.gfd.retrofit
 
 import com.google.gson.GsonBuilder
 import com.seok.gfd.BuildConfig
-import com.seok.gfd.retrofit.service.GUserService
-import com.seok.gfd.retrofit.service.TRCommitService
 import com.seok.gfd.retrofit.service.UserService
+import com.seok.gfd.retrofit.service.CommitService
+import com.seok.gfd.retrofit.service.GithubApiService
+import com.seok.gfd.retrofit.service.GithubCommitService
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 
 class RetrofitClient {
     companion object {
         lateinit var retrofit: Retrofit
-        fun githubUserApiService(): UserService {
+        fun githubApiService(): GithubApiService {
             val gson = GsonBuilder().setLenient().create()
             retrofit = Retrofit.Builder()
                 .baseUrl("https://api.github.com/")
                 .addConverterFactory(GsonConverterFactory.create(gson))
                 .build()
-            return retrofit.create(UserService::class.java)
+            return retrofit.create(GithubApiService::class.java)
         }
-        fun getGithubCode(): UserService{
+        fun githubAuthService(): GithubApiService{
             retrofit = Retrofit.Builder()
                 .baseUrl("https://github.com/login/oauth/")
                 .addConverterFactory(GsonConverterFactory.create())
                 .build()
-            return retrofit.create(UserService::class.java)
+            return retrofit.create(GithubApiService::class.java)
         }
-        fun gUserService() : GUserService{
+        fun userService() : UserService{
             val gson = GsonBuilder().setLenient().create()
             retrofit = Retrofit.Builder()
-                .baseUrl("http://10.0.2.2:8080/api/v1/")
+                .baseUrl(BuildConfig.GFD_API_URL)
                 .addConverterFactory(GsonConverterFactory.create(gson))
                 .build()
-            return retrofit.create(GUserService::class.java)
+            return retrofit.create(UserService::class.java)
         }
-        fun trCommitService() : TRCommitService{
+        fun commitService() : CommitService{
             val gson = GsonBuilder().setLenient().create()
             retrofit = Retrofit.Builder()
                 .baseUrl(BuildConfig.GFD_API_URL)
                 .addConverterFactory(GsonConverterFactory.create(gson))
                 .build()
-            return retrofit.create(TRCommitService::class.java)
+            return retrofit.create(CommitService::class.java)
+        }
+        fun githubCommitService(): GithubCommitService{
+            val gson = GsonBuilder().setLenient().create()
+            retrofit = Retrofit.Builder()
+                .baseUrl("https://github-contributions-api.now.sh/v1/")
+                .addConverterFactory(GsonConverterFactory.create(gson))
+                .build()
+            return retrofit.create(GithubCommitService::class.java)
         }
     }
 }