[go: nahoru, domu]
Skip to content

Commit

Permalink
[dash] Moving more files around and fixing broken links that result (f…
Browse files Browse the repository at this point in the history 
…lutter#1253)

* stashing

* Moving more files around and fixing links.

* Removing an unnecessary link.

* Removed the "packages" restriction from .gitignore.

* Fixing image links to start from the top of the repo. (Relative doesn't work.)

* One last image path fix
  • Loading branch information
@sfshaza2
sfshaza2 committed Sep 11, 2018
1 parent 54b6240 commit 2d53665
Show file tree
Hide file tree
Showing 119 changed files with 460 additions and 326 deletions.
1 change: 0 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ node_modules
.packages
.dart_tool
# pubspec.lock
packages
example.g

# We haven't had any issues due to npm (sub-)package version discrepancies,
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ from dartlang.org, we recommend manually running the following.
[Build Status SVG]: https://travis-ci.org/flutter/website.svg?branch=dash
[Cloning a repository]: https://help.github.com/articles/cloning-a-repository
[Dart install]: https://www.dartlang.org/install
[Flutter install]: https://flutter.io/get-started/install
[Flutter install]: /get-started/install
[Firebase]: https://firebase.google.com/
[first-timers SVG]: https://img.shields.io/badge/first--timers--only-friendly-blue.svg?style=flat-square
[first-timers]: https://www.firsttimersonly.com/
Expand Down
4 changes: 2 additions & 2 deletions src/_data/catalog/index.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
},
{
"name": "Animation and Motion",
"description": "Bring animations to your app. Check out <a href=\"/animations/\">Animations</a> in Flutter for an overview.",
"description": "Bring animations to your app.",
"id":"animation"
},
{
Expand Down Expand Up @@ -112,4 +112,4 @@
"description": "Make your app accessible. (This is a work-in-progress.)",
"id":"accessibility"
},
]
]
37 changes: 19 additions & 18 deletions src/_data/side-nav.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
- title: GitHub samples
permalink: https://github.com/flutter/samples/blob/master/INDEX.md
- title: Flutter Gallery - demo app
permalink: xxx
permalink: https://github.com/flutter/flutter/tree/master/examples/flutter_gallery#flutter-gallery

- title: Development
children:
Expand All @@ -45,17 +45,17 @@
- title: Tour the framework
permalink: /widgets-into
- title: Building layouts
permalink: /tutorials/layout
permalink: /development/ui/layout
- title: Adding interactivity
permalink: /tutorials/interactive
permalink: /development/ui/interactive
- title: "Assets and images"
permanlink: /assets-and-images
permanlink: /development/ui/assets-and-images
- title: "Navigation & routing"
permalink: /cookbook/navigation/navigation-basics
- title: Inspect an app's UI
permalink: /inspector
permalink: /development/tools/inspector
- title: Animations
permalink: /animations
permalink: /development/ui/animations
children:
- title: Animations overview
- title: Implicitly animated widgets
Expand All @@ -75,7 +75,7 @@
children:
- title: Architect app to manage data flow
- title: JSON and serialization
permalink: /json
permalink: /development/data/json
- title: Back-end services
- title: Use Firebase with Flutter
- title: Run background processes
Expand All @@ -93,23 +93,23 @@
- title: "Packages & Plugins"
children:
- title: Using packages
permalink: /using-packages
permalink: /development/packages/using-packages
- title: "Developing packages & plugins"
permalink: /developing-packages
permalink: /development/packages/developing-packages
- title: Package site
permalink: http://pub.dartlang.org/flutter
- title: Tools
children:
- title: Using hot reload
permalink: /tools/hot-reload
permalink: /development/tools/hot-reload
- title: Using an IDE
permalink: /tools/using-ide
permalink: /development/tools/using-ide
- title: Using an IDE
permalink: /tools/using-ide/vscode
permalink: /development/tools/using-ide/vscode
- title: Format Flutter code
permalink: /tools/formatting
permalink: /development/tools/formatting
- title: Widget inspector
permalink: /tools/inspector
permalink: /development/tools/inspector

- title: "Testing & Optimization"
children:
Expand All @@ -124,21 +124,22 @@
- title: Deployment
children:
- title: Build and release for Android
permalink: /android-release
permalink: /deployment/android-release
- title: Build and release for iOS
permalink: /ios-release
permalink: /deployment/ios-release
- title: Continuous deployment with fastlane
permalink: /fastlane-cd
permalink: /deployment/fastlane-cd

- title: Resources
children:
- title: Dart resources
permalink: /resources/bootstrap-into-dart
- title: Flutter best practices
- title: Technical videos for learning Flutter
- title: Flutter developer communities
- title: Flutter learning resources
- title: FAQ
permalink: /faq
permalink: /resources/faq

- title: "APIs & References"
children:
Expand Down
30 changes: 15 additions & 15 deletions src/_includes/sidebar.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@
<li class="nav-item"><a class="nav-link" href="/cookbook">Cookbook</a></li>
<li class="nav-item"><a class="nav-link" href="/catalog/samples">Sample catalog</a></li>
<li class="nav-item"><a class="nav-link" href="/codelabs">Codelabs</a></li>
<li class="nav-item"><a class="nav-link" href="/tutorials/layout">Build layouts - Tutorial</a></li>
<li class="nav-item"><a class="nav-link" href="/tutorials/interactive">Add interactivity - Tutorial</a></li>
<li class="nav-item"><a class="nav-link" href="/development/ui/layout">Build layouts - Tutorial</a></li>
<li class="nav-item"><a class="nav-link" href="/development/ui/interactive">Add interactivity - Tutorial</a></li>
<li class="nav-item"><a class="nav-link" href="/get-started/flutter-for/web-devs">Flutter for Web devs</a></li>
<li class="nav-item"><a class="nav-link" href="/get-started/flutter-for/android-devs">Flutter for Android devs</a></li>
<li class="nav-item"><a class="nav-link" href="/get-started/flutter-for/ios-devs">Flutter for iOS devs</a></li>
<li class="nav-item"><a class="nav-link" href="/get-started/flutter-for/react-native-devs">Flutter for React Native devs</a></li>
<li class="nav-item"><a class="nav-link" href="/get-started/flutter-for/xamarin-forms-devs">Flutter for Xamarin.Forms devs</a></li>
<li class="nav-item"><a class="nav-link" href="/gestures">Gestures</a></li>
<li class="nav-item"><a class="nav-link" href="/animations">Animations</a></li>
<li class="nav-item"><a class="nav-link" href="/development/ui/animations">Animations</a></li>
<li class="nav-item"><a class="nav-link" href="/layout">Box constraints</a></li>
<li class="nav-item"><a class="nav-link" href="/assets-and-images">Assets and images</a></li>
<li class="nav-item"><a class="nav-link" href="/development/ui/assets-and-images">Assets and images</a></li>
<li class="nav-item"><a class="nav-link" href="/tutorials/internationalization">Internationalization</a></li>
<li class="nav-item"><a class="nav-link" href="/accessibility">Accessibility</a></li>
</ul>
Expand All @@ -42,10 +42,10 @@
</li>

<ul class="nav flex-column flex-nowrap collapse" id="apisMenu">
<li class="nav-item"><a class="nav-link" href="/using-packages">Using packages</a></li>
<li class="nav-item"><a class="nav-link" href="/developing-packages">Developing packages</a></li>
<li class="nav-item"><a class="nav-link" href="/development/packages/using-packages">Using packages</a></li>
<li class="nav-item"><a class="nav-link" href="/development/packages/developing-packages">Developing packages</a></li>
<li class="nav-item"><a class="nav-link" href="/platform-channels">Platform-specific code</a></li>
<li class="nav-item"><a class="nav-link" href="/json">JSON and serialization</a></li>
<li class="nav-item"><a class="nav-link" href="/development/data/json">JSON and serialization</a></li>
{% comment %}
<!-- Temporarily removed because the codelab is broken and possibly
about to be replaced by a completely new one. -->
Expand All @@ -58,25 +58,25 @@
</li>

<ul class="nav flex-column flex-nowrap collapse" id="toolsMenu">
<li class="nav-item"><a class="nav-link" href="/tools/using-ide">Using Flutter IDEs</a></li>
<li class="nav-item"><a class="nav-link" href="/tools/hot-reload">Using hot reload</a></li>
<li class="nav-item"><a class="nav-link" href="/development/tools/using-ide">Using Flutter IDEs</a></li>
<li class="nav-item"><a class="nav-link" href="/development/tools/hot-reload">Using hot reload</a></li>
<li class="nav-item"><a class="nav-link" href="/testing">Test your app</a></li>
<li class="nav-item"><a class="nav-link" href="/debugging">Debug your app</a></li>
<li class="nav-item"><a class="nav-link" href="/ui-performance">Performance Profiling</a></li>
<li class="nav-item"><a class="nav-link" href="/tools/inspector">Inspect your UI</a></li>
<li class="nav-item"><a class="nav-link" href="/android-release">Build and release for Android</a></li>
<li class="nav-item"><a class="nav-link" href="/ios-release">Build and release for iOS</a></li>
<li class="nav-item"><a class="nav-link" href="/fastlane-cd">Continuous deployment with Fastlane</a></li>
<li class="nav-item"><a class="nav-link" href="/development/tools/inspector">Inspect your UI</a></li>
<li class="nav-item"><a class="nav-link" href="/deployment/android-release">Build and release for Android</a></li>
<li class="nav-item"><a class="nav-link" href="/deployment/ios-release">Build and release for iOS</a></li>
<li class="nav-item"><a class="nav-link" href="/deployment/fastlane-cd">Continuous deployment with fastlane</a></li>
<li class="nav-item"><a class="nav-link" href="/upgrading">Upgrade your Flutter install</a></li>
<li class="nav-item"><a class="nav-link" href="/tools/formatting">Format your source code</a></li>
<li class="nav-item"><a class="nav-link" href="/development/tools/formatting">Format your source code</a></li>
</ul>

<li class="nav-item">
<a class="nav-link" data-toggle="collapse" data-target="#detailsMenu" role="button" aria-expanded="false" aria-controls="detailsMenu">More details</a>
</li>

<ul class="nav flex-column flex-nowrap collapse" id="detailsMenu">
<li class="nav-item"><a class="nav-link" href="/faq">FAQ</a></li>
<li class="nav-item"><a class="nav-link" href="/resources/faq">FAQ</a></li>
<li class="nav-item"><a class="nav-link" href="/technical-overview">Technical overview</a></li>
<li class="nav-item"><a class="nav-link" href="https://docs.google.com/presentation/d/1B3p0kP6NV_XMOimRV09Ms75ymIjU5gr6GGIX74Om_DE/edit?usp=sharing">Magic of Flutter slides</a></li>
<li class="nav-item"><a class="nav-link" href="https://docs.google.com/presentation/d/1cw7A4HbvM_Abv320rVgPVGiUP2msVs7tfGbkgdrTy0I/edit?usp=sharing">Architecture diagrams</a></li>
Expand Down
3 changes: 2 additions & 1 deletion src/cookbook/images/fading-in-images.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ to the project’s _pubspec.yaml_ file:
+ - assets/loading.gif
```

(See [Assets and Images](/assets-and-images/) for a full guide to adding assets.)
(See [Assets and Images](/development/ui/assets-and-images/)
for a full guide to adding assets.)

Then, use the [`FadeInImage.assetNetwork`](https://docs.flutter.io/flutter/widgets/FadeInImage/FadeInImage.assetNetwork.html)
constructor:
Expand Down
2 changes: 1 addition & 1 deletion src/cookbook/networking/fetch-data.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ network request. It will also include a factory constructor that allows us to
create a `Post` from json.

Converting JSON by hand is only one option. For more information, please see the
full article on [JSON and serialization](/json).
full article on [JSON and serialization](/development/data/json).

<!-- skip -->
```dart
Expand Down
0 src/android-release.md → src/deployment/android-release.md
View file
File renamed without changes.
8 changes: 4 additions & 4 deletions src/fastlane-cd.md → src/deployment/fastlane-cd.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ delivery from a local machine.
certificate in your target's settings pane.
1. Create a `Fastfile` script for each platform.
* ![Android](/images/fastlane-cd/android.png) On Android, follow the
[Fastlane Android beta deployment guide](https://docs.fastlane.tools/getting-started/android/beta-deployment/).
[fastlane Android beta deployment guide](https://docs.fastlane.tools/getting-started/android/beta-deployment/).
Your edit could be as simple as adding a `lane` that calls `upload_to_play_store`.
Set the `apk` argument to `../build/app/outputs/apk/release/app-release.apk`
to use the apk `flutter build` already built.
Expand Down Expand Up @@ -147,7 +147,7 @@ repository root.
* Shard your script to run on both Linux and macOS platforms.
* Remember to specify a dependency on Xcode for macOS (for example
`osx_image: xcode9.2`).
* See [fastlane CI documentation](https://flutter.io/fastlane-cd/)
* See [fastlane CI documentation](/deployment/fastlane-cd)
for CI specific setup.
* During the setup phase, depending on the platform, make sure that:
* Bundler is available using `gem install bundler`.
Expand All @@ -163,5 +163,5 @@ repository root.
## Reference
The [Flutter Gallery in the Flutter repo](https://github.com/flutter/flutter/tree/master/examples/flutter_gallery)
uses Fastlane for continuous deployment. See the source for a working example of
Fastlane in action. The Flutter framework repository's Cirrus script is [here](https://github.com/flutter/flutter/blob/master/.cirrus.yml).
uses fastlane for continuous deployment. See the source for a working example of
fastlane in action. The Flutter framework repository's Cirrus script is [here](https://github.com/flutter/flutter/blob/master/.cirrus.yml).
0 src/ios-release.md → src/deployment/ios-release.md
View file
File renamed without changes.
0 src/json.md → src/development/data/json.md
View file
File renamed without changes.
0 src/developing-packages.md → ...velopment/packages/developing-packages.md
View file
File renamed without changes.
13 changes: 8 additions & 5 deletions src/using-packages.md → src/development/packages/using-packages.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,13 @@ platform SDKs (like
[Firebase](https://github.com/flutter/plugins/blob/master/FlutterFire.md)).

If you are looking to develop a new package, please see
[developing packages](/developing-packages).
[developing packages](/development/packages/developing-packages).

If you are looking to add assets, images, or fonts, whether stored in files or
packages, please see [Assets & Images](/assets-and-images).
packages, please see [Assets & Images](/development/ui/assets-and-images).

* TOC
{:toc}

## Using packages

Expand Down Expand Up @@ -67,7 +70,7 @@ For a complete example, see [CSS Colors example](#css-example) below.
## Developing new packages

Should a package not be available for your specific use case, you can
[develop new custom packages](/developing-packages).
[develop new custom packages](/development/packages/developing-packages).

## Managing package dependencies & versions

Expand Down Expand Up @@ -155,8 +158,8 @@ additional dependency options are avaialble:
```

Finally, you can use the `ref` argument to pin the dependency to a specific git commit,
branch, or tag. For more details, see the
[Pub Dependencies article](https://www.dartlang.org/tools/pub/dependencies).
branch, or tag. For more details, see
[Pub Dependencies](https://www.dartlang.org/tools/pub/dependencies).

## Examples

Expand Down
4 changes: 2 additions & 2 deletions src/tools/formatting.md → src/development/tools/formatting.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ amount of line breaks for Flutter-style code.

Here is an example of automatically formatted code *with* trailing commas:

![Automatically formatted code with trailing commas](/tools/images/trailing-comma-with.png)
![Automatically formatted code with trailing commas](images/trailing-comma-with.png)

And the same code automatically formatted code *without* trailing commas:

![Automatically formatted code without trailing commas](/tools/images/trailing-comma-without.png)
![Automatically formatted code without trailing commas](images/trailing-comma-without.png)
2 changes: 1 addition & 1 deletion src/tools/hot-reload.md → src/development/tools/hot-reload.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ To hot reload a Flutter app:
select **Save All** (`cmd-s`/`ctrl-s`), or click the Hot Reload button on the
toolbar:

![alt_text](/tools/images/hot-reload.gif "image_tooltip")
![alt_text](images/hot-reload.gif "image_tooltip")

If you're running the app at the command line using `flutter run`,
enter `r` in the terminal window.
Expand Down
0 src/tools/images/assists.gif → src/development/tools/images/assists.gif
View file
File renamed without changes
0 src/tools/images/dart-analysis.png → ...evelopment/tools/images/dart-analysis.png
View file
File renamed without changes
0 src/tools/images/debug-panel.png → src/development/tools/images/debug-panel.png
View file
File renamed without changes
0 src/tools/images/hot-reload.gif → src/development/tools/images/hot-reload.gif
View file
File renamed without changes
0 ...tools/images/inspector_select_example.gif → ...tools/images/inspector_select_example.gif
View file
File renamed without changes
0 ...images/keymap-settings-flutter-plugin.png → ...images/keymap-settings-flutter-plugin.png
View file
File renamed without changes
0 src/tools/images/log.png → src/development/tools/images/log.png
View file
File renamed without changes
0 src/tools/images/main-toolbar.png → ...development/tools/images/main-toolbar.png
View file
File renamed without changes
0 src/tools/images/switch_inspector_tree.gif → ...nt/tools/images/switch_inspector_tree.gif
View file
File renamed without changes
0 src/tools/images/templates.gif → src/development/tools/images/templates.gif
View file
File renamed without changes
0 src/tools/images/trailing-comma-with.png → ...ment/tools/images/trailing-comma-with.png
View file
File renamed without changes
0 src/tools/images/trailing-comma-without.png → ...t/tools/images/trailing-comma-without.png
View file
File renamed without changes
0 src/tools/images/visual-debugging.png → ...lopment/tools/images/visual-debugging.png
View file
File renamed without changes
6 changes: 3 additions & 3 deletions src/tools/inspector.md → src/development/tools/inspector.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ these widget trees. It can be helpful when:
* Undestanding existing layouts
* Diagnosing layout issues

![IntelliJ Flutter Inspector Window](/tools/images/visual-debugging.png)
![IntelliJ Flutter Inspector Window](images/visual-debugging.png)

To start click "Select widget" on the Flutter Inspector toolbar, and then click
on the device to select a widget. The selected widget is then highlighted
on the device and in the widget tree.

![Select Demo](/tools/images/inspector_select_example.gif)
![Select Demo](images/inspector_select_example.gif)

You can then browse around the interactive widget tree in the IDE to view
nearby widgets and see their field values. If you are trying to debug a layout
Expand All @@ -36,7 +36,7 @@ same location in the tree. When debugging layout issues, the key fields to look
at are the `size` and `constraints` fields. The constraints flow down the tree,
and the sizes flow back up.

![Switch Trees](/tools/images/switch_inspector_tree.gif)
![Switch Trees](images/switch_inspector_tree.gif)

For a more complete demonstration of the Inspector, please see the
[DartConf 2018 talk](https://www.youtube.com/watch?v=JIcmJNT9DNI).
Expand Down
0 src/tools/using-ide-vscode.md → src/development/tools/using-ide-vscode.md
View file
File renamed without changes.
Loading

0 comments on commit 2d53665

Please sign in to comment.