Filterlists: add icon for uMatrix

[collinbarrett]

@collinbarrett please add an icon to it for the field - Software

PS Although the umatrix icon is scary. forgive me gorhill

_Originally posted by @bogachenko in https://github.com/collinbarrett/FilterLists/issues/164#issuecomment-462870888_

[DandelionSprout]

I have a good image for uMatrix (below) that could be used, as well as for five other software tools as well. But when the pull I made for it broke in a pretty bizarre way, I haven't felt like making another shot at adding them myself...

[DandelionSprout]

For the record, here's ones for Hosts File Editor, Google Hit Hider by Domain (which is the logo of its developer's personal website), Diversion, dnsmasq, and Slimjet as well.

[DandelionSprout]

The images are uncompressed, but that was the least of my worries at the time.

[bogachenko]

I have a good image for uMatrix (below) that could be used, as well as for five other software tools as well. But when the pull I made for it broke in a pretty bizarre way, I haven't felt like making another shot at adding them myself...

@DandelionSprout my northern friend ... why do you repeat everything? in ur pull https://github.com/collinbarrett/FilterLists/pull/661/files

mistake in file SoftwareIcon.tsx (https://github.com/DandelionSprout/FilterLists/blob/2e2c68d8c05ec923c0eaa64c23109cdb7a474e3c/src/FilterLists.Web/ClientApp/modules/home/components/softwareIcon/SoftwareIcon.tsx) I think so

you have so

import * as React from "react";
import {
    img1,
    img2,
    img3,
    img4,
    img5,
    img6,
    img7,
    img8,
    img10,
    img11,
    img12,
    img13,
    img14,
    img15,
    img16,
    img17,
    img18,
    img19,
    img20,
    img21,
    img22,
    img23,
    img24,
    img25
} from "./imgs";

interface IProps {
    id: number;
};

export const SoftwareIcon = (props: IProps) =>
    icons[props.id]
    ? <img src={icons[props.id].image}
           width="20"
           alt={icons[props.id].imageTitle}
           title={icons[props.id].imageTitle}/>
    : null;

interface IIcon {
    image: any;
    imageTitle: string;
};

const icons: { [id: number]: IIcon; } = {
    1: { image: img1, imageTitle: "uBlock Origin" },
    2: { image: img2, imageTitle: "Adblock Plus" },
    3: { image: img3, imageTitle: "AdGuard" },
    4: { image: img4, imageTitle: "DNS66" },
    5: { image: img5, imageTitle: "Nano Adblocker" },
    6: { image: img6, imageTitle: "AdBlock" },
    7: { image: img7, imageTitle: "AdAway" },
    8: { image: img8, imageTitle: "Personal Blocklist" },
    10: { image: img10, imageTitle: "Redirector" },
    11: { image: img10, imageTitle: "Hosts File Editor" },
    12: { image: img12, imageTitle: "Gas Mask" },
    13: { image: img13, imageTitle: "MinerBlock" },
    14: { image: img14, imageTitle: "Pi-hole" },
    15: { image: img15, imageTitle: "uBlock" },
    16: { image: img16, imageTitle: "Internet Explorer (TPL)" },
    17: { image: img10, imageTitle: "Google Hit Hider by Domain" },
    18: { image: img18, imageTitle: "FireHOL" },
    19: { image: img19, imageTitle: "Samsung Knox" },
    20: { image: img20, imageTitle: "Little Snitch" },
    21: { image: img21, imageTitle: "Privoxy" },
    22: { image: img20, imageTitle: "Diversion" },
    23: { image: img20, imageTitle: "dnsmasq" },
    24: { image: img20, imageTitle: "Slimjet" },
    25: { image: img20, imageTitle: "uMatrix" }
};

must be!

import * as React from "react";
import {
    img1,
    img2,
    img3,
    img4,
    img5,
    img6,
    img7,
    img8,
    img10,
    img11,
    img12,
    img13,
    img14,
    img15,
    img16,
    img17,
    img18,
    img19,
    img20,
    img21,
    img22,
    img23,
    img24,
    img25
} from "./imgs";

interface IProps {
    id: number;
};

export const SoftwareIcon = (props: IProps) =>
    icons[props.id]
    ? <img src={icons[props.id].image}
           width="20"
           alt={icons[props.id].imageTitle}
           title={icons[props.id].imageTitle}/>
    : null;

interface IIcon {
    image: any;
    imageTitle: string;
};

const icons: { [id: number]: IIcon; } = {
    1: { image: img1, imageTitle: "uBlock Origin" },
    2: { image: img2, imageTitle: "Adblock Plus" },
    3: { image: img3, imageTitle: "AdGuard" },
    4: { image: img4, imageTitle: "DNS66" },
    5: { image: img5, imageTitle: "Nano Adblocker" },
    6: { image: img6, imageTitle: "AdBlock" },
    7: { image: img7, imageTitle: "AdAway" },
    8: { image: img8, imageTitle: "Personal Blocklist" },
    10: { image: img10, imageTitle: "Redirector" },
    11: { image: img11, imageTitle: "Hosts File Editor" },
    12: { image: img12, imageTitle: "Gas Mask" },
    13: { image: img13, imageTitle: "MinerBlock" },
    14: { image: img14, imageTitle: "Pi-hole" },
    15: { image: img15, imageTitle: "uBlock" },
    16: { image: img16, imageTitle: "Internet Explorer (TPL)" },
    17: { image: img17, imageTitle: "Google Hit Hider by Domain" },
    18: { image: img18, imageTitle: "FireHOL" },
    19: { image: img19, imageTitle: "Samsung Knox" },
    20: { image: img20, imageTitle: "Little Snitch" },
    21: { image: img21, imageTitle: "Privoxy" },
    22: { image: img22, imageTitle: "Diversion" },
    23: { image: img23, imageTitle: "dnsmasq" },
    24: { image: img24, imageTitle: "Slimjet" },
    25: { image: img25, imageTitle: "uMatrix" }
};

Maybe this is a mistake? @collinbarrett

[DandelionSprout]

Wait, how come no one told me this before and/or figured it out? This is actually super-great information, and I'm surprised I never spotted that.

You (Bogachenko) normally strike me as a somewhat silly guy, but that was some splendid detective work you've done, and you have my standing applauses for it. 👏

I'll now definitely do a 2nd attempt at the pull sometime tomorrow.

[collinbarrett]

Agreed. Good catch, @bogachenko . Thanks.

Sorry, ya'll. My time has been so limited. I really appreciate the contributions ya'll are making, and I've been trying to keep up with those, but my quality control and further development has been very limited as of late.

I hope for that to change...

[bogachenko]

@DandelionSprout

silly guy

here's how? okay. well, next time I'll be smarter and I won't help you.

[DandelionSprout]

Wait, that was not what I meant.

I was referring to things like calling me John Snow, the sometimes interestingly named commit titles, thinking of the uMatrix icon as "scary", and thinking of Travis as an addressable entity, which are uncommon in tech projects. They're not inherently negative, but has made me slightly uncertain how to discuss things with you.

I can be a playful fun-seeker too, but I tend to be a bit more straight-forward when it comes to work-like things I'm involved in. Hopefully that's understandable and/or forgivable.

[collinbarrett]

closed by #692