Compare commits
14 Commits
fb3df19bbe
..
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 84cc8d4320 | |||
| 6a936e7364 | |||
| 827a3bbec8 | |||
| 52b5d9e259 | |||
| b2adb4bee3 | |||
| 489dc227de | |||
| 1a0d2f3acf | |||
| 32739b2dd9 | |||
| 251e9542ad | |||
| 44b230ed85 | |||
| d77b200d52 | |||
| 0f741d9ca8 | |||
| 1e740f230d | |||
| cac56c42cc |
@@ -178,6 +178,7 @@ class RedisCacheProvider extends CacheProvider<List<int>> {
|
|||||||
|
|
||||||
// Force close the client
|
// Force close the client
|
||||||
scheduleMicrotask(() => client.close(force: true));
|
scheduleMicrotask(() => client.close(force: true));
|
||||||
|
return null;
|
||||||
});
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
|
|||||||
@@ -33,6 +33,8 @@ void main(List<String> args) async {
|
|||||||
SchemeMigration(),
|
SchemeMigration(),
|
||||||
DownloadHistoryMigration(),
|
DownloadHistoryMigration(),
|
||||||
LikeRecordMigration(),
|
LikeRecordMigration(),
|
||||||
|
AppVersionMigration(),
|
||||||
|
AppVersionSeed(),
|
||||||
]);
|
]);
|
||||||
await runMigrations(migrationRunner, args);
|
await runMigrations(migrationRunner, args);
|
||||||
}
|
}
|
||||||
@@ -64,3 +66,30 @@ Future doUserSeed() async {
|
|||||||
}
|
}
|
||||||
return connection.close();
|
return connection.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class AppVersionSeed extends Migration {
|
||||||
|
@override
|
||||||
|
void up(Schema schema) async {
|
||||||
|
await doAppVersionSeed();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void down(Schema schema) async {}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future doAppVersionSeed() async {
|
||||||
|
var connection = await connectToPostgres(configuration);
|
||||||
|
await connection.open();
|
||||||
|
var executor = PostgreSqlExecutor(connection);
|
||||||
|
var appVersionQuery = AppVersionQuery();
|
||||||
|
var one = await appVersionQuery.getOne(executor);
|
||||||
|
if (one.isEmpty) {
|
||||||
|
appVersionQuery = AppVersionQuery();
|
||||||
|
appVersionQuery.values.copyFrom(AppVersion(
|
||||||
|
versionCode: 1,
|
||||||
|
versionName: '1.0.0',
|
||||||
|
));
|
||||||
|
return appVersionQuery.insert(executor).then((value) => connection.close());
|
||||||
|
}
|
||||||
|
return connection.close();
|
||||||
|
}
|
||||||
|
|||||||
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
class Apis {
|
class Apis {
|
||||||
static const apiScheme = 'http';
|
static const apiScheme = 'http';
|
||||||
static const apiHost = '127.0.0.1';
|
static const apiHost = 'home.debuggerx.com';
|
||||||
static const apiPort = 3000;
|
static const apiPort = 30000;
|
||||||
|
|
||||||
static const appNewVersionUrl = 'https://www.debuggerx.com';
|
static const appNewVersionUrl = 'https://www.debuggerx.com';
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,25 @@
|
|||||||
|
import 'package:angel3_orm/angel3_orm.dart';
|
||||||
import 'package:angel3_serialize/angel3_serialize.dart';
|
import 'package:angel3_serialize/angel3_serialize.dart';
|
||||||
|
import 'package:dde_gesture_manager_api/src/models/base_model.dart';
|
||||||
|
import 'package:angel3_migration/angel3_migration.dart';
|
||||||
|
import 'package:optional/optional.dart';
|
||||||
part 'app_version.g.dart';
|
part 'app_version.g.dart';
|
||||||
|
|
||||||
@serializable
|
@serializable
|
||||||
abstract class _AppVersion {
|
@orm
|
||||||
|
abstract class _AppVersion extends BaseModel {
|
||||||
|
@SerializableField(isNullable: false)
|
||||||
|
@Column(isNullable: false)
|
||||||
|
String? get versionName;
|
||||||
|
|
||||||
|
@SerializableField(isNullable: false)
|
||||||
|
@Column(isNullable: false)
|
||||||
|
int? get versionCode;
|
||||||
|
}
|
||||||
|
|
||||||
|
@serializable
|
||||||
|
@Orm(tableName: 'app_versions', generateMigrations: false)
|
||||||
|
abstract class _AppVersionResp {
|
||||||
@SerializableField(isNullable: false)
|
@SerializableField(isNullable: false)
|
||||||
String? get versionName;
|
String? get versionName;
|
||||||
|
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ abstract class _SimpleSchemeTransMetaData {
|
|||||||
|
|
||||||
int? get likes;
|
int? get likes;
|
||||||
|
|
||||||
bool? get liked;
|
bool get liked;
|
||||||
}
|
}
|
||||||
|
|
||||||
SimpleSchemeTransMetaData transSimpleSchemeMetaData(SimpleScheme scheme) => SimpleSchemeTransMetaData(
|
SimpleSchemeTransMetaData transSimpleSchemeMetaData(SimpleScheme scheme) => SimpleSchemeTransMetaData(
|
||||||
@@ -98,7 +98,7 @@ SimpleSchemeTransMetaData transSimpleSchemeMetaData(SimpleScheme scheme) => Simp
|
|||||||
uuid: scheme.uuid,
|
uuid: scheme.uuid,
|
||||||
name: scheme.name,
|
name: scheme.name,
|
||||||
shared: scheme.shared,
|
shared: scheme.shared,
|
||||||
liked: scheme.liked,
|
liked: scheme.liked ?? false,
|
||||||
likes: scheme.metadata?['likes'] ?? 0,
|
likes: scheme.metadata?['likes'] ?? 0,
|
||||||
downloads: scheme.metadata?['downloads'] ?? 0,
|
downloads: scheme.metadata?['downloads'] ?? 0,
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -201,19 +201,16 @@ Future configureServer(Angel app) async {
|
|||||||
|
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case 'recommend':
|
case 'recommend':
|
||||||
// orders = [recommend, likes, downloads, SchemeFields.id];
|
orders = [recommend, likes, downloads, SchemeFields.id];
|
||||||
orders = [recommend];
|
|
||||||
break;
|
break;
|
||||||
case 'updated':
|
case 'updated':
|
||||||
orders = [updated];
|
orders = [updated];
|
||||||
break;
|
break;
|
||||||
case 'likes':
|
case 'likes':
|
||||||
// orders = [likes, recommend, downloads, SchemeFields.id];
|
orders = [likes, recommend, downloads, SchemeFields.id];
|
||||||
orders = [likes];
|
|
||||||
break;
|
break;
|
||||||
case 'downloads':
|
case 'downloads':
|
||||||
// orders = [downloads, recommend, likes, SchemeFields.id];
|
orders = [downloads, recommend, likes, SchemeFields.id];
|
||||||
orders = [downloads];
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
return res.unProcessableEntity();
|
return res.unProcessableEntity();
|
||||||
|
|||||||
@@ -3,24 +3,18 @@ import 'dart:async';
|
|||||||
import 'package:angel3_framework/angel3_framework.dart';
|
import 'package:angel3_framework/angel3_framework.dart';
|
||||||
import 'package:dde_gesture_manager_api/apis.dart';
|
import 'package:dde_gesture_manager_api/apis.dart';
|
||||||
import 'package:dde_gesture_manager_api/src/models/app_version.dart';
|
import 'package:dde_gesture_manager_api/src/models/app_version.dart';
|
||||||
import 'package:file/file.dart';
|
import 'controller_extensions.dart';
|
||||||
import 'package:yaml/yaml.dart';
|
|
||||||
|
|
||||||
late FileSystem fs;
|
|
||||||
|
|
||||||
Future configureServer(Angel app) async {
|
Future configureServer(Angel app) async {
|
||||||
app.get(
|
app.get(
|
||||||
Apis.system.appVersion,
|
Apis.system.appVersion,
|
||||||
(req, res) async {
|
(req, res) async {
|
||||||
var pubspec = fs.currentDirectory.parent.childDirectory('app').childFile('pubspec.yaml').readAsStringSync();
|
var appVersionQuery = AppVersionQuery();
|
||||||
var version = loadYaml(pubspec)['version'] as String;
|
appVersionQuery.orderBy(AppVersionFields.versionCode, descending: true);
|
||||||
var versions = version.split('+');
|
return appVersionQuery.getOne(req.queryExecutor).then((value) => AppVersionResp(
|
||||||
return res.json(AppVersion(versionName: versions.first, versionCode: int.parse(versions.last)));
|
versionName: value.value.versionName,
|
||||||
|
versionCode: value.value.versionCode,
|
||||||
|
));
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
configureServerWithFileSystem(FileSystem fileSystem) {
|
|
||||||
fs = fileSystem;
|
|
||||||
return configureServer;
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import 'package:angel3_framework/angel3_framework.dart';
|
import 'package:angel3_framework/angel3_framework.dart';
|
||||||
|
import 'package:angel3_cors/angel3_cors.dart';
|
||||||
import 'package:file/file.dart';
|
import 'package:file/file.dart';
|
||||||
import 'controllers/auth_controllers.dart' as auth_controllers;
|
import 'controllers/auth_controllers.dart' as auth_controllers;
|
||||||
import 'controllers/system_controllers.dart' as system_controllers;
|
import 'controllers/system_controllers.dart' as system_controllers;
|
||||||
@@ -20,8 +21,10 @@ AngelConfigurer configureServer(FileSystem fileSystem) {
|
|||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
app.fallback(cors());
|
||||||
|
|
||||||
// Typically, you want to mount controllers first, after any global middleware.
|
// Typically, you want to mount controllers first, after any global middleware.
|
||||||
await app.configure(system_controllers.configureServerWithFileSystem(fileSystem));
|
await app.configure(system_controllers.configureServer);
|
||||||
await app.configure(auth_controllers.configureServer);
|
await app.configure(auth_controllers.configureServer);
|
||||||
await app.configure(scheme_controllers.configureServer);
|
await app.configure(scheme_controllers.configureServer);
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -9,16 +9,16 @@ dependencies:
|
|||||||
angel3_configuration: ^4.1.0
|
angel3_configuration: ^4.1.0
|
||||||
angel3_framework: ^4.2.0
|
angel3_framework: ^4.2.0
|
||||||
angel3_migration: ^4.0.3
|
angel3_migration: ^4.0.3
|
||||||
angel3_orm: ^4.0.5
|
angel3_orm: ^4.0.6
|
||||||
angel3_orm_postgres: ^3.3.0
|
angel3_orm_postgres: ^3.3.0
|
||||||
angel3_serialize: ^4.1.0
|
angel3_serialize: ^4.1.0
|
||||||
angel3_production: ^3.1.2
|
angel3_production: ^3.1.2
|
||||||
belatuk_pretty_logging: ^4.0.0
|
belatuk_pretty_logging: ^4.0.0
|
||||||
optional: ^6.0.0
|
optional: ^6.0.0
|
||||||
logging: ^1.0.0
|
logging: ^1.0.0
|
||||||
yaml: ^3.1.0
|
|
||||||
mailer: ^5.0.2
|
mailer: ^5.0.2
|
||||||
uuid: ^3.0.5
|
uuid: ^3.0.5
|
||||||
|
angel3_cors: ^4.1.0
|
||||||
neat_cache:
|
neat_cache:
|
||||||
path: 3rd_party/neat_cache
|
path: 3rd_party/neat_cache
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
|
|||||||
@@ -6,3 +6,4 @@ MIGRATION_IMAGE="$(docker image ls --filter label=stage=dart_builder -q)"
|
|||||||
docker run --name=dgm_api_migrate --network dgm_api_default "$MIGRATION_IMAGE"
|
docker run --name=dgm_api_migrate --network dgm_api_default "$MIGRATION_IMAGE"
|
||||||
docker rm "$(docker ps -a --filter name=dgm_api_migrate -q)"
|
docker rm "$(docker ps -a --filter name=dgm_api_migrate -q)"
|
||||||
docker image prune -f --filter label=stage=dart_builder
|
docker image prune -f --filter label=stage=dart_builder
|
||||||
|
docker image prune -f
|
||||||
@@ -3,7 +3,7 @@ import 'package:flutter/cupertino.dart';
|
|||||||
/// [UOS设计指南](https://docs.uniontech.com/zh/content/t_dbG3kBK9iDf9B963ok)
|
/// [UOS设计指南](https://docs.uniontech.com/zh/content/t_dbG3kBK9iDf9B963ok)
|
||||||
const double localManagerPanelWidth = 260;
|
const double localManagerPanelWidth = 260;
|
||||||
|
|
||||||
const double marketOrMePanelWidth = 450;
|
const double marketOrMePanelWidth = 400;
|
||||||
|
|
||||||
const shortDuration = const Duration(milliseconds: 100);
|
const shortDuration = const Duration(milliseconds: 100);
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import 'package:dde_gesture_manager/extensions.dart';
|
|||||||
import 'package:dde_gesture_manager/models/scheme.dart' as AppScheme;
|
import 'package:dde_gesture_manager/models/scheme.dart' as AppScheme;
|
||||||
import 'package:dde_gesture_manager/utils/helper.dart';
|
import 'package:dde_gesture_manager/utils/helper.dart';
|
||||||
import 'package:dde_gesture_manager/utils/notificator.dart';
|
import 'package:dde_gesture_manager/utils/notificator.dart';
|
||||||
|
import 'package:dde_gesture_manager/widgets/market.dart';
|
||||||
import 'package:dde_gesture_manager/widgets/me.dart';
|
import 'package:dde_gesture_manager/widgets/me.dart';
|
||||||
import 'package:dde_gesture_manager_api/apis.dart';
|
import 'package:dde_gesture_manager_api/apis.dart';
|
||||||
import 'package:dde_gesture_manager_api/models.dart';
|
import 'package:dde_gesture_manager_api/models.dart';
|
||||||
@@ -173,4 +174,27 @@ class Api {
|
|||||||
Apis.scheme.download(schemeId: schemeId.param),
|
Apis.scheme.download(schemeId: schemeId.param),
|
||||||
SchemeForDownloadSerializer.fromMap,
|
SchemeForDownloadSerializer.fromMap,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
static Future<MarketSchemeTransMetaDataResp?> marketSchemes(
|
||||||
|
{required MarketSortType type, required int page, int pageSize = 30}) =>
|
||||||
|
_get(
|
||||||
|
Apis.scheme.market(type: type.name.param, page: page.param, pageSize: pageSize.param),
|
||||||
|
MarketSchemeTransMetaDataResp.fromMap,
|
||||||
|
);
|
||||||
|
|
||||||
|
static Future<List<int>?> userLikes() => _get(
|
||||||
|
Apis.scheme.userLikes,
|
||||||
|
(e) => (e['list'] as List).cast<int>(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
class MarketSchemeTransMetaDataResp {
|
||||||
|
bool hasMore;
|
||||||
|
List<MarketSchemeTransMetaData> items;
|
||||||
|
|
||||||
|
MarketSchemeTransMetaDataResp.fromMap(Map map)
|
||||||
|
: hasMore = map['hasMore'],
|
||||||
|
items = (map['items'] as List)
|
||||||
|
.map<MarketSchemeTransMetaData>((e) => MarketSchemeTransMetaDataSerializer.fromMap(e))
|
||||||
|
.toList();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ class LocalSchemes implements LocalSchemesInterface<LocalSchemeEntryWeb> {
|
|||||||
}
|
}
|
||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
|
return null;
|
||||||
})
|
})
|
||||||
.where((e) => e != null)
|
.where((e) => e != null)
|
||||||
.cast<LocalSchemeEntryWeb>()
|
.cast<LocalSchemeEntryWeb>()
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
import 'package:dde_gesture_manager/builder/provider_annotation.dart';
|
||||||
|
|
||||||
|
@ProviderModel()
|
||||||
|
class SchemeListRefreshKey {
|
||||||
|
@ProviderModelProp(nullable: false)
|
||||||
|
int refreshKey;
|
||||||
|
|
||||||
|
SchemeListRefreshKey() : refreshKey = DateTime.now().millisecondsSinceEpoch;
|
||||||
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
import 'package:dde_gesture_manager/extensions.dart';
|
import 'package:dde_gesture_manager/extensions.dart';
|
||||||
import 'package:dde_gesture_manager/models/content_layout.provider.dart';
|
import 'package:dde_gesture_manager/models/content_layout.provider.dart';
|
||||||
import 'package:dde_gesture_manager/models/scheme.provider.dart';
|
import 'package:dde_gesture_manager/models/scheme.provider.dart';
|
||||||
|
import 'package:dde_gesture_manager/models/scheme_list_refresh_key.provider.dart';
|
||||||
import 'package:dde_gesture_manager/pages/gesture_editor.dart';
|
import 'package:dde_gesture_manager/pages/gesture_editor.dart';
|
||||||
import 'package:dde_gesture_manager/pages/local_manager.dart';
|
import 'package:dde_gesture_manager/pages/local_manager.dart';
|
||||||
import 'package:dde_gesture_manager/pages/market_or_me.dart';
|
import 'package:dde_gesture_manager/pages/market_or_me.dart';
|
||||||
@@ -36,6 +37,9 @@ class _ContentState extends State<Content> {
|
|||||||
ChangeNotifierProvider(
|
ChangeNotifierProvider(
|
||||||
create: (context) => CopiedGesturePropProvider.empty(),
|
create: (context) => CopiedGesturePropProvider.empty(),
|
||||||
),
|
),
|
||||||
|
ChangeNotifierProvider(
|
||||||
|
create: (context) => SchemeListRefreshKeyProvider(),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
builder: (context, child) {
|
builder: (context, child) {
|
||||||
if (widthChanged && mounted) {
|
if (widthChanged && mounted) {
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import 'package:dde_gesture_manager/models/content_layout.provider.dart';
|
|||||||
import 'package:dde_gesture_manager/models/local_schemes_provider.dart';
|
import 'package:dde_gesture_manager/models/local_schemes_provider.dart';
|
||||||
import 'package:dde_gesture_manager/models/scheme.dart';
|
import 'package:dde_gesture_manager/models/scheme.dart';
|
||||||
import 'package:dde_gesture_manager/models/scheme.provider.dart';
|
import 'package:dde_gesture_manager/models/scheme.provider.dart';
|
||||||
|
import 'package:dde_gesture_manager/models/scheme_list_refresh_key.provider.dart';
|
||||||
import 'package:dde_gesture_manager/models/settings.provider.dart';
|
import 'package:dde_gesture_manager/models/settings.provider.dart';
|
||||||
import 'package:dde_gesture_manager/pages/content.dart';
|
import 'package:dde_gesture_manager/pages/content.dart';
|
||||||
import 'package:dde_gesture_manager/utils/helper.dart';
|
import 'package:dde_gesture_manager/utils/helper.dart';
|
||||||
@@ -332,6 +333,9 @@ class GestureEditor extends StatelessWidget {
|
|||||||
.firstWhere((ele) => ele.scheme.id == schemeProvider.id);
|
.firstWhere((ele) => ele.scheme.id == schemeProvider.id);
|
||||||
localSchemeEntry.scheme.uploaded = true;
|
localSchemeEntry.scheme.uploaded = true;
|
||||||
localSchemeEntry.save(localSchemesProvider);
|
localSchemeEntry.save(localSchemesProvider);
|
||||||
|
context
|
||||||
|
.read<SchemeListRefreshKeyProvider>()
|
||||||
|
.setProps(refreshKey: DateTime.now().millisecondsSinceEpoch);
|
||||||
} else {
|
} else {
|
||||||
Notificator.error(context, title: LocaleKeys.info_upload_failed.tr());
|
Notificator.error(context, title: LocaleKeys.info_upload_failed.tr());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -63,6 +63,7 @@ class _LoginWidgetState extends State<LoginWidget> {
|
|||||||
else
|
else
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
|
return null;
|
||||||
},
|
},
|
||||||
onSubmitAnimationCompleted: () {
|
onSubmitAnimationCompleted: () {
|
||||||
var token = H().sp.getString(SPKeys.accessToken);
|
var token = H().sp.getString(SPKeys.accessToken);
|
||||||
@@ -75,7 +76,7 @@ class _LoginWidgetState extends State<LoginWidget> {
|
|||||||
.read<ConfigsProvider>()
|
.read<ConfigsProvider>()
|
||||||
.setProps(accessToken: token, email: H().sp.getString(SPKeys.loginEmail));
|
.setProps(accessToken: token, email: H().sp.getString(SPKeys.loginEmail));
|
||||||
},
|
},
|
||||||
onRecoverPassword: (_) {},
|
onRecoverPassword: (_) => null,
|
||||||
hideForgotPasswordButton: true,
|
hideForgotPasswordButton: true,
|
||||||
disableCustomPageTransformer: true,
|
disableCustomPageTransformer: true,
|
||||||
messages: LoginMessages(
|
messages: LoginMessages(
|
||||||
@@ -87,11 +88,13 @@ class _LoginWidgetState extends State<LoginWidget> {
|
|||||||
if (FlutterLogin.defaultEmailValidator(value) != null) {
|
if (FlutterLogin.defaultEmailValidator(value) != null) {
|
||||||
return LocaleKeys.me_login_email_error_hint.tr();
|
return LocaleKeys.me_login_email_error_hint.tr();
|
||||||
}
|
}
|
||||||
|
return null;
|
||||||
},
|
},
|
||||||
passwordValidator: (value) {
|
passwordValidator: (value) {
|
||||||
if (value!.isEmpty || value.length < 8 || value.length > 16) {
|
if (value!.isEmpty || value.length < 8 || value.length > 16) {
|
||||||
return LocaleKeys.me_login_password_hint.tr();
|
return LocaleKeys.me_login_password_hint.tr();
|
||||||
}
|
}
|
||||||
|
return null;
|
||||||
},
|
},
|
||||||
theme: LoginTheme(
|
theme: LoginTheme(
|
||||||
pageColorDark: Colors.transparent,
|
pageColorDark: Colors.transparent,
|
||||||
|
|||||||
+196
-4
@@ -1,7 +1,16 @@
|
|||||||
|
import 'package:auto_size_text/auto_size_text.dart';
|
||||||
|
import 'package:cached_network_image/cached_network_image.dart';
|
||||||
import 'package:dde_gesture_manager/constants/constants.dart';
|
import 'package:dde_gesture_manager/constants/constants.dart';
|
||||||
|
import 'package:dde_gesture_manager/http/api.dart';
|
||||||
|
import 'package:dde_gesture_manager/models/configs.provider.dart';
|
||||||
|
import 'package:dde_gesture_manager/models/settings.provider.dart';
|
||||||
import 'package:dde_gesture_manager/widgets/dde_button.dart';
|
import 'package:dde_gesture_manager/widgets/dde_button.dart';
|
||||||
|
import 'package:dde_gesture_manager_api/models.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:dde_gesture_manager/extensions.dart';
|
import 'package:dde_gesture_manager/extensions.dart';
|
||||||
|
import 'package:markdown_editor_ot/markdown_editor.dart';
|
||||||
|
import 'package:numeral/numeral.dart';
|
||||||
|
import 'package:collection/collection.dart';
|
||||||
|
|
||||||
enum MarketSortType {
|
enum MarketSortType {
|
||||||
recommend,
|
recommend,
|
||||||
@@ -18,10 +27,69 @@ class MarketWidget extends StatefulWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class _MarketWidgetState extends State<MarketWidget> {
|
class _MarketWidgetState extends State<MarketWidget> {
|
||||||
|
List<MarketSchemeTransMetaData> _schemes = [];
|
||||||
|
bool _hasMore = true;
|
||||||
|
int _currentPage = 0;
|
||||||
MarketSortType _type = MarketSortType.recommend;
|
MarketSortType _type = MarketSortType.recommend;
|
||||||
|
String? _selected;
|
||||||
|
String? _hovering;
|
||||||
|
int _refreshKey = 0;
|
||||||
|
List<int> _likedSchemes = [];
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
Api.userLikes().then((value) {
|
||||||
|
if (mounted && value != null)
|
||||||
|
setState(() {
|
||||||
|
_likedSchemes = value;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
Api.marketSchemes(type: _type, page: _currentPage).then((value) {
|
||||||
|
if (mounted && value != null)
|
||||||
|
setState(() {
|
||||||
|
_schemes = value.items;
|
||||||
|
_selected = value.items.isNotEmpty ? value.items.first.uuid : null;
|
||||||
|
_hasMore = value.hasMore;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
Color _getItemBackgroundColor(int index, String? schemeId) {
|
||||||
|
Color _color = index % 2 == 0 ? context.t.scaffoldBackgroundColor : context.t.backgroundColor;
|
||||||
|
if (schemeId == _hovering) _color = context.t.dialogBackgroundColor;
|
||||||
|
if (schemeId == _selected) _color = context.read<SettingsProvider>().currentActiveColor;
|
||||||
|
return _color;
|
||||||
|
}
|
||||||
|
|
||||||
|
_refreshList() {
|
||||||
|
Future.delayed(const Duration(milliseconds: 100), () {
|
||||||
|
Api.marketSchemes(type: _type, page: 0).then((value) {
|
||||||
|
if (mounted && value != null)
|
||||||
|
setState(() {
|
||||||
|
_schemes = value.items;
|
||||||
|
_hasMore = value.hasMore;
|
||||||
|
_selected = value.items.first.uuid;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
_getMoreSchemes() {
|
||||||
|
'try to fetch page: ${_currentPage + 1}'.sout();
|
||||||
|
if (_hasMore)
|
||||||
|
Api.marketSchemes(type: _type, page: ++_currentPage).then((value) {
|
||||||
|
if (mounted && value != null)
|
||||||
|
setState(() {
|
||||||
|
_schemes.addAll(value.items);
|
||||||
|
_hasMore = value.hasMore;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
|
var currentSelectedScheme = _schemes.firstWhereOrNull((e) => e.uuid == _selected);
|
||||||
return Column(
|
return Column(
|
||||||
mainAxisSize: MainAxisSize.max,
|
mainAxisSize: MainAxisSize.max,
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
@@ -46,6 +114,7 @@ class _MarketWidgetState extends State<MarketWidget> {
|
|||||||
onTap: () {
|
onTap: () {
|
||||||
setState(() {
|
setState(() {
|
||||||
_type = e;
|
_type = e;
|
||||||
|
_refreshList();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
child: Center(
|
child: Center(
|
||||||
@@ -71,7 +140,107 @@ class _MarketWidgetState extends State<MarketWidget> {
|
|||||||
borderRadius: BorderRadius.circular(defaultBorderRadius),
|
borderRadius: BorderRadius.circular(defaultBorderRadius),
|
||||||
),
|
),
|
||||||
child: Column(
|
child: Column(
|
||||||
children: [Text('asd')],
|
children: [
|
||||||
|
Flexible(
|
||||||
|
child: Padding(
|
||||||
|
padding: EdgeInsets.symmetric(horizontal: 1, vertical: 2),
|
||||||
|
child: ListView.builder(
|
||||||
|
itemBuilder: (context, index) {
|
||||||
|
if (index == _schemes.length - 1) _getMoreSchemes();
|
||||||
|
return GestureDetector(
|
||||||
|
onTap: () {
|
||||||
|
setState(() {
|
||||||
|
_selected = _schemes[index].uuid;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
child: MouseRegion(
|
||||||
|
cursor: SystemMouseCursors.click,
|
||||||
|
onEnter: (_) {
|
||||||
|
setState(() {
|
||||||
|
_hovering = _schemes[index].uuid;
|
||||||
|
});
|
||||||
|
},
|
||||||
|
child: Container(
|
||||||
|
color: _getItemBackgroundColor(index, _schemes[index].uuid),
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.only(left: 6, right: 12.0),
|
||||||
|
child: DefaultTextStyle(
|
||||||
|
style: context.t.textTheme.bodyText2!.copyWith(
|
||||||
|
color: _selected == _schemes[index].uuid ? Colors.white : null,
|
||||||
|
),
|
||||||
|
child: Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
|
children: [
|
||||||
|
Text(_schemes[index].name ?? ''),
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
SizedBox(
|
||||||
|
width: 50,
|
||||||
|
child: Align(
|
||||||
|
alignment: Alignment.centerRight,
|
||||||
|
child: AutoSizeText(
|
||||||
|
'${numeral(_schemes[index].downloads ?? 0, fractionDigits: 1)}'
|
||||||
|
.padLeft(5),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Icon(
|
||||||
|
Icons.file_download,
|
||||||
|
size: 18,
|
||||||
|
),
|
||||||
|
SizedBox(
|
||||||
|
width: 50,
|
||||||
|
child: Align(
|
||||||
|
alignment: Alignment.centerRight,
|
||||||
|
child: AutoSizeText(
|
||||||
|
'${numeral(_schemes[index].likes ?? 0, fractionDigits: 1)}'.padLeft(5),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Icon(
|
||||||
|
_likedSchemes.contains(_schemes[index].id)
|
||||||
|
? Icons.thumb_up
|
||||||
|
: Icons.thumb_up_off_alt,
|
||||||
|
size: 17),
|
||||||
|
]
|
||||||
|
.map((e) => Padding(
|
||||||
|
padding: const EdgeInsets.only(right: 3),
|
||||||
|
child: e,
|
||||||
|
))
|
||||||
|
.toList(),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
itemCount: _schemes.length,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Divider(thickness: .5),
|
||||||
|
Flexible(
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.only(left: 8),
|
||||||
|
child: MdPreview(
|
||||||
|
text: _schemes.firstWhereOrNull((e) => e.uuid == _selected)?.description ?? '',
|
||||||
|
widgetImage: (imageUrl) => CachedNetworkImage(
|
||||||
|
imageUrl: imageUrl,
|
||||||
|
placeholder: (context, url) => const SizedBox(
|
||||||
|
width: double.infinity,
|
||||||
|
height: 300,
|
||||||
|
child: Center(child: CircularProgressIndicator()),
|
||||||
|
),
|
||||||
|
errorWidget: (context, url, error) => const Icon(Icons.error),
|
||||||
|
),
|
||||||
|
onCodeCopied: () {},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -81,12 +250,35 @@ class _MarketWidgetState extends State<MarketWidget> {
|
|||||||
mainAxisAlignment: MainAxisAlignment.end,
|
mainAxisAlignment: MainAxisAlignment.end,
|
||||||
children: [
|
children: [
|
||||||
DButton.like(
|
DButton.like(
|
||||||
enabled: true,
|
enabled: context.watch<ConfigsProvider>().accessToken.notNull,
|
||||||
onTap: () {},
|
onTap: () {
|
||||||
|
bool liked = _likedSchemes.contains(currentSelectedScheme!.id!);
|
||||||
|
Api.likeScheme(schemeId: currentSelectedScheme.uuid!, isLike: !liked).then((value) {
|
||||||
|
if (value) {
|
||||||
|
setState(() {
|
||||||
|
if (liked) {
|
||||||
|
_likedSchemes.remove(currentSelectedScheme.id);
|
||||||
|
currentSelectedScheme.likes = currentSelectedScheme.likes! - 1;
|
||||||
|
} else {
|
||||||
|
_likedSchemes.add(currentSelectedScheme.id!);
|
||||||
|
currentSelectedScheme.likes = currentSelectedScheme.likes! + 1;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
),
|
),
|
||||||
DButton.download(
|
DButton.download(
|
||||||
enabled: true,
|
enabled: true,
|
||||||
onTap: () {},
|
onTap: () {
|
||||||
|
Api.downloadScheme(schemeId: currentSelectedScheme!.uuid!).then((value) {
|
||||||
|
/// todo: 下载逻辑
|
||||||
|
value.sout();
|
||||||
|
setState(() {
|
||||||
|
currentSelectedScheme.downloads = currentSelectedScheme.downloads! + 1;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
},
|
||||||
),
|
),
|
||||||
]
|
]
|
||||||
.map((e) => Padding(
|
.map((e) => Padding(
|
||||||
|
|||||||
+18
-4
@@ -5,8 +5,10 @@ import 'package:dde_gesture_manager/constants/constants.dart';
|
|||||||
import 'package:dde_gesture_manager/extensions.dart';
|
import 'package:dde_gesture_manager/extensions.dart';
|
||||||
import 'package:dde_gesture_manager/http/api.dart';
|
import 'package:dde_gesture_manager/http/api.dart';
|
||||||
import 'package:dde_gesture_manager/models/configs.provider.dart';
|
import 'package:dde_gesture_manager/models/configs.provider.dart';
|
||||||
|
import 'package:dde_gesture_manager/models/scheme_list_refresh_key.provider.dart';
|
||||||
import 'package:dde_gesture_manager/models/settings.provider.dart';
|
import 'package:dde_gesture_manager/models/settings.provider.dart';
|
||||||
import 'package:dde_gesture_manager/utils/notificator.dart';
|
import 'package:dde_gesture_manager/utils/notificator.dart';
|
||||||
|
import 'package:dde_gesture_manager/utils/simple_throttle.dart';
|
||||||
import 'package:dde_gesture_manager_api/models.dart';
|
import 'package:dde_gesture_manager_api/models.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_platform_alert/flutter_platform_alert.dart';
|
import 'package:flutter_platform_alert/flutter_platform_alert.dart';
|
||||||
@@ -33,6 +35,7 @@ class _MeWidgetState extends State<MeWidget> {
|
|||||||
SchemeListType _type = SchemeListType.uploaded;
|
SchemeListType _type = SchemeListType.uploaded;
|
||||||
String? _selected;
|
String? _selected;
|
||||||
String? _hovering;
|
String? _hovering;
|
||||||
|
int _refreshKey = 0;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
@@ -66,6 +69,12 @@ class _MeWidgetState extends State<MeWidget> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
|
var refreshKey = context.watch<SchemeListRefreshKeyProvider>().refreshKey;
|
||||||
|
if (_refreshKey != refreshKey) {
|
||||||
|
Future.microtask(SimpleThrottle.bind(_refreshList));
|
||||||
|
}
|
||||||
|
_refreshKey = refreshKey;
|
||||||
|
|
||||||
var currentSelectedScheme = _schemes.firstWhereOrNull((e) => e.uuid == _selected);
|
var currentSelectedScheme = _schemes.firstWhereOrNull((e) => e.uuid == _selected);
|
||||||
return Padding(
|
return Padding(
|
||||||
padding: EdgeInsets.only(top: 10),
|
padding: EdgeInsets.only(top: 10),
|
||||||
@@ -114,7 +123,7 @@ class _MeWidgetState extends State<MeWidget> {
|
|||||||
if (mounted && value != null)
|
if (mounted && value != null)
|
||||||
setState(() {
|
setState(() {
|
||||||
_schemes = value;
|
_schemes = value;
|
||||||
_selected = value.first.uuid;
|
_selected = value.isEmpty ? null : value.first.uuid;
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@@ -261,10 +270,12 @@ class _MeWidgetState extends State<MeWidget> {
|
|||||||
DButton.like(
|
DButton.like(
|
||||||
enabled: true,
|
enabled: true,
|
||||||
onTap: () {
|
onTap: () {
|
||||||
Api.likeScheme(schemeId: currentSelectedScheme!.uuid!, isLike: !currentSelectedScheme.liked!)
|
Api.likeScheme(schemeId: currentSelectedScheme!.uuid!, isLike: !currentSelectedScheme.liked)
|
||||||
.then((value) {
|
.then((value) {
|
||||||
if (value) {
|
if (value) {
|
||||||
_refreshList();
|
context
|
||||||
|
.read<SchemeListRefreshKeyProvider>()
|
||||||
|
.setProps(refreshKey: DateTime.now().millisecondsSinceEpoch);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@@ -273,8 +284,11 @@ class _MeWidgetState extends State<MeWidget> {
|
|||||||
enabled: true,
|
enabled: true,
|
||||||
onTap: () {
|
onTap: () {
|
||||||
Api.downloadScheme(schemeId: currentSelectedScheme!.uuid!).then((value) {
|
Api.downloadScheme(schemeId: currentSelectedScheme!.uuid!).then((value) {
|
||||||
|
/// todo: 下载逻辑
|
||||||
value.sout();
|
value.sout();
|
||||||
_refreshList();
|
context
|
||||||
|
.read<SchemeListRefreshKeyProvider>()
|
||||||
|
.setProps(refreshKey: DateTime.now().millisecondsSinceEpoch);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
|
|||||||
+1
-1
@@ -11,7 +11,7 @@
|
|||||||
For more details:
|
For more details:
|
||||||
* https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
|
* https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
|
||||||
-->
|
-->
|
||||||
<base href="/">
|
<base href="/dgm_web/">
|
||||||
|
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<meta content="IE=Edge" http-equiv="X-UA-Compatible">
|
<meta content="IE=Edge" http-equiv="X-UA-Compatible">
|
||||||
|
|||||||
Reference in New Issue
Block a user