tauri-apps/tauri
1
1
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2024-11-28 20:48:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(cli): icons not added to the Android project (#7902)

Browse Source
This commit is contained in:
Lucas Fernandes Nogueira 2023-09-26 15:22:23 -03:00 committed by GitHub
parent deea943626
commit 228e5a4c76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.changes/fix-icons-android.md Normal file
View File

@ -0,0 +1,6 @@
---
"@tauri-apps/cli": patch:bug
"tauri-cli": patch:bug
---
Fixes `icon` command not writing files to the correct Android project folders.

26
tooling/cli/src/icon.rs
View File

@ -2,10 +2,7 @@
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
use crate::{ use crate::{helpers::app_paths::tauri_dir, Result};
helpers::{app_paths::tauri_dir, config::get as get_tauri_config},
Result,
};
use std::{ use std::{
collections::HashMap, collections::HashMap,
@ -27,7 +24,6 @@ use image::{
open, ColorType, DynamicImage, ImageBuffer, ImageEncoder, Rgba, open, ColorType, DynamicImage, ImageBuffer, ImageEncoder, Rgba,
}; };
use serde::Deserialize; use serde::Deserialize;
use tauri_utils::platform::Target;
#[derive(Debug, Deserialize)] #[derive(Debug, Deserialize)]
struct IcnsEntry { struct IcnsEntry {
@ -361,22 +357,10 @@ fn png(source: &DynamicImage, out_dir: &Path, ios_color: Rgba<u8>) -> Result<()>
let mut entries = desktop_entries(out_dir); let mut entries = desktop_entries(out_dir);
// Android let android_out = out_dir
let (config, _metadata) = { .parent()
let tauri_config = get_tauri_config(Target::current(), None)?; .unwrap()
.join("gen/android/app/src/main/res/");
let tauri_config_guard = tauri_config.lock().unwrap();
let tauri_config_ = tauri_config_guard.as_ref().unwrap();
crate::mobile::android::get_config(
&crate::mobile::get_app(tauri_config_),
tauri_config_,
&Default::default(),
)
};
let android_out = out_dir.parent().unwrap().join(format!(
"gen/android/{}/app/src/main/res/",
config.app().name_snake()
));
let out = if android_out.exists() { let out = if android_out.exists() {
android_out android_out
} else { } else {