Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove images from app assets, use cached network images #210

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file removed assets/simulations/BubbleSortDark.png
Binary file not shown.
Binary file removed assets/simulations/BubbleSortLight.png
Binary file not shown.
Binary file removed assets/simulations/Epicycloid.png
Binary file not shown.
Binary file removed assets/simulations/Epicycloid1Dark.png
Binary file not shown.
Binary file removed assets/simulations/Epicycloid1Light.png
Binary file not shown.
Binary file removed assets/simulations/EpicycloidDark.png
Binary file not shown.
Binary file removed assets/simulations/FourierSeriesDark.png
Binary file not shown.
Binary file removed assets/simulations/FourierSeriesLight.png
Binary file not shown.
Binary file removed assets/simulations/InsertionSortDark.png
Binary file not shown.
Binary file removed assets/simulations/InsertionSortLight.png
Binary file not shown.
Binary file removed assets/simulations/LissajousCurveDark.png
Binary file not shown.
Binary file removed assets/simulations/LissajousCurveLight.png
Binary file not shown.
Binary file removed assets/simulations/MaurerRoseDark.png
Binary file not shown.
Binary file removed assets/simulations/MaurerRoseLight.png
Binary file not shown.
Binary file removed assets/simulations/RosePatternDark.png
Binary file not shown.
Binary file removed assets/simulations/RosePatternLight.png
Binary file not shown.
Binary file removed assets/simulations/ToothpickPatternDark.png
Binary file not shown.
Binary file removed assets/simulations/ToothpickPatternLight.png
Binary file not shown.
9 changes: 6 additions & 3 deletions lib/src/custom_items/simulation_card.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'package:cached_network_image/cached_network_image.dart';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
Expand Down Expand Up @@ -59,9 +60,11 @@ class _SimulationCardState extends State<SimulationCard> {
flex: 10,
child: Container(
padding: EdgeInsets.fromLTRB(5, 10, 5, 0),
child: Image.asset(
widget.image,
fit: BoxFit.fill,
child:CachedNetworkImage(
imageUrl: widget.image,
progressIndicatorBuilder: (context, url, downloadProgress) =>
CircularProgressIndicator(value: downloadProgress.progress),
errorWidget: (context, url, error) => Icon(Icons.error),
),
),
),
Expand Down
41 changes: 21 additions & 20 deletions lib/src/data/simulations.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import 'package:shared_preferences/shared_preferences.dart';
import 'package:simulate/src/simulations/lissajous_curve.dart';
import 'package:simulate/src/simulations/epicycloid_curve.dart';
import 'package:simulate/src/simulations/maurer_rose.dart';
import 'package:cached_network_image/cached_network_image.dart';

class Simulations with ChangeNotifier {
static var _favorites = [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1];
Expand Down Expand Up @@ -57,8 +58,8 @@ class Simulations with ChangeNotifier {
id: 0,
simulationName: 'Toothpick Pattern',
image: theme.darkTheme
? 'assets/simulations/ToothpickPatternDark.png'
: 'assets/simulations/ToothpickPatternLight.png',
? 'https://raw.githubusercontent.com/builtree/assets/simulate/web-assets/ToothpickPatternDark.png'
: 'https://raw.githubusercontent.com/builtree/assets/simulate/web-assets/ToothpickPatternLight.png',
direct: ToothpickPattern(),
infoLink: 'https://en.wikipedia.org/wiki/Toothpick_sequence',
fav: _favorites[0],
Expand All @@ -67,8 +68,8 @@ class Simulations with ChangeNotifier {
id: 1,
simulationName: 'Bubble Sort (Bars)',
image: theme.darkTheme
? 'assets/simulations/BubbleSortDark.png'
: 'assets/simulations/BubbleSortLight.png',
? 'https://raw.githubusercontent.com/builtree/assets/simulate/web-assets/BubbleSortDark.png'
: 'https://raw.githubusercontent.com/builtree/assets/simulate/web-assets/BubbleSortLight.png',
direct: BubbleSortBars(),
infoLink: 'https://en.wikipedia.org/wiki/Bubble_sort',
fav: _favorites[1],
Expand All @@ -77,8 +78,8 @@ class Simulations with ChangeNotifier {
id: 2,
simulationName: 'Insertion Sort',
image: theme.darkTheme
? 'assets/simulations/InsertionSortDark.png'
: 'assets/simulations/InsertionSortLight.png',
? 'https://raw.githubusercontent.com/builtree/assets/simulate/web-assets/InsertionSortDark.png'
: 'https://raw.githubusercontent.com/builtree/assets/simulate/web-assets/InsertionSortLight.png',
direct: InsertionHome(),
infoLink: 'https://en.wikipedia.org/wiki/Insertion_sort',
fav: _favorites[2],
Expand All @@ -87,8 +88,8 @@ class Simulations with ChangeNotifier {
id: 3,
simulationName: 'Rose Pattern',
image: theme.darkTheme
? 'assets/simulations/RosePatternDark.png'
: 'assets/simulations/RosePatternLight.png',
? 'https://raw.githubusercontent.com/builtree/assets/simulate/web-assets/RosePatternDark.png'
: 'https://raw.githubusercontent.com/builtree/assets/simulate/web-assets/RosePatternLight.png',
direct: RosePattern(),
infoLink: 'https://en.wikipedia.org/wiki/Rose_(mathematics)',
fav: _favorites[3],
Expand All @@ -97,8 +98,8 @@ class Simulations with ChangeNotifier {
id: 4,
simulationName: 'Fourier Series',
image: theme.darkTheme
? 'assets/simulations/FourierSeriesDark.png'
: 'assets/simulations/FourierSeriesLight.png',
? 'https://raw.githubusercontent.com/builtree/assets/simulate/web-assets/FourierSeriesDark.png'
: 'https://raw.githubusercontent.com/builtree/assets/simulate/web-assets/FourierSeriesLight.png',
direct: FourierSeries(),
infoLink: 'https://en.wikipedia.org/wiki/Fourier_series',
fav: _favorites[4],
Expand All @@ -107,8 +108,8 @@ class Simulations with ChangeNotifier {
id: 5,
simulationName: 'Lissajous Pattern',
image: theme.darkTheme
? 'assets/simulations/LissajousCurveDark.png'
: 'assets/simulations/LissajousCurveLight.png',
? 'https://raw.githubusercontent.com/builtree/assets/simulate/web-assets/LissajousCurveDark.png'
: 'https://raw.githubusercontent.com/builtree/assets/simulate/web-assets/LissajousCurveLight.png',
direct: LissajousCurve(),
infoLink: 'https://en.wikipedia.org/wiki/Lissajous_curve',
fav: _favorites[5],
Expand All @@ -117,8 +118,8 @@ class Simulations with ChangeNotifier {
id: 6,
simulationName: 'Epicycloid Pattern (Pencil of Lines)',
image: theme.darkTheme
? 'assets/simulations/Epicycloid1Dark.png'
: 'assets/simulations/Epicycloid1Light.png',
? 'https://raw.githubusercontent.com/builtree/assets/simulate/web-assets/Epicycloid1Dark.png'
: 'https://raw.githubusercontent.com/builtree/assets/simulate/web-assets/Epicycloid1Light.png',
direct: EpicycloidCurve(),
infoLink: 'https://en.wikipedia.org/wiki/Epicycloid',
fav: _favorites[6],
Expand All @@ -127,8 +128,8 @@ class Simulations with ChangeNotifier {
id: 7,
simulationName: 'Epicycloid Curve',
image: theme.darkTheme
? 'assets/simulations/EpicycloidDark.png'
: 'assets/simulations/Epicycloid.png',
? 'https://raw.githubusercontent.com/builtree/assets/simulate/web-assets/EpicycloidDark.png'
: 'https://raw.githubusercontent.com/builtree/assets/simulate/web-assets/Epicycloid.png',
direct: NormalEpicycloidCurve(),
infoLink: 'https://en.wikipedia.org/wiki/Epicycloid',
fav: _favorites[7],
Expand All @@ -137,8 +138,8 @@ class Simulations with ChangeNotifier {
id: 8,
simulationName: 'Maurer Rose Pattern',
image: theme.darkTheme
? 'assets/simulations/MaurerRoseDark.png'
: 'assets/simulations/MaurerRoseLight.png',
? 'https://raw.githubusercontent.com/builtree/assets/simulate/web-assets/MaurerRoseDark.png'
: 'https://raw.githubusercontent.com/builtree/assets/simulate/web-assets/MaurerRoseLight.png',
direct: MaurerRoseCurve(),
infoLink: 'https://en.wikipedia.org/wiki/Maurer_rose',
fav: _favorites[8],
Expand All @@ -147,8 +148,8 @@ class Simulations with ChangeNotifier {
id: 9,
simulationName: 'Selection Sort',
image: theme.darkTheme
? 'assets/simulations/InsertionSortDark.png'
: 'assets/simulations/InsertionSortLight.png',
? 'https://raw.githubusercontent.com/builtree/assets/simulate/web-assets/InsertionSortDark.png'
: 'https://raw.githubusercontent.com/builtree/assets/simulate/web-assets/InsertionSortLight.png',
direct: SelectionSortBars(),
infoLink: 'https://en.wikipedia.org/wiki/Selection_sort',
fav: _favorites[9],
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dependencies:
provider: ^6.0.2
shared_preferences: ^2.0.12
flutter_screenutil: ^5.1.0
cached_network_image: ^3.2.0

dev_dependencies:
flutter_test:
Expand All @@ -24,7 +25,6 @@ flutter:
uses-material-design: true

assets:
- assets/simulations/
- android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png

fonts:
Expand Down