Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CREATE] 프로젝트 생성 #1

Open
wants to merge 26 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
2c9db8c
Initial commit
ChaeYubin Nov 12, 2022
bd099cb
[CREATE] 프로젝트 생성
SongKong00 Nov 12, 2022
5622699
Delete hackathonAndroid directory
lucy1287 Nov 12, 2022
1194fe8
[CREATE] 프로젝트 생성
SongKong00 Nov 12, 2022
ba88993
[FEAT] BottomNavi 구현
SongKong00 Nov 12, 2022
6374c71
[FEAT] #1 kakao map api config
ChaeYubin Nov 12, 2022
0d2fb2a
Merge branch 'android' of https://github.com/University-MakeUs-Challe…
ChaeYubin Nov 12, 2022
b42cf76
[FEAT] #2 - kakao map
ChaeYubin Nov 12, 2022
35b1130
[FEAT] #3 - kakao map marker, cirle
ChaeYubin Nov 12, 2022
2c13971
[FEAT] 마이페이지 프래그먼트 구성 완료
ChaeYubin Nov 12, 2022
8ce6328
[FEAT] 술자리 만들기 2 - Bottom Sheet Dialog Layout
ChaeYubin Nov 12, 2022
848b5e0
[FIX] - 마이페이지 레이아웃 수정
ChaeYubin Nov 12, 2022
6a8bbcf
[FEAT] 챌린지 페이지
lucy1287 Nov 12, 2022
c6bc0f9
[FEAT] 챌린지 페이지
lucy1287 Nov 12, 2022
1f96e56
[FEAT]홈 화면
SongKong00 Nov 12, 2022
ec6ae2f
Merge branch 'android' into Android
SongKong00 Nov 12, 2022
f0081ae
Merge pull request #2 from University-MakeUs-Challenge/Android
SongKong00 Nov 12, 2022
b332f13
{FEAT]홈 화면2
SongKong00 Nov 12, 2022
3841743
[FEAT] 바코드 인식 페이지
ChaeYubin Nov 12, 2022
ab29fba
[FEAT]홈 화면2
SongKong00 Nov 12, 2022
345c689
[FIX] 코드 수정
ChaeYubin Nov 12, 2022
f33bd4e
[FIX] 충돌 해결
ChaeYubin Nov 12, 2022
7c67f40
[FEAT] 챌린지 BottomSheet
lucy1287 Nov 12, 2022
9b664fa
Merge branch 'android' of https://github.com/University-MakeUs-Challe…
lucy1287 Nov 12, 2022
aa36e8a
[FIX] 코드 합치기
ChaeYubin Nov 12, 2022
688e3ec
Merge branch 'android' of https://github.com/University-MakeUs-Challe…
ChaeYubin Nov 12, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Client/.idea/.gitignore

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

9 changes: 9 additions & 0 deletions Client/.idea/Client.iml

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

8 changes: 8 additions & 0 deletions Client/.idea/modules.xml

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

6 changes: 6 additions & 0 deletions Client/.idea/vcs.xml

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

3 changes: 2 additions & 1 deletion Client/README.md
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
8팀 Client README.md 파일입니다!
8팀 Client README.md 파일입니다!
Initial commit
15 changes: 15 additions & 0 deletions Client/hackathonAndroid/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
*.iml
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
.DS_Store
/build
/captures
.externalNativeBuild
.cxx
local.properties
3 changes: 3 additions & 0 deletions Client/hackathonAndroid/.idea/.gitignore

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

1 change: 1 addition & 0 deletions Client/hackathonAndroid/.idea/.name

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

6 changes: 6 additions & 0 deletions Client/hackathonAndroid/.idea/compiler.xml

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

19 changes: 19 additions & 0 deletions Client/hackathonAndroid/.idea/gradle.xml

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

35 changes: 35 additions & 0 deletions Client/hackathonAndroid/.idea/misc.xml

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

7 changes: 7 additions & 0 deletions Client/hackathonAndroid/.idea/vcs.xml

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

1 change: 1 addition & 0 deletions Client/hackathonAndroid/app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
52 changes: 52 additions & 0 deletions Client/hackathonAndroid/app/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
}

android {
compileSdk 32

defaultConfig {
applicationId "com.example.hackatonumc3rd"
minSdk 21
targetSdk 32
versionCode 1
versionName "1.0"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = '1.8'
}
viewBinding {
enabled true
}
}

dependencies {
//kakao map\
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation files('libs/libDaumMapAndroid.jar')

implementation "androidx.fragment:fragment-ktx:1.5.4"
implementation 'com.google.android.material:material:1.5.0-alpha02'
implementation 'androidx.core:core-ktx:1.7.0'
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'com.google.android.material:material:1.7.0'
implementation 'com.google.android.material:material:1.4.0-alpha01'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
}
Binary file not shown.
21 changes: 21 additions & 0 deletions Client/hackathonAndroid/app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.example.hackatonumc3rd

import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4

import org.junit.Test
import org.junit.runner.RunWith

import org.junit.Assert.*

/**
* Instrumented test, which will execute on an Android device.
*
* See [testing documentation](http://d.android.com/tools/testing).
*/
@RunWith(AndroidJUnit4::class)
class ExampleInstrumentedTest {
@Test
fun useAppContext() {
// Context of the app under test.
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("com.example.hackatonumc3rd", appContext.packageName)
}
}
44 changes: 44 additions & 0 deletions Client/hackathonAndroid/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.example.hackatonumc3rd">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

<application
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:networkSecurityConfig="@xml/network_security_config"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.HackatonUMC3rd"
android:usesCleartextTraffic="true"
tools:targetApi="31">
<activity
android:name=".MapActivity"
android:exported="false">
<meta-data
android:name="android.app.lib_name"
android:value="" />
</activity>
<activity
android:name=".MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<meta-data
android:name="com.kakao.sdk.AppKey"
android:value="a516fc446af0e4ffd895b83d2d9f85fd" />
</application>

</manifest>
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package com.example.hackatonumc3rd

import android.content.Intent
import android.content.res.ColorStateList
import android.graphics.Color
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import com.example.hackatonumc3rd.databinding.DialogBarcodeBinding
import com.example.hackatonumc3rd.databinding.DialogBarcodeContainerBinding
import com.google.android.material.bottomsheet.BottomSheetDialogFragment

class AuthBottomSheet(): BottomSheetDialogFragment() {
lateinit var viewBinding: DialogBarcodeContainerBinding
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
viewBinding = DialogBarcodeContainerBinding.inflate(layoutInflater)

childFragmentManager
.beginTransaction()
.replace(viewBinding.barcodeContainer.id, BarcodeSelectFragment())
.commitAllowingStateLoss()

childFragmentManager.setFragmentResultListener("requestKey", this) { requestKey, bundle ->
val message = bundle.getString("bundleKey")

if (message == "scan")
childFragmentManager.beginTransaction().replace(viewBinding.barcodeContainer.id, BarcodeScanFragment()).commitAllowingStateLoss()

if (message == "previous")
childFragmentManager.beginTransaction().replace(viewBinding.barcodeContainer.id, BarcodeSelectFragment()).commitAllowingStateLoss()
}

return viewBinding.root
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package com.example.hackatonumc3rd

import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.os.bundleOf
import androidx.fragment.app.Fragment
import androidx.fragment.app.setFragmentResult
import com.example.hackatonumc3rd.databinding.DialogBarcodeCompleteBinding

class BarcodeComplete: Fragment() {
lateinit var viewBinding: DialogBarcodeCompleteBinding
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
viewBinding = DialogBarcodeCompleteBinding.inflate(layoutInflater)
lateinit var msg: String

viewBinding.btnDone.setOnClickListener {
msg = "done"
setFragmentResult("requestKey", bundleOf("bundleKey" to msg))
}

return viewBinding.root
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package com.example.hackatonumc3rd

import android.content.res.ColorStateList
import android.graphics.Color
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.core.os.bundleOf
import androidx.fragment.app.Fragment
import androidx.fragment.app.setFragmentResult
import com.example.hackatonumc3rd.databinding.DialogBarcodeScanBinding

class BarcodeScanFragment : Fragment() {
lateinit var viewBinding: DialogBarcodeScanBinding
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
viewBinding = DialogBarcodeScanBinding.inflate(layoutInflater)
lateinit var msg: String

viewBinding.btnPrevious.setOnClickListener {
msg = "previous"
setFragmentResult("requestKey", bundleOf("bundleKey" to msg))
}

viewBinding.btnNext.setOnClickListener {
msg = "next"
setFragmentResult("requestKey", bundleOf("bundleKey" to msg))
}

return viewBinding.root
}
}
Loading