Got sociable status working
This commit is contained in:
parent
fd6bfd2ea4
commit
c74501eb34
22 changed files with 134 additions and 78 deletions
|
@ -1,10 +1,10 @@
|
|||
<img src="https://github.com/Nutcake/ReCon/raw/main/assets/images/logo512.png" width="200"/>
|
||||
<img src="https://github.com/Nutcake/recon/raw/main/assets/images/logo512.png" width="200"/>
|
||||
|
||||
# ReCon
|
||||
# recon
|
||||
|
||||
A Resonite Contacts App
|
||||
|
||||
[Get it here](https://github.com/Nutcake/ReCon/releases/latest)
|
||||
[Get it here](https://github.com/Nutcake/recon/releases/latest)
|
||||
|
||||
## Building
|
||||
|
||||
|
@ -17,4 +17,4 @@ For example, notifications are currently not supported on non-android builds.
|
|||
|
||||
## Screenshots
|
||||
|
||||
<img src="https://github.com/Nutcake/ReCon/assets/10452593/a46ccf8a-0a9f-4518-98e6-84fad2d7bf26" width=198/> <img src="https://github.com/Nutcake/ReCon/assets/10452593/5d158f58-cd27-4a68-abf3-9068e92b6a82" width=198/> <img src="https://github.com/Nutcake/ReCon/assets/10452593/f2ce95ef-e513-46cb-9654-31e74cdc7c09" width=198/> <img src="https://github.com/Nutcake/ReCon/assets/10452593/58ef5e5e-1b53-4a47-92f8-bcbcba7a1e86" width=198/>
|
||||
<img src="https://github.com/Nutcake/recon/assets/10452593/a46ccf8a-0a9f-4518-98e6-84fad2d7bf26" width=198/> <img src="https://github.com/Nutcake/recon/assets/10452593/5d158f58-cd27-4a68-abf3-9068e92b6a82" width=198/> <img src="https://github.com/Nutcake/recon/assets/10452593/f2ce95ef-e513-46cb-9654-31e74cdc7c09" width=198/> <img src="https://github.com/Nutcake/recon/assets/10452593/58ef5e5e-1b53-4a47-92f8-bcbcba7a1e86" width=198/>
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<!-- Optional, you'll have to check this permission by yourself. -->
|
||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||
<application
|
||||
android:label="ReCon"
|
||||
android:label="recon"
|
||||
android:name="${applicationName}"
|
||||
android:icon="@mipmap/ic_launcher">
|
||||
<activity
|
||||
|
|
|
@ -3,4 +3,4 @@ package de.voidspace.recon
|
|||
import io.flutter.embedding.android.FlutterActivity
|
||||
|
||||
class MainActivity: FlutterActivity() {
|
||||
}
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
package de.voidspace.recon
|
||||
package me.voidspace.recon
|
||||
|
||||
import io.flutter.embedding.android.FlutterActivity
|
||||
|
||||
class MainActivity: FlutterActivity() {
|
||||
}
|
||||
}
|
|
@ -45,7 +45,7 @@
|
|||
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
|
||||
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
|
||||
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
|
||||
97C146EE1CF9000F007C117D /* ReCon.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ReCon.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
97C146EE1CF9000F007C117D /* recon.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = recon.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
|
||||
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
|
||||
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
|
||||
|
@ -110,7 +110,7 @@
|
|||
97C146EF1CF9000F007C117D /* Products */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
97C146EE1CF9000F007C117D /* ReCon.app */,
|
||||
97C146EE1CF9000F007C117D /* recon.app */,
|
||||
331C8081294A63A400263BE5 /* RunnerTests.xctest */,
|
||||
);
|
||||
name = Products;
|
||||
|
@ -195,7 +195,7 @@
|
|||
);
|
||||
name = Runner;
|
||||
productName = Runner;
|
||||
productReference = 97C146EE1CF9000F007C117D /* ReCon.app */;
|
||||
productReference = 97C146EE1CF9000F007C117D /* recon.app */;
|
||||
productType = "com.apple.product-type.application";
|
||||
};
|
||||
/* End PBXNativeTarget section */
|
||||
|
@ -446,7 +446,7 @@
|
|||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = ReCon;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = recon;
|
||||
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
|
||||
INFOPLIST_KEY_NSDownloadsFolderUsageDescription = "Downloading assets from your inventory";
|
||||
INFOPLIST_KEY_NSMicrophoneUsageDescription = "Recording voice messages";
|
||||
|
@ -474,7 +474,7 @@
|
|||
ENABLE_BITCODE = NO;
|
||||
FLUTTER_BUILD_NAME = 0.11.2;
|
||||
INFOPLIST_FILE = Runner/Info.plist;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = ReCon;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = recon;
|
||||
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
|
||||
LD_RUNPATH_SEARCH_PATHS = (
|
||||
|
@ -484,7 +484,7 @@
|
|||
MACOSX_DEPLOYMENT_TARGET = 11.0;
|
||||
MARKETING_VERSION = 0.11.2;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = ch.isota.recon;
|
||||
PRODUCT_NAME = ReCon;
|
||||
PRODUCT_NAME = recon;
|
||||
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
||||
SWIFT_VERSION = 5.0;
|
||||
VERSIONING_SYSTEM = "apple-generic";
|
||||
|
@ -592,7 +592,7 @@
|
|||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = ReCon;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = recon;
|
||||
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
|
||||
INFOPLIST_KEY_NSDownloadsFolderUsageDescription = "Downloading assets from your inventory";
|
||||
INFOPLIST_KEY_NSMicrophoneUsageDescription = "Recording voice messages";
|
||||
|
@ -652,7 +652,7 @@
|
|||
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
|
||||
GCC_WARN_UNUSED_FUNCTION = YES;
|
||||
GCC_WARN_UNUSED_VARIABLE = YES;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = ReCon;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = recon;
|
||||
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
|
||||
INFOPLIST_KEY_NSDownloadsFolderUsageDescription = "Downloading assets from your inventory";
|
||||
INFOPLIST_KEY_NSMicrophoneUsageDescription = "Recording voice messages";
|
||||
|
@ -682,7 +682,7 @@
|
|||
ENABLE_BITCODE = NO;
|
||||
FLUTTER_BUILD_NAME = 0.11.2;
|
||||
INFOPLIST_FILE = Runner/Info.plist;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = ReCon;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = recon;
|
||||
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
|
||||
LD_RUNPATH_SEARCH_PATHS = (
|
||||
|
@ -692,7 +692,7 @@
|
|||
MACOSX_DEPLOYMENT_TARGET = 11.0;
|
||||
MARKETING_VERSION = 0.11.2;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = ch.isota.recon;
|
||||
PRODUCT_NAME = ReCon;
|
||||
PRODUCT_NAME = recon;
|
||||
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
||||
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
||||
SWIFT_VERSION = 5.0;
|
||||
|
@ -712,7 +712,7 @@
|
|||
ENABLE_BITCODE = NO;
|
||||
FLUTTER_BUILD_NAME = 0.11.2;
|
||||
INFOPLIST_FILE = Runner/Info.plist;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = ReCon;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = recon;
|
||||
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
|
||||
LD_RUNPATH_SEARCH_PATHS = (
|
||||
|
@ -722,7 +722,7 @@
|
|||
MACOSX_DEPLOYMENT_TARGET = 11.0;
|
||||
MARKETING_VERSION = 0.11.2;
|
||||
PRODUCT_BUNDLE_IDENTIFIER = ch.isota.recon;
|
||||
PRODUCT_NAME = ReCon;
|
||||
PRODUCT_NAME = recon;
|
||||
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
|
||||
SWIFT_VERSION = 5.0;
|
||||
VERSIONING_SYSTEM = "apple-generic";
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "97C146ED1CF9000F007C117D"
|
||||
BuildableName = "ReCon.app"
|
||||
BuildableName = "recon.app"
|
||||
BlueprintName = "Runner"
|
||||
ReferencedContainer = "container:Runner.xcodeproj">
|
||||
</BuildableReference>
|
||||
|
@ -31,7 +31,7 @@
|
|||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "97C146ED1CF9000F007C117D"
|
||||
BuildableName = "ReCon.app"
|
||||
BuildableName = "recon.app"
|
||||
BlueprintName = "Runner"
|
||||
ReferencedContainer = "container:Runner.xcodeproj">
|
||||
</BuildableReference>
|
||||
|
@ -65,7 +65,7 @@
|
|||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "97C146ED1CF9000F007C117D"
|
||||
BuildableName = "ReCon.app"
|
||||
BuildableName = "recon.app"
|
||||
BlueprintName = "Runner"
|
||||
ReferencedContainer = "container:Runner.xcodeproj">
|
||||
</BuildableReference>
|
||||
|
@ -82,7 +82,7 @@
|
|||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "97C146ED1CF9000F007C117D"
|
||||
BuildableName = "ReCon.app"
|
||||
BuildableName = "recon.app"
|
||||
BlueprintName = "Runner"
|
||||
ReferencedContainer = "container:Runner.xcodeproj">
|
||||
</BuildableReference>
|
||||
|
@ -93,7 +93,7 @@
|
|||
</AnalyzeAction>
|
||||
<ArchiveAction
|
||||
buildConfiguration = "Release"
|
||||
customArchiveName = "ReCon"
|
||||
customArchiveName = "recon"
|
||||
revealArchiveInOrganizer = "YES">
|
||||
</ArchiveAction>
|
||||
</Scheme>
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>$(DEVELOPMENT_LANGUAGE)</string>
|
||||
<key>CFBundleDisplayName</key>
|
||||
<string>ReCon</string>
|
||||
<string>recon</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>$(EXECUTABLE_NAME)</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
|
@ -15,7 +15,7 @@
|
|||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>ReCon</string>
|
||||
<string>recon</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
|
|
|
@ -6,7 +6,7 @@ class GithubApi {
|
|||
static const baseUrl = "https://api.github.com";
|
||||
|
||||
static Future<String> getLatestTagName() async {
|
||||
final response = await http.get(Uri.parse("$baseUrl/repos/Nutcake/ReCon/releases?per_page=1"));
|
||||
final response = await http.get(Uri.parse("$baseUrl/repos/Nutcake/recon/releases?per_page=1"));
|
||||
if (response.statusCode != 200) return "";
|
||||
final body = jsonDecode(response.body) as List;
|
||||
if (body.isEmpty) return "";
|
||||
|
|
|
@ -228,17 +228,19 @@ class MessagingClient extends ChangeNotifier {
|
|||
// Adjusting values to ensure correct placement of 'headless'
|
||||
if (friend.isHeadless) return 2.5;
|
||||
switch (friend.userStatus.onlineStatus) {
|
||||
case OnlineStatus.online:
|
||||
case OnlineStatus.sociable:
|
||||
return 0;
|
||||
case OnlineStatus.away:
|
||||
case OnlineStatus.online:
|
||||
return 1;
|
||||
case OnlineStatus.busy:
|
||||
case OnlineStatus.away:
|
||||
return 2;
|
||||
case OnlineStatus.busy:
|
||||
return 3;
|
||||
case OnlineStatus.invisible:
|
||||
return 2.5;
|
||||
return 3.5;
|
||||
case OnlineStatus.offline:
|
||||
default:
|
||||
return 3;
|
||||
return 4;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ class NotificationClient {
|
|||
android: fln.AndroidInitializationSettings("ic_notification"),
|
||||
iOS: fln.DarwinInitializationSettings(),
|
||||
macOS: fln.DarwinInitializationSettings(),
|
||||
linux: fln.LinuxInitializationSettings(defaultActionName: "Open ReCon"),
|
||||
linux: fln.LinuxInitializationSettings(defaultActionName: "Open recon"),
|
||||
));
|
||||
|
||||
Future<void> showUnreadMessagesNotification(Iterable<Message> messages) async {
|
||||
|
|
|
@ -59,20 +59,20 @@ void main() async {
|
|||
// Ignore
|
||||
}
|
||||
|
||||
runApp(ReCon(settingsClient: settingsClient, cachedAuthentication: cachedAuth));
|
||||
runApp(recon(settingsClient: settingsClient, cachedAuthentication: cachedAuth));
|
||||
}
|
||||
|
||||
class ReCon extends StatefulWidget {
|
||||
const ReCon({required this.settingsClient, required this.cachedAuthentication, super.key});
|
||||
class recon extends StatefulWidget {
|
||||
const recon({required this.settingsClient, required this.cachedAuthentication, super.key});
|
||||
|
||||
final SettingsClient settingsClient;
|
||||
final AuthenticationData cachedAuthentication;
|
||||
|
||||
@override
|
||||
State<ReCon> createState() => _ReConState();
|
||||
State<recon> createState() => _reconState();
|
||||
}
|
||||
|
||||
class _ReConState extends State<ReCon> {
|
||||
class _reconState extends State<recon> {
|
||||
final Typography _typography = Typography.material2021(platform: defaultTargetPlatform);
|
||||
final ReceivePort _port = ReceivePort();
|
||||
late AuthenticationData _authData = widget.cachedAuthentication;
|
||||
|
@ -165,7 +165,7 @@ class _ReConState extends State<ReCon> {
|
|||
child: DynamicColorBuilder(
|
||||
builder: (ColorScheme? lightDynamic, ColorScheme? darkDynamic) => MaterialApp(
|
||||
debugShowCheckedModeBanner: true,
|
||||
title: 'ReCon',
|
||||
title: 'recon',
|
||||
theme: ThemeData(
|
||||
useMaterial3: true,
|
||||
textTheme: _typography.black,
|
||||
|
|
|
@ -5,14 +5,16 @@ enum OnlineStatus {
|
|||
invisible,
|
||||
away,
|
||||
busy,
|
||||
online;
|
||||
online,
|
||||
sociable;
|
||||
|
||||
static final List<Color> _colors = [
|
||||
Colors.transparent,
|
||||
Colors.transparent,
|
||||
Colors.grey,
|
||||
Colors.yellow,
|
||||
Colors.red,
|
||||
Colors.green,
|
||||
Colors.blue,
|
||||
];
|
||||
|
||||
Color color(BuildContext context) => this == OnlineStatus.offline || this == OnlineStatus.invisible
|
||||
|
@ -28,6 +30,8 @@ enum OnlineStatus {
|
|||
|
||||
int compareTo(OnlineStatus other) {
|
||||
if (this == other) return 0;
|
||||
if (this == OnlineStatus.sociable) return -1;
|
||||
if (other == OnlineStatus.sociable) return 1;
|
||||
if (this == OnlineStatus.online) return -1;
|
||||
if (other == OnlineStatus.online) return 1;
|
||||
if (this == OnlineStatus.away) return -1;
|
||||
|
|
|
@ -12,7 +12,7 @@ class FriendOnlineStatusIndicator extends StatelessWidget {
|
|||
Widget build(BuildContext context) {
|
||||
final UserStatus userStatus = friend.userStatus;
|
||||
final OnlineStatus onlineStatus = userStatus.onlineStatus;
|
||||
return userStatus.appVersion.contains("ReCon") && friend.isOnline
|
||||
return userStatus.appVersion.contains("recon") && friend.isOnline
|
||||
? SizedBox.square(
|
||||
dimension: 10,
|
||||
child: Image.asset(
|
||||
|
|
|
@ -21,7 +21,7 @@ class _FriendsListAppBarState extends State<FriendsListAppBar> with AutomaticKee
|
|||
Widget build(BuildContext context) {
|
||||
super.build(context);
|
||||
return AppBar(
|
||||
title: const Text("ReCon"),
|
||||
title: const Text("recon"),
|
||||
actions: [
|
||||
Consumer<MessagingClient>(builder: (context, client, _) {
|
||||
return PopupMenuButton<OnlineStatus>(
|
||||
|
|
|
@ -55,13 +55,8 @@ class _LoginScreenState extends State<LoginScreen> {
|
|||
|
||||
);
|
||||
Future<void> submit() async {
|
||||
if (_usernameController.text.contains(emailReg) || _passwordController.text.isEmpty) {
|
||||
setState(() {
|
||||
_error = "Email found! YAAAAY!";
|
||||
_isUsernameEmail = true;
|
||||
});
|
||||
}
|
||||
if (_usernameController.text.isEmpty ||_usernameController.text.contains(emailReg) || _passwordController.text.isEmpty) { //some little thing is giving me the hiccups
|
||||
|
||||
if (_usernameController.text.isEmpty || _passwordController.text.isEmpty) {
|
||||
setState(() {
|
||||
_error = "Please enter a valid username/password combination.";
|
||||
});
|
||||
|
@ -116,7 +111,62 @@ class _LoginScreenState extends State<LoginScreen> {
|
|||
});
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> passwordResetSubmit() async {
|
||||
if (_usernameController.text.contains(emailReg) || _passwordController.text.isEmpty) {
|
||||
setState(() {
|
||||
_error = "Please provide an email on the 'Username' textbox";
|
||||
});
|
||||
return;
|
||||
}
|
||||
setState(() {
|
||||
_error = "";
|
||||
_isLoading = false;
|
||||
});
|
||||
/*try {
|
||||
final authData = await ApiClient.tryLogin(
|
||||
username: _usernameController.text,
|
||||
password: _passwordController.text,
|
||||
oneTimePad: _totpController.text.isEmpty ? null : _totpController.text,
|
||||
);
|
||||
if (!authData.isAuthenticated) {
|
||||
setState(() {
|
||||
_error = "Login unsuccessful: Server sent invalid response.";
|
||||
_isLoading = false;
|
||||
});
|
||||
return;
|
||||
}
|
||||
setState(() {
|
||||
_error = "";
|
||||
_isLoading = false;
|
||||
});
|
||||
await loginSuccessful(authData);
|
||||
} catch (e, s) {
|
||||
setState(() {
|
||||
if (e == ApiClient.totpKey) {
|
||||
if (_needsTotp == false) {
|
||||
_error = "Please enter your 2FA-Code";
|
||||
_totpFocusNode.requestFocus();
|
||||
WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
|
||||
_scrollController.animateTo(_scrollController.position.maxScrollExtent,
|
||||
duration: const Duration(milliseconds: 400), curve: Curves.easeOutCirc);
|
||||
});
|
||||
} else {
|
||||
_error = "The given 2FA code is not valid.";
|
||||
}
|
||||
_needsTotp = true;
|
||||
} else {
|
||||
_error = "Login unsuccessful: $e.";
|
||||
}
|
||||
if (kDebugMode) {
|
||||
FlutterError.reportError(FlutterErrorDetails(
|
||||
exception: e,
|
||||
stack: s,
|
||||
));
|
||||
}
|
||||
_isLoading = false;
|
||||
});
|
||||
}*/
|
||||
}
|
||||
Future<void> loginSuccessful(AuthenticationData authData) async {
|
||||
final settingsClient = ClientHolder.of(context).settingsClient;
|
||||
final notificationManager = FlutterLocalNotificationsPlugin();
|
||||
|
@ -173,7 +223,7 @@ class _LoginScreenState extends State<LoginScreen> {
|
|||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
appBar: AppBar(
|
||||
title: const Text("OpenContacts"),
|
||||
title: const Text("recon"),
|
||||
),
|
||||
body: Builder(builder: (context) {
|
||||
return ListView(
|
||||
|
@ -240,13 +290,13 @@ class _LoginScreenState extends State<LoginScreen> {
|
|||
label: const Text("Login"),
|
||||
),
|
||||
),
|
||||
Padding(
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(top: 16),
|
||||
child: _isLoading
|
||||
child: _isUsernameEmail
|
||||
? const Center(child: CircularProgressIndicator())
|
||||
: TextButton.icon(
|
||||
onPressed: submit,
|
||||
icon: const Icon(Icons.question_mark),
|
||||
onPressed: passwordResetSubmit,
|
||||
icon: const Icon(Icons.refresh),
|
||||
label: const Text("Forgot Password?"),
|
||||
),
|
||||
),
|
||||
|
|
|
@ -74,14 +74,14 @@ class SettingsPage extends StatelessWidget {
|
|||
),
|
||||
ListTile(
|
||||
trailing: const Icon(Icons.info_outline),
|
||||
title: const Text("About ReCon"),
|
||||
title: const Text("About recon"),
|
||||
onTap: () async {
|
||||
showAboutDialog(
|
||||
context: context,
|
||||
applicationVersion: (await PackageInfo.fromPlatform()).version,
|
||||
applicationIcon: InkWell(
|
||||
onTap: () async {
|
||||
if (!await launchUrl(Uri.parse("https://github.com/Nutcake/ReCon"),
|
||||
if (!await launchUrl(Uri.parse("https://github.com/Nutcake/recon"),
|
||||
mode: LaunchMode.externalApplication)) {
|
||||
if (context.mounted) {
|
||||
ScaffoldMessenger.of(context)
|
||||
|
|
|
@ -38,7 +38,7 @@ class UpdateNotifier extends StatelessWidget {
|
|||
children: [
|
||||
TextButton.icon(
|
||||
onPressed: () {
|
||||
launchUrl(Uri.parse("https://github.com/Nutcake/ReCon/releases/latest"),
|
||||
launchUrl(Uri.parse("https://github.com/Nutcake/recon/releases/latest"),
|
||||
mode: LaunchMode.externalApplication,
|
||||
);
|
||||
},
|
||||
|
|
|
@ -40,11 +40,11 @@ static void my_application_activate(GApplication* application) {
|
|||
if (use_header_bar) {
|
||||
GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
|
||||
gtk_widget_show(GTK_WIDGET(header_bar));
|
||||
gtk_header_bar_set_title(header_bar, "ReCon");
|
||||
gtk_header_bar_set_title(header_bar, "recon");
|
||||
gtk_header_bar_set_show_close_button(header_bar, TRUE);
|
||||
gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
|
||||
} else {
|
||||
gtk_window_set_title(window, "ReCon");
|
||||
gtk_window_set_title(window, "recon");
|
||||
}
|
||||
|
||||
gtk_window_set_default_size(window, 480, 900);
|
||||
|
|
|
@ -54,7 +54,7 @@
|
|||
331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
|
||||
333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
|
||||
335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
|
||||
33CC10ED2044A3C60003C045 /* ReCon.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ReCon.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
33CC10ED2044A3C60003C045 /* recon.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = recon.app; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
|
||||
33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; };
|
||||
33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
|
||||
|
@ -134,7 +134,7 @@
|
|||
33CC10EE2044A3C60003C045 /* Products */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
33CC10ED2044A3C60003C045 /* ReCon.app */,
|
||||
33CC10ED2044A3C60003C045 /* recon.app */,
|
||||
331C80D5294CF71000263BE5 /* RunnerTests.xctest */,
|
||||
);
|
||||
name = Products;
|
||||
|
@ -238,7 +238,7 @@
|
|||
);
|
||||
name = Runner;
|
||||
productName = Runner;
|
||||
productReference = 33CC10ED2044A3C60003C045 /* ReCon.app */;
|
||||
productReference = 33CC10ED2044A3C60003C045 /* recon.app */;
|
||||
productType = "com.apple.product-type.application";
|
||||
};
|
||||
/* End PBXNativeTarget section */
|
||||
|
@ -570,7 +570,7 @@
|
|||
DEVELOPMENT_TEAM = P9AV4LPNLL;
|
||||
FLUTTER_BUILD_NAME = "0.11.1-beta";
|
||||
INFOPLIST_FILE = Runner/Info.plist;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = ReCon;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = recon;
|
||||
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
|
||||
LD_RUNPATH_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
|
@ -578,7 +578,7 @@
|
|||
);
|
||||
MARKETING_VERSION = "0.11.1-beta";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = ch.isota.recon;
|
||||
PRODUCT_NAME = ReCon;
|
||||
PRODUCT_NAME = recon;
|
||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||
SWIFT_VERSION = 5.0;
|
||||
};
|
||||
|
@ -710,7 +710,7 @@
|
|||
DEVELOPMENT_TEAM = P9AV4LPNLL;
|
||||
FLUTTER_BUILD_NAME = "0.11.1-beta";
|
||||
INFOPLIST_FILE = Runner/Info.plist;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = ReCon;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = recon;
|
||||
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
|
||||
LD_RUNPATH_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
|
@ -718,7 +718,7 @@
|
|||
);
|
||||
MARKETING_VERSION = "0.11.1-beta";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = ch.isota.recon;
|
||||
PRODUCT_NAME = ReCon;
|
||||
PRODUCT_NAME = recon;
|
||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
|
||||
SWIFT_VERSION = 5.0;
|
||||
|
@ -741,7 +741,7 @@
|
|||
DEVELOPMENT_TEAM = P9AV4LPNLL;
|
||||
FLUTTER_BUILD_NAME = "0.11.1-beta";
|
||||
INFOPLIST_FILE = Runner/Info.plist;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = ReCon;
|
||||
INFOPLIST_KEY_CFBundleDisplayName = recon;
|
||||
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.social-networking";
|
||||
LD_RUNPATH_SEARCH_PATHS = (
|
||||
"$(inherited)",
|
||||
|
@ -749,7 +749,7 @@
|
|||
);
|
||||
MARKETING_VERSION = "0.11.1-beta";
|
||||
PRODUCT_BUNDLE_IDENTIFIER = ch.isota.recon;
|
||||
PRODUCT_NAME = ReCon;
|
||||
PRODUCT_NAME = recon;
|
||||
PROVISIONING_PROFILE_SPECIFIER = "";
|
||||
SWIFT_VERSION = 5.0;
|
||||
};
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "33CC10EC2044A3C60003C045"
|
||||
BuildableName = "ReCon.app"
|
||||
BuildableName = "recon.app"
|
||||
BlueprintName = "Runner"
|
||||
ReferencedContainer = "container:Runner.xcodeproj">
|
||||
</BuildableReference>
|
||||
|
@ -31,7 +31,7 @@
|
|||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "33CC10EC2044A3C60003C045"
|
||||
BuildableName = "ReCon.app"
|
||||
BuildableName = "recon.app"
|
||||
BlueprintName = "Runner"
|
||||
ReferencedContainer = "container:Runner.xcodeproj">
|
||||
</BuildableReference>
|
||||
|
@ -65,7 +65,7 @@
|
|||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "33CC10EC2044A3C60003C045"
|
||||
BuildableName = "ReCon.app"
|
||||
BuildableName = "recon.app"
|
||||
BlueprintName = "Runner"
|
||||
ReferencedContainer = "container:Runner.xcodeproj">
|
||||
</BuildableReference>
|
||||
|
@ -82,7 +82,7 @@
|
|||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "33CC10EC2044A3C60003C045"
|
||||
BuildableName = "ReCon.app"
|
||||
BuildableName = "recon.app"
|
||||
BlueprintName = "Runner"
|
||||
ReferencedContainer = "container:Runner.xcodeproj">
|
||||
</BuildableReference>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
name: recon
|
||||
name: OpenContacts
|
||||
description: A Resonite Contacts App for Android
|
||||
# The following line prevents the package from being accidentally published to
|
||||
# pub.dev using `flutter pub publish`. This is preferred for private packages.
|
||||
|
@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
|
|||
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
||||
# In Windows, build-name is used as the major, minor, and patch parts
|
||||
# of the product and file versions while build-number is used as the build suffix.
|
||||
version: 0.11.3-beta+1
|
||||
version: 0.1.0-indev+1
|
||||
|
||||
environment:
|
||||
sdk: ">=3.0.1"
|
||||
|
|
|
@ -14,7 +14,7 @@ import 'package:recon/models/authentication_data.dart';
|
|||
void main() {
|
||||
testWidgets('Counter increments smoke test', (WidgetTester tester) async {
|
||||
// Build our app and trigger a frame.
|
||||
await tester.pumpWidget(ReCon(
|
||||
await tester.pumpWidget(recon(
|
||||
settingsClient: SettingsClient(),
|
||||
cachedAuthentication: AuthenticationData.unauthenticated(),
|
||||
));
|
||||
|
|
Loading…
Reference in a new issue