Skip to content

Commit

Permalink
Merge pull request #11 from amber-dchat/main
Browse files Browse the repository at this point in the history
v0.1.0
  • Loading branch information
ahqsoftwares authored Oct 3, 2024
2 parents c4ef85b + 5dbc6f9 commit 5d495a0
Show file tree
Hide file tree
Showing 35 changed files with 83 additions and 83 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
owner: context.repo.owner,
repo: context.repo.repo,
tag_name: version,
name: `DChatt v${version}`,
name: `Amber DChat v${version}`,
body: String(fs.readFileSync("./latest.md")),
draft: true
});
Expand Down Expand Up @@ -272,8 +272,8 @@ jobs:
with:
script: |
github.rest.repos.updateRelease({
owner: "ahqsoftwares",
repo: "tauri-ahq-store",
owner: context.repo.owner,
repo: context.repo.repo,
release_id: process.env.R_ID,
draft: false
});
4 changes: 2 additions & 2 deletions latest.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# DChatt
# Amber DChat

These are internal release notes for DChatt.
These are internal release notes for Amber DChat.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "dchatt-app",
"name": "amber-dchatt",
"private": true,
"version": "0.0.3",
"version": "0.1.0",
"type": "module",
"scripts": {
"dev": "tauri dev",
Expand All @@ -15,7 +15,7 @@
"react-dom": "^18.3.1"
},
"devDependencies": {
"@tauri-apps/cli": "^2.0.0",
"@tauri-apps/cli": "^2.0.1",
"@types/react": "^18.3.11",
"@types/react-dom": "^18.3.0",
"@vitejs/plugin-react": "^4.3.2",
Expand Down
90 changes: 45 additions & 45 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
cargo-features = ["profile-rustflags", "trim-paths"]

[package]
name = "dchatt"
version = "0.0.3"
name = "amber-dchatt"
version = "0.1.0"
description = "A Tauri App"
authors = ["DChatt"]
authors = ["Amber DChat"]
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[lib]
name = "dchatt_app_lib"
name = "amber_dchatt_app_lib"
crate-type = ["staticlib", "cdylib", "rlib"]

[build-dependencies]
tauri-build = { version = "2.0.0", features = [] }
tauri-build = { version = "2.0.1", features = [] }

[dependencies]
tauri = { version = "2.0.0", features = [] }
tauri = { version = "2.0.1", features = [] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"

Expand Down
6 changes: 3 additions & 3 deletions src-tauri/capabilities/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"windows": ["splash", "chatapplication"],
"remote": {
"urls": [
"https://dchat-app.github.io/*",
"https://dchat-app.github.io",
"https://dchat-app.github.io/"
"https://amber-dchat.github.io/*",
"https://amber-dchat.github.io",
"https://amber-dchat.github.io/"
]
},
"permissions": [
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/gen/android/app/.gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/src/main/java/com/dchatt/app/generated
/src/main/java/com/amber/chat/generated
/src/main/jniLibs/**/*.so
/src/main/assets/tauri.conf.json
/tauri.build.gradle.kts
Expand Down
4 changes: 2 additions & 2 deletions src-tauri/gen/android/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ val tauriProperties = Properties().apply {

android {
compileSdk = 34
namespace = "com.dchatt.app"
namespace = "com.amber.chat"
defaultConfig {
manifestPlaceholders["usesCleartextTraffic"] = "false"
applicationId = "com.dchatt.app"
applicationId = "com.amber.chat"
minSdk = 24
targetSdk = 34
versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt()
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/gen/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<application
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:theme="@style/Theme.dchatt_app"
android:theme="@style/Theme.amber_dchatt"
android:usesCleartextTraffic="${usesCleartextTraffic}">
<activity
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package com.dchatt.app
package com.amber.chat

class MainActivity : TauriActivity()
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.
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.
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.
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.
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.
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.
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.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="Theme.dchatt_app" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<style name="Theme.amber_dchatt" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Customize your theme here. -->
</style>
</resources>
4 changes: 2 additions & 2 deletions src-tauri/gen/android/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<resources>
<string name="app_name">dchatt-app</string>
<string name="main_activity_title">dchatt-app</string>
<string name="app_name">Amber DChat</string>
<string name="main_activity_title">Amber DChat</string>
</resources>
2 changes: 1 addition & 1 deletion src-tauri/gen/android/app/src/main/res/values/themes.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="Theme.dchatt_app" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<style name="Theme.amber_dchatt" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Customize your theme here. -->
</style>
</resources>
6 changes: 3 additions & 3 deletions src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ fn ready(window: WebviewWindow) {
async fn launch(mut window: WebviewWindow, _app: AppHandle) {
#[cfg(mobile)]
{
window.navigate(Url::parse("https://dchat-app.github.io").unwrap());
window.navigate(Url::parse("https://amber-dchat.github.io/").unwrap());
}

#[cfg(desktop)]
{
let w = WebviewWindowBuilder::new(&_app, "chatapplication", WebviewUrl::External(Url::parse("https://dchat-app.github.io").unwrap()))
.title("DChatt")
let w = WebviewWindowBuilder::new(&_app, "chatapplication", WebviewUrl::External(Url::parse("https://amber-dchat.github.io/").unwrap()))
.title("Amber DChat")
.center()
.min_inner_size(1024.0, 768.0)
.closable(true)
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]

fn main() {
dchatt_app_lib::run()
amber_dchatt_app_lib::run()
}
10 changes: 5 additions & 5 deletions src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"$schema": "https://schema.tauri.app/config/2.0.0-rc",
"productName": "DChatt",
"productName": "Amber DChat",
"version": "../package.json",
"identifier": "com.dchatt.app",
"identifier": "com.amber.chat",
"build": {
"beforeDevCommand": "pnpm vite --host",
"devUrl": "http://localhost:1420",
Expand Down Expand Up @@ -31,7 +31,7 @@
"updater": {
"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDM0MjlBRjlCQzhDMDlGQTYKUldTbW44REltNjhwTk43NUdxajg3QVBEV3Y3RUlpMGhzc0J4bml1RFd5UE5Kdk0waGZ2SnlVNCsK",
"endpoints": [
"https://github.com/dchat-app/application/releases/latest/download/latest.json"
"https://github.com/amber-dchat/application/releases/latest/download/latest.json"
]
}
},
Expand All @@ -43,7 +43,7 @@
"android": {
"minSdkVersion": 30
},
"copyright": "Copyright © 2024 DChatt",
"copyright": "Copyright © 2024 Amber DChat",
"linux": {
"appimage": {
"bundleMediaFramework": true,
Expand Down Expand Up @@ -72,7 +72,7 @@
},
"wix": null
},
"publisher": "DChatt",
"publisher": "Amber DChat",
"icon": [
"icons/32x32.png",
"icons/128x128.png",
Expand Down
2 changes: 1 addition & 1 deletion src/ui/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ export default function Updater() {

<progress data-tauri-drag-region max={100} value={progress} className="progress progress-info mt-3" />

<h2 data-tauri-drag-region className="text-sm font-extrabold mt-auto">&#169; DChatt {new Date().getFullYear()}</h2>
<h2 data-tauri-drag-region className="text-sm font-extrabold mt-auto">&#169; Amber DChat {new Date().getFullYear()}</h2>
</div>
}

0 comments on commit 5d495a0

Please sign in to comment.