@lynxship/cli 0.1.19 → 0.1.21

package/templates/android-host/app/src/main/java/template/MainActivity.java

@@ -1,19 +1,114 @@
 package __PACKAGE_NAME__;
 
 import android.app.Activity;
+import android.graphics.Color;
 import android.os.Bundle;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.ProgressBar;
+import android.widget.TextView;
 
+import com.lynx.tasm.LynxError;
 import com.lynx.tasm.LynxView;
+import com.lynx.tasm.LynxViewClient;
 import com.lynx.tasm.LynxViewBuilder;
 
 public final class MainActivity extends Activity {
+    private FrameLayout root;
+    private LynxView lynxView;
+    private ProgressBar loading;
+    private TextView errorView;
+    private LynxViewClient lifecycleClient;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        LynxView lynxView = new LynxViewBuilder()
+
+        root = new FrameLayout(this);
+        root.setBackgroundColor(Color.WHITE);
+
+        lynxView = new LynxViewBuilder()
                 .setTemplateProvider(new ProjectTemplateProvider(this))
                 .build(this);
-        setContentView(lynxView);
-        lynxView.renderTemplateUrl("main.lynx.bundle", "");
+        lifecycleClient = new LynxViewClient() {
+            @Override
+            public void onPageStart(String url) {
+                runOnUiThread(() -> showLoading());
+            }
+
+            @Override
+            public void onFirstScreen() {
+                runOnUiThread(() -> showContent());
+            }
+
+            @Override
+            public void onReceivedError(LynxError error) {
+                runOnUiThread(() -> showError(error == null ? "Lynx failed to load" : error.toString()));
+            }
+        };
+        lynxView.addLynxViewClient(lifecycleClient);
+
+        root.addView(lynxView, new FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.MATCH_PARENT,
+                FrameLayout.LayoutParams.MATCH_PARENT));
+        setContentView(root);
+
+        loading = new ProgressBar(this);
+        FrameLayout.LayoutParams loadingParams = new FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.WRAP_CONTENT,
+                FrameLayout.LayoutParams.WRAP_CONTENT,
+                Gravity.CENTER);
+        root.addView(loading, loadingParams);
+
+        errorView = new TextView(this);
+        errorView.setGravity(Gravity.CENTER);
+        errorView.setTextColor(Color.DKGRAY);
+        errorView.setTextSize(16);
+        errorView.setPadding(48, 24, 48, 24);
+        errorView.setOnClickListener(view -> render());
+        FrameLayout.LayoutParams errorParams = new FrameLayout.LayoutParams(
+                FrameLayout.LayoutParams.MATCH_PARENT,
+                FrameLayout.LayoutParams.WRAP_CONTENT,
+                Gravity.CENTER);
+        errorParams.setMargins(32, 32, 32, 32);
+        root.addView(errorView, errorParams);
+        render();
+    }
+
+    private void render() {
+        showLoading();
+        try {
+            lynxView.renderTemplateUrl("main.lynx.bundle", "");
+        } catch (RuntimeException error) {
+            showError(error.getMessage() == null ? "Lynx failed to start" : error.getMessage());
+        }
+    }
+
+    private void showLoading() {
+        if (loading != null) loading.setVisibility(View.VISIBLE);
+        if (errorView != null) errorView.setVisibility(View.GONE);
+    }
+
+    private void showContent() {
+        if (loading != null) loading.setVisibility(View.GONE);
+        if (errorView != null) errorView.setVisibility(View.GONE);
+    }
+
+    private void showError(String message) {
+        if (loading != null) loading.setVisibility(View.GONE);
+        if (errorView != null) {
+            errorView.setText("Unable to load Lynx content.\nTap to retry.\n\n" + message);
+            errorView.setVisibility(View.VISIBLE);
+        }
+    }
+
+    @Override
+    protected void onDestroy() {
+        if (lynxView != null) {
+            if (lifecycleClient != null) lynxView.removeLynxViewClient(lifecycleClient);
+            lynxView.destroy();
+        }
+        super.onDestroy();
     }
 }

package/templates/ios-host/__IOS_TARGET_NAME__/DemoLynxProvider.swift

@@ -1,18 +1,28 @@
 import Foundation
 
-class DemoLynxProvider: NSObject, LynxTemplateProvider {
-  func loadTemplate(withUrl url: String!, onComplete callback: LynxTemplateLoadBlock!) {
-    if let filePath = Bundle.main.path(forResource: url, ofType: "bundle") {
-      do {
-        let data = try Data(contentsOf: URL(fileURLWithPath: filePath))
-        callback(data, nil)
-      } catch {
-        print("Error reading file: \(error.localizedDescription)")
-        callback(nil, error)
-      }
-    } else {
-      let urlError = NSError(domain: "com.lynx", code: 400, userInfo: [NSLocalizedDescriptionKey: "Invalid URL."])
-      callback(nil, urlError)
-    }
-  }
-}
+class DemoLynxProvider: NSObject, LynxTemplateProvider {
+  private let onError: (Error) -> Void
+
+  init(onError: @escaping (Error) -> Void) {
+    self.onError = onError
+  }
+
+  func loadTemplate(withUrl url: String!, onComplete callback: LynxTemplateLoadBlock!) {
+    let requestedURL = url ?? ""
+    DispatchQueue.global(qos: .userInitiated).async { [onError] in
+      guard let filePath = Bundle.main.path(forResource: requestedURL, ofType: "bundle")
+        ?? Bundle.main.path(forResource: requestedURL, ofType: nil) else {
+        let urlError = NSError(domain: "com.lynx", code: 400, userInfo: [NSLocalizedDescriptionKey: "Invalid URL."])
+        onError(urlError)
+        callback(nil, urlError)
+        return
+      }
+      do {
+        callback(try Data(contentsOf: URL(fileURLWithPath: filePath)), nil)
+      } catch {
+        onError(error)
+        callback(nil, error)
+      }
+    }
+  }
+}

package/templates/ios-host/__IOS_TARGET_NAME__/ViewController.swift

@@ -1,22 +1,110 @@
-import UIKit
-
-class ViewController: UIViewController {
-
-  override func viewDidLoad() {
-    super.viewDidLoad()
-
-    let lynxView = LynxView { builder in
-      builder.config = LynxConfig(provider: DemoLynxProvider())
-      builder.screenSize = self.view.frame.size
+import UIKit
+
+class ViewController: UIViewController {
+    private var lynxView: LynxView!
+    private let loading = UIActivityIndicatorView(style: .large)
+    private let errorLabel = UILabel()
+
+  override func viewDidLoad() {
+    super.viewDidLoad()
+
+    view.backgroundColor = .systemBackground
+    lynxView = LynxView { [weak self] builder in
+      builder.config = LynxConfig(provider: DemoLynxProvider { [weak self] error in
+        DispatchQueue.main.async {
+          self?.showError(error.localizedDescription)
+        }
+      })
+      builder.screenSize = self.view.frame.size
       builder.fontScale = 1.0
     }
 
-    lynxView.preferredLayoutWidth = self.view.frame.size.width
-    lynxView.preferredLayoutHeight = self.view.frame.size.height
-    lynxView.layoutWidthMode = .exact
-    lynxView.layoutHeightMode = .exact
-    self.view.addSubview(lynxView)
-
-    lynxView.loadTemplate(fromURL: "main.lynx", initData: nil)
-  }
-}
+    lynxView.preferredLayoutWidth = view.bounds.width
+    lynxView.preferredLayoutHeight = view.bounds.height
+    lynxView.layoutWidthMode = .exact
+    lynxView.layoutHeightMode = .exact
+    view.addSubview(lynxView)
+
+    loading.translatesAutoresizingMaskIntoConstraints = false
+    view.addSubview(loading)
+    NSLayoutConstraint.activate([
+      loading.centerXAnchor.constraint(equalTo: view.centerXAnchor),
+      loading.centerYAnchor.constraint(equalTo: view.centerYAnchor)
+    ])
+
+    errorLabel.translatesAutoresizingMaskIntoConstraints = false
+    errorLabel.textAlignment = .center
+    errorLabel.numberOfLines = 0
+    errorLabel.textColor = .secondaryLabel
+    errorLabel.isHidden = true
+    errorLabel.isUserInteractionEnabled = true
+    errorLabel.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(retry)))
+    view.addSubview(errorLabel)
+    NSLayoutConstraint.activate([
+      errorLabel.leadingAnchor.constraint(equalTo: view.leadingAnchor, constant: 32),
+      errorLabel.trailingAnchor.constraint(equalTo: view.trailingAnchor, constant: -32),
+      errorLabel.centerYAnchor.constraint(equalTo: view.centerYAnchor)
+    ])
+
+    let lifecycle = LynxLifecycleClient(
+      onStart: { [weak self] in self?.showLoading() },
+      onFirstScreen: { [weak self] in self?.showContent() }
+    )
+    lynxView.addLifecycleClient(lifecycle)
+
+    load()
+  }
+
+  override func viewDidLayoutSubviews() {
+    super.viewDidLayoutSubviews()
+    lynxView?.frame = view.bounds
+    lynxView?.preferredLayoutWidth = view.bounds.width
+    lynxView?.preferredLayoutHeight = view.bounds.height
+    lynxView?.updateViewport(withPreferredLayoutWidth: view.bounds.width,
+                             preferredLayoutHeight: view.bounds.height,
+                             needLayout: true)
+  }
+
+  private func load() {
+    showLoading()
+    lynxView.loadTemplate(fromURL: "main.lynx", initData: nil)
+  }
+
+  private func showLoading() {
+    loading.startAnimating()
+    errorLabel.isHidden = true
+  }
+
+  private func showContent() {
+    loading.stopAnimating()
+    errorLabel.isHidden = true
+  }
+
+  private func showError(_ message: String) {
+    loading.stopAnimating()
+    errorLabel.text = "Unable to load Lynx content.\nTap to retry.\n\n\(message)"
+    errorLabel.isHidden = false
+  }
+
+  @objc private func retry() {
+    load()
+  }
+}
+
+private final class LynxLifecycleClient: NSObject, LynxViewLifecycle {
+  private let onStart: () -> Void
+  private let onFirstScreen: () -> Void
+
+  init(onStart: @escaping () -> Void, onFirstScreen: @escaping () -> Void) {
+    self.onStart = onStart
+    self.onFirstScreen = onFirstScreen
+  }
+
+  func lynxViewDidStartLoading(_ view: LynxView) {
+    onStart()
+  }
+
+  func lynxViewDidFirstScreen(_ view: LynxView) {
+    onFirstScreen()
+  }
+}