Merge remote-tracking branch 'upstream/dev' into dev
This commit is contained in:
commit
01a00fc98d
2 changed files with 62 additions and 56 deletions
|
|
@ -18,16 +18,20 @@ export default () =>
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
execute([ephemeral], ctx) {
|
execute([ephemeral], ctx) {
|
||||||
const info = getDebugInfo();
|
const info = getDebugInfo();
|
||||||
const content = [
|
|
||||||
"**ShiggyCord Debug Info**",
|
if(info.device.codename === undefined) { info.device.codename = ""}
|
||||||
`> ShiggyCord: ${info.bunny.version} (${info.bunny.loader.name} ${info.bunny.loader.version})`,
|
else{ info.device.codename = "(" + info.device.codename + ")" }
|
||||||
`> Discord: ${info.discord.version} (${info.discord.build})`,
|
|
||||||
`> React: ${info.react.version} (RN ${info.react.nativeVersion})`,
|
const content = [
|
||||||
`> Hermes: ${info.hermes.version} (bcv${info.hermes.bytecodeVersion})`,
|
"**ShiggyCord Debug Info**",
|
||||||
`> System: ${info.os.name} ${info.os.version} ${info.os.sdk ? `(SDK ${info.os.sdk})` : ""}`.trimEnd(),
|
`> ShiggyCord: ${info.bunny.version} (${info.bunny.loader.name} ${info.bunny.loader.version})`,
|
||||||
`> Device: ${info.device.model}`,
|
`> Discord: ${info.discord.version} (${info.discord.build})`,
|
||||||
].join("\n");
|
`> React: ${info.react.version} (RN ${info.react.nativeVersion})`,
|
||||||
|
`> Hermes: ${info.hermes.version} (bcv${info.hermes.bytecodeVersion})`,
|
||||||
|
`> System: ${info.os.name} ${info.os.version} ${info.os.sdk ? `(SDK ${info.os.sdk})` : ""}`.trimEnd(),
|
||||||
|
`> Device: ${info.device.model} ${info.device.codename}`,
|
||||||
|
].join("\n");
|
||||||
|
|
||||||
if (ephemeral?.value) {
|
if (ephemeral?.value) {
|
||||||
messageUtil.sendBotMessage(ctx.channel.id, content);
|
messageUtil.sendBotMessage(ctx.channel.id, content);
|
||||||
|
|
|
||||||
|
|
@ -23,52 +23,54 @@ const { showSimpleActionSheet } = lazyDestructure(() =>
|
||||||
|
|
||||||
// TODO: These styles work weirdly. Low DPI Has cramped text. Fix?
|
// TODO: These styles work weirdly. Low DPI Has cramped text. Fix?
|
||||||
const useStyles = createStyles({
|
const useStyles = createStyles({
|
||||||
card: {
|
card: {
|
||||||
backgroundColor: semanticColors?.CARD_SECONDARY_BG,
|
backgroundColor: semanticColors?.CARD_SECONDARY_BG,
|
||||||
borderRadius: 12,
|
borderRadius: 12,
|
||||||
overflow: "hidden",
|
overflow: "hidden"
|
||||||
},
|
},
|
||||||
header: {
|
header: {
|
||||||
padding: 0,
|
padding: 0,
|
||||||
},
|
},
|
||||||
headerLeading: {
|
headerLeading: {
|
||||||
flexDirection: "column",
|
flex: 1,
|
||||||
justifyContent: "center",
|
flexDirection: "column",
|
||||||
flexShrink: 1,
|
justifyContent: "center",
|
||||||
scale: 1.2,
|
scale: 1.2
|
||||||
},
|
},
|
||||||
headerTrailing: {
|
headerTrailing: {
|
||||||
display: "flex",
|
display: "flex",
|
||||||
flexDirection: "row",
|
flexDirection: "row",
|
||||||
gap: 15,
|
gap: 15,
|
||||||
alignItems: "center",
|
alignItems: "center"
|
||||||
},
|
},
|
||||||
headerLabel: {
|
headerLabel: {
|
||||||
...TextStyleSheet["heading-md/semibold"],
|
...TextStyleSheet["heading-lg/semibold"],
|
||||||
color: semanticColors.MOBILE_TEXT_HEADING_PRIMARY,
|
},
|
||||||
},
|
headerLabelCompact: {
|
||||||
headerSubtitle: {
|
...TextStyleSheet["text-md/semibold"],
|
||||||
...TextStyleSheet["text-md/semibold"],
|
},
|
||||||
color: semanticColors.TEXT_MUTED,
|
headerSubtitle: {
|
||||||
},
|
...TextStyleSheet["text-sm/semibold"],
|
||||||
descriptionLabel: {
|
color: semanticColors.TEXT_MUTED,
|
||||||
...TextStyleSheet["text-md/semibold"],
|
},
|
||||||
color: semanticColors.TEXT_NORMAL,
|
descriptionLabel: {
|
||||||
},
|
...TextStyleSheet["text-md/semibold"],
|
||||||
actions: {
|
color: "text-strong",
|
||||||
flexDirection: "row-reverse",
|
},
|
||||||
alignItems: "center",
|
actions: {
|
||||||
gap: 5,
|
flexDirection: "row-reverse",
|
||||||
},
|
alignItems: "center",
|
||||||
iconStyle: {
|
gap: 5
|
||||||
tintColor: semanticColors.INTERACTIVE_ICON_DEFAULT,
|
},
|
||||||
opacity: 0.2,
|
iconStyle: {
|
||||||
height: 64,
|
tintColor: semanticColors.LOGO_PRIMARY,
|
||||||
width: 64,
|
opacity: 0.2,
|
||||||
left: void 0,
|
height: 64,
|
||||||
right: "30%",
|
width: 64,
|
||||||
top: "-10%",
|
left: void 0,
|
||||||
},
|
right: "30%",
|
||||||
|
top: "-10%"
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
interface Action {
|
interface Action {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue