Merge branch 'feat/#69' of https://github.com/PrayHelper/prayhelper-m…

…obile into feat/#69

t
 the commit.

.github/workflows/release.yml

@@ -0,0 +1,31 @@
+name: Deploy
+
+on:
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  url_change:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Replace URLs
+        run: |
+          sed -i 's|www.dev.uspray.kr|www.uspray.kr|g' ios/Runner/Runner.entitlements
+          sed -i 's|www.dev.uspray.kr|www.uspray.kr|g' android/app/src/main/AndroidManifest.xml
+          sed -i 's|www.dev.uspray.kr|www.uspray.kr|g' lib/bloc/notification/fcm_setting.dart
+          sed -i 's|www.dev.uspray.kr|www.uspray.kr|g' lib/bloc/notification/local_notification_setting.dart
+          sed -i 's|www.dev.uspray.kr|www.uspray.kr|g' lib/controller/webview_controller.dart
+          sed -i 's|www.dev.uspray.kr|www.uspray.kr|g' lib/screen/webview_screen.dart
+
+      - name: Commit and Push Changes
+        run: |
+          git config --global user.email ${{ secrets.GIT_USER_EMAIL }}
+          git config --global user.name ${{ secrets.GIT_USER_NAME }}
+          git add .
+          git commit -m "URL changed: dev.uspray -> uspray"
+          git push origin HEAD:${{ github.head_ref }}

android/app/build.gradle

@@ -6,6 +6,12 @@ if (localPropertiesFile.exists()) {
     }
 }
 
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('app/key.properties')
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
 def flutterRoot = localProperties.getProperty('flutter.sdk')
 if (flutterRoot == null) {
     throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
@@ -44,7 +50,6 @@ android {
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.prayhelper.uspray"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
@@ -54,11 +59,18 @@ android {
         versionName flutterVersionName
     }
 
+    signingConfigs {
+        release {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile file(keystoreProperties['storeFile'])
+            storePassword keystoreProperties['storePassword']
+        }
+    }
+
     buildTypes {
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
         }
     }
 }

android/app/src/main/AndroidManifest.xml

@@ -2,11 +2,15 @@
     package="com.prayhelper.uspray">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
 
     <application
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        android:label="Uspray"
+        android:label="유스프레이"
         android:usesCleartextTraffic="true">
         <activity
             android:name="com.prayhelper.uspray.MainActivity"
@@ -17,7 +21,8 @@
             android:showWhenLocked="true"
             android:theme="@style/LaunchTheme"
             android:turnScreenOn="true"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize"
+            android:screenOrientation="portrait">
 
             <meta-data
                 android:name="flutter_deeplinking_enabled"
@@ -33,15 +38,9 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data
-                    android:host="www.dev.uspray.kr"
-                    android:scheme="https" />
                 <data
                     android:host="www.uspray.kr"
                     android:scheme="https" />
-                <data
-                    android:host="www.intg.uspray.kr"
-                    android:scheme="https" />
             </intent-filter>
 
             <intent-filter>
@@ -71,9 +70,4 @@
             android:value="high_importance_channel" />
     </application>
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
 </manifest>

ios/Runner/Info.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
-	<string>Uspray</string>
+	<string>유스프레이</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -22,6 +22,8 @@
 	<string>$(FLUTTER_BUILD_NAME)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>UIInterfaceOrientation</key>
+    <string>UIInterfaceOrientationPortrait</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

ios/Runner/Runner.entitlements

@@ -7,8 +7,6 @@
 	<key>com.apple.developer.associated-domains</key>
 	<array>
 		<string>applinks:www.uspray.kr</string>
-		<string>applinks:www.dev.uspray.kr</string>
-        <string>applinks:www.intg.uspray.kr</string>
 	</array>
 </dict>
 </plist>

lib/bloc/link_sharing/deeplinking.dart

@@ -1,8 +1,6 @@
 import 'package:com.prayhelper.uspray/controller/webview_controller.dart';
 import 'package:uni_links/uni_links.dart';
 
-import '../../debug/logger.dart';
-
 Future<void> initDeepLinks() async {
   // Listen for incoming deep links
   try {
@@ -23,7 +21,6 @@ Future<void> initDeepLinks() async {
 void handleDeepLink(Uri? uri) {
   //핸들링 코드정의
   if (uri != null) {
-    logger.d(uri);
     //TODO Can handling specific path
       WebviewMainController.to.loadUrl(uri.toString());
 

lib/bloc/link_sharing/invokeDefault.dart

@@ -1,6 +1,4 @@
 import 'dart:io';
-
-import 'package:com.prayhelper.uspray/debug/logger.dart';
 import 'package:flutter/services.dart';
 
 class InvokeDefault {
@@ -13,9 +11,7 @@ class InvokeDefault {
         await channel.invokeMethod('openManageDefaultAppsSettings');
       }
     } on PlatformException catch (e) {
-      logger.d('Error: $e');
     } catch (e){
-      logger.d('Error: $e');
     }
   }
 }

lib/bloc/notification/fcm_setting.dart

@@ -2,8 +2,6 @@
 import 'dart:io';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:com.prayhelper.uspray/controller/webview_controller.dart';
-
-import '../../debug/logger.dart';
 import 'local_notification_setting.dart';
 
 void fcmSetting() async{
@@ -51,10 +49,7 @@ void fcmSetting() async{
 
   // Listen to the onMessageOpenedApp stream
   FirebaseMessaging.onMessageOpenedApp.listen((RemoteMessage message) {
-    WebviewMainController.to.loadUrl("https://www.naver.com/");
-    //TODO REAL
-    // final url = message.data['url'];
-    // if (url != null) {}
+    WebviewMainController.to.loadUrl("https://www.dev.uspray.kr/main/");
   });
 
 }

lib/bloc/notification/local_notification_setting.dart

@@ -26,7 +26,7 @@ Future<void> notificationSetting() async {
     initializationSettings,
     onDidReceiveNotificationResponse: (payload) async {
       //TODO loadUrl(payload.input!)
-      WebviewMainController.to.loadUrl("https://www.naver.com/");
+      WebviewMainController.to.loadUrl("https://www.dev.uspray.kr/main/");
     }
   );
 }

lib/controller/webview_controller.dart

@@ -5,14 +5,13 @@ import 'package:com.prayhelper.uspray/controller/token_controller.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:webview_flutter/webview_flutter.dart';
-
-import '../debug/logger.dart';
+import 'package:webview_flutter_android/webview_flutter_android.dart';
+import 'package:webview_flutter_wkwebview/webview_flutter_wkwebview.dart';
 
 class WebviewMainController extends GetxController {
   static WebviewMainController get to => Get.find();
 
   static var controller = WebViewController()
-    ..enableZoom(false)
     ..setJavaScriptMode(JavaScriptMode.unrestricted)
     ..setBackgroundColor(const Color(0x00000000))
     ..setNavigationDelegate(
@@ -27,7 +26,7 @@ class WebviewMainController extends GetxController {
         },
       ),
     )
-    //JavaScriptChannel을 웹뷰 컨트롤러에 더한다
+    ..enableZoom(false)
     ..addJavaScriptChannel(
         //JavaScriptChannel 이름
         "FlutterGetDeviceToken",
@@ -53,7 +52,6 @@ class WebviewMainController extends GetxController {
     ..addJavaScriptChannel(
         "FlutterShareLink",
         onMessageReceived: (JavaScriptMessage message) async {
-          logger.d("SHARED IS CONNECTED");
           Map<String, dynamic> data = jsonDecode(message.message);
           shareLinkForAOS(data['url']);
         },
@@ -75,6 +73,18 @@ class WebviewMainController extends GetxController {
     controller.loadRequest(Uri.parse(url));
   }
 
+  void setPlatformSpecifics(WebViewController controller){
+    if (controller.platform is AndroidWebViewController) {
+      (controller.platform as AndroidWebViewController)
+        ..setTextZoom(100)
+        ..enableZoom(false);
+    } else if (controller.platform is WebKitWebViewController) {
+      (controller.platform as WebKitWebViewController);
+      // .allowsBackForwardNavigationGestures = true;
+    }
+  }
+
+
 }
 
 

lib/main.dart

@@ -1,5 +1,3 @@
-import 'package:com.prayhelper.uspray/bloc/link_sharing/invokeDefault.dart';
-import 'package:com.prayhelper.uspray/debug/logger.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:get/get.dart';
@@ -10,7 +8,6 @@ import 'bloc/link_sharing/deeplinking.dart';
 import 'bloc/notification/init_notification.dart';
 import 'controller/webview_controller.dart';
 import 'package:firebase_core/firebase_core.dart';
-import 'package:flutter/services.dart';
 
 late AndroidNotificationChannel channel;
 
@@ -21,7 +18,6 @@ void main() async {
 
   await initNotification();
   await initDeepLinks();
-  // await InvokeDefault.openManageDefaultAppsSettings();
-
-  runApp(PrayHelperApp());
+
+  runApp(const PrayHelperApp());
 }

lib/pray_helper_app.dart

@@ -7,7 +7,6 @@ import 'package:uni_links/uni_links.dart';
 import 'controller/token_controller.dart';
 import 'controller/webview_controller.dart';
 import 'package:webview_flutter_android/webview_flutter_android.dart';
-import 'debug/logger.dart';
 
 bool _initialUriIsHandled = false;
 
@@ -24,18 +23,16 @@ class _PrayHelperAppState extends State<PrayHelperApp> {
   Object? _err;
   StreamSubscription? _sub;
 
-  // 앱 정보 저장
   @override
   Widget build(BuildContext context) {
     final controller = WebviewMainController.to.getController();
+    WebviewMainController.to.setPlatformSpecifics(controller);
     if (controller.platform is AndroidWebViewController) {
       AndroidWebViewController.enableDebugging(true);
     }
 
     return FutureBuilder<List<String>?>(
-      future: Future.wait(
-        [getFcmToken(), SplashDelay.waiting() ],
-      ),
+      future: Future.wait([getFcmToken(), SplashDelay.waiting()]),
       builder: (context, AsyncSnapshot<List<String>?> snapshot) {
         return (snapshot.hasData)
             ? MaterialApp(
@@ -67,21 +64,16 @@ class _PrayHelperAppState extends State<PrayHelperApp> {
     if (!_initialUriIsHandled) {
       _initialUriIsHandled = true;
 
-      logger.d('_handleInitialUri called');
       try {
         final uri = await getInitialUri();
         if (uri == null) {
-          logger.d('no initial uri');
         } else {
-          logger.d('got initial uri: $uri');
         }
         if (!mounted) return;
         setState(() => _initialUri = uri);
       } on PlatformException {
-        logger.d('falied to get initial uri');
       } on FormatException catch (err) {
         if (!mounted) return;
-        logger.d('malformed initial uri');
         setState(() => _err = err);
       }
     }

lib/screen/webview_screen.dart

@@ -2,8 +2,6 @@ import 'dart:async';
 import 'package:flutter/material.dart';
 import 'package:webview_flutter/webview_flutter.dart';
 
-import '../debug/logger.dart';
-
 class WebViewScreen extends StatefulWidget {
   WebViewScreen({super.key, required this.controller});
 
@@ -30,7 +28,6 @@ class _WebViewScreenState extends State<WebViewScreen> {
     );
   }
 
-  //TODO 이후 나가는 창 커스터마이징
   Future<bool> showExitPopup() async {
     return await showDialog(
           context: context,
@@ -65,12 +62,14 @@ class _WebViewScreenState extends State<WebViewScreen> {
   }
 
   Future<bool> onGoBack() async {
-    //TODO URL CHANGE
-    if (await widget.controller.canGoBack() &&
-        await widget.controller.currentUrl() !=
-            'https://www.dev.uspray.kr/main') {
-      widget.controller.goBack();
-      return Future.value(false);
+    if (await widget.controller.currentUrl() != 'https://www.dev.uspray.kr/main') {
+      if(!await widget.controller.canGoBack()){
+        Future<bool> dialogResult = showExitPopup();
+        return Future.value(dialogResult);
+      }else {
+        widget.controller.goBack();
+        return Future.value(false);
+      }
     } else {
       Future<bool> dialogResult = showExitPopup();
       return Future.value(dialogResult);