Skip to content

Commit

Permalink
Merge pull request #12 from KPUCE2021SP/main
Browse files Browse the repository at this point in the history
Pull request
  • Loading branch information
boifromangye authored Aug 3, 2021
2 parents 939c2e8 + 6f3916c commit d5d6e5f
Show file tree
Hide file tree
Showing 35 changed files with 613 additions and 156 deletions.
138 changes: 138 additions & 0 deletions android-project/.idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions android-project/.idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion android-project/.idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions android-project/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 0 additions & 10 deletions android-project/.idea/runConfigurations.xml

This file was deleted.

7 changes: 3 additions & 4 deletions android-project/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,9 @@ dependencies {
implementation 'com.google.firebase:firebase-auth-ktx'
// Declare the dependencies for the Crashlytics and Analytics libraries
// When using the BoM, you don't specify versions in Firebase library dependencies
implementation 'com.google.firebase:firebase-crashlytics-ktx'

implementation 'com.google.firebase:firebase-analytics-ktx'
implementation 'com.google.firebase:firebase-storage-ktx'
implementation 'com.google.firebase:firebase-config-ktx'

implementation 'com.google.firebase:firebase-firestore-ktx'
implementation 'com.google.firebase:firebase-database-ktx'

}
9 changes: 8 additions & 1 deletion android-project/app/google-services.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:970980545204:android:fb3c5463a832e420707de1",
"mobilesdk_app_id": "1:970980545204:android:e41f55be5ee7cd0e707de1",
"android_client_info": {
"package_name": "kr.ac.kpu.kpuce2021sp.haneulbori_and"
}
Expand All @@ -29,6 +29,13 @@
{
"client_id": "970980545204-144rge9ababoidpr13jigf0nsoeaabh9.apps.googleusercontent.com",
"client_type": 3
},
{
"client_id": "970980545204-1rv3torkqfrseali3rv5elvrtu7btc47.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
"bundle_id": "com.mataewoos.HaneulBori-Swift"
}
}
]
}
Expand Down
3 changes: 3 additions & 0 deletions android-project/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Haneulboriand">
<activity
android:name=".LoginActivity"
android:exported="true" />
<activity android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package kr.ac.kpu.kpuce2021sp.haneulbori_and

import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle

class LoginActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_login)
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions android-project/app/src/main/res/drawable/facebook_icon.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/facebook" android:height="48dp" android:width="48dp">
</item>
</layer-list>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions android-project/app/src/main/res/drawable/google_icon.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/google" android:height="48dp" android:width="48dp">
</item>
<item>
<shape>
<corners android:radius="100dp"/>
<stroke android:color="#454545" android:width="0.5dp"/>
</shape>
</item>
</layer-list>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions android-project/app/src/main/res/drawable/kakao_icon.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/kakao" android:height="48dp" android:width="48dp">
</item>
</layer-list>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions android-project/app/src/main/res/drawable/naver_icon.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/naver" android:height="48dp" android:width="48dp">
</item>
</layer-list>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit d5d6e5f

Please sign in to comment.