Skip to content

Commit

Permalink
[#30] 로그인 기능 추가
Browse files Browse the repository at this point in the history
- UI 작업
  • Loading branch information
ethan-223 committed Aug 4, 2022
1 parent 6424263 commit d7f09cc
Show file tree
Hide file tree
Showing 8 changed files with 120 additions and 0 deletions.
1 change: 1 addition & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ android {
kotlinOptions {
jvmTarget = '1.8'
}

buildFeatures {
viewBinding true
}
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.MoyeoRunandroid">
<activity
android:name=".login.LoginActivity"
android:exported="false" />
<activity
android:name=".MainActivity"
android:exported="true">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.moyerun.moyeorun_android.login

import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import com.moyerun.moyeorun_android.databinding.ActivityLoginBinding

class LoginActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
val binding = ActivityLoginBinding.inflate(layoutInflater)
setContentView(binding.root)

binding.buttonLoginGoogle.setOnClickListener {
//Todo: 구글 로그인 작업 @winter223
}
}
}
18 changes: 18 additions & 0 deletions app/src/main/res/drawable/login_google_logo.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="22dp"
android:height="22dp"
android:viewportWidth="22"
android:viewportHeight="22">
<path
android:pathData="M4.5271,11.0009C4.5271,10.2378 4.6599,9.5064 4.899,8.8253L1.2143,6.0225C0.4402,7.5188 0,9.2086 0,11.0009C0,12.7503 0.4193,14.4048 1.1593,15.8732L4.8573,13.0611C4.6429,12.4116 4.5271,11.7193 4.5271,11.0009Z"
android:fillColor="#FBBC05"/>
<path
android:pathData="M11.331,17.6747C8.3066,17.6747 5.7451,15.7392 4.859,13.061L1.1592,15.8731C2.992,19.5041 6.8039,21.9999 11.2133,21.9999C14.0992,21.9999 16.636,20.9297 18.5258,19.1729L15.029,16.5152C14.012,17.2466 12.7521,17.6747 11.331,17.6747Z"
android:fillColor="#34A853"/>
<path
android:pathData="M11.3311,4.3252C12.9913,4.3252 14.4314,4.9096 15.5224,5.8792L18.0213,3.4188L18.5772,2.8717C16.6836,1.0887 14.126,0 11.2154,0C6.8477,0 3.0662,2.4492 1.2144,6.0225L4.8991,8.8235C5.8193,6.2067 8.3504,4.3252 11.3311,4.3252Z"
android:fillColor="#EA4335"/>
<path
android:pathData="M21.8122,8.9185H17.4235H11.1414V13.0929H17.4217C17.0042,14.498 16.1694,15.6984 15.0291,16.5173L18.5259,19.175C20.2127,17.606 21.3777,15.4863 21.8103,13.0929C21.9336,12.4155 22,11.7175 22,11.001C22,10.2882 21.9336,9.5922 21.8122,8.9185Z"
android:fillColor="#4285F3"/>
</vector>
42 changes: 42 additions & 0 deletions app/src/main/res/drawable/login_logo.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="238dp"
android:height="258dp"
android:viewportWidth="238"
android:viewportHeight="258">
<path
android:pathData="M62.454,92.096C64.345,82.13 67.531,65.228 69.52,55.245L68.723,55.429C64.047,74.064 55.881,106.135 54.786,111.202L43.536,113.772C44.929,103.387 48.614,73.41 50.305,59.313L49.508,59.496C47.915,68.321 45.428,83.134 43.038,95.997L39.554,114.678L25.318,117.931L39.353,43.392L60.454,38.567C59.858,45.342 58.167,61.9 56.969,70.742L57.468,70.627C60.356,59.898 62.047,52.766 66.328,37.218L88.225,32.209L74.19,106.749L59.061,110.209L62.454,92.096Z"
android:fillColor="#1162FF"/>
<path
android:pathData="M125.956,44.367L119.389,78.854C116.501,94.19 110.329,99.561 98.884,102.183C86.838,104.936 81.067,99.83 83.956,84.821L90.924,48.314C93.71,33.753 100.38,28.371 110.334,26.094C123.567,23.064 128.839,29.14 125.956,44.367ZM106.443,44.115L98.781,84.959C98.283,87.753 98.684,89.371 100.374,88.987C102.265,88.556 102.861,86.921 103.457,83.892L111.12,42.938C111.716,39.588 111.217,38.739 109.429,39.146C107.939,39.49 107.045,40.77 106.443,44.115Z"
android:fillColor="#1162FF"/>
<path
android:pathData="M127.744,94.511L131.429,74.603C131.727,73.036 132.025,70.288 132.025,68.682L131.131,22.404L146.96,18.784C145.768,27.625 144.77,37.815 143.177,48.779L144.175,48.549C146.266,40.144 149.453,28.061 151.94,17.642L167.963,13.976L148.157,66.812C147.561,68.447 147.361,68.923 147.063,70.489L143.08,91L127.744,94.511Z"
android:fillColor="#1162FF"/>
<path
android:pathData="M191.545,49.502L178.605,52.462L175.419,70.11L190.748,66.605L186.766,81.011L157.304,87.753L171.338,13.213L200.405,6.563L197.717,20.672L184.181,23.77L181.293,38.245L194.233,35.285L191.545,49.502Z"
android:fillColor="#1162FF"/>
<path
android:pathData="M236.732,19.031L230.165,53.524C227.276,68.86 221.104,74.23 209.66,76.852C197.614,79.606 191.843,74.5 194.731,59.491L201.7,22.984C204.485,8.422 211.156,3.041 221.11,0.763C234.342,-2.272 239.62,3.804 236.732,19.031ZM217.225,18.778L209.563,59.623C209.064,62.417 209.465,64.035 211.156,63.65C213.047,63.22 213.643,61.579 214.239,58.556L221.901,17.602C222.497,14.252 221.998,13.402 220.21,13.81C218.72,14.154 217.821,15.428 217.225,18.778Z"
android:fillColor="#1162FF"/>
<path
android:pathData="M81.001,132.978L56.867,138.478L56.872,138.464L21.007,146.615L0,257.5L35.566,249.417L35.576,249.363L55.607,244.801L64.52,198.033L65.706,197.764C69.569,196.884 70.902,197.378 68.824,208.36C64.073,233.482 62.882,241.237 63.627,242.978L86.051,237.868C86.35,233.663 88.722,221.336 91.399,208.149C94.669,191.96 93.625,186.469 87.982,184.093C93.625,180.895 98.081,174.627 100.159,163.806L101.645,156.144C105.209,137.652 98.821,128.919 81.001,132.978ZM78.623,159.469L76.991,168.754C75.653,175.746 74.466,177.766 70.01,178.783L68.226,179.189L73.128,152.756L74.466,152.453C78.923,151.445 79.81,152.991 78.623,159.469Z">
<aapt:attr name="android:fillColor">
<gradient
android:startY="182.648"
android:startX="-15.0224"
android:endY="205.125"
android:endX="96.6586"
android:type="linear">
<item android:offset="0" android:color="#001162FF"/>
<item android:offset="0.7161" android:color="#FF1162FF"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M134.731,120.864L118.602,207.199C117.871,211.188 118.457,213.124 120.655,212.615C123.293,212.004 124.029,209.927 124.91,205.747L141.038,119.412L164.5,114L148.957,197.016C145.143,217.475 138.84,227.208 118.602,231.877C98.805,236.443 92.943,226.817 96.462,207.859L111.709,126.183L134.731,120.864Z"
android:fillColor="#1162FF"/>
<path
android:pathData="M151.5,223L172.283,112.208L197.641,106.39C196.167,136.018 193.661,176.236 193.364,180.758L194.395,180.523C196.016,163.436 201.325,119.234 203.242,108.928L203.977,104.938L225.5,100L204.717,210.782L178.624,216.771C180.245,188.542 182.751,146.735 183.047,143.166L181.87,143.435C180.249,155.589 174.794,202.847 172.434,215.647L171.991,218.297L151.5,223Z"
android:fillColor="#1162FF"/>
</vector>
35 changes: 35 additions & 0 deletions app/src/main/res/layout/activity_login.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>

<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".login.LoginActivity">

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/imageview_login_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/login_logo"
app:layout_constraintBottom_toTopOf="@id/button_login_google"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<!-- Todo: EditText 브랜치 합쳐지면 Border Background 적용 @winter223 -->
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/button_login_google"
android:layout_width="match_parent"
android:layout_height="56dp"
android:layout_marginHorizontal="27dp"
android:drawableStart="@drawable/login_google_logo"
android:text="@string/login_button_google"
android:textColor="@color/text_google_login_gray"
android:textSize="18dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/imageview_login_logo" />

</androidx.constraintlayout.widget.ConstraintLayout>
1 change: 1 addition & 0 deletions app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<color name="text_default_black">#333333</color>
<color name="text_gray">#828282</color>
<color name="text_hint_gray">#A9A9A9</color>
<color name="text_google_login_gray">#686868</color>

<!-- Line colors -->
<color name="line_dialog_divider">#EBECEF</color>
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,7 @@
<string name="cancel">취소</string>
<string name="ok">확인</string>

<!-- Login -->
<string name="login_button_start">시작하기</string>
<string name="login_button_google">구글 계정으로 로그인</string>
</resources>

0 comments on commit d7f09cc

Please sign in to comment.