Preping for merge in main

This commit is contained in:
Mrdabup 2024-07-15 11:13:40 -04:00
parent 3953f80940
commit 66c8c06673
10 changed files with 19 additions and 17 deletions

2
.gitignore vendored
View file

@ -43,3 +43,5 @@ app.*.map.json
/android/app/profile
/android/app/release
/android/key.properties
# NEVER STORE ANY KEY OR API KEYS WHEN COMMITING CODE!!

View file

@ -49,7 +49,7 @@ android {
}
defaultConfig {
applicationId "de.voidspace.recon"
applicationId "de.tojcklguy.opencontacts"
minSdkVersion 24
targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()

View file

@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.voidspace.recon">
package="de.tojcklguy.opencontacts">
<!-- The INTERNET permission is required for development. Specifically,
the Flutter tool needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.

View file

@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.voidspace.recon">
package="de.tojcklguy.opencontacts">
<!-- Required to fetch data from the internet. -->
<uses-permission android:name="android.permission.INTERNET" />

View file

@ -1,4 +1,4 @@
package de.voidspace.recon
package de.tojcklguy.opencontacts
import io.flutter.embedding.android.FlutterActivity

View file

@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.voidspace.recon">
package="de.tojcklguy.opencontacts">
<!-- The INTERNET permission is required for development. Specifically,
the Flutter tool needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.

View file

@ -53,7 +53,7 @@ class _FriendsListAppBarState extends State<FriendsListAppBar> with AutomaticKee
}
},
itemBuilder: (BuildContext context) => OnlineStatus.values
.where((element) => element == OnlineStatus.online || element == OnlineStatus.offline).sorted((a, b) => b.index.compareTo(a.index),)
.where((element) => element == OnlineStatus.sociable || element == OnlineStatus.online ||element == OnlineStatus.busy || element == OnlineStatus.offline).sorted((a, b) => b.index.compareTo(a.index),)
.map(
(item) => PopupMenuItem<OnlineStatus>(
value: item,

View file

@ -17,8 +17,8 @@ class Home extends StatefulWidget {
class _HomeState extends State<Home> {
static const List<Widget> _appBars = [
FriendsListAppBar(),
SessionListAppBar(),
FriendsListAppBar(),
InventoryBrowserAppBar(),
SettingsAppBar()
];
@ -41,8 +41,8 @@ class _HomeState extends State<Home> {
controller: _pageController,
physics: const NeverScrollableScrollPhysics(),
children: const [
FriendsList(),
SessionList(),
FriendsList(),
InventoryBrowser(),
SettingsPage(),
],
@ -60,14 +60,14 @@ class _HomeState extends State<Home> {
});
},
destinations: const [
NavigationDestination(
icon: Icon(Icons.message),
label: "Chat",
),
NavigationDestination(
icon: Icon(Icons.public),
label: "Sessions",
),
NavigationDestination(
icon: Icon(Icons.message),
label: "Chat",
),
NavigationDestination(
icon: Icon(Icons.inventory),
label: "Inventory",

View file

@ -297,7 +297,7 @@ class _LoginScreenState extends State<LoginScreen> {
label: const Text("Login"),
),
),
Padding(
/*Padding(
padding: const EdgeInsets.only(top: 16),
child: _isEmailResetSend
? const Center(child: CircularProgressIndicator())
@ -306,7 +306,7 @@ class _LoginScreenState extends State<LoginScreen> {
icon: const Icon(Icons.refresh),
label: const Text("Forgot Password?"),
),
),
),*/
Center(
child: AnimatedOpacity(
opacity: _errorOpacity,

View file

@ -7,7 +7,7 @@ project(runner LANGUAGES CXX)
set(BINARY_NAME "recon")
# The unique GTK application identifier for this application. See:
# https://wiki.gnome.org/HowDoI/ChooseApplicationID
set(APPLICATION_ID "de.voidspace.recon")
set(APPLICATION_ID "de.tojcklguy.opencontacts")
# Explicitly opt in to modern CMake behaviors to avoid warnings with recent
# versions of CMake.