resolve conflicts

builtree · Feb 3, 2022 · d029299 · d029299
2 parents f099467 + f2ca7cc
commit d029299
Show file tree

Hide file tree

Showing 17 changed files with 114 additions and 96 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -6,6 +6,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
       - name: Setup Python
         uses: actions/setup-python@v2
         with:

diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@
 .history
 .svn/
 /site/
+.venv/
 
 # IntelliJ related
 *.iml

diff --git a/docs/contributing.md b/docs/contributing.md
@@ -42,7 +42,7 @@ git checkout -b [BRANCH NAME]
 
 1. Install mkdocs and its requirements
 ```bash
-python3 -m  pip install mkdocs pymdown-extensions mkdocs-material mkdocs-git-revision-date-localized-plugin
+python3 -m  pip install -r requirements-docs.txt
 ```
 2. Check the installations by:
 ```bash

diff --git a/docs/doc/index.md b/docs/doc/index.md
diff --git a/lib/src/custom_items/home_page.dart b/lib/src/custom_items/home_page.dart
@@ -13,8 +13,9 @@ class HomePage extends StatelessWidget {
         if (constraints.maxWidth != 0) {
           ScreenUtil.init(
             constraints,
+            context: context,
             designSize: Size(512.0, 850.0),
-            allowFontScaling: false,
+            minTextAdapt: false,
           );
           return Container(
             child: ListView(

diff --git a/lib/src/simulations/bubble_sort.dart b/lib/src/simulations/bubble_sort.dart
@@ -144,8 +144,9 @@ class _BubbleSortBarsState extends State<BubbleSortBars> {
         if (constraints.maxWidth != 0) {
           ScreenUtil.init(
             constraints,
+            context: context,
             designSize: Size(512.0, 1024.0),
-            allowFontScaling: true,
+            minTextAdapt: true,
           );
           return Scaffold(
             appBar: AppBar(

diff --git a/lib/src/simulations/epicycloid.dart b/lib/src/simulations/epicycloid.dart
@@ -44,8 +44,9 @@ class _NormalEpicycloidCurveState extends State<NormalEpicycloidCurve> {
         if (constraints.maxWidth != 0) {
           ScreenUtil.init(
             constraints,
+            context: context,
             designSize: Size(720.0, 1600.0),
-            allowFontScaling: true,
+            minTextAdapt: true,
           );
           return Scaffold(
             appBar: AppBar(

diff --git a/lib/src/simulations/epicycloid_curve.dart b/lib/src/simulations/epicycloid_curve.dart
@@ -36,8 +36,9 @@ class _EpicycloidCurveState extends State<EpicycloidCurve> {
         if (constraints.maxWidth != 0) {
           ScreenUtil.init(
             constraints,
+            context: context,
             designSize: Size(434.0, 924.0),
-            allowFontScaling: true,
+            minTextAdapt: true,
           );
           return Scaffold(
             appBar: AppBar(

diff --git a/lib/src/simulations/fourier_series.dart b/lib/src/simulations/fourier_series.dart
@@ -62,8 +62,9 @@ class _FourierSeriesState extends State<FourierSeries> {
         if (constraints.maxWidth != 0) {
           ScreenUtil.init(
             constraints,
+            context: context,
             designSize: Size(1024.0, 512.0),
-            allowFontScaling: true,
+            minTextAdapt: true,
           );
           return Scaffold(
             appBar: AppBar(
@@ -122,7 +123,8 @@ class _FourierSeriesState extends State<FourierSeries> {
                           Slider(
                             min: 1,
                             max: 100,
-                            activeColor: Theme.of(context).colorScheme.secondary,
+                            activeColor:
+                                Theme.of(context).colorScheme.secondary,
                             inactiveColor: Colors.grey,
                             onChanged: (value) {
                               setState(() {
@@ -140,7 +142,8 @@ class _FourierSeriesState extends State<FourierSeries> {
                           Slider(
                             min: 10,
                             max: 200,
-                            activeColor: Theme.of(context).colorScheme.secondary,
+                            activeColor:
+                                Theme.of(context).colorScheme.secondary,
                             inactiveColor: Colors.grey,
                             onChanged: (value) {
                               setState(() {
@@ -158,7 +161,8 @@ class _FourierSeriesState extends State<FourierSeries> {
                           Slider(
                             min: 0,
                             max: 0.3,
-                            activeColor: Theme.of(context).colorScheme.secondary,
+                            activeColor:
+                                Theme.of(context).colorScheme.secondary,
                             inactiveColor: Colors.grey,
                             onChanged: (value) {
                               setState(() {

diff --git a/lib/src/simulations/insertion_sort.dart b/lib/src/simulations/insertion_sort.dart
@@ -123,8 +123,9 @@ class _InsertionHomeState extends State<InsertionHome> {
         if (constraints.maxWidth != 0) {
           ScreenUtil.init(
             constraints,
+            context: context,
             designSize: Size(512.0, 1024.0),
-            allowFontScaling: true,
+            minTextAdapt: true,
           );
           return Scaffold(
             appBar: AppBar(

diff --git a/lib/src/simulations/lissajous_curve.dart b/lib/src/simulations/lissajous_curve.dart
@@ -38,8 +38,9 @@ class _LissajousCurveState extends State<LissajousCurve> {
         if (constraints.maxWidth != 0) {
           ScreenUtil.init(
             constraints,
+            context: context,
             designSize: Size(512.0, 1024.0),
-            allowFontScaling: true,
+            minTextAdapt: true,
           );
           return Scaffold(
             appBar: AppBar(

diff --git a/lib/src/simulations/maurer_rose.dart b/lib/src/simulations/maurer_rose.dart
@@ -38,8 +38,9 @@ class MaurerRoseCurveState extends State<MaurerRoseCurve> {
         if (constraints.maxWidth != 0) {
           ScreenUtil.init(
             constraints,
+            context: context,
             designSize: Size(512.0, 1024.0),
-            allowFontScaling: true,
+            minTextAdapt: true,
           );
           return Scaffold(
             appBar: AppBar(

diff --git a/lib/src/simulations/rose_pattern.dart b/lib/src/simulations/rose_pattern.dart
@@ -37,8 +37,9 @@ class _RosePatternState extends State<RosePattern> {
         if (constraints.maxWidth != 0) {
           ScreenUtil.init(
             constraints,
+            context: context,
             designSize: Size(512.0, 1024.0),
-            allowFontScaling: true,
+            minTextAdapt: true,
           );
           return Scaffold(
             appBar: AppBar(

diff --git a/lib/src/simulations/toothpick.dart b/lib/src/simulations/toothpick.dart
@@ -144,8 +144,9 @@ class _ToothpickPatternState extends State<ToothpickPattern> {
         if (constraints.maxWidth != 0) {
           ScreenUtil.init(
             constraints,
+            context: context,
             designSize: Size(512.0, 1024.0),
-            allowFontScaling: true,
+            minTextAdapt: true,
           );
           return Scaffold(
             appBar: AppBar(

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -1,79 +1,78 @@
-site_name: 'Simulate'
-site_description: 'Official site for Simulate'
-site_author: 'Yash Lamba'
-site_url: 'https://builtree.github.io/simulate/'
+site_name: "Simulate"
+site_description: "Official site for Simulate"
+site_author: "Yash Lamba"
+site_url: "https://builtree.github.io/simulate/"
 
 # Repository
-repo_name: 'builtree/simulate'
-repo_url: 'https://github.com/builtree/simulate'
+repo_name: "builtree/simulate"
+repo_url: "https://github.com/builtree/simulate"
 
 # Copyright
 nav:
-  - Home: 'index.md'
-  - Contributing: 'contributing.md'
-  - Documentation: 
-    - Home: 'doc/index.md'
-  - Simulations: 
-    - All Simulations: 'simulations/index.md'
-    - Algorithms: 
-      - Toothpick Pattern: 'simulations/algorithms/ToothpickPattern.md'
-    - Mathematics: 
-      - Lissajous Pattern: 'simulations/mathematics/LissajousPattern.md'
-      - Maurer Rose Pattern: 'simulations/mathematics/MaurerRosePattern.md'
-      - Fourier Series: 'simulations/mathematics/FourierSeries.md'
-  - Simulate Web:
-    - Home: 'https://builtree.github.io/simulate/web'
+    - Home: "index.md"
+    - Contributing: "contributing.md"
+    # - Documentation:
+    #   - Home: 'doc/index.md'
+    - Simulations:
+          - All Simulations: "simulations/index.md"
+          - Algorithms:
+                - Toothpick Pattern: "simulations/algorithms/ToothpickPattern.md"
+          - Mathematics:
+                - Lissajous Pattern: "simulations/mathematics/LissajousPattern.md"
+                - Maurer Rose Pattern: "simulations/mathematics/MaurerRosePattern.md"
+                - Fourier Series: "simulations/mathematics/FourierSeries.md"
+    - Simulate Web:
+          - Home: "https://builtree.github.io/simulate/web"
 
 # Configuration
 theme:
-  name: 'material'
-  features:
-    - navigation.tabs
-  palette:
-    primary: 'black'
-    accent: 'white'
-  font:
-    text: 'Ubuntu'
-    code: 'Ubuntu Mono'
-  icon:
-    logo: material/atom
-    repo: octicons/mark-github-16
+    name: "material"
+    features:
+        - navigation.tabs
+    palette:
+        primary: "black"
+        accent: "white"
+    font:
+        text: "Ubuntu"
+        code: "Ubuntu Mono"
+    icon:
+        logo: material/atom
+        repo: octicons/mark-github-16
 
 # Customization
 
 # Extensions
 markdown_extensions:
-  - admonition
-  - codehilite:
-      guess_lang: false
-  - toc:
-      permalink: true
-  - pymdownx.arithmatex
-  - pymdownx.betterem:
-      smart_enable: all
-  - pymdownx.caret
-  - pymdownx.critic
-  - pymdownx.details
-  - pymdownx.emoji:
-      emoji_generator: !!python/name:pymdownx.emoji.to_svg
-  - pymdownx.inlinehilite
-  - pymdownx.magiclink
-  - pymdownx.mark
-  - pymdownx.smartsymbols
-  - pymdownx.superfences
-  - footnotes
-  - pymdownx.tasklist:
-      custom_checkbox: true
-  - pymdownx.tabbed
-  - pymdownx.tilde
-  - attr_list
+    - admonition
+    - codehilite:
+          guess_lang: false
+    - toc:
+          permalink: true
+    - pymdownx.arithmatex
+    - pymdownx.betterem:
+          smart_enable: all
+    - pymdownx.caret
+    - pymdownx.critic
+    - pymdownx.details
+    - pymdownx.emoji:
+          emoji_generator: !!python/name:pymdownx.emoji.to_svg
+    - pymdownx.inlinehilite
+    - pymdownx.magiclink
+    - pymdownx.mark
+    - pymdownx.smartsymbols
+    - pymdownx.superfences
+    - footnotes
+    - pymdownx.tasklist:
+          custom_checkbox: true
+    - pymdownx.tabbed
+    - pymdownx.tilde
+    - attr_list
 
-  # Plugins
+    # Plugins
 plugins:
-  - search
-  - git-revision-date-localized:
-      type: date
-
-extra_javascript:
-  - https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-MML-AM_CHTML
+    - search
+    - git-revision-date-localized:
+          type: date
 
+extra_javascript:
+    - https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-MML-AM_CHTML
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -4,30 +4,30 @@ description: A collection of simulations and visualizations
 version: 1.0.0+1
 
 environment:
-    sdk: ">=2.1.0 <3.0.0"
+  sdk: ">=2.1.0 <3.0.0"
 
 dependencies:
-    flutter:
-        sdk: flutter
+  flutter:
+    sdk: flutter
 
-    cupertino_icons: ^1.0.4
-    url_launcher: ^6.0.17
-    provider: ^6.0.2
-    shared_preferences: ^2.0.11
-    flutter_screenutil: ^4.0.3+2
-    cached_network_image: ^3.2.0
+  cupertino_icons: ^1.0.4
+  url_launcher: ^6.0.18
+  provider: ^6.0.2
+  shared_preferences: ^2.0.12
+  flutter_screenutil: ^5.1.0
+  cached_network_image: ^3.2.0
 
 dev_dependencies:
-    flutter_test:
-        sdk: flutter
+  flutter_test:
+    sdk: flutter
 
 flutter:
-    uses-material-design: true
+  uses-material-design: true
 
-    assets:
-        - android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+  assets:
+    - android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
 
-    fonts:
-        - family: Ubuntu
-          fonts:
-              - asset: fonts/Ubuntu-Regular.ttf
+  fonts:
+    - family: Ubuntu
+      fonts:
+        - asset: fonts/Ubuntu-Regular.ttf
diff --git a/requirements-docs.txt b/requirements-docs.txt
@@ -0,0 +1,4 @@
+mkdocs>=1.1.2
+pymdown-extensions>=8.0.1
+mkdocs-git-revision-date-localized-plugin>=0.7.3
+mkdocs-material>=8.1.6