vodorod/umbrix
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 1 Wiki Activity

feat: Umbrix branding - logo and name changes

Browse Source 
- Changed app title from Hiddify to Umbrix in home page
- Added custom Umbrix logo (192x192 PNG)
- Updated intro page with Umbrix branding and gradient design
- Updated drawer menu with Umbrix logo
- Modified add profile modal with modern gradient cards
- Updated Russian translations (appTitle: Umbrix)
This commit is contained in:
Hiddify User
2025-12-26 18:41:25 +03:00
parent 07032c851b
commit 5411a30519
5 changed files with 241 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/translations/strings_ru.i18n.json
View File

@@ -1,6 +1,6 @@
{ {
"general": { "general": {
"appTitle": "Hiddify", "appTitle": "Umbrix",
"reset": "Сброс", "reset": "Сброс",
"toggle": { "toggle": {
"enabled": "Включено", "enabled": "Включено",

14
lib/features/common/adaptive_root_scaffold.dart
View File

@@ -1,6 +1,7 @@
import 'package:fluentui_system_icons/fluentui_system_icons.dart'; import 'package:fluentui_system_icons/fluentui_system_icons.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_adaptive_scaffold/flutter_adaptive_scaffold.dart'; import 'package:flutter_adaptive_scaffold/flutter_adaptive_scaffold.dart';
import 'package:hiddify/gen/assets.gen.dart';
import 'package:hiddify/core/localization/translations.dart'; import 'package:hiddify/core/localization/translations.dart';
import 'package:hiddify/core/router/router.dart'; import 'package:hiddify/core/router/router.dart';
import 'package:hiddify/features/stats/widget/side_bar_stats_overview.dart'; import 'package:hiddify/features/stats/widget/side_bar_stats_overview.dart';
@@ -123,16 +124,15 @@ class _CustomAdaptiveScaffold extends HookConsumerWidget {
child: Column( child: Column(
children: [ children: [
Container( Container(
width: 96, width: 80,
height: 96, height: 80,
padding: const EdgeInsets.all(12),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(16), borderRadius: BorderRadius.circular(20),
color: Theme.of(context).colorScheme.primaryContainer, color: Theme.of(context).colorScheme.primaryContainer,
), ),
child: Icon( child: Assets.images.umbrixLogo.image(
Icons.shield_outlined, fit: BoxFit.contain,
size: 56,
color: Theme.of(context).colorScheme.primary,
), ),
), ),
const SizedBox(height: 16), const SizedBox(height: 16),

2
lib/features/home/widget/home_page.dart
View File

@@ -36,7 +36,7 @@ class HomePage extends HookConsumerWidget {
title: Text.rich( title: Text.rich(
TextSpan( TextSpan(
children: [ children: [
TextSpan(text: t.general.appTitle), const TextSpan(text: "Umbrix"),
const TextSpan(text: " "), const TextSpan(text: " "),
const WidgetSpan( const WidgetSpan(
child: AppVersionLabel(), child: AppVersionLabel(),

304
lib/features/intro/widget/intro_page.dart
View File

@@ -8,6 +8,7 @@ import 'package:hiddify/core/localization/locale_preferences.dart';
import 'package:hiddify/core/localization/translations.dart'; import 'package:hiddify/core/localization/translations.dart';
import 'package:hiddify/core/model/constants.dart'; import 'package:hiddify/core/model/constants.dart';
import 'package:hiddify/core/model/region.dart'; import 'package:hiddify/core/model/region.dart';
import 'package:hiddify/gen/assets.gen.dart';
import 'package:hiddify/core/preferences/general_preferences.dart'; import 'package:hiddify/core/preferences/general_preferences.dart';
import 'package:hiddify/features/common/general_pref_tiles.dart'; import 'package:hiddify/features/common/general_pref_tiles.dart';
import 'package:hiddify/features/config_option/data/config_option_repository.dart'; import 'package:hiddify/features/config_option/data/config_option_repository.dart';
@@ -25,7 +26,7 @@ class IntroPage extends HookConsumerWidget with PresLogger {
@override @override
Widget build(BuildContext context, WidgetRef ref) { Widget build(BuildContext context, WidgetRef ref) {
final t = ref.watch(translationsProvider); final t = ref.watch(translationsProvider);
final theme = Theme.of(context);
final isStarting = useState(false); final isStarting = useState(false);
if (!locationInfoLoaded) { if (!locationInfoLoaded) {
@@ -34,83 +35,214 @@ class IntroPage extends HookConsumerWidget with PresLogger {
} }
return Scaffold( return Scaffold(
body: SafeArea( body: Container(
child: CustomScrollView( decoration: BoxDecoration(
shrinkWrap: true, gradient: LinearGradient(
slivers: [ begin: Alignment.topCenter,
SliverToBoxAdapter( end: Alignment.bottomCenter,
child: SizedBox( colors: [
width: 224, theme.colorScheme.surface,
height: 224, theme.colorScheme.surfaceContainerHighest,
],
),
),
child: SafeArea(
child: CustomScrollView(
shrinkWrap: true,
slivers: [
// Логотип и заголовок
SliverToBoxAdapter(
child: Padding( child: Padding(
padding: const EdgeInsets.all(24), padding: const EdgeInsets.symmetric(vertical: 32, horizontal: 24),
child: Assets.images.logo.svg(), child: Column(
), children: [
), // Логотип с анимацией
), Hero(
SliverCrossAxisConstrained( tag: 'app_logo',
maxCrossAxisExtent: 368, child: Container(
child: MultiSliver( width: 120,
children: [ height: 120,
const LocalePrefTile(), padding: const EdgeInsets.all(16),
const SliverGap(4), decoration: BoxDecoration(
const RegionPrefTile(), color: theme.colorScheme.primaryContainer.withOpacity(0.3),
const SliverGap(4), borderRadius: BorderRadius.circular(30),
const EnableAnalyticsPrefTile(), boxShadow: [
const SliverGap(4), BoxShadow(
Padding( color: theme.colorScheme.primary.withOpacity(0.2),
padding: const EdgeInsets.symmetric(horizontal: 16), blurRadius: 20,
child: Text.rich( offset: const Offset(0, 10),
t.intro.termsAndPolicyCaution( ),
tap: (text) => TextSpan( ],
text: text, ),
style: const TextStyle(color: Colors.blue), child: Assets.images.umbrixLogo.image(
recognizer: TapGestureRecognizer() fit: BoxFit.contain,
..onTap = () async { ),
await UriUtils.tryLaunch(
Uri.parse(Constants.termsAndConditionsUrl),
);
},
), ),
), ),
style: Theme.of(context).textTheme.bodySmall, const Gap(24),
), // Заголовок
Text(
'Welcome to Umbrix',
style: theme.textTheme.headlineMedium?.copyWith(
fontWeight: FontWeight.bold,
color: theme.colorScheme.onSurface,
),
textAlign: TextAlign.center,
),
const Gap(8),
Text(
'Fast and Secure',
style: theme.textTheme.bodyLarge?.copyWith(
color: theme.colorScheme.onSurfaceVariant,
),
textAlign: TextAlign.center,
),
],
), ),
Padding( ),
padding: const EdgeInsets.symmetric(
horizontal: 16,
vertical: 24,
),
child: FilledButton(
onPressed: () async {
if (isStarting.value) return;
isStarting.value = true;
if (!ref.read(analyticsControllerProvider).requireValue) {
loggy.info("disabling analytics per user request");
try {
await ref.read(analyticsControllerProvider.notifier).disableAnalytics();
} catch (error, stackTrace) {
loggy.error(
"could not disable analytics",
error,
stackTrace,
);
}
}
await ref.read(Preferences.introCompleted.notifier).update(true);
},
child: isStarting.value
? LinearProgressIndicator(
backgroundColor: Colors.transparent,
color: Theme.of(context).colorScheme.onSurface,
)
: Text(t.intro.start),
),
),
],
), ),
),
], // Настройки в виде карточек
SliverCrossAxisConstrained(
maxCrossAxisExtent: 400,
child: MultiSliver(
children: [
// Язык
Padding(
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 6),
child: _SettingCard(
child: const LocalePrefTile(),
),
),
// Регион
Padding(
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 6),
child: _SettingCard(
child: const RegionPrefTile(),
),
),
// Аналитика
Padding(
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 6),
child: _SettingCard(
child: const EnableAnalyticsPrefTile(),
),
),
const SliverGap(16),
// Условия использования
Padding(
padding: const EdgeInsets.symmetric(horizontal: 32),
child: Text.rich(
t.intro.termsAndPolicyCaution(
tap: (text) => TextSpan(
text: text,
style: TextStyle(
color: theme.colorScheme.primary,
fontWeight: FontWeight.w600,
decoration: TextDecoration.underline,
),
recognizer: TapGestureRecognizer()
..onTap = () async {
await UriUtils.tryLaunch(
Uri.parse(Constants.termsAndConditionsUrl),
);
},
),
),
style: theme.textTheme.bodySmall?.copyWith(
color: theme.colorScheme.onSurfaceVariant,
),
textAlign: TextAlign.center,
),
),
// Кнопка начать
Padding(
padding: const EdgeInsets.fromLTRB(24, 24, 24, 32),
child: Container(
decoration: BoxDecoration(
gradient: LinearGradient(
colors: [
theme.colorScheme.primary,
theme.colorScheme.primary.withOpacity(0.8),
],
),
borderRadius: BorderRadius.circular(16),
boxShadow: [
BoxShadow(
color: theme.colorScheme.primary.withOpacity(0.4),
blurRadius: 12,
offset: const Offset(0, 6),
),
],
),
child: Material(
color: Colors.transparent,
child: InkWell(
onTap: isStarting.value
? null
: () async {
isStarting.value = true;
if (!ref.read(analyticsControllerProvider).requireValue) {
loggy.info("disabling analytics per user request");
try {
await ref.read(analyticsControllerProvider.notifier).disableAnalytics();
} catch (error, stackTrace) {
loggy.error(
"could not disable analytics",
error,
stackTrace,
);
}
}
await ref.read(Preferences.introCompleted.notifier).update(true);
},
borderRadius: BorderRadius.circular(16),
child: Container(
height: 56,
alignment: Alignment.center,
child: isStarting.value
? SizedBox(
width: 24,
height: 24,
child: CircularProgressIndicator(
strokeWidth: 3,
valueColor: AlwaysStoppedAnimation<Color>(
theme.colorScheme.onPrimary,
),
),
)
: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Text(
t.intro.start,
style: theme.textTheme.titleMedium?.copyWith(
color: theme.colorScheme.onPrimary,
fontWeight: FontWeight.bold,
),
),
const Gap(8),
Icon(
Icons.arrow_forward_rounded,
color: theme.colorScheme.onPrimary,
),
],
),
),
),
),
),
),
],
),
),
],
),
), ),
), ),
); );
@@ -185,3 +317,29 @@ class RegionLocale {
RegionLocale(this.region, this.locale); RegionLocale(this.region, this.locale);
} }
// Карточка для настроек
class _SettingCard extends StatelessWidget {
const _SettingCard({required this.child});
final Widget child;
@override
Widget build(BuildContext context) {
final theme = Theme.of(context);
return Container(
decoration: BoxDecoration(
color: theme.colorScheme.surfaceContainerHighest.withOpacity(0.5),
borderRadius: BorderRadius.circular(16),
border: Border.all(
color: theme.colorScheme.outline.withOpacity(0.1),
),
),
child: ClipRRect(
borderRadius: BorderRadius.circular(16),
child: child,
),
);
}
}

1
pubspec.yaml
View File

@@ -124,6 +124,7 @@ flutter:
# - assets/core/geoip.db # - assets/core/geoip.db
# - assets/core/geosite.db # - assets/core/geosite.db
- assets/images/logo.svg - assets/images/logo.svg
- assets/images/umbrix_logo.png
- assets/images/tray_icon.ico - assets/images/tray_icon.ico
- assets/images/tray_icon.png - assets/images/tray_icon.png
- assets/images/tray_icon_dark.ico - assets/images/tray_icon_dark.ico