Release 0.2.2+79

Author: micfong-z

.github/docs/release-notes.md

@@ -1,11 +1,6 @@
-## PPM Build 77
+## PPM Build 79
 
-- **Search Questions** is now available! Features:
-  - Filtering by subjects and / or by levels
-  - Checking answers with one click
-  - Previewing original question papers and mark schemes
-- Enhances application performance
-- Fixes update check dialog
+- Adds paper preview in **Checkout** page.
 
 **Note:** Past Paper Master is still in beta test, and there are still many features to be added and bugs to be fixed. Please report any issues you encounter to SCIE.DEV. Thank you for your support!
 
@@ -15,9 +10,9 @@ See [commit history](https://github.com/SCIEDEV/PastPaperMaster/commits/main) fo
 
 Currently, none of the binaries are signed due to a lack of developer certificate. (which is expensive!)
 
-- `ppm-macos-v0.2.1-beta+77.tar.gz` macOS Universal application.
+- `ppm-macos-v0.2.2-beta+79.tar.gz` macOS Universal application.
   - Since this application is not signed, you may need to click the <kbd>Open anyway</kbd> button in System Settings » Privacy & Security.
   - Opening this app anyway should be secure since this app is already open source; if you are still concerned of security, just build this app from source and use that binary.
-- `ppm-windows-v0.2.1-beta+77.zip` Windows x64 application.
+- `ppm-windows-v0.2.2-beta+79.zip` Windows x64 application.
   - Again, this application is not signed. You may see Windows Defender warning about this application.
-- `ppm-linux-v0.2.1-beta+77.tar.gz` Linux x64 application.
+- `ppm-linux-v0.2.2-beta+79.tar.gz` Linux x64 application.

lib/core/global.dart

@@ -8,26 +8,21 @@ late BuildContext globalContext;
 const String kAppStage = 'Beta Version';
 
 const String kReleaseNotes = '''
-- **Search Questions** is now available! Features:
-  - Filtering by subjects and / or by levels
-  - Checking answers with one click
-  - Previewing original question papers and mark schemes
-- Enhances application performance
-- Fixes update check dialog
+- Adds paper preview in **Checkout** page.
 
 **Note:** Past Paper Master is still in beta test, and there are still many features to be added and bugs to be fixed. Please report any issues you encounter to SCIE.DEV. Thank you for your support!
 
 See [full changelog](https://github.com/SCIEDEV/PastPaperMaster/releases) and [commit history](https://github.com/SCIEDEV/PastPaperMaster/commits/main/) for changes in previous versions.
 ''';
 
 const String kAppStageShort = 'β ';
-const String kVersionTag = 'v0.2.1-beta+77';
+const String kVersionTag = 'v0.2.2-beta+79';
 const int kMajorVersion = 0;
 const int kMinorVersion = 2;
-const int kPatchVersion = 1;
-const int kBuildNumber = 77;
+const int kPatchVersion = 2;
+const int kBuildNumber = 79;
 const int kDatabaseVersion = 1;
-const String kLastCommitHash = '95bd791b0de68adebcea532880ca21dadced0bb4';
+const String kLastCommitHash = 'b97e47be0c1e0b1839708acde87420b585ec4e16';
 
 const String kBundledDataPath = 'assets/json/';
 const String kLocalDataPath = '/json/';

lib/core/provider.dart

@@ -116,6 +116,26 @@ class CheckoutItem {
 
   CheckoutItem(this.name, this.path);
 
+  String getItemUrl() {
+    final StringBuffer url = StringBuffer("https://papers.gceguide.com/");
+    if (path.isEmpty) {
+      return url.toString();
+    }
+    if (path[0] == "IGCSE") {
+      url.write("Cambridge%20IGCSE/");
+    } else if (path[0] == "A(S) Level") {
+      url.write("A%20Levels/");
+    } else {
+      // Hopefully we won't reach here :(
+      throw Exception("Invalid document path: ${path[0]}");
+    }
+    for (var i = 1; i < path.length; i++) {
+      url.write("${path[i]}/");
+    }
+    url.write(name);
+    return url.toString();
+  }
+
   @override
   bool operator ==(Object other) =>
       identical(this, other) || other is CheckoutItem && name == other.name;

lib/pages/checkout.dart

@@ -1,11 +1,13 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_feather_icons/flutter_feather_icons.dart';
 import 'package:past_paper_master/components/button.dart';
 import 'package:past_paper_master/components/dialogs.dart';
 import 'package:past_paper_master/core/box_decorations.dart';
 import 'package:past_paper_master/core/colors.dart';
 import 'package:past_paper_master/core/global.dart';
 import 'package:past_paper_master/core/provider.dart';
 import 'package:past_paper_master/core/textstyle.dart';
+import 'package:pdfrx/pdfrx.dart';
 import 'package:provider/provider.dart';
 import 'package:rive/rive.dart';
 
@@ -168,6 +170,28 @@ class CheckoutEntryRow extends StatelessWidget {
                 style: MTextStyles.smRgGrey500,
               ),
             ),
+            SizedBox(
+              width: 28,
+              height: 28,
+              child: RawMaterialButton(
+                onPressed: () {
+                  showPdfPreview(
+                    context,
+                    item.name,
+                    item.getItemUrl(),
+                  );
+                },
+                shape: const RoundedRectangleBorder(
+                  borderRadius: BorderRadius.all(Radius.circular(4)),
+                ),
+                child: Icon(
+                  FeatherIcons.eye,
+                  color: MColors.grey.shade500,
+                  size: 16,
+                ),
+              ),
+            ),
+            const SizedBox(width: 4),
             if (isSelected)
               Icon(
                 Icons.square_rounded,
@@ -185,6 +209,111 @@ class CheckoutEntryRow extends StatelessWidget {
       ),
     );
   }
+
+  void showPdfPreview(
+    BuildContext context,
+    String viewingPdfName,
+    String viewingPdfUrl,
+  ) {
+    viewingPdfName = 'File Preview · $viewingPdfName';
+    Navigator.push(
+      context,
+      MaterialPageRoute<void>(
+        builder: (BuildContext context) {
+          return Scaffold(
+            appBar: AppBar(
+              title: Text(viewingPdfName),
+              elevation: 8.0,
+              shadowColor: const Color(0x19101828),
+              titleTextStyle: MTextStyles.lgMdGrey900,
+              shape: Border(
+                bottom: BorderSide(
+                  color: MColors.grey.shade200,
+                ),
+              ),
+              backgroundColor: MColors.white,
+              // add a back button
+              leading: RawMaterialButton(
+                onPressed: () {
+                  Navigator.pop(context);
+                },
+                child: Icon(
+                  FeatherIcons.chevronLeft,
+                  color: MColors.grey.shade700,
+                  size: 24,
+                ),
+              ),
+              centerTitle: false,
+            ),
+            body: PdfViewer.uri(
+              params: PdfViewerParams(
+                enableTextSelection: true,
+                maxScale: 10.0,
+                backgroundColor: MColors.grey.shade50,
+                errorBannerBuilder: (context, error, stackTrace, documentRef) =>
+                    Container(
+                  decoration: BoxDecoration(
+                    color: MColors.white,
+                    borderRadius: const BorderRadius.only(
+                      bottomLeft: Radius.circular(8),
+                      bottomRight: Radius.circular(8),
+                    ),
+                    border: Border.all(
+                      color: MColors.grey.shade200,
+                      strokeAlign: BorderSide.strokeAlignOutside,
+                    ),
+                  ),
+                  padding: const EdgeInsets.symmetric(
+                    vertical: 48,
+                    horizontal: 24,
+                  ),
+                  child: Column(
+                    mainAxisAlignment: MainAxisAlignment.center,
+                    children: [
+                      const SizedBox(
+                        width: 64,
+                        height: 64,
+                        child: RiveAnimation.asset(
+                          'assets/rive/empty_folder.riv',
+                          artboard: 'empty download',
+                          fit: BoxFit.fitWidth,
+                        ),
+                      ),
+                      const SizedBox(
+                        height: 8,
+                        width: double.infinity,
+                      ),
+                      Text(
+                        'Cannot view document',
+                        style: MTextStyles.mdMdGrey900,
+                      ),
+                      const SizedBox(
+                        height: 4,
+                        width: double.infinity,
+                      ),
+                      Text(
+                        'The document is not a PDF, or a network error occurred.',
+                        style: MTextStyles.smRgGrey500,
+                      ),
+                      Text(
+                        'If you believe that this should not have happened, screenshot this page and report it to SCIE.DEV.',
+                        style: MTextStyles.smRgGrey500,
+                      ),
+                      Text(
+                        error.toString(),
+                        style: MTextStyles.smRgGrey200,
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+              Uri.parse(viewingPdfUrl),
+            ),
+          );
+        },
+      ),
+    );
+  }
 }
 
 class CheckoutTableHeader extends StatelessWidget {
@@ -217,7 +346,7 @@ class CheckoutTableHeader extends StatelessWidget {
               style: MTextStyles.xsMdGrey500,
             ),
           ),
-          const SizedBox(width: 16),
+          const SizedBox(width: 48),
         ],
       ),
     );

pubspec.yaml

@@ -3,7 +3,7 @@ description: Past Paper Master.
 
 publish_to: "none"
 
-version: 0.2.1+77
+version: 0.2.2+79
 
 environment:
   sdk: ">=2.18.2 <3.0.0"