mirror of
https://gitlab.com/nkming2/nc-photos.git
synced 2025-02-02 06:46:22 +01:00
Remove obsolete file
This commit is contained in:
Ming Ming
parent
69dada413b
commit
a000bc98e4
3 changed files with 0 additions and 374 deletions
|
|
@ -1,356 +0,0 @@
|
||||||
import 'dart:async';
|
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
|
||||||
import 'package:logging/logging.dart';
|
|
||||||
import 'package:nc_photos/account.dart';
|
|
||||||
import 'package:nc_photos/app_localizations.dart';
|
|
||||||
import 'package:nc_photos/controller/pref_controller.dart';
|
|
||||||
import 'package:nc_photos/db/entity_converter.dart';
|
|
||||||
import 'package:nc_photos/entity/pref.dart';
|
|
||||||
import 'package:nc_photos/entity/pref_util.dart' as pref_util;
|
|
||||||
import 'package:nc_photos/help_utils.dart' as help_utils;
|
|
||||||
import 'package:nc_photos/legacy/connect.dart';
|
|
||||||
import 'package:nc_photos/theme.dart';
|
|
||||||
import 'package:nc_photos/url_launcher_util.dart';
|
|
||||||
import 'package:nc_photos/widget/app_intermediate_circular_progress_indicator.dart';
|
|
||||||
import 'package:nc_photos/widget/home.dart';
|
|
||||||
import 'package:nc_photos/widget/root_picker.dart';
|
|
||||||
import 'package:np_codegen/np_codegen.dart';
|
|
||||||
import 'package:np_collection/np_collection.dart';
|
|
||||||
import 'package:np_db/np_db.dart';
|
|
||||||
import 'package:np_platform_util/np_platform_util.dart';
|
|
||||||
import 'package:np_string/np_string.dart';
|
|
||||||
|
|
||||||
part 'sign_in.g.dart';
|
|
||||||
|
|
||||||
class SignIn extends StatefulWidget {
|
|
||||||
static const routeName = "/sign-in-legacy";
|
|
||||||
|
|
||||||
const SignIn({super.key});
|
|
||||||
|
|
||||||
@override
|
|
||||||
createState() => _SignInState();
|
|
||||||
}
|
|
||||||
|
|
||||||
@npLog
|
|
||||||
class _SignInState extends State<SignIn> {
|
|
||||||
@override
|
|
||||||
build(BuildContext context) {
|
|
||||||
return Scaffold(
|
|
||||||
body: Builder(builder: (context) => _buildContent(context)),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
Widget _buildContent(BuildContext context) {
|
|
||||||
if (_isConnecting) {
|
|
||||||
return const Stack(
|
|
||||||
children: [
|
|
||||||
Positioned(
|
|
||||||
left: 0,
|
|
||||||
right: 0,
|
|
||||||
bottom: 64,
|
|
||||||
child: Center(
|
|
||||||
child: SizedBox(
|
|
||||||
width: 24,
|
|
||||||
height: 24,
|
|
||||||
child: AppIntermediateCircularProgressIndicator(),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
return SafeArea(
|
|
||||||
child: LayoutBuilder(
|
|
||||||
builder: (BuildContext context, BoxConstraints viewportConstraints) {
|
|
||||||
return Form(
|
|
||||||
key: _formKey,
|
|
||||||
child: SingleChildScrollView(
|
|
||||||
child: ConstrainedBox(
|
|
||||||
constraints: BoxConstraints(
|
|
||||||
minHeight: viewportConstraints.maxHeight,
|
|
||||||
),
|
|
||||||
child: IntrinsicHeight(
|
|
||||||
child: Column(
|
|
||||||
children: [
|
|
||||||
Padding(
|
|
||||||
padding: const EdgeInsets.all(24),
|
|
||||||
child: Text(
|
|
||||||
L10n.global().signInHeaderText,
|
|
||||||
style: Theme.of(context).textTheme.headlineSmall,
|
|
||||||
textAlign: TextAlign.center,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
Align(
|
|
||||||
alignment: Alignment.center,
|
|
||||||
child: Container(
|
|
||||||
constraints: BoxConstraints(
|
|
||||||
maxWidth:
|
|
||||||
Theme.of(context).widthLimitedContentMaxWidth,
|
|
||||||
),
|
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 32),
|
|
||||||
child: _buildForm(context),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
Container(
|
|
||||||
alignment: AlignmentDirectional.centerStart,
|
|
||||||
constraints: BoxConstraints(
|
|
||||||
maxWidth:
|
|
||||||
Theme.of(context).widthLimitedContentMaxWidth,
|
|
||||||
),
|
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 16),
|
|
||||||
child: InkWell(
|
|
||||||
onTap: () {
|
|
||||||
launch(help_utils.twoFactorAuthUrl);
|
|
||||||
},
|
|
||||||
child: Padding(
|
|
||||||
padding: const EdgeInsets.symmetric(
|
|
||||||
horizontal: 16, vertical: 16),
|
|
||||||
child: Row(
|
|
||||||
mainAxisSize: MainAxisSize.max,
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
const Icon(Icons.help_outline, size: 16),
|
|
||||||
const SizedBox(width: 4),
|
|
||||||
Expanded(
|
|
||||||
child:
|
|
||||||
Text(L10n.global().signIn2faHintText),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
if (getRawPlatform() != NpPlatform.web)
|
|
||||||
Expanded(child: Container()),
|
|
||||||
Container(
|
|
||||||
constraints: BoxConstraints(
|
|
||||||
maxWidth:
|
|
||||||
Theme.of(context).widthLimitedContentMaxWidth,
|
|
||||||
),
|
|
||||||
padding: const EdgeInsets.all(16),
|
|
||||||
child: Row(
|
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
||||||
children: [
|
|
||||||
if (!ModalRoute.of(context)!.isFirst)
|
|
||||||
TextButton(
|
|
||||||
onPressed: () {
|
|
||||||
Navigator.pop(context);
|
|
||||||
},
|
|
||||||
child: Text(MaterialLocalizations.of(context)
|
|
||||||
.cancelButtonLabel),
|
|
||||||
)
|
|
||||||
else
|
|
||||||
Container(),
|
|
||||||
ElevatedButton(
|
|
||||||
onPressed: () {
|
|
||||||
if (_formKey.currentState?.validate() ==
|
|
||||||
true) {
|
|
||||||
_connect();
|
|
||||||
}
|
|
||||||
},
|
|
||||||
child: Text(L10n.global().connectButtonLabel),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Widget _buildForm(BuildContext context) {
|
|
||||||
return Column(
|
|
||||||
mainAxisSize: MainAxisSize.min,
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
Center(
|
|
||||||
child: Icon(
|
|
||||||
Icons.cloud,
|
|
||||||
color: Theme.of(context).colorScheme.primary,
|
|
||||||
size: 72,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(height: 8),
|
|
||||||
Row(
|
|
||||||
children: [
|
|
||||||
SizedBox(
|
|
||||||
width: 64,
|
|
||||||
child: DropdownButtonHideUnderline(
|
|
||||||
child: DropdownButtonFormField<_Scheme>(
|
|
||||||
value: _scheme,
|
|
||||||
items: [_Scheme.http, _Scheme.https]
|
|
||||||
.map((e) => DropdownMenuItem<_Scheme>(
|
|
||||||
value: e,
|
|
||||||
child: Text(e.toValueString()),
|
|
||||||
))
|
|
||||||
.toList(),
|
|
||||||
onChanged: (newValue) {
|
|
||||||
setState(() {
|
|
||||||
_scheme = newValue!;
|
|
||||||
});
|
|
||||||
},
|
|
||||||
onSaved: (value) {
|
|
||||||
_formValue.scheme = value!.toValueString();
|
|
||||||
},
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const Padding(
|
|
||||||
padding: EdgeInsets.symmetric(horizontal: 4),
|
|
||||||
child: Text("://"),
|
|
||||||
),
|
|
||||||
Expanded(
|
|
||||||
child: TextFormField(
|
|
||||||
decoration: InputDecoration(
|
|
||||||
hintText: L10n.global().serverAddressInputHint,
|
|
||||||
),
|
|
||||||
keyboardType: TextInputType.url,
|
|
||||||
validator: (value) {
|
|
||||||
if (value!.trim().trimRightAny("/").isEmpty) {
|
|
||||||
return L10n.global().serverAddressInputInvalidEmpty;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
},
|
|
||||||
onSaved: (value) {
|
|
||||||
_formValue.address = value!.trim().trimRightAny("/");
|
|
||||||
},
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
const SizedBox(height: 8),
|
|
||||||
TextFormField(
|
|
||||||
decoration: InputDecoration(
|
|
||||||
hintText: L10n.global().usernameInputHint,
|
|
||||||
),
|
|
||||||
validator: (value) {
|
|
||||||
if (value!.trim().isEmpty) {
|
|
||||||
return L10n.global().usernameInputInvalidEmpty;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
},
|
|
||||||
onSaved: (value) {
|
|
||||||
_formValue.username = value!;
|
|
||||||
},
|
|
||||||
),
|
|
||||||
const SizedBox(height: 8),
|
|
||||||
TextFormField(
|
|
||||||
decoration: InputDecoration(
|
|
||||||
hintText: L10n.global().passwordInputHint,
|
|
||||||
),
|
|
||||||
obscureText: true,
|
|
||||||
validator: (value) {
|
|
||||||
if (value!.trim().isEmpty) {
|
|
||||||
return L10n.global().passwordInputInvalidEmpty;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
},
|
|
||||||
onSaved: (value) {
|
|
||||||
_formValue.password = value!;
|
|
||||||
},
|
|
||||||
),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> _connect() async {
|
|
||||||
_formKey.currentState!.save();
|
|
||||||
Account? account = Account(
|
|
||||||
id: Account.newId(),
|
|
||||||
scheme: _formValue.scheme,
|
|
||||||
address: _formValue.address,
|
|
||||||
userId: _formValue.username.toCi(),
|
|
||||||
username2: _formValue.username,
|
|
||||||
password: _formValue.password,
|
|
||||||
roots: [""],
|
|
||||||
);
|
|
||||||
_log.info("[_connect] Try connecting with account: $account");
|
|
||||||
account = await Navigator.pushNamed<Account>(context, Connect.routeName,
|
|
||||||
arguments: ConnectArguments(account));
|
|
||||||
if (account == null) {
|
|
||||||
// connection failed
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
account = await Navigator.pushNamed<Account>(context, RootPicker.routeName,
|
|
||||||
arguments: RootPickerArguments(account));
|
|
||||||
if (account == null) {
|
|
||||||
// ???
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
// we've got a good account
|
|
||||||
setState(() {
|
|
||||||
_isConnecting = true;
|
|
||||||
});
|
|
||||||
try {
|
|
||||||
await _persistAccount(account);
|
|
||||||
unawaited(
|
|
||||||
Navigator.pushNamedAndRemoveUntil(
|
|
||||||
context, Home.routeName, (route) => false,
|
|
||||||
arguments: HomeArguments(account)),
|
|
||||||
);
|
|
||||||
} catch (_) {
|
|
||||||
setState(() {
|
|
||||||
_isConnecting = false;
|
|
||||||
});
|
|
||||||
rethrow;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> _persistAccount(Account account) async {
|
|
||||||
await context.read<NpDb>().addAccounts([account.toDb()]);
|
|
||||||
// only signing in with app password would trigger distinct
|
|
||||||
final accounts = (Pref().getAccounts3Or([])..add(account)).distinct();
|
|
||||||
try {
|
|
||||||
AccountPref.setGlobalInstance(
|
|
||||||
account, await pref_util.loadAccountPref(account));
|
|
||||||
} catch (e, stackTrace) {
|
|
||||||
_log.shout("[_connect] Failed reading pref for account: $account", e,
|
|
||||||
stackTrace);
|
|
||||||
}
|
|
||||||
final prefController = context.read<PrefController>();
|
|
||||||
unawaited(Pref().setAccounts3(accounts));
|
|
||||||
unawaited(prefController.setCurrentAccountIndex(accounts.indexOf(account)));
|
|
||||||
}
|
|
||||||
|
|
||||||
final _formKey = GlobalKey<FormState>();
|
|
||||||
var _scheme = _Scheme.https;
|
|
||||||
var _isConnecting = false;
|
|
||||||
|
|
||||||
final _formValue = _FormValue();
|
|
||||||
}
|
|
||||||
|
|
||||||
enum _Scheme {
|
|
||||||
http,
|
|
||||||
https,
|
|
||||||
}
|
|
||||||
|
|
||||||
extension on _Scheme {
|
|
||||||
String toValueString() {
|
|
||||||
switch (this) {
|
|
||||||
case _Scheme.http:
|
|
||||||
return "http";
|
|
||||||
|
|
||||||
case _Scheme.https:
|
|
||||||
return "https";
|
|
||||||
|
|
||||||
default:
|
|
||||||
throw StateError("Unknown value: $this");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class _FormValue {
|
|
||||||
late String scheme;
|
|
||||||
late String address;
|
|
||||||
late String username;
|
|
||||||
late String password;
|
|
||||||
}
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
// GENERATED CODE - DO NOT MODIFY BY HAND
|
|
||||||
|
|
||||||
part of 'sign_in.dart';
|
|
||||||
|
|
||||||
// **************************************************************************
|
|
||||||
// NpLogGenerator
|
|
||||||
// **************************************************************************
|
|
||||||
|
|
||||||
extension _$_SignInStateNpLog on _SignInState {
|
|
||||||
// ignore: unused_element
|
|
||||||
Logger get _log => log;
|
|
||||||
|
|
||||||
static final log = Logger("legacy.sign_in._SignInState");
|
|
||||||
}
|
|
||||||
|
|
@ -17,7 +17,6 @@ import 'package:nc_photos/controller/trusted_cert_controller.dart';
|
||||||
import 'package:nc_photos/di_container.dart';
|
import 'package:nc_photos/di_container.dart';
|
||||||
import 'package:nc_photos/language_util.dart' as language_util;
|
import 'package:nc_photos/language_util.dart' as language_util;
|
||||||
import 'package:nc_photos/legacy/connect.dart' as legacy;
|
import 'package:nc_photos/legacy/connect.dart' as legacy;
|
||||||
import 'package:nc_photos/legacy/sign_in.dart' as legacy;
|
|
||||||
import 'package:nc_photos/mobile/self_signed_cert_manager.dart';
|
import 'package:nc_photos/mobile/self_signed_cert_manager.dart';
|
||||||
import 'package:nc_photos/navigation_manager.dart';
|
import 'package:nc_photos/navigation_manager.dart';
|
||||||
import 'package:nc_photos/protected_page_handler.dart';
|
import 'package:nc_photos/protected_page_handler.dart';
|
||||||
|
|
@ -207,9 +206,6 @@ class _WrappedAppState extends State<_WrappedApp>
|
||||||
Splash.routeName: () => MaterialPageRoute(
|
Splash.routeName: () => MaterialPageRoute(
|
||||||
builder: (context) => const Splash(),
|
builder: (context) => const Splash(),
|
||||||
),
|
),
|
||||||
legacy.SignIn.routeName: () => MaterialPageRoute(
|
|
||||||
builder: (context) => const legacy.SignIn(),
|
|
||||||
),
|
|
||||||
CollectionPicker.routeName: CollectionPicker.buildRoute,
|
CollectionPicker.routeName: CollectionPicker.buildRoute,
|
||||||
LanguageSettings.routeName: LanguageSettings.buildRoute,
|
LanguageSettings.routeName: LanguageSettings.buildRoute,
|
||||||
PeopleBrowser.routeName: PeopleBrowser.buildRoute,
|
PeopleBrowser.routeName: PeopleBrowser.buildRoute,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue