Skip to content

Commit

Permalink
ready for 0.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
fzahner committed Mar 18, 2022
1 parent 03c3cc2 commit 846adab
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 24 deletions.
26 changes: 16 additions & 10 deletions projects/lib/view/articles/licenseGuide.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import 'package:flutter/material.dart';
import 'package:projects/controller/internal/actionHelper.dart';
import 'package:projects/style/heroPhotoViewRouteWrapper.dart';
import 'package:projects/style/textStyles.dart' as customStyles;
import 'package:projects/style/unorderedListWidget.dart';

Expand All @@ -27,24 +26,31 @@ class LicenseGuide extends StatelessWidget {
),
UnorderedList([
"Republication and distribution must be allowed.",
"Publication of derivative work must be allowed.",
"Commercial use of the work must be allowed.",
"The license must be perpetual (non-expiring) and non-revocable.",
"Acknowledgment of all authors/contributors of a work may be required.",
"Publication of derivative work under the same license may be required.",
"For digital distribution, use of open file formats free of digital restrictions management (DRM) may be required."
"Publication of derivative work must be allowed.",
"Commercial use of the work must be allowed.",
"The license must be perpetual (non-expiring) and non-revocable.",
"Acknowledgment of all authors/contributors of a work may be required.",
"Publication of derivative work under the same license may be required.",
"For digital distribution, use of open file formats free of digital restrictions management (DRM) may be required."
], customStyles.articleText),
Text("Licenses supported by Commons Uploader", style: customStyles.headerText),
Text("Licenses supported by Commons Uploader",
style: customStyles.headerText),
Divider(),
Text("In Commons Uploader, you can select one of the five most commonly used licenses for uploading Media to Wikimedia Commons. These include: ", style: customStyles.articleText,),
Text(
"In Commons Uploader, you can select one of the five most commonly used licenses for uploading Media to Wikimedia Commons. These include: ",
style: customStyles.articleText,
),
UnorderedList([
"CC0",
"Attribution 3.0",
"Attribution-ShareAlike 3.0",
"Attribution 4.0",
"Attribution-ShareAlike 4.0",
], customStyles.articleText),
Text("The main similarity between all these licenses is that they allow others distribute, remix, adapt, and build upon your work, even commercially, as long as they credit you for the original creation. The only exception to this is the CCO license, where the author does not need to be credited.", style: customStyles.articleText,),
Text(
"The main similarity between all these licenses is that they allow others distribute, remix, adapt, and build upon your work, even commercially, as long as they credit you for the original creation. The only exception to this is the CCO license, where the author does not need to be credited.",
style: customStyles.articleText,
),
Padding(padding: EdgeInsets.only(bottom: 8)),
TextButton(
child: Text("Read more"),
Expand Down
18 changes: 6 additions & 12 deletions projects/lib/view/homeFragment.dart
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,12 @@ class HomeFragment extends StatelessWidget {
"If you wish to reuse content from Wikimedia Commons - on your own website, in print, or otherwise - check out this article.",
onTap: ReusingContentFragment()));
articleList.add(new Article(
title: "License Guide",
description:
"This page gives non-lawyers an overview of complicated copyright laws.",
onTap: LicenseGuide()
));
articleList.add(new Article(
title: "Text Place 2",
image: Image.network(
"https://upload.wikimedia.org/wikipedia/commons/5/59/SQM_GE_289A_Boxcab_Carmelita_-_Reverso.jpg"),
description:
"Quo quia ab unde dolor. Et eaque sapiente quia eum ad deleniti quisquam. ",
));
title: "License Guide",
image: Image.network(
"https://upload.wikimedia.org/wikipedia/commons/thumb/d/d0/CC-BY-SA_icon.svg/640px-CC-BY-SA_icon.svg.png"),
description:
"This page gives non-lawyers an overview of complicated copyright laws.",
onTap: LicenseGuide()));

// ------------------------------

Expand Down
1 change: 0 additions & 1 deletion projects/lib/view/simpleUpload/simpleUploadPage.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import 'package:projects/style/themes.dart';
import 'package:projects/view/simpleUpload/simpleCategoriesPage.dart';
import 'package:projects/view/singlePage/notLoggedIn.dart';
import 'package:projects/view/uploadFlow/descriptionFragment.dart';
import 'package:projects/view/uploadFlow/selectImage.dart';

class SimpleUploadPage extends StatefulWidget {
@override
Expand Down
2 changes: 1 addition & 1 deletion projects/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repository: https://github.com/geometalab/PhotoUploadApp
# pub.dev using `pub publish`. This is preferred for private packages.
publish_to: 'none' # Remove this line if you wish to publish to pub.dev

version: 0.2.0
version: 0.3.0

environment:
sdk: ">=2.14.0 <3.0.0"
Expand Down

0 comments on commit 846adab

Please sign in to comment.