tester.nicolai
/
selfprivacy.org.app
forked from SelfPrivacy/selfprivacy.org.app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add more

fdroid
Kherel 2020-12-02 10:16:23 +01:00
parent 90df52e895
commit 4875e3ee07
19 changed files with 456 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/fonts/BrandIcons.ttf
View File

Binary file not shown.

6
ios/Podfile.lock
View File

@ -1,5 +1,7 @@
PODS:
- Flutter (1.0.0)
- package_info (0.0.1):
- Flutter
- path_provider (0.0.1):
- Flutter
- shared_preferences (0.0.1):
@ -9,6 +11,7 @@ PODS:
DEPENDENCIES:
- Flutter (from `Flutter`)
- package_info (from `.symlinks/plugins/package_info/ios`)
- path_provider (from `.symlinks/plugins/path_provider/ios`)
- shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
- url_launcher (from `.symlinks/plugins/url_launcher/ios`)
@ -16,6 +19,8 @@ DEPENDENCIES:
EXTERNAL SOURCES:
Flutter:
:path: Flutter
package_info:
:path: ".symlinks/plugins/package_info/ios"
path_provider:
:path: ".symlinks/plugins/path_provider/ios"
shared_preferences:
@ -25,6 +30,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
Flutter: 0e3d915762c693b495b44d77113d4970485de6ec
package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef

14
lib/config/brand_colors.dart
View File

@ -18,6 +18,18 @@ class BrandColors {
/// ![](https://www.colorhexa.com/DDDDDD.png)
static const Color gray4 = Color(0xFFDDDDDD);
/// ![](https://www.colorhexa.com/EDEEF1.png)
static const Color gray5 = Color(0xFFEDEEF1);
/// ![](https://www.colorhexa.com/FA0E0E.png)
static const Color red = Color(0xFFFA0E0E);
/// ![](https://www.colorhexa.com/00AF54.png)
static const Color green1 = Color(0xFF00AF54);
/// ![](https://www.colorhexa.com/0F8849.png)
static const Color green2 = Color(0xFF0F8849);
static const primary = blue;
static const headlineColor = black;
static const inactive = gray2;
@ -26,6 +38,8 @@ class BrandColors {
static const textColor1 = black;
static const textColor2 = gray1;
static const dividerColor = gray5;
static const warning = red;
static get navBackground => white.withOpacity(0.8);

4
lib/config/brand_theme.dart
View File

@ -18,4 +18,6 @@ final theme = ThemeData(
),
);
final brandPagePadding = EdgeInsets.symmetric(horizontal: 15, vertical: 30);
final brandPagePadding1 = EdgeInsets.symmetric(horizontal: 15, vertical: 30);
final brandPagePadding2 = EdgeInsets.symmetric(horizontal: 15);

6
lib/config/text_themes.dart
View File

@ -23,6 +23,12 @@ final headline2Style = GoogleFonts.inter(
color: BrandColors.headlineColor,
);
final headline3Style = GoogleFonts.inter(
fontSize: 20,
fontWeight: NamedFontWeight.extraBold,
color: BrandColors.headlineColor,
);
final captionStyle = GoogleFonts.inter(
fontSize: 18,
fontWeight: NamedFontWeight.medium,

16
lib/ui/components/brand_divider/brand_divider.dart Normal file
View File

@ -0,0 +1,16 @@
import 'package:flutter/material.dart';
import 'package:selfprivacy/config/brand_colors.dart';
class BrandDivider extends StatelessWidget {
const BrandDivider({Key key}) : super(key: key);
@override
Widget build(BuildContext context) {
return Container(
width: double.infinity,
height: 1,
color: BrandColors.dividerColor,
);
}
}

39
lib/ui/components/brand_header/brand_header.dart Normal file
View File

@ -0,0 +1,39 @@
import 'package:flutter/material.dart';
import 'package:selfprivacy/ui/components/brand_icons/brand_icons.dart';
import 'package:selfprivacy/utils/extensions/text_extension.dart';
class BrandHeader extends StatelessWidget {
const BrandHeader({
Key key,
@required this.title,
this.hasBackButton = false,
}) : super(key: key);
final String title;
final bool hasBackButton;
@override
Widget build(BuildContext context) {
return Container(
padding: EdgeInsets.only(
top: hasBackButton ? 4 : 17,
bottom: hasBackButton ? 7 : 20,
left: hasBackButton ? 1 : 15,
),
child: Container(
child: Row(
children: [
if (hasBackButton) ...[
IconButton(
icon: Icon(BrandIcons.arrow_left),
onPressed: () => Navigator.of(context).pop(),
),
SizedBox(width: 10),
],
Text(title).caption,
],
),
),
);
}
}

2
lib/ui/components/brand_icons/brand_icons.dart
View File

@ -57,4 +57,6 @@ class BrandIcons {
IconData(0xe816, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData github =
IconData(0xe817, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData arrow_left =
IconData(0xe818, fontFamily: _kFontFam, fontPackage: _kFontPkg);
}

56
lib/ui/pages/about/about.dart Normal file
View File

@ -0,0 +1,56 @@
import 'package:flutter/material.dart';
import 'package:selfprivacy/config/brand_theme.dart';
import 'package:selfprivacy/ui/components/brand_divider/brand_divider.dart';
import 'package:selfprivacy/ui/components/brand_header/brand_header.dart';
import 'package:selfprivacy/utils/extensions/text_extension.dart';
class AboutPage extends StatelessWidget {
const AboutPage({Key key}) : super(key: key);
@override
Widget build(BuildContext context) {
return SafeArea(
child: Scaffold(
body: ListView(
children: [
BrandHeader(title: 'О проекте', hasBackButton: true),
Padding(
padding: brandPagePadding2,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
BrandDivider(),
SizedBox(height: 20),
Text('О проекте').h3,
SizedBox(height: 10),
Text('Всё больше организаций хотят владеть нашими данными')
.body1,
SizedBox(height: 10),
Text('А мы сами хотим распоряжаться своими данными на своем сервере.')
.body1,
SizedBox(height: 20),
BrandDivider(),
SizedBox(height: 10),
Text('Миссия проекта').h3,
SizedBox(height: 10),
Text(
'Цифровая независимость и приватность доступная каждому'),
SizedBox(height: 20),
BrandDivider(),
SizedBox(height: 10),
Text('Цель').h3,
SizedBox(height: 10),
Text(
'Развивать программу, которая позволит каждому создавать приватные сервисы для себя и своих близких'),
SizedBox(height: 10),
Text(
'Развивать программу, которая позволит каждому создавать приватные сервисы для себя и своих близких'),
],
),
),
],
),
),
);
}
}

46
lib/ui/pages/info/info.dart Normal file
View File

@ -0,0 +1,46 @@
import 'package:flutter/material.dart';
import 'package:selfprivacy/config/brand_theme.dart';
import 'package:selfprivacy/ui/components/brand_divider/brand_divider.dart';
import 'package:selfprivacy/ui/components/brand_header/brand_header.dart';
import 'package:selfprivacy/utils/extensions/text_extension.dart';
import 'package:package_info/package_info.dart';
class InfoPage extends StatelessWidget {
const InfoPage({Key key}) : super(key: key);
@override
Widget build(BuildContext context) {
return SafeArea(
child: Scaffold(
body: ListView(
children: [
BrandHeader(title: 'О приложении', hasBackButton: true),
Padding(
padding: brandPagePadding2,
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
BrandDivider(),
SizedBox(height: 10),
FutureBuilder(
future: _version(),
builder: (context, snapshot) {
return Text(
'Тут любая служебная информация, v.${snapshot.data}')
.body1;
}),
],
),
),
],
),
),
);
}
Future<String> _version() async {
var packageInfo = await PackageInfo.fromPlatform();
return packageInfo.version;
}
}

86
lib/ui/pages/more/more.dart Normal file
View File

@ -0,0 +1,86 @@
import 'package:flutter/material.dart';
import 'package:selfprivacy/config/brand_colors.dart';
import 'package:selfprivacy/config/brand_theme.dart';
import 'package:selfprivacy/ui/components/brand_divider/brand_divider.dart';
import 'package:selfprivacy/ui/components/brand_header/brand_header.dart';
import 'package:selfprivacy/ui/components/brand_icons/brand_icons.dart';
import 'package:selfprivacy/ui/pages/about/about.dart';
import 'package:selfprivacy/ui/pages/info/info.dart';
import 'package:selfprivacy/ui/pages/settings/setting.dart';
import 'package:selfprivacy/utils/extensions/text_extension.dart';
import 'package:selfprivacy/utils/route_transitions/basic.dart';
class MorePage extends StatelessWidget {
const MorePage({Key key}) : super(key: key);
@override
Widget build(BuildContext context) {
return ListView(
children: [
BrandHeader(title: 'Еще'),
Padding(
padding: brandPagePadding2,
child: Column(
children: [
BrandDivider(),
_NavItem(
title: 'Настройки',
iconData: BrandIcons.settings,
goTo: SettingsPage(),
),
_NavItem(
title: 'О проекте Selfprivacy',
iconData: BrandIcons.triangle,
goTo: AboutPage(),
),
_NavItem(
title: 'О приложении',
iconData: BrandIcons.help,
goTo: InfoPage(),
),
],
),
)
],
);
}
}
class _NavItem extends StatelessWidget {
const _NavItem({
Key key,
@required this.iconData,
@required this.goTo,
@required this.title,
}) : super(key: key);
final IconData iconData;
final Widget goTo;
final String title;
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: () => Navigator.of(context).push(materialRoute(goTo)),
child: Container(
padding: EdgeInsets.symmetric(vertical: 24),
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
width: 1.0,
color: BrandColors.dividerColor,
),
),
),
child: Row(
children: [
Text(title).body1,
Spacer(),
Icon(iconData, size: 20),
SizedBox(width: 18),
],
),
),
);
}
}

3
lib/ui/pages/onboarding/onboarding.dart
View File

@ -39,7 +39,8 @@ class OnboardingPage extends StatelessWidget {
),
BrandButton.rised(
onPressed: () {
Navigator.of(context).push(materialRoute(RootPage()));
Navigator.of(context)
.pushReplacement(materialRoute(RootPage()));
},
title: 'Приступим!',
)

3
lib/ui/pages/rootRoute.dart
View File

@ -1,6 +1,7 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:selfprivacy/ui/components/brand_tab_bar/brand_tab_bar.dart';
import 'package:selfprivacy/ui/pages/more/more.dart';
import 'package:selfprivacy/ui/pages/servers/servers.dart';
import 'package:selfprivacy/ui/pages/services/services.dart';
@ -37,7 +38,7 @@ class _RootPageState extends State<RootPage>
ServersPage(),
ServicesPage(),
Text('users'),
Text('more'),
MorePage(),
],
),
bottomNavigationBar: BottomTabBar(

2
lib/ui/pages/servers/servers.dart
View File

@ -16,7 +16,7 @@ class ServersPage extends StatelessWidget {
Widget build(BuildContext context) {
return Scaffold(
body: ListView(
padding: brandPagePadding,
padding: brandPagePadding1,
children: [
Text('Начало').caption,
Text('SelfPrivacy').h1,

2
lib/ui/pages/services/services.dart
View File

@ -23,7 +23,7 @@ class _ServicesPageState extends State<ServicesPage> {
final uninitialized = serviceCubit.state.uninitialized;
return Scaffold(
body: ListView(
padding: brandPagePadding,
padding: brandPagePadding1,
children: [
Text('Сервисы').caption,
SizedBox(height: 24),

165
lib/ui/pages/settings/setting.dart Normal file
View File

@ -0,0 +1,165 @@
import 'package:flutter/material.dart';
import 'package:selfprivacy/config/brand_colors.dart';
import 'package:selfprivacy/config/brand_theme.dart';
import 'package:selfprivacy/ui/components/brand_divider/brand_divider.dart';
import 'package:selfprivacy/ui/components/brand_header/brand_header.dart';
import 'package:selfprivacy/utils/extensions/text_extension.dart';
class SettingsPage extends StatelessWidget {
const SettingsPage({Key key}) : super(key: key);
@override
Widget build(BuildContext context) {
return SafeArea(
child: Scaffold(
body: ListView(
children: [
BrandHeader(title: 'Настройки', hasBackButton: true),
Padding(
padding: brandPagePadding2,
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
BrandDivider(),
_SwitcherBlock(
child: _TextColumn(
title: 'Allow Auto-upgrade',
value: 'Wether to allow automatic packages upgrades',
),
isActive: true,
),
_SwitcherBlock(
child: _TextColumn(
title: 'Reboot after upgrade',
value: 'Reboot without prompt after applying updates',
),
isActive: false,
),
_Button(
onTap: () {},
child: _TextColumn(
title: 'Server Timezone',
value: 'Europe/Kyiv',
),
),
_Button(
onTap: () {},
child: _TextColumn(
title: 'Server Locale',
value: 'Default',
),
),
_Button(
onTap: () {},
child: _TextColumn(
hasWarning: true,
title: 'Factory Reset',
value: 'Restore default settings on your server',
),
)
],
),
)
],
),
),
);
}
}
class _SwitcherBlock extends StatelessWidget {
const _SwitcherBlock({
Key key,
@required this.child,
@required this.isActive,
}) : super(key: key);
final Widget child;
final bool isActive;
@override
Widget build(BuildContext context) {
return Container(
padding: EdgeInsets.only(top: 20, bottom: 5),
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(width: 1, color: BrandColors.dividerColor),
)),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Flexible(child: child),
SizedBox(width: 5),
Switch(
activeColor: BrandColors.green1,
activeTrackColor: BrandColors.green2,
onChanged: (v) {},
value: isActive,
),
],
),
);
}
}
class _Button extends StatelessWidget {
const _Button({
Key key,
@required this.onTap,
@required this.child,
}) : super(key: key);
final Widget child;
final VoidCallback onTap;
@override
Widget build(BuildContext context) {
return InkWell(
onTap: onTap,
child: Container(
padding: EdgeInsets.only(top: 20, bottom: 5),
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(width: 1, color: BrandColors.dividerColor),
)),
child: child,
),
);
}
}
class _TextColumn extends StatelessWidget {
const _TextColumn({
Key key,
@required this.title,
@required this.value,
this.hasWarning = false,
}) : super(key: key);
final String title;
final String value;
final bool hasWarning;
@override
Widget build(BuildContext context) {
return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(title).body1.copyWith(
style: TextStyle(color: hasWarning ? BrandColors.warning : null)),
SizedBox(height: 5),
Text(value)
.body1
.copyWith(
style: TextStyle(
fontSize: 13,
height: 1.53,
color: BrandColors.gray1,
),
)
.copyWith(
style:
TextStyle(color: hasWarning ? BrandColors.warning : null)),
],
);
}
}

2
lib/utils/extensions/text_extension.dart
View File

@ -7,6 +7,8 @@ import 'package:selfprivacy/config/text_themes.dart';
extension TextExtension on Text {
Text get h1 => copyWith(style: headline1Style);
Text get h2 => copyWith(style: headline2Style);
Text get h3 => copyWith(style: headline3Style);
Text get caption => copyWith(style: captionStyle);
Text get body1 => copyWith(style: body1Style);

7
pubspec.lock
View File

@ -210,6 +210,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.0.4"
package_info:
dependency: "direct main"
description:
name: package_info
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.3+2"
path:
dependency: transitive
description:

3
pubspec.yaml
View File

@ -1,7 +1,7 @@
name: selfprivacy
description: selfprivacy.org
publish_to: 'none'
version: 1.0.0+1
version: 0.1.0+1
environment:
sdk: ">=2.7.0 <3.0.0"
@ -14,6 +14,7 @@ dependencies:
equatable: ^1.2.5
flutter_bloc: ^6.1.1
google_fonts: ^1.1.1
package_info: ^0.4.3+2
provider: ^4.3.2+2
url_launcher: ^5.7.10