Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
fe49125
desktop settings menu pages
Oct 5, 2022
31cbc51
Merge remote-tracking branch 'origin/desktop' into desktop
Oct 5, 2022
5827b13
SettingsMenu route added
Oct 5, 2022
b46fb82
page for settings options
Oct 6, 2022
548b0e7
basic desktop settings view
Oct 6, 2022
7120c9e
added required onSelectionChanged param
Oct 6, 2022
0964116
added settings options and padding
Oct 6, 2022
ebc9c15
option text color changes on selection
Oct 7, 2022
fac914e
button color background
Oct 7, 2022
ac9413d
value numbers allow text color to change on selection
Oct 7, 2022
efc5582
WIP: Widget testing
Likho Oct 7, 2022
3c50077
WIP: widget tests, animated text test
Likho Oct 10, 2022
0f667ca
Fix wallet_info_row test and update address book
Likho Oct 12, 2022
dca6486
Merge branch 'desktop' into widget-tests
Likho Oct 12, 2022
78048a7
Merge remote-tracking branch 'origin/staging' into widget-tests
Likho Oct 12, 2022
52a65c8
Merge branch 'staging' into widget-tests
Oct 12, 2022
3bb2e1d
WIP: widget tests
Likho Oct 13, 2022
eef976d
potential github workflows fix
Oct 13, 2022
1c8ab5c
Merge branch 'widget-tests' of https://github.com/cypherstack/stack_w…
Oct 13, 2022
be45315
WIP: widget testing, update transaction card tests to use riverpod
Likho Oct 16, 2022
145da3c
EmojiSelect widget test
Likho Oct 17, 2022
ec927b6
WIP: Widget testing
Likho Oct 17, 2022
7b71678
pushNamedRoute mock fix
julian-CStack Oct 17, 2022
a8e145e
Complete table view widgets
Likho Oct 17, 2022
777ca51
Merge branch 'widget-tests' of github.com:cypherstack/stack_wallet in…
Likho Oct 17, 2022
c8ec409
Widget testing, add more tests
Likho Oct 17, 2022
95fc05b
works on fully upgraded macbook
Oct 17, 2022
d22746b
Widget tests for managed_favorite, node_card, transaction_card and no…
Likho Oct 18, 2022
ffc1b19
Progress bar widget test and clean node_options test
Likho Oct 18, 2022
0336789
Test progress bar and stack dialog
Likho Oct 18, 2022
6cd7163
Test textfield_icon_button
Likho Oct 18, 2022
ba0eb96
Merge branch 'staging' into widget-tests
Oct 18, 2022
fa9aad1
add externalCalls pref mock
Oct 18, 2022
dff0fae
Merge branch 'mac3.3.4' into flutter3.3.4
Oct 18, 2022
29ceca8
update pubspec
Oct 18, 2022
5ffdebd
update workflow to 3.3.4
Oct 18, 2022
ded0ab8
install dependencies, rust, and build monero and epic cash
Oct 18, 2022
3192f2e
remove apt-get
Oct 18, 2022
29e4ead
workflow typo
Oct 18, 2022
226720e
correct monero build script
Oct 18, 2022
cb96bab
fix github workflow being stuck
Oct 18, 2022
b77f470
Merge branch 'staging' into flutter3.3.4
Oct 18, 2022
b8d304f
Merge branch 'staging' into flutter3.3.4
msalazarm Oct 24, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,39 @@ jobs:
- name: Prepare repository
uses: actions/checkout@v3
with:
flutter-version: '3.0.5'
flutter-version: '3.3.4'
channel: 'stable'
- name: Install Flutter
uses: subosito/flutter-action@v2
- name: Setup | Rust
uses: ATiltedTree/setup-rust@v1
with:
rust-version: stable
components: clippy
- name: Checkout submodules
run: git submodule update --init --recursive
- name: install dependencies
run: |
cargo install cargo-ndk
rustup target add x86_64-unknown-linux-gnu
sudo apt install -y unzip automake build-essential file pkg-config git python libtool libtinfo5 cmake openjdk-8-jre-headless libgit2-dev clang libncurses5-dev libncursesw5-dev zlib1g-dev llvm
sudo apt install -y debhelper libclang-dev cargo rustc opencl-headers libssl-dev ocl-icd-opencl-dev
sudo apt install -y libc6-dev-i386
sudo apt install -y build-essential cmake git libgit2-dev clang libncurses5-dev libncursesw5-dev zlib1g-dev pkg-config llvm
sudo apt install -y build-essential debhelper cmake libclang-dev libncurses5-dev clang libncursesw5-dev cargo rustc opencl-headers libssl-dev pkg-config ocl-icd-opencl-dev
sudo apt install -y unzip automake build-essential file pkg-config git python libtool libtinfo5 cmake openjdk-8-jre-headless
- name: Build Lelantus
run: |
cd crypto_plugins/flutter_liblelantus/scripts/linux/
./build_all.sh
- name: Build Monero
run: |
cd crypto_plugins/flutter_libmonero/scripts/linux/
./build_monero_all.sh
- name: Build Epic Cash
run: |
cd crypto_plugins/flutter_libepiccash/scripts/linux/
./build_all.sh
- name: Get dependencies
run: flutter pub get
- name: Create temp files
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,4 @@ coverage
scripts/**/build
/lib/external_api_keys.dart
/test/services/coins/bitcoincash/bitcoincash_wallet_test_parameters.dart
/test/services/coins/namecoin/namecoin_wallet_test_parameters.dart.txt
2 changes: 1 addition & 1 deletion ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ SPEC CHECKSUMS:
DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
file_picker: 817ab1d8cd2da9d2da412a417162deee3500fc95
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
flutter_libepiccash: 36241aa7d3126f6521529985ccb3dc5eaf7bb317
flutter_libmonero: da68a616b73dd0374a8419c684fa6b6df2c44ffe
flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
Expand Down
12 changes: 11 additions & 1 deletion ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 46;
objectVersion = 50;
objects = {

/* Begin PBXBuildFile section */
Expand Down Expand Up @@ -198,6 +198,7 @@
CreatedOnToolsVersion = 7.3.1;
DevelopmentTeam = 4DQKUWSG6C;
LastSwiftMigration = 1100;
ProvisioningStyle = Automatic;
};
};
};
Expand Down Expand Up @@ -451,6 +452,8 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 79;
DEVELOPMENT_TEAM = 4DQKUWSG6C;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -509,6 +512,7 @@
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.cypherstack.stackwallet;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
STRIP_INSTALLED_PRODUCT = NO;
STRIP_STYLE = "non-global";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
Expand Down Expand Up @@ -635,6 +639,8 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 79;
DEVELOPMENT_TEAM = 4DQKUWSG6C;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -693,6 +699,7 @@
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.cypherstack.stackwallet;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
STRIP_INSTALLED_PRODUCT = NO;
STRIP_STYLE = "non-global";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
Expand All @@ -711,6 +718,8 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 79;
DEVELOPMENT_TEAM = 4DQKUWSG6C;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -769,6 +778,7 @@
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = com.cypherstack.stackwallet;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
STRIP_INSTALLED_PRODUCT = NO;
STRIP_STYLE = "non-global";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
Expand Down
6 changes: 4 additions & 2 deletions lib/pages_desktop_specific/home/desktop_home_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:stackwallet/pages_desktop_specific/home/desktop_menu.dart';
import 'package:stackwallet/pages_desktop_specific/home/my_stack_view/my_stack_view.dart';
import 'package:stackwallet/pages_desktop_specific/home/settings_menu/settings_menu.dart';
import 'package:stackwallet/route_generator.dart';
import 'package:stackwallet/utilities/theme/stack_colors.dart';

Expand Down Expand Up @@ -30,8 +31,9 @@ class _DesktopHomeViewState extends ConsumerState<DesktopHomeView> {
Container(
color: Colors.orange,
),
Container(
color: Colors.yellow,
const Navigator(
onGenerateRoute: RouteGenerator.generateRoute,
initialRoute: SettingsMenu.routeName,
),
Container(
color: Colors.blue,
Expand Down
68 changes: 68 additions & 0 deletions lib/pages_desktop_specific/home/desktop_settings_view.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:stackwallet/pages_desktop_specific/home/settings_menu/settings_menu.dart';
import 'package:stackwallet/utilities/theme/stack_colors.dart';

class DesktopSettingsView extends ConsumerStatefulWidget {
const DesktopSettingsView({Key? key}) : super(key: key);

static const String routeName = "/desktopSettings";

@override
ConsumerState<DesktopSettingsView> createState() =>
_DesktopSettingsViewState();
}

class _DesktopSettingsViewState extends ConsumerState<DesktopSettingsView> {
int currentViewIndex = 0;
final List<Widget> contentViews = [
Container(
color: Colors.lime,
), //b+r
Container(
color: Colors.green,
), //security
Container(
color: Colors.red,
), //currency
Container(
color: Colors.orange,
), //language
Container(
color: Colors.yellow,
), //nodes
Container(
color: Colors.blue,
), //syncing prefs
Container(
color: Colors.pink,
), //appearance
Container(
color: Colors.purple,
), //advanced
];

void onMenuSelectionChanged(int newIndex) {
setState(() {
currentViewIndex = newIndex;
});
}

// will have a row with two items: SettingsMenu and settings contentxd
@override
Widget build(BuildContext context) {
return Material(
color: Theme.of(context).extension<StackColors>()!.background,
child: Row(
children: [
SettingsMenu(
onSelectionChanged: onMenuSelectionChanged,
),
Expanded(
child: contentViews[currentViewIndex],
),
],
),
);
}
}
Empty file.
Loading