feature:

- 앱 UI 변경 중
- 앱 용량 최적화
- Guest 서비스 추가 중

Author: msnodeve

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "com.seok.gfd"
         minSdkVersion 26
         targetSdkVersion 28
-        versionCode 7
-        versionName "2.17.7"
+        versionCode 9
+        versionName "2.17.8"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/AndroidManifest.xml

@@ -8,7 +8,7 @@
     <application
             android:allowBackup="true"
             android:fullBackupContent="@xml/backup_descriptor"
-            android:icon="@drawable/gfd_logo_foreground"
+            android:icon="@drawable/gfd_app_logo"
             android:label="@string/app_name"
             android:supportsRtl="true"
             android:theme="@style/AppTheme"

app/src/main/java/com/seok/gfd/views/LoginActivity.kt

@@ -4,53 +4,36 @@ package com.seok.gfd.views
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.os.Handler
+import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
 import com.seok.gfd.BuildConfig
 import com.seok.gfd.R
-import com.seok.gfd.utils.ProgressbarDialog
 import com.seok.gfd.utils.SharedPreference
 import com.seok.gfd.viewmodel.UserViewModel
 import kotlinx.android.synthetic.main.activity_login.*
 import org.jetbrains.anko.longToast
 import java.net.HttpURLConnection
 
-@Suppress(
-    "NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS",
-    "RECEIVER_NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS"
-)
 class LoginActivity : AppCompatActivity() {
 
     private lateinit var userViewModel: UserViewModel
     private lateinit var sharedPreference: SharedPreference
-    private lateinit var progressbar: ProgressbarDialog
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_login)
 
         init()
         initViewModelFun()
-
-        // 로그인 버튼 눌렀을 경우 Github login 창으로 넘김
-        login_img_login.setOnClickListener {
-            progressbar.show()
-            val intent = Intent(
-                Intent.ACTION_VIEW,
-                Uri.parse(BuildConfig.GITHUB_OAUTH_URL + BuildConfig.GITHUB_CLIENT_ID)
-            )
-            // onNewIntent() 리다이렉트
-            startActivityForResult(intent, HttpURLConnection.HTTP_OK)
-        }
-        userViewModel.getUserInfoAndSignInGithub(sharedPreference.getValue(BuildConfig.PREFERENCES_TOKEN_KEY))
+        setOnClickFun()
 
     }
 
     // ViewModel 세팅 및 초기화
     private fun init() {
-        progressbar = ProgressbarDialog(this)
-        progressbar.show()
         sharedPreference = SharedPreference(application)
         userViewModel = ViewModelProviders.of(this).get(UserViewModel::class.java)
         userViewModel.getUsersCount()
@@ -72,7 +55,7 @@ class LoginActivity : AppCompatActivity() {
             if (it == HttpURLConnection.HTTP_OK) {
                 goToMainActivity()
             } else {
-                progressbar.hide()
+                login_progress_bar.visibility = View.INVISIBLE
                 longToast(getString(R.string.fail_access_token))
             }
         })
@@ -92,7 +75,34 @@ class LoginActivity : AppCompatActivity() {
     private fun goToMainActivity() {
         startActivity(Intent(this, MainActivity::class.java))
         overridePendingTransition(R.anim.fade_in, R.anim.fade_out)
-        progressbar.hide()
-        finish()
+    }
+
+    private fun setOnClickFun(){
+        // Guest 로그인 버튼을 눌렀을 경우
+        login_img_guest.setOnClickListener {
+            syncUI()
+        }
+
+        // 로그인 버튼 눌렀을 경우 Github login 창으로 넘김
+        login_img_login.setOnClickListener {
+            syncUI()
+            val intent = Intent(
+                Intent.ACTION_VIEW,
+                Uri.parse(BuildConfig.GITHUB_OAUTH_URL + BuildConfig.GITHUB_CLIENT_ID)
+            )
+            // onNewIntent() 리다이렉트
+            startActivityForResult(intent, HttpURLConnection.HTTP_OK)
+        }
+    }
+
+    private fun syncUI(){
+        login_progress_bar.visibility = View.VISIBLE
+        login_img_login.isClickable = false
+        login_img_guest.isClickable = false
+        Handler().postDelayed({
+            login_progress_bar.visibility = View.INVISIBLE
+            login_img_login.isClickable = true
+            login_img_guest.isClickable = true
+        }, 3000)
     }
 }

app/src/main/java/com/seok/gfd/views/MainSub.kt

@@ -66,7 +66,7 @@ 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_light)
+            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 +75,7 @@ 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_light)
+            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)

app/src/main/res/drawable/gfd_app_logo.png

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#444444" />
+    <corners android:radius="40dip"/>
+    <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
+</shape>

app/src/main/res/drawable/gfd_logo.png

@@ -12,22 +12,11 @@
             android:layout_width="300dp"
             android:layout_height="300dp"
             android:layout_weight="1"
-            android:visibility="gone"
+            android:visibility="visible"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/gfd_launcher" />
 
-    <com.ssomai.android.scalablelayout.ScalableLayout
-            android:id="@+id/scale_layout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-    </com.ssomai.android.scalablelayout.ScalableLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>