Skip to content

Commit

Permalink
feat: change icon
Browse files Browse the repository at this point in the history
  • Loading branch information
ThaUnknown committed Feb 24, 2024
1 parent d0593e8 commit 35fa5f1
Show file tree
Hide file tree
Showing 17 changed files with 14 additions and 14 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
# Build output
**/dist/
**/build/
**/public/
**/android/

# Dependencies
Expand Down
5 changes: 5 additions & 0 deletions capacitor/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ android/app/src/*
android/app/src/main/*
!android/app/src/main/AndroidManifest.xml
ios/
*.jks
*.pepk
*.bat
pepk.jar
encryption_public_key.pem

package-lock.json
.env
Expand Down
10 changes: 3 additions & 7 deletions capacitor/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
{
"name": "capacitor",
"version": "1.0.3",
"private": true,
"scripts": {
"build:native": "cd public/nodejs/ && npm install && docker build -t android-build:latest . && docker run -v ${PWD}:/app/ -it android-build:latest /bin/bash /app/setup-deps.sh",
"build:app": "cross-env NODE_ENV=production run-s build:web build:assets build:android",
"build:app": "cross-env NODE_ENV=production run-s build:web build:native build:assets",
"build:web": "webpack build",
"build:android": "cap build android",
"build:ios": "cap build ios",
"build:assets": "capacitor-assets generate --iconBackgroundColor #17191c00 --iconBackgroundColorDark #17191c00 --splashBackgroundColor #17191c --splashBackgroundColorDark #17191c --android",
"build:assets": "capacitor-assets generate --iconBackgroundColor #17191c --iconBackgroundColorDark #17191c --splashBackgroundColor #17191c --splashBackgroundColorDark #17191c --android",
"dev:adb-port": "adb reverse tcp:5001 tcp:5001",
"dev:ios": "run-p dev:start cap-run:ios",
"dev:android": "cap run android",
Expand All @@ -19,10 +18,7 @@
},
"devDependencies": {
"@capacitor/assets": "^3.0.1",
"chrome-net": "^3.3.4",
"cordova-res": "^0.15.4",
"crypto-browserify": "^3.12.0",
"hybrid-chunk-store": "^1.2.2",
"nodejs-mobile-gyp": "^0.3.1",
"npm-run-all": "^4.1.5",
"webpack-cli": "^5.1.4",
Expand Down
Binary file modified capacitor/resources/logo-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified capacitor/resources/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion common/components/Menubar.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<div class='w-full z-101 navbar bg-transparent border-0 p-0 d-flex'>
<div class='d-flex h-full draggable align-items-center text-center'>
{#if window.version.platform !== 'darwin'}
<img src='./logo.ico' class='position-absolute w-50 h-50 m-10 pointer d-md-block d-none' alt='ico' use:click={close} />
<img src='./logo_filled.png' class='position-absolute w-50 h-50 m-10 pointer d-md-block d-none p-5' alt='ico' use:click={close} />
{/if}
</div>
<div class='h-full bg-dark flex-grow-1'>
Expand Down
2 changes: 1 addition & 1 deletion common/components/Navbar.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
<nav class='navbar navbar-fixed-bottom d-block d-md-none border-0 bg-dark'>
<div class='navbar-menu h-full d-flex flex-row justify-content-center align-items-center m-0 pb-5' class:animate={page !== 'player'}>
<img src='./logo.ico' class='w-50 h-50 m-10 pointer' alt='ico' use:click={close} />
<img src='./logo_filled.png' class='w-50 h-50 m-10 pointer p-5' alt='ico' use:click={close} />
{#each links as { click: _click, icon, text, image, css, page: _page }, i (i)}
<div
class='navbar-link navbar-link-with-icon pointer overflow-hidden {css}'
Expand Down
File renamed without changes.
Binary file removed common/public/logo.ico
Binary file not shown.
Binary file removed common/public/logo_cut.png
Binary file not shown.
Binary file not shown.
Binary file added common/public/logo_filled.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion common/webpack.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ module.exports = (parentDir, alias = {}, aliasFields = 'browser', filename = 'ap
<!-- <link rel="preconnect" href="https://www.youtube-nocookie.com"> -->
<link rel="preconnect" href="https://graphql.anilist.co">
<link rel='icon' href='/logo.ico'>
<link rel='icon' href='/logo_filled.png' type="image/png" >
${htmlWebpackPlugin.tags.headTags}
</head>
Expand Down
Binary file modified electron/buildResources/icon.icns
Binary file not shown.
Binary file modified electron/buildResources/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions electron/src/main/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ function createWindow () {
backgroundThrottling: false,
preload: path.join(__dirname, '/preload.js')
},
icon: path.join(__dirname, '/logo.ico'),
icon: path.join(__dirname, '/logo_filled.png'),
show: false
})
new Discord(mainWindow)
Expand Down Expand Up @@ -84,7 +84,7 @@ function createWindow () {
mainWindow.webContents.on('render-process-gone', (e, { reason }) => {
if (reason === 'crashed') {
if (++crashcount > 10) {
dialog.showMessageBox({ message: 'Crashed too many times.', title: 'Miru', detail: 'App crashed too many times. For a fix visit https://github.com/ThaUnknown/miru/blob/master/docs/faq.md#miru-crashed-too-many-times', icon: '/renderer/public/logo.ico' }).then(() => {
dialog.showMessageBox({ message: 'Crashed too many times.', title: 'Miru', detail: 'App crashed too many times. For a fix visit https://github.com/ThaUnknown/miru/blob/master/docs/faq.md#miru-crashed-too-many-times', icon: '/renderer/public/logo_filled.png' }).then(() => {
shell.openExternal('https://github.com/ThaUnknown/miru/blob/master/docs/faq.md#miru-crashed-too-many-times')
app.quit()
})
Expand Down

0 comments on commit 35fa5f1

Please sign in to comment.