Merge pull request #39 from tukcomCD2024/Android_front-end

Android front end
tukcomCD2024 · Mar 12, 2024 · 6e07eb5 · 6e07eb5
2 parents 26177f1 + ae23282
commit 6e07eb5
Show file tree

Hide file tree

Showing 23 changed files with 83 additions and 1 deletion.
diff --git a/Android/.gradle/8.2/checksums/checksums.lock b/Android/.gradle/8.2/checksums/checksums.lock
diff --git a/Android/.gradle/8.2/dependencies-accessors/dependencies-accessors.lock b/Android/.gradle/8.2/dependencies-accessors/dependencies-accessors.lock
diff --git a/Android/.gradle/8.2/dependencies-accessors/gc.properties b/Android/.gradle/8.2/dependencies-accessors/gc.properties
diff --git a/Android/.gradle/8.2/executionHistory/executionHistory.lock b/Android/.gradle/8.2/executionHistory/executionHistory.lock
diff --git a/Android/.gradle/8.2/fileChanges/last-build.bin b/Android/.gradle/8.2/fileChanges/last-build.bin
diff --git a/Android/.gradle/8.2/fileHashes/fileHashes.bin b/Android/.gradle/8.2/fileHashes/fileHashes.bin
diff --git a/Android/.gradle/8.2/fileHashes/fileHashes.lock b/Android/.gradle/8.2/fileHashes/fileHashes.lock
diff --git a/Android/.gradle/8.2/gc.properties b/Android/.gradle/8.2/gc.properties
diff --git a/Android/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/Android/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/Android/.gradle/buildOutputCleanup/cache.properties b/Android/.gradle/buildOutputCleanup/cache.properties
@@ -0,0 +1,2 @@
+#Tue Mar 12 19:39:19 KST 2024
+gradle.version=8.2
diff --git a/Android/.gradle/config.properties b/Android/.gradle/config.properties
@@ -0,0 +1,2 @@
+#Tue Mar 12 19:39:10 KST 2024
+java.home=/Applications/Android Studio.app/Contents/jbr/Contents/Home
diff --git a/Android/.gradle/vcs-1/gc.properties b/Android/.gradle/vcs-1/gc.properties
diff --git a/Android/.idea/.gitignore b/Android/.idea/.gitignore
diff --git a/Android/.idea/.name b/Android/.idea/.name
diff --git a/Android/.idea/compiler.xml b/Android/.idea/compiler.xml
diff --git a/Android/.idea/deploymentTargetDropDown.xml b/Android/.idea/deploymentTargetDropDown.xml
diff --git a/Android/.idea/gradle.xml b/Android/.idea/gradle.xml
diff --git a/Android/.idea/kotlinc.xml b/Android/.idea/kotlinc.xml
diff --git a/Android/.idea/migrations.xml b/Android/.idea/migrations.xml
diff --git a/Android/.idea/misc.xml b/Android/.idea/misc.xml
diff --git a/Android/.idea/vcs.xml b/Android/.idea/vcs.xml
diff --git a/Android/app/src/main/java/com/example/front_end_android/Login.kt b/Android/app/src/main/java/com/example/front_end_android/Login.kt
@@ -29,7 +29,7 @@ class Login : AppCompatActivity() {
 
         val gson = GsonBuilder().setLenient().create()
         val retrofit = Retrofit.Builder()
-            .baseUrl("http://172.30.58.135:8080/")//실제로는 aws url이 들어가야함
+            .baseUrl("https://4kringo.shop:8080/")//실제로는 aws url이 들어가야함
             .addConverterFactory(GsonConverterFactory.create(gson))
             .build();
         val service = retrofit.create(RetrofitService::class.java);

diff --git a/Android/local.properties b/Android/local.properties
@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Tue Mar 12 19:39:12 KST 2024
+sdk.dir=/Users/kimseongmin/Library/Android/sdk
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#Tue Mar 12 19:39:19 KST 2024
		gradle.version=8.2
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#Tue Mar 12 19:39:10 KST 2024
		java.home=/Applications/Android Studio.app/Contents/jbr/Contents/Home