From 240826731301ab63c79525508e3d391e160a1ee3 Mon Sep 17 00:00:00 2001
From: ybmin <nimby@sparcs.org>
Date: Tue, 3 Dec 2024 21:21:43 +0900
Subject: [PATCH] Revert: 01b7047d731377fd1fea8a28eb5ab604206798f2 inappwebview
 location

---
 .github/workflows/build.yml                   |  2 +-
 android/app/build.gradle                      |  1 -
 android/build.gradle                          |  2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |  2 +-
 lib/views/taxiView.dart                       | 23 +++++--------------
 5 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8f5f664..a85f1ba 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,7 +8,7 @@ on:
 
 env:
   FLUTTER_VERSION: "3"
-  JAVA_VERSION: "11"
+  JAVA_VERSION: "17"
 
 jobs:
   build-android:
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 07071aa..193d561 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -60,7 +60,6 @@ android {
 
     kotlinOptions {
         jvmTarget = '1.8'
-        languageVersion = '1.8'
     }
 
     sourceSets {
diff --git a/android/build.gradle b/android/build.gradle
index d817c2a..9f980fc 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0'
+        classpath 'com.android.tools.build:gradle:7.1.2'
         classpath 'com.google.gms:google-services:4.3.13'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index fb5eb59..cc5527d 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
diff --git a/lib/views/taxiView.dart b/lib/views/taxiView.dart
index 47af588..da2ef2c 100644
--- a/lib/views/taxiView.dart
+++ b/lib/views/taxiView.dart
@@ -35,17 +35,6 @@ class TaxiView extends HookWidget {
   FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin =
       FlutterLocalNotificationsPlugin();
 
-  //TODO: Remove this on production
-  Future<void> _requestLocationPermission() async {
-    var status = await Permission.locationWhenInUse.status;
-    if (status.isDenied) {
-      status = await Permission.locationWhenInUse.request();
-    }
-    if (!status.isGranted) {
-      Fluttertoast.showToast(msg: "위치 권한이 거부되었습니다.");
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
     String address = RemoteConfigController().frontUrl;
@@ -81,12 +70,6 @@ class TaxiView extends HookWidget {
 
     devicePixelRatio = MediaQuery.of(context).devicePixelRatio;
 
-    //TODO: Remove this on production
-    useEffect(() {
-      _requestLocationPermission();
-      return;
-    }, []);
-
     useEffect(() {
       if (isTimerUp.value) {
         FcmToken().init().then((value) {
@@ -863,6 +846,12 @@ class TaxiView extends HookWidget {
               },
               androidOnPermissionRequest:
                   (controller, origin, resources) async {
+                if (resources.contains("location")) {
+                  var status = await Permission.location.request();
+                  if (!status.isGranted) {
+                    openAppSettings();
+                  }
+                }
                 return PermissionRequestResponse(
                     resources: resources,
                     action: PermissionRequestResponseAction.GRANT);