diff --git a/android/app/build.gradle b/android/app/build.gradle
index f8b3b4e5f5158906f95dca30aa9eb0a4b617cc78..7886e0731c1aeaec4ad80de6efb6b7d1f3d2b465 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -33,7 +33,7 @@ android {
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
- applicationId "com.vereign.mobile_app"
+ applicationId "com.vereign.app"
minSdkVersion 16
targetSdkVersion 28
versionCode flutterVersionCode.toInteger()
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index 30571d46cee45c24950b7fbbabf888aa3ff8504e..deaa5f6c624042dbcba56e63aef911d09af87d27 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.vereign.mobile_app">
+ package="com.vereign.app">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 4b0abf865885ce69726092a064a39380fba063d9..67974226a5b4c671e42a9ba128c0d0bd9afb3c41 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- package="com.vereign.mobile_app">
+ package="com.vereign.app">
<uses-permission android:name="android.permission.INTERNET" />
diff --git a/android/app/src/main/java/com/vereign/mobile_app/MainActivity.java b/android/app/src/main/java/com/vereign/mobile_app/MainActivity.java
index 6f5ea70773be7fa80c304381204cbb5d34248ec0..061279cd4dc7a34bf09aa274731cd01d6df7c518 100644
--- a/android/app/src/main/java/com/vereign/mobile_app/MainActivity.java
+++ b/android/app/src/main/java/com/vereign/mobile_app/MainActivity.java
@@ -1,4 +1,4 @@
-package com.vereign.mobile_app;
+package com.vereign.app;
import android.os.Bundle;
import io.flutter.app.FlutterActivity;
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
index 30571d46cee45c24950b7fbbabf888aa3ff8504e..deaa5f6c624042dbcba56e63aef911d09af87d27 100644
--- a/android/app/src/profile/AndroidManifest.xml
+++ b/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.vereign.mobile_app">
+ package="com.vereign.app">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 9b932325355e51583af0274d1d8abc6ccf082455..d4f7184a0a457502c77ed729ae822bfda81fc16e 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
objects = {
/* Begin PBXBuildFile section */
- 11CD157822E0938400C26878 /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11CD157722E0938400C26878 /* File.swift */; };
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
2B7C3A4D2AAA9093CF166788 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 243F8ED4CD2745551915608C /* Pods_Runner.framework */; };
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
@@ -41,7 +40,6 @@
/* Begin PBXFileReference section */
01FCA16E363494253C1046FA /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
11CD157622E0938300C26878 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
- 11CD157722E0938400C26878 /* File.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = "<group>"; };
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
243F8ED4CD2745551915608C /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -103,7 +101,6 @@
97C146E51CF9000F007C117D = {
isa = PBXGroup;
children = (
- 11CD157722E0938400C26878 /* File.swift */,
9740EEB11CF90186004384FC /* Flutter */,
97C146F01CF9000F007C117D /* Runner */,
97C146EF1CF9000F007C117D /* Products */,
@@ -189,6 +186,7 @@
TargetAttributes = {
97C146ED1CF9000F007C117D = {
CreatedOnToolsVersion = 7.3.1;
+ DevelopmentTeam = 825ANDQ593;
LastSwiftMigration = 1020;
};
};
@@ -300,7 +298,6 @@
buildActionMask = 2147483647;
files = (
978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */,
- 11CD157822E0938400C26878 /* File.swift in Sources */,
97C146F31CF9000F007C117D /* main.m in Sources */,
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */,
);
@@ -385,7 +382,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
- DEVELOPMENT_TEAM = S8QB4VV633;
+ DEVELOPMENT_TEAM = 825ANDQ593;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -397,7 +394,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.vereign.mobileApp;
+ PRODUCT_BUNDLE_IDENTIFIER = com.vereign.app;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner-Bridging-Header.h";
SWIFT_VERSION = 4.0;
@@ -518,6 +515,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+ DEVELOPMENT_TEAM = 825ANDQ593;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -529,7 +527,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.vereign.mobileApp;
+ PRODUCT_BUNDLE_IDENTIFIER = com.vereign.app;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -545,6 +543,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+ DEVELOPMENT_TEAM = 825ANDQ593;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@@ -556,7 +555,7 @@
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
);
- PRODUCT_BUNDLE_IDENTIFIER = com.vereign.mobileApp;
+ PRODUCT_BUNDLE_IDENTIFIER = com.vereign.app;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Runner-Bridging-Header.h";
SWIFT_VERSION = 4.0;
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 28ec77b17371af1209d20fe9be4f191226b8b61e..30ff88c9d9395a34bdd0c49a85f281ca2e146010 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -18,28 +18,26 @@
<string>$(FLUTTER_BUILD_NAME)</string>
<key>CFBundleSignature</key>
<string>????</string>
+ <key>CFBundleURLTypes</key>
+ <array>
+ <dict>
+ <key>CFBundleIdentifier</key>
+ <string></string>
+ <key>CFBundleTypeRole</key>
+ <string>Editor</string>
+ <key>CFBundleURLSchemes</key>
+ <array>
+ <string>app://com.vereign.app/oauth2</string>
+ <string>vereign://app.vereign.com</string>
+ </array>
+ </dict>
+ </array>
<key>CFBundleVersion</key>
<string>$(FLUTTER_BUILD_NUMBER)</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
- <key>io.flutter.embedded_views_preview</key>
- <string>YES</string>
- <key>CFBundleURLTypes</key>
- <array>
- <dict>
- <key>CFBundleIdentifier</key>
- <string></string>
- <key>CFBundleTypeRole</key>
- <string>Editor</string>
- <key>CFBundleURLSchemes</key>
- <array>
- <string>app://com.vereign.app/oauth2</string>
- <string>vereign://app.vereign.com</string>
- </array>
- </dict>
- </array>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>UISupportedInterfaceOrientations</key>
@@ -57,5 +55,7 @@
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
+ <key>io.flutter.embedded_views_preview</key>
+ <string>YES</string>
</dict>
</plist>
diff --git a/lib/app.dart b/lib/app.dart
index e4c8685c25a88c294cbc376d3bdab9ae1bb392e0..18e116547c5e3c681e2e9c01516c2d0ff47d72e7 100644
--- a/lib/app.dart
+++ b/lib/app.dart
@@ -16,7 +16,7 @@ class App extends StatefulWidget {
class _AppState extends State<App> {
StreamSubscription _sub;
- String _appMode = "app";
+ String _appMode = "";
// Url of the app which invoked OAuth
String _invokerURL;
@@ -69,7 +69,7 @@ class _AppState extends State<App> {
@override
Widget build(BuildContext context) {
return MaterialApp(
- title: 'Flutter Web Views',
+ title: 'Vereign',
theme: ThemeData(
primarySwatch: Colors.blue,
fontFamily: "Arial",
diff --git a/lib/screens/home.dart b/lib/screens/home.dart
index ed3a1de7ff0e91b63a345d21830e93efcfbceb37..4e85c7b73115d523675152a3651098e98e253490 100644
--- a/lib/screens/home.dart
+++ b/lib/screens/home.dart
@@ -47,6 +47,7 @@ class _HomeState extends State<Home> {
onPressed: () async {
Navigator.of(context).pop();
+ log('Try launch ${widget.invokerURL}');
if (await canLaunch(widget.invokerURL)) {
await launch("${widget.invokerURL}?token=$token");
} else {
@@ -81,7 +82,7 @@ class _HomeState extends State<Home> {
}
openVereign() {
- FlutterWebBrowser.openWebPage(url: 'https://app.vereign.com', androidToolbarColor: Colors.deepPurple);
+ FlutterWebBrowser.openWebPage(url: 'https://gospodinbodurov.dev.vereign.com', androidToolbarColor: Colors.deepPurple);
}
startOAuth() {