improve licenses

DerGoogler · Feb 10, 2024 · d1fc711 · d1fc711
1 parent 055ec8c
commit d1fc711
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 7 deletions.
diff --git a/Website/src/activitys/LicensesActivity.tsx b/Website/src/activitys/LicensesActivity.tsx
@@ -30,7 +30,7 @@ const DepCard = (props: { dep: (typeof li)[0] }) => {
   };
 
   const handleOpenLicense = () => {
-    fetch(`https://spdx.org/licenses/${dep.license}.json`)
+    fetch(`https://raw.githubusercontent.com/spdx/license-list-data/main/website/${dep.license}.json`)
       .then((res) => {
         if (res.status === 200) {
           return res.json();
@@ -48,9 +48,7 @@ const DepCard = (props: { dep: (typeof li)[0] }) => {
           },
         });
       })
-      .catch((err) => {
-        os.toast(err, Toast.LENGTH_SHORT);
-      });
+      .catch((err) => {});
   };
 
   return (
@@ -107,7 +105,7 @@ const LicensesActivity = () => {
 
   return (
     <Page renderToolbar={renderToolbar}>
-      <Page.RelativeContent zeroMargin>
+      <Page.RelativeContent>
         <FlatList
           list={li}
           renderItem={(dep) => <DepCard dep={dep} />}

diff --git a/Website/src/activitys/ModuleViewActivity.tsx b/Website/src/activitys/ModuleViewActivity.tsx
@@ -54,6 +54,7 @@ import DownloadIcon from "@mui/icons-material/Download";
 import Tooltip from "@mui/material/Tooltip";
 import { view } from "@Native/View";
 import AntiFeatureListItem from "@Components/AntiFeatureListItem";
+import FetchTextActivity from "./FetchTextActivity";
 
 function a11yProps(index: number) {
   return {
@@ -583,12 +584,34 @@ const ModuleViewActivity = () => {
             )}
 
             {track.license && (
-              <ListItem>
+              <ListItemButton
+                onClick={() => {
+                  fetch(`https://raw.githubusercontent.com/spdx/license-list-data/main/website/${track.license}.json`)
+                    .then((res) => {
+                      if (res.status === 200) {
+                        return res.json();
+                      } else {
+                        throw new Error("Fetching license failed");
+                      }
+                    })
+                    .then((json: LicenseSPX) => {
+                      context.pushPage({
+                        component: FetchTextActivity,
+                        key: "license_" + track.license,
+                        extra: {
+                          raw_data: json.licenseText,
+                          modulename: json.name,
+                        },
+                      });
+                    })
+                    .catch((err) => {});
+                }}
+              >
                 <ListItemIcon>
                   <FormatAlignLeftIcon />
                 </ListItemIcon>
                 <StyledListItemText primary={strings("license")} secondary={track.license} />
-              </ListItem>
+              </ListItemButton>
             )}
 
             {track.support && (