Merge pull request #6549 from menloresearch/enhancement/layout-mobile
enhancement: base layout mobile
This commit is contained in:
Nghia Doan
GitHub
commit
7780fb3edd
@ -24,7 +24,7 @@
|
|||||||
"serve:web-app": "yarn workspace @janhq/web-app serve:web",
|
"serve:web-app": "yarn workspace @janhq/web-app serve:web",
|
||||||
"build:serve:web-app": "yarn build:web-app && yarn serve:web-app",
|
"build:serve:web-app": "yarn build:web-app && yarn serve:web-app",
|
||||||
"dev:tauri": "yarn build:icon && yarn copy:assets:tauri && cross-env IS_CLEAN=true tauri dev",
|
"dev:tauri": "yarn build:icon && yarn copy:assets:tauri && cross-env IS_CLEAN=true tauri dev",
|
||||||
"dev:ios": "yarn copy:assets:mobile && yarn tauri ios dev",
|
"dev:ios": "yarn copy:assets:mobile && RUSTC_WRAPPER= yarn tauri ios dev",
|
||||||
"dev:android": "yarn copy:assets:mobile && yarn tauri android dev",
|
"dev:android": "yarn copy:assets:mobile && yarn tauri android dev",
|
||||||
"build:android": "yarn build && yarn copy:assets:mobile && yarn tauri android build --no-default-features --features mobile",
|
"build:android": "yarn build && yarn copy:assets:mobile && yarn tauri android build --no-default-features --features mobile",
|
||||||
"build:ios": "yarn build && yarn copy:assets:mobile && yarn tauri ios build --no-default-features --features mobile",
|
"build:ios": "yarn build && yarn copy:assets:mobile && yarn tauri ios build --no-default-features --features mobile",
|
||||||
|
|||||||
1
src-tauri/.gitignore
vendored
1
src-tauri/.gitignore
vendored
@ -2,6 +2,7 @@
|
|||||||
# will have compiled files and executables
|
# will have compiled files and executables
|
||||||
/target/
|
/target/
|
||||||
/gen/schemas
|
/gen/schemas
|
||||||
|
/gen/android
|
||||||
binaries
|
binaries
|
||||||
!binaries/download.sh
|
!binaries/download.sh
|
||||||
!binaries/download.bat
|
!binaries/download.bat
|
||||||
@ -1,12 +0,0 @@
|
|||||||
# EditorConfig is awesome: https://EditorConfig.org
|
|
||||||
|
|
||||||
# top-most EditorConfig file
|
|
||||||
root = true
|
|
||||||
|
|
||||||
[*]
|
|
||||||
indent_style = space
|
|
||||||
indent_size = 2
|
|
||||||
end_of_line = lf
|
|
||||||
charset = utf-8
|
|
||||||
trim_trailing_whitespace = false
|
|
||||||
insert_final_newline = false
|
|
||||||
19
src-tauri/gen/android/.gitignore
vendored
19
src-tauri/gen/android/.gitignore
vendored
@ -1,19 +0,0 @@
|
|||||||
*.iml
|
|
||||||
.gradle
|
|
||||||
/local.properties
|
|
||||||
/.idea/caches
|
|
||||||
/.idea/libraries
|
|
||||||
/.idea/modules.xml
|
|
||||||
/.idea/workspace.xml
|
|
||||||
/.idea/navEditor.xml
|
|
||||||
/.idea/assetWizardSettings.xml
|
|
||||||
.DS_Store
|
|
||||||
build
|
|
||||||
/captures
|
|
||||||
.externalNativeBuild
|
|
||||||
.cxx
|
|
||||||
local.properties
|
|
||||||
key.properties
|
|
||||||
|
|
||||||
/.tauri
|
|
||||||
/tauri.settings.gradle
|
|
||||||
6
src-tauri/gen/android/app/.gitignore
vendored
6
src-tauri/gen/android/app/.gitignore
vendored
@ -1,6 +0,0 @@
|
|||||||
/src/main/java/jan/ai/app/generated
|
|
||||||
/src/main/jniLibs/**/*.so
|
|
||||||
/src/main/assets/tauri.conf.json
|
|
||||||
/tauri.build.gradle.kts
|
|
||||||
/proguard-tauri.pro
|
|
||||||
/tauri.properties
|
|
||||||
@ -1,82 +0,0 @@
|
|||||||
import java.util.Properties
|
|
||||||
|
|
||||||
plugins {
|
|
||||||
id("com.android.application")
|
|
||||||
id("org.jetbrains.kotlin.android")
|
|
||||||
id("rust")
|
|
||||||
}
|
|
||||||
|
|
||||||
val tauriProperties = Properties().apply {
|
|
||||||
val propFile = file("tauri.properties")
|
|
||||||
if (propFile.exists()) {
|
|
||||||
propFile.inputStream().use { load(it) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
android {
|
|
||||||
compileSdk = 36
|
|
||||||
namespace = "jan.ai.app"
|
|
||||||
defaultConfig {
|
|
||||||
manifestPlaceholders["usesCleartextTraffic"] = "false"
|
|
||||||
applicationId = "jan.ai.app"
|
|
||||||
minSdk = 24
|
|
||||||
targetSdk = 36
|
|
||||||
versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt()
|
|
||||||
versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0")
|
|
||||||
}
|
|
||||||
buildTypes {
|
|
||||||
getByName("debug") {
|
|
||||||
manifestPlaceholders["usesCleartextTraffic"] = "true"
|
|
||||||
isDebuggable = true
|
|
||||||
isJniDebuggable = true
|
|
||||||
isMinifyEnabled = false
|
|
||||||
packaging { jniLibs.keepDebugSymbols.add("*/arm64-v8a/*.so")
|
|
||||||
jniLibs.keepDebugSymbols.add("*/armeabi-v7a/*.so")
|
|
||||||
jniLibs.keepDebugSymbols.add("*/x86/*.so")
|
|
||||||
jniLibs.keepDebugSymbols.add("*/x86_64/*.so")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
getByName("release") {
|
|
||||||
isMinifyEnabled = true
|
|
||||||
isShrinkResources = true // Remove unused resources
|
|
||||||
// signingConfig = signingConfigs.getByName("release") // Disabled for development
|
|
||||||
proguardFiles(
|
|
||||||
*fileTree(".") { include("**/*.pro") }
|
|
||||||
.plus(getDefaultProguardFile("proguard-android-optimize.txt"))
|
|
||||||
.toList().toTypedArray()
|
|
||||||
)
|
|
||||||
// Additional size optimizations
|
|
||||||
packaging {
|
|
||||||
resources.excludes.addAll(listOf(
|
|
||||||
"META-INF/LICENSE*",
|
|
||||||
"META-INF/NOTICE*",
|
|
||||||
"META-INF/*.RSA",
|
|
||||||
"META-INF/*.SF",
|
|
||||||
"META-INF/*.DSA"
|
|
||||||
))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
kotlinOptions {
|
|
||||||
jvmTarget = "1.8"
|
|
||||||
}
|
|
||||||
buildFeatures {
|
|
||||||
buildConfig = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
rust {
|
|
||||||
rootDirRel = "../../../"
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
implementation("androidx.webkit:webkit:1.14.0")
|
|
||||||
implementation("androidx.appcompat:appcompat:1.7.1")
|
|
||||||
implementation("androidx.activity:activity-ktx:1.10.1")
|
|
||||||
implementation("com.google.android.material:material:1.12.0")
|
|
||||||
testImplementation("junit:junit:4.13.2")
|
|
||||||
androidTestImplementation("androidx.test.ext:junit:1.1.4")
|
|
||||||
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.0")
|
|
||||||
}
|
|
||||||
|
|
||||||
apply(from = "tauri.build.gradle.kts")
|
|
||||||
21
src-tauri/gen/android/app/proguard-rules.pro
vendored
21
src-tauri/gen/android/app/proguard-rules.pro
vendored
@ -1,21 +0,0 @@
|
|||||||
# Add project specific ProGuard rules here.
|
|
||||||
# You can control the set of applied configuration files using the
|
|
||||||
# proguardFiles setting in build.gradle.
|
|
||||||
#
|
|
||||||
# For more details, see
|
|
||||||
# http://developer.android.com/guide/developing/tools/proguard.html
|
|
||||||
|
|
||||||
# If your project uses WebView with JS, uncomment the following
|
|
||||||
# and specify the fully qualified class name to the JavaScript interface
|
|
||||||
# class:
|
|
||||||
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
|
||||||
# public *;
|
|
||||||
#}
|
|
||||||
|
|
||||||
# Uncomment this to preserve the line number information for
|
|
||||||
# debugging stack traces.
|
|
||||||
#-keepattributes SourceFile,LineNumberTable
|
|
||||||
|
|
||||||
# If you keep the line number information, uncomment this to
|
|
||||||
# hide the original source file name.
|
|
||||||
#-renamesourcefileattribute SourceFile
|
|
||||||
@ -1,40 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
|
||||||
|
|
||||||
<!-- AndroidTV support -->
|
|
||||||
<uses-feature android:name="android.software.leanback" android:required="false" />
|
|
||||||
|
|
||||||
<application
|
|
||||||
android:icon="@mipmap/ic_launcher"
|
|
||||||
android:label="@string/app_name"
|
|
||||||
android:theme="@style/Theme.jan"
|
|
||||||
android:usesCleartextTraffic="${usesCleartextTraffic}">
|
|
||||||
<activity
|
|
||||||
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
|
|
||||||
android:launchMode="singleTask"
|
|
||||||
android:label="@string/main_activity_title"
|
|
||||||
android:name=".MainActivity"
|
|
||||||
android:exported="true">
|
|
||||||
<intent-filter>
|
|
||||||
<action android:name="android.intent.action.MAIN" />
|
|
||||||
<category android:name="android.intent.category.LAUNCHER" />
|
|
||||||
<!-- AndroidTV support -->
|
|
||||||
<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
|
|
||||||
</intent-filter>
|
|
||||||
<!-- DEEP LINK PLUGIN. AUTO-GENERATED. DO NOT REMOVE. -->
|
|
||||||
|
|
||||||
<!-- DEEP LINK PLUGIN. AUTO-GENERATED. DO NOT REMOVE. -->
|
|
||||||
</activity>
|
|
||||||
|
|
||||||
<provider
|
|
||||||
android:name="androidx.core.content.FileProvider"
|
|
||||||
android:authorities="${applicationId}.fileprovider"
|
|
||||||
android:exported="false"
|
|
||||||
android:grantUriPermissions="true">
|
|
||||||
<meta-data
|
|
||||||
android:name="android.support.FILE_PROVIDER_PATHS"
|
|
||||||
android:resource="@xml/file_paths" />
|
|
||||||
</provider>
|
|
||||||
</application>
|
|
||||||
</manifest>
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
Jan
|
|
||||||
|
|
||||||
Copyright 2025 Menlo Research
|
|
||||||
|
|
||||||
This product includes software developed by Menlo Research (https://menlo.ai).
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
You may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
|
|
||||||
Attribution is requested in user-facing documentation and materials, where appropriate.
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
package jan.ai.app
|
|
||||||
|
|
||||||
import android.os.Bundle
|
|
||||||
import androidx.activity.enableEdgeToEdge
|
|
||||||
|
|
||||||
class MainActivity : TauriActivity() {
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
|
||||||
enableEdgeToEdge()
|
|
||||||
super.onCreate(savedInstanceState)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:aapt="http://schemas.android.com/aapt"
|
|
||||||
android:width="108dp"
|
|
||||||
android:height="108dp"
|
|
||||||
android:viewportWidth="108"
|
|
||||||
android:viewportHeight="108">
|
|
||||||
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
|
|
||||||
<aapt:attr name="android:fillColor">
|
|
||||||
<gradient
|
|
||||||
android:endX="85.84757"
|
|
||||||
android:endY="92.4963"
|
|
||||||
android:startX="42.9492"
|
|
||||||
android:startY="49.59793"
|
|
||||||
android:type="linear">
|
|
||||||
<item
|
|
||||||
android:color="#44000000"
|
|
||||||
android:offset="0.0" />
|
|
||||||
<item
|
|
||||||
android:color="#00000000"
|
|
||||||
android:offset="1.0" />
|
|
||||||
</gradient>
|
|
||||||
</aapt:attr>
|
|
||||||
</path>
|
|
||||||
<path
|
|
||||||
android:fillColor="#FFFFFF"
|
|
||||||
android:fillType="nonZero"
|
|
||||||
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
|
|
||||||
android:strokeWidth="1"
|
|
||||||
android:strokeColor="#00000000" />
|
|
||||||
</vector>
|
|
||||||
@ -1,170 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="108dp"
|
|
||||||
android:height="108dp"
|
|
||||||
android:viewportWidth="108"
|
|
||||||
android:viewportHeight="108">
|
|
||||||
<path
|
|
||||||
android:fillColor="#3DDC84"
|
|
||||||
android:pathData="M0,0h108v108h-108z" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M9,0L9,108"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M19,0L19,108"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M29,0L29,108"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M39,0L39,108"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M49,0L49,108"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M59,0L59,108"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M69,0L69,108"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M79,0L79,108"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M89,0L89,108"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M99,0L99,108"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M0,9L108,9"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M0,19L108,19"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M0,29L108,29"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M0,39L108,39"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M0,49L108,49"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M0,59L108,59"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M0,69L108,69"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M0,79L108,79"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M0,89L108,89"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M0,99L108,99"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M19,29L89,29"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M19,39L89,39"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M19,49L89,49"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M19,59L89,59"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M19,69L89,69"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M19,79L89,79"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M29,19L29,89"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M39,19L39,89"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M49,19L49,89"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M59,19L59,89"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M69,19L69,89"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
<path
|
|
||||||
android:fillColor="#00000000"
|
|
||||||
android:pathData="M79,19L79,89"
|
|
||||||
android:strokeWidth="0.8"
|
|
||||||
android:strokeColor="#33FFFFFF" />
|
|
||||||
</vector>
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
tools:context=".MainActivity">
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="Hello World!"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintLeft_toLeftOf="parent"
|
|
||||||
app:layout_constraintRight_toRightOf="parent"
|
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
|
||||||
|
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 4.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 19 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 4.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 26 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 10 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 42 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 23 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 60 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 23 KiB |
@ -1,6 +0,0 @@
|
|||||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
|
||||||
<!-- Base application theme. -->
|
|
||||||
<style name="Theme.jan" parent="Theme.MaterialComponents.DayNight.NoActionBar">
|
|
||||||
<!-- Customize your theme here. -->
|
|
||||||
</style>
|
|
||||||
</resources>
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
<color name="purple_200">#FFBB86FC</color>
|
|
||||||
<color name="purple_500">#FF6200EE</color>
|
|
||||||
<color name="purple_700">#FF3700B3</color>
|
|
||||||
<color name="teal_200">#FF03DAC5</color>
|
|
||||||
<color name="teal_700">#FF018786</color>
|
|
||||||
<color name="black">#FF000000</color>
|
|
||||||
<color name="white">#FFFFFFFF</color>
|
|
||||||
</resources>
|
|
||||||
@ -1,4 +0,0 @@
|
|||||||
<resources>
|
|
||||||
<string name="app_name">Jan</string>
|
|
||||||
<string name="main_activity_title">Jan</string>
|
|
||||||
</resources>
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
|
||||||
<!-- Base application theme. -->
|
|
||||||
<style name="Theme.jan" parent="Theme.MaterialComponents.DayNight.NoActionBar">
|
|
||||||
<!-- Customize your theme here. -->
|
|
||||||
</style>
|
|
||||||
</resources>
|
|
||||||
@ -1,5 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<paths xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<external-path name="my_images" path="." />
|
|
||||||
<cache-path name="my_cache_images" path="." />
|
|
||||||
</paths>
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
buildscript {
|
|
||||||
repositories {
|
|
||||||
google()
|
|
||||||
mavenCentral()
|
|
||||||
}
|
|
||||||
dependencies {
|
|
||||||
classpath("com.android.tools.build:gradle:8.11.0")
|
|
||||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
allprojects {
|
|
||||||
repositories {
|
|
||||||
google()
|
|
||||||
mavenCentral()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks.register("clean").configure {
|
|
||||||
delete("build")
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
plugins {
|
|
||||||
`kotlin-dsl`
|
|
||||||
}
|
|
||||||
|
|
||||||
gradlePlugin {
|
|
||||||
plugins {
|
|
||||||
create("pluginsForCoolKids") {
|
|
||||||
id = "rust"
|
|
||||||
implementationClass = "RustPlugin"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
repositories {
|
|
||||||
google()
|
|
||||||
mavenCentral()
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
compileOnly(gradleApi())
|
|
||||||
implementation("com.android.tools.build:gradle:8.11.0")
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,52 +0,0 @@
|
|||||||
import java.io.File
|
|
||||||
import org.apache.tools.ant.taskdefs.condition.Os
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.GradleException
|
|
||||||
import org.gradle.api.logging.LogLevel
|
|
||||||
import org.gradle.api.tasks.Input
|
|
||||||
import org.gradle.api.tasks.TaskAction
|
|
||||||
|
|
||||||
open class BuildTask : DefaultTask() {
|
|
||||||
@Input
|
|
||||||
var rootDirRel: String? = null
|
|
||||||
@Input
|
|
||||||
var target: String? = null
|
|
||||||
@Input
|
|
||||||
var release: Boolean? = null
|
|
||||||
|
|
||||||
@TaskAction
|
|
||||||
fun assemble() {
|
|
||||||
val executable = """yarn""";
|
|
||||||
try {
|
|
||||||
runTauriCli(executable)
|
|
||||||
} catch (e: Exception) {
|
|
||||||
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
|
|
||||||
runTauriCli("$executable.cmd")
|
|
||||||
} else {
|
|
||||||
throw e;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun runTauriCli(executable: String) {
|
|
||||||
val rootDirRel = rootDirRel ?: throw GradleException("rootDirRel cannot be null")
|
|
||||||
val target = target ?: throw GradleException("target cannot be null")
|
|
||||||
val release = release ?: throw GradleException("release cannot be null")
|
|
||||||
val args = listOf("tauri", "android", "android-studio-script");
|
|
||||||
|
|
||||||
project.exec {
|
|
||||||
workingDir(File(project.projectDir, rootDirRel))
|
|
||||||
executable(executable)
|
|
||||||
args(args)
|
|
||||||
if (project.logger.isEnabled(LogLevel.DEBUG)) {
|
|
||||||
args("-vv")
|
|
||||||
} else if (project.logger.isEnabled(LogLevel.INFO)) {
|
|
||||||
args("-v")
|
|
||||||
}
|
|
||||||
if (release) {
|
|
||||||
args("--release")
|
|
||||||
}
|
|
||||||
args(listOf("--target", target))
|
|
||||||
}.assertNormalExitValue()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,85 +0,0 @@
|
|||||||
import com.android.build.api.dsl.ApplicationExtension
|
|
||||||
import org.gradle.api.DefaultTask
|
|
||||||
import org.gradle.api.Plugin
|
|
||||||
import org.gradle.api.Project
|
|
||||||
import org.gradle.kotlin.dsl.configure
|
|
||||||
import org.gradle.kotlin.dsl.get
|
|
||||||
|
|
||||||
const val TASK_GROUP = "rust"
|
|
||||||
|
|
||||||
open class Config {
|
|
||||||
lateinit var rootDirRel: String
|
|
||||||
}
|
|
||||||
|
|
||||||
open class RustPlugin : Plugin<Project> {
|
|
||||||
private lateinit var config: Config
|
|
||||||
|
|
||||||
override fun apply(project: Project) = with(project) {
|
|
||||||
config = extensions.create("rust", Config::class.java)
|
|
||||||
|
|
||||||
val defaultAbiList = listOf("arm64-v8a", "armeabi-v7a", "x86", "x86_64");
|
|
||||||
val abiList = (findProperty("abiList") as? String)?.split(',') ?: defaultAbiList
|
|
||||||
|
|
||||||
val defaultArchList = listOf("arm64", "arm", "x86", "x86_64");
|
|
||||||
val archList = (findProperty("archList") as? String)?.split(',') ?: defaultArchList
|
|
||||||
|
|
||||||
val targetsList = (findProperty("targetList") as? String)?.split(',') ?: listOf("aarch64", "armv7", "i686", "x86_64")
|
|
||||||
|
|
||||||
extensions.configure<ApplicationExtension> {
|
|
||||||
@Suppress("UnstableApiUsage")
|
|
||||||
flavorDimensions.add("abi")
|
|
||||||
productFlavors {
|
|
||||||
create("universal") {
|
|
||||||
dimension = "abi"
|
|
||||||
ndk {
|
|
||||||
abiFilters += abiList
|
|
||||||
}
|
|
||||||
}
|
|
||||||
defaultArchList.forEachIndexed { index, arch ->
|
|
||||||
create(arch) {
|
|
||||||
dimension = "abi"
|
|
||||||
ndk {
|
|
||||||
abiFilters.add(defaultAbiList[index])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
afterEvaluate {
|
|
||||||
for (profile in listOf("debug", "release")) {
|
|
||||||
val profileCapitalized = profile.replaceFirstChar { it.uppercase() }
|
|
||||||
val buildTask = tasks.maybeCreate(
|
|
||||||
"rustBuildUniversal$profileCapitalized",
|
|
||||||
DefaultTask::class.java
|
|
||||||
).apply {
|
|
||||||
group = TASK_GROUP
|
|
||||||
description = "Build dynamic library in $profile mode for all targets"
|
|
||||||
}
|
|
||||||
|
|
||||||
tasks["mergeUniversal${profileCapitalized}JniLibFolders"].dependsOn(buildTask)
|
|
||||||
|
|
||||||
for (targetPair in targetsList.withIndex()) {
|
|
||||||
val targetName = targetPair.value
|
|
||||||
val targetArch = archList[targetPair.index]
|
|
||||||
val targetArchCapitalized = targetArch.replaceFirstChar { it.uppercase() }
|
|
||||||
val targetBuildTask = project.tasks.maybeCreate(
|
|
||||||
"rustBuild$targetArchCapitalized$profileCapitalized",
|
|
||||||
BuildTask::class.java
|
|
||||||
).apply {
|
|
||||||
group = TASK_GROUP
|
|
||||||
description = "Build dynamic library in $profile mode for $targetArch"
|
|
||||||
rootDirRel = config.rootDirRel
|
|
||||||
target = targetName
|
|
||||||
release = profile == "release"
|
|
||||||
}
|
|
||||||
|
|
||||||
buildTask.dependsOn(targetBuildTask)
|
|
||||||
tasks["merge$targetArchCapitalized${profileCapitalized}JniLibFolders"].dependsOn(
|
|
||||||
targetBuildTask
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
# Project-wide Gradle settings.
|
|
||||||
# IDE (e.g. Android Studio) users:
|
|
||||||
# Gradle settings configured through the IDE *will override*
|
|
||||||
# any settings specified in this file.
|
|
||||||
# For more details on how to configure your build environment visit
|
|
||||||
# http://www.gradle.org/docs/current/userguide/build_environment.html
|
|
||||||
# Specifies the JVM arguments used for the daemon process.
|
|
||||||
# The setting is particularly useful for tweaking memory settings.
|
|
||||||
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
|
|
||||||
# When configured, Gradle will run in incubating parallel mode.
|
|
||||||
# This option should only be used with decoupled projects. More details, visit
|
|
||||||
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
|
||||||
# org.gradle.parallel=true
|
|
||||||
# AndroidX package structure to make it clearer which packages are bundled with the
|
|
||||||
# Android operating system, and which are packaged with your app"s APK
|
|
||||||
# https://developer.android.com/topic/libraries/support-library/androidx-rn
|
|
||||||
android.useAndroidX=true
|
|
||||||
# Kotlin code style for this project: "official" or "obsolete":
|
|
||||||
kotlin.code.style=official
|
|
||||||
# Enables namespacing of each library's R class so that its R class includes only the
|
|
||||||
# resources declared in the library itself and none from the library's dependencies,
|
|
||||||
# thereby reducing the size of the R class for that library
|
|
||||||
android.nonTransitiveRClass=true
|
|
||||||
android.nonFinalResIds=false
|
|
||||||
Binary file not shown.
@ -1,6 +0,0 @@
|
|||||||
#Tue May 10 19:22:52 CST 2022
|
|
||||||
distributionBase=GRADLE_USER_HOME
|
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
|
|
||||||
distributionPath=wrapper/dists
|
|
||||||
zipStorePath=wrapper/dists
|
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
|
||||||
185
src-tauri/gen/android/gradlew
vendored
185
src-tauri/gen/android/gradlew
vendored
@ -1,185 +0,0 @@
|
|||||||
#!/usr/bin/env sh
|
|
||||||
|
|
||||||
#
|
|
||||||
# Copyright 2015 the original author or authors.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
#
|
|
||||||
|
|
||||||
##############################################################################
|
|
||||||
##
|
|
||||||
## Gradle start up script for UN*X
|
|
||||||
##
|
|
||||||
##############################################################################
|
|
||||||
|
|
||||||
# Attempt to set APP_HOME
|
|
||||||
# Resolve links: $0 may be a link
|
|
||||||
PRG="$0"
|
|
||||||
# Need this for relative symlinks.
|
|
||||||
while [ -h "$PRG" ] ; do
|
|
||||||
ls=`ls -ld "$PRG"`
|
|
||||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
|
||||||
if expr "$link" : '/.*' > /dev/null; then
|
|
||||||
PRG="$link"
|
|
||||||
else
|
|
||||||
PRG=`dirname "$PRG"`"/$link"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
SAVED="`pwd`"
|
|
||||||
cd "`dirname \"$PRG\"`/" >/dev/null
|
|
||||||
APP_HOME="`pwd -P`"
|
|
||||||
cd "$SAVED" >/dev/null
|
|
||||||
|
|
||||||
APP_NAME="Gradle"
|
|
||||||
APP_BASE_NAME=`basename "$0"`
|
|
||||||
|
|
||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
|
||||||
MAX_FD="maximum"
|
|
||||||
|
|
||||||
warn () {
|
|
||||||
echo "$*"
|
|
||||||
}
|
|
||||||
|
|
||||||
die () {
|
|
||||||
echo
|
|
||||||
echo "$*"
|
|
||||||
echo
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# OS specific support (must be 'true' or 'false').
|
|
||||||
cygwin=false
|
|
||||||
msys=false
|
|
||||||
darwin=false
|
|
||||||
nonstop=false
|
|
||||||
case "`uname`" in
|
|
||||||
CYGWIN* )
|
|
||||||
cygwin=true
|
|
||||||
;;
|
|
||||||
Darwin* )
|
|
||||||
darwin=true
|
|
||||||
;;
|
|
||||||
MINGW* )
|
|
||||||
msys=true
|
|
||||||
;;
|
|
||||||
NONSTOP* )
|
|
||||||
nonstop=true
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
|
||||||
if [ -n "$JAVA_HOME" ] ; then
|
|
||||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
|
||||||
# IBM's JDK on AIX uses strange locations for the executables
|
|
||||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
|
||||||
else
|
|
||||||
JAVACMD="$JAVA_HOME/bin/java"
|
|
||||||
fi
|
|
||||||
if [ ! -x "$JAVACMD" ] ; then
|
|
||||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
location of your Java installation."
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
JAVACMD="java"
|
|
||||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
location of your Java installation."
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
|
||||||
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
|
||||||
MAX_FD_LIMIT=`ulimit -H -n`
|
|
||||||
if [ $? -eq 0 ] ; then
|
|
||||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
|
||||||
MAX_FD="$MAX_FD_LIMIT"
|
|
||||||
fi
|
|
||||||
ulimit -n $MAX_FD
|
|
||||||
if [ $? -ne 0 ] ; then
|
|
||||||
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# For Darwin, add options to specify how the application appears in the dock
|
|
||||||
if $darwin; then
|
|
||||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
|
||||||
fi
|
|
||||||
|
|
||||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
|
||||||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
|
||||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
|
||||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
|
||||||
|
|
||||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
|
||||||
|
|
||||||
# We build the pattern for arguments to be converted via cygpath
|
|
||||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
|
||||||
SEP=""
|
|
||||||
for dir in $ROOTDIRSRAW ; do
|
|
||||||
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
|
||||||
SEP="|"
|
|
||||||
done
|
|
||||||
OURCYGPATTERN="(^($ROOTDIRS))"
|
|
||||||
# Add a user-defined pattern to the cygpath arguments
|
|
||||||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
|
||||||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
|
||||||
fi
|
|
||||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
|
||||||
i=0
|
|
||||||
for arg in "$@" ; do
|
|
||||||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
|
||||||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
|
||||||
|
|
||||||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
|
||||||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
|
||||||
else
|
|
||||||
eval `echo args$i`="\"$arg\""
|
|
||||||
fi
|
|
||||||
i=`expr $i + 1`
|
|
||||||
done
|
|
||||||
case $i in
|
|
||||||
0) set -- ;;
|
|
||||||
1) set -- "$args0" ;;
|
|
||||||
2) set -- "$args0" "$args1" ;;
|
|
||||||
3) set -- "$args0" "$args1" "$args2" ;;
|
|
||||||
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
|
||||||
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
|
||||||
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
|
||||||
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
|
||||||
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
|
||||||
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Escape application args
|
|
||||||
save () {
|
|
||||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
|
||||||
echo " "
|
|
||||||
}
|
|
||||||
APP_ARGS=`save "$@"`
|
|
||||||
|
|
||||||
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
|
||||||
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
|
||||||
|
|
||||||
exec "$JAVACMD" "$@"
|
|
||||||
89
src-tauri/gen/android/gradlew.bat
vendored
89
src-tauri/gen/android/gradlew.bat
vendored
@ -1,89 +0,0 @@
|
|||||||
@rem
|
|
||||||
@rem Copyright 2015 the original author or authors.
|
|
||||||
@rem
|
|
||||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
@rem you may not use this file except in compliance with the License.
|
|
||||||
@rem You may obtain a copy of the License at
|
|
||||||
@rem
|
|
||||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
@rem
|
|
||||||
@rem Unless required by applicable law or agreed to in writing, software
|
|
||||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
@rem See the License for the specific language governing permissions and
|
|
||||||
@rem limitations under the License.
|
|
||||||
@rem
|
|
||||||
|
|
||||||
@if "%DEBUG%" == "" @echo off
|
|
||||||
@rem ##########################################################################
|
|
||||||
@rem
|
|
||||||
@rem Gradle startup script for Windows
|
|
||||||
@rem
|
|
||||||
@rem ##########################################################################
|
|
||||||
|
|
||||||
@rem Set local scope for the variables with windows NT shell
|
|
||||||
if "%OS%"=="Windows_NT" setlocal
|
|
||||||
|
|
||||||
set DIRNAME=%~dp0
|
|
||||||
if "%DIRNAME%" == "" set DIRNAME=.
|
|
||||||
set APP_BASE_NAME=%~n0
|
|
||||||
set APP_HOME=%DIRNAME%
|
|
||||||
|
|
||||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
|
||||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
|
||||||
|
|
||||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
|
||||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
|
||||||
|
|
||||||
@rem Find java.exe
|
|
||||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
|
||||||
|
|
||||||
set JAVA_EXE=java.exe
|
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
|
||||||
if "%ERRORLEVEL%" == "0" goto execute
|
|
||||||
|
|
||||||
echo.
|
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
|
||||||
echo.
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
echo location of your Java installation.
|
|
||||||
|
|
||||||
goto fail
|
|
||||||
|
|
||||||
:findJavaFromJavaHome
|
|
||||||
set JAVA_HOME=%JAVA_HOME:"=%
|
|
||||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|
||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
|
||||||
|
|
||||||
echo.
|
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
|
||||||
echo.
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
echo location of your Java installation.
|
|
||||||
|
|
||||||
goto fail
|
|
||||||
|
|
||||||
:execute
|
|
||||||
@rem Setup the command line
|
|
||||||
|
|
||||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
|
||||||
|
|
||||||
:end
|
|
||||||
@rem End local scope for the variables with windows NT shell
|
|
||||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
|
||||||
|
|
||||||
:fail
|
|
||||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
|
||||||
rem the _cmd.exe /c_ return code!
|
|
||||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
|
||||||
exit /b 1
|
|
||||||
|
|
||||||
:mainEnd
|
|
||||||
if "%OS%"=="Windows_NT" endlocal
|
|
||||||
|
|
||||||
:omega
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
include ':app'
|
|
||||||
|
|
||||||
apply from: 'tauri.settings.gradle'
|
|
||||||
@ -9,6 +9,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"bundle": {
|
"bundle": {
|
||||||
|
"active": true,
|
||||||
"iOS": {
|
"iOS": {
|
||||||
"developmentTeam": "<DEVELOPMENT_TEAM_ID>"
|
"developmentTeam": "<DEVELOPMENT_TEAM_ID>"
|
||||||
},
|
},
|
||||||
|
|||||||
@ -1,11 +1,24 @@
|
|||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html lang="en">
|
<html lang="en" class="bg-app">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<link rel="icon" type="image/png" sizes="32x32" href="/images/jan-logo.png" />
|
<link
|
||||||
<link rel="icon" type="image/png" sizes="16x16" href="/images/jan-logo.png" />
|
rel="icon"
|
||||||
|
type="image/png"
|
||||||
|
sizes="32x32"
|
||||||
|
href="/images/jan-logo.png"
|
||||||
|
/>
|
||||||
|
<link
|
||||||
|
rel="icon"
|
||||||
|
type="image/png"
|
||||||
|
sizes="16x16"
|
||||||
|
href="/images/jan-logo.png"
|
||||||
|
/>
|
||||||
<link rel="apple-touch-icon" href="/images/jan-logo.png" />
|
<link rel="apple-touch-icon" href="/images/jan-logo.png" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<meta
|
||||||
|
name="viewport"
|
||||||
|
content="width=device-width, initial-scale=1.0, user-scalable=no, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover, interactive-widget=resizes-visual"
|
||||||
|
/>
|
||||||
<title>Jan</title>
|
<title>Jan</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|||||||
@ -122,7 +122,7 @@ const LeftPanel = () => {
|
|||||||
) {
|
) {
|
||||||
if (currentIsSmallScreen && open) {
|
if (currentIsSmallScreen && open) {
|
||||||
setLeftPanel(false)
|
setLeftPanel(false)
|
||||||
} else if(!open) {
|
} else if (!open) {
|
||||||
setLeftPanel(true)
|
setLeftPanel(true)
|
||||||
}
|
}
|
||||||
prevScreenSizeRef.current = currentIsSmallScreen
|
prevScreenSizeRef.current = currentIsSmallScreen
|
||||||
@ -141,7 +141,7 @@ const LeftPanel = () => {
|
|||||||
return () => {
|
return () => {
|
||||||
window.removeEventListener('resize', handleResize)
|
window.removeEventListener('resize', handleResize)
|
||||||
}
|
}
|
||||||
}, [setLeftPanel])
|
}, [open, setLeftPanel])
|
||||||
|
|
||||||
const currentPath = useRouterState({
|
const currentPath = useRouterState({
|
||||||
select: (state) => state.location.pathname,
|
select: (state) => state.location.pathname,
|
||||||
@ -184,7 +184,7 @@ const LeftPanel = () => {
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{/* Backdrop overlay for small screens */}
|
{/* Backdrop overlay for small screens */}
|
||||||
{isSmallScreen && open && (
|
{isSmallScreen && open && !IS_IOS && !IS_ANDROID && (
|
||||||
<div
|
<div
|
||||||
className="fixed inset-0 bg-black/50 backdrop-blur z-30"
|
className="fixed inset-0 bg-black/50 backdrop-blur z-30"
|
||||||
onClick={(e) => {
|
onClick={(e) => {
|
||||||
@ -207,7 +207,7 @@ const LeftPanel = () => {
|
|||||||
isResizableContext && 'h-full w-full',
|
isResizableContext && 'h-full w-full',
|
||||||
// Small screen context: fixed positioning and styling
|
// Small screen context: fixed positioning and styling
|
||||||
isSmallScreen &&
|
isSmallScreen &&
|
||||||
'fixed h-[calc(100%-16px)] bg-app z-50 rounded-sm border border-left-panel-fg/10 m-2 px-1 w-48',
|
'fixed h-full pb-[calc(env(safe-area-inset-bottom)+env(safe-area-inset-top))] bg-main-view z-50 md:border border-left-panel-fg/10 px-1 w-full md:w-48',
|
||||||
// Default context: original styling
|
// Default context: original styling
|
||||||
!isResizableContext &&
|
!isResizableContext &&
|
||||||
!isSmallScreen &&
|
!isSmallScreen &&
|
||||||
@ -266,7 +266,8 @@ const LeftPanel = () => {
|
|||||||
<div
|
<div
|
||||||
className={cn(
|
className={cn(
|
||||||
'flex flex-col',
|
'flex flex-col',
|
||||||
Object.keys(downloads).length > 0 || localDownloadingModels.size > 0
|
Object.keys(downloads).length > 0 ||
|
||||||
|
localDownloadingModels.size > 0
|
||||||
? 'h-[calc(100%-200px)]'
|
? 'h-[calc(100%-200px)]'
|
||||||
: 'h-[calc(100%-140px)]'
|
: 'h-[calc(100%-140px)]'
|
||||||
)}
|
)}
|
||||||
@ -379,7 +380,9 @@ const LeftPanel = () => {
|
|||||||
</button>
|
</button>
|
||||||
</DropdownMenuTrigger>
|
</DropdownMenuTrigger>
|
||||||
<DropdownMenuContent side="bottom" align="end">
|
<DropdownMenuContent side="bottom" align="end">
|
||||||
<DeleteAllThreadsDialog onDeleteAll={deleteAllThreads} />
|
<DeleteAllThreadsDialog
|
||||||
|
onDeleteAll={deleteAllThreads}
|
||||||
|
/>
|
||||||
</DropdownMenuContent>
|
</DropdownMenuContent>
|
||||||
</DropdownMenu>
|
</DropdownMenu>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -30,12 +30,15 @@ const SettingsMenu = () => {
|
|||||||
// On web: exclude llamacpp provider as it's not available
|
// On web: exclude llamacpp provider as it's not available
|
||||||
const activeProviders = providers.filter((provider) => {
|
const activeProviders = providers.filter((provider) => {
|
||||||
if (!provider.active) return false
|
if (!provider.active) return false
|
||||||
|
|
||||||
// On web version, hide llamacpp provider
|
// On web version, hide llamacpp provider
|
||||||
if (!PlatformFeatures[PlatformFeature.LOCAL_INFERENCE] && provider.provider === 'llama.cpp') {
|
if (
|
||||||
|
!PlatformFeatures[PlatformFeature.LOCAL_INFERENCE] &&
|
||||||
|
provider.provider === 'llama.cpp'
|
||||||
|
) {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
return true
|
return true
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -92,7 +95,7 @@ const SettingsMenu = () => {
|
|||||||
title: 'common:keyboardShortcuts',
|
title: 'common:keyboardShortcuts',
|
||||||
route: route.settings.shortcuts,
|
route: route.settings.shortcuts,
|
||||||
hasSubMenu: false,
|
hasSubMenu: false,
|
||||||
isEnabled: true,
|
isEnabled: PlatformFeatures[PlatformFeature.SHORTCUT],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: 'common:hardware',
|
title: 'common:hardware',
|
||||||
@ -137,7 +140,7 @@ const SettingsMenu = () => {
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<button
|
<button
|
||||||
className="fixed top-4 right-4 sm:hidden size-5 cursor-pointer items-center justify-center rounded hover:bg-main-view-fg/10 transition-all duration-200 ease-in-out data-[state=open]:bg-main-view-fg/10 z-20"
|
className="fixed top-[calc(10px+env(safe-area-inset-top))] right-4 sm:hidden size-5 cursor-pointer items-center justify-center rounded hover:bg-main-view-fg/10 transition-all duration-200 ease-in-out data-[state=open]:bg-main-view-fg/10 z-20"
|
||||||
onClick={toggleMenu}
|
onClick={toggleMenu}
|
||||||
aria-label="Toggle settings menu"
|
aria-label="Toggle settings menu"
|
||||||
>
|
>
|
||||||
@ -152,7 +155,7 @@ const SettingsMenu = () => {
|
|||||||
'h-full w-44 shrink-0 px-1.5 pt-3 border-r border-main-view-fg/5 bg-main-view',
|
'h-full w-44 shrink-0 px-1.5 pt-3 border-r border-main-view-fg/5 bg-main-view',
|
||||||
'sm:flex',
|
'sm:flex',
|
||||||
isMenuOpen
|
isMenuOpen
|
||||||
? 'flex fixed sm:hidden top-0 z-10 m-1 h-[calc(100%-8px)] border-r-0 border-l bg-main-view right-0 py-8 rounded-tr-lg rounded-br-lg'
|
? 'flex fixed sm:hidden top-[calc(10px+env(safe-area-inset-top))] z-10 m-1 h-[calc(100%-8px)] border-r-0 border-l bg-main-view right-0 py-8 rounded-tr-lg rounded-br-lg'
|
||||||
: 'hidden'
|
: 'hidden'
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
@ -162,77 +165,82 @@ const SettingsMenu = () => {
|
|||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
return (
|
return (
|
||||||
<div key={menu.title}>
|
<div key={menu.title}>
|
||||||
<Link
|
<Link
|
||||||
to={menu.route}
|
to={menu.route}
|
||||||
className="block px-2 gap-1.5 cursor-pointer hover:bg-main-view-fg/5 py-1 w-full rounded [&.active]:bg-main-view-fg/5"
|
className="block px-2 gap-1.5 cursor-pointer hover:bg-main-view-fg/5 py-1 w-full rounded [&.active]:bg-main-view-fg/5"
|
||||||
>
|
>
|
||||||
<div className="flex items-center justify-between">
|
<div className="flex items-center justify-between">
|
||||||
<span className="text-main-view-fg/80">{t(menu.title)}</span>
|
<span className="text-main-view-fg/80">
|
||||||
{menu.hasSubMenu && (
|
{t(menu.title)}
|
||||||
<button
|
</span>
|
||||||
onClick={(e) => {
|
{menu.hasSubMenu && (
|
||||||
e.preventDefault()
|
<button
|
||||||
e.stopPropagation()
|
onClick={(e) => {
|
||||||
toggleProvidersExpansion()
|
e.preventDefault()
|
||||||
}}
|
e.stopPropagation()
|
||||||
className="text-main-view-fg/60 hover:text-main-view-fg/80"
|
toggleProvidersExpansion()
|
||||||
>
|
}}
|
||||||
{expandedProviders ? (
|
className="text-main-view-fg/60 hover:text-main-view-fg/80"
|
||||||
<IconChevronDown size={16} />
|
>
|
||||||
) : (
|
{expandedProviders ? (
|
||||||
<IconChevronRight size={16} />
|
<IconChevronDown size={16} />
|
||||||
)}
|
) : (
|
||||||
</button>
|
<IconChevronRight size={16} />
|
||||||
)}
|
)}
|
||||||
</div>
|
</button>
|
||||||
</Link>
|
)}
|
||||||
|
</div>
|
||||||
|
</Link>
|
||||||
|
|
||||||
{/* Sub-menu for model providers */}
|
{/* Sub-menu for model providers */}
|
||||||
{menu.hasSubMenu && expandedProviders && (
|
{menu.hasSubMenu && expandedProviders && (
|
||||||
<div className="ml-2 mt-1 space-y-1 first-step-setup-remote-provider">
|
<div className="ml-2 mt-1 space-y-1 first-step-setup-remote-provider">
|
||||||
{activeProviders.map((provider) => {
|
{activeProviders.map((provider) => {
|
||||||
const isActive = matches.some(
|
const isActive = matches.some(
|
||||||
(match) =>
|
(match) =>
|
||||||
match.routeId === '/settings/providers/$providerName' &&
|
match.routeId ===
|
||||||
'providerName' in match.params &&
|
'/settings/providers/$providerName' &&
|
||||||
match.params.providerName === provider.provider
|
'providerName' in match.params &&
|
||||||
)
|
match.params.providerName === provider.provider
|
||||||
|
)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div key={provider.provider}>
|
<div key={provider.provider}>
|
||||||
<div
|
<div
|
||||||
className={cn(
|
className={cn(
|
||||||
'flex px-2 items-center gap-1.5 cursor-pointer hover:bg-main-view-fg/5 py-1 w-full rounded [&.active]:bg-main-view-fg/5 text-main-view-fg/80',
|
'flex px-2 items-center gap-1.5 cursor-pointer hover:bg-main-view-fg/5 py-1 w-full rounded [&.active]:bg-main-view-fg/5 text-main-view-fg/80',
|
||||||
isActive && 'bg-main-view-fg/5',
|
isActive && 'bg-main-view-fg/5',
|
||||||
// hidden for llama.cpp provider for setup remote provider
|
// hidden for llama.cpp provider for setup remote provider
|
||||||
provider.provider === 'llama.cpp' &&
|
provider.provider === 'llama.cpp' &&
|
||||||
stepSetupRemoteProvider &&
|
stepSetupRemoteProvider &&
|
||||||
'hidden'
|
'hidden'
|
||||||
)}
|
)}
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
navigate({
|
navigate({
|
||||||
to: route.settings.providers,
|
to: route.settings.providers,
|
||||||
params: {
|
params: {
|
||||||
providerName: provider.provider,
|
providerName: provider.provider,
|
||||||
},
|
},
|
||||||
...(stepSetupRemoteProvider
|
...(stepSetupRemoteProvider
|
||||||
? { search: { step: 'setup_remote_provider' } }
|
? {
|
||||||
: {}),
|
search: { step: 'setup_remote_provider' },
|
||||||
})
|
}
|
||||||
}
|
: {}),
|
||||||
>
|
})
|
||||||
<ProvidersAvatar provider={provider} />
|
}
|
||||||
<div className="truncate">
|
>
|
||||||
<span>{getProviderTitle(provider.provider)}</span>
|
<ProvidersAvatar provider={provider} />
|
||||||
|
<div className="truncate">
|
||||||
|
<span>{getProviderTitle(provider.provider)}</span>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
)
|
||||||
)
|
})}
|
||||||
})}
|
</div>
|
||||||
</div>
|
)}
|
||||||
)}
|
</div>
|
||||||
</div>
|
|
||||||
)
|
)
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -6,6 +6,8 @@ import HeaderPage from './HeaderPage'
|
|||||||
import { isProd } from '@/lib/version'
|
import { isProd } from '@/lib/version'
|
||||||
import { useTranslation } from '@/i18n/react-i18next-compat'
|
import { useTranslation } from '@/i18n/react-i18next-compat'
|
||||||
import { localStorageKey } from '@/constants/localStorage'
|
import { localStorageKey } from '@/constants/localStorage'
|
||||||
|
import { PlatformFeatures } from '@/lib/platform/const'
|
||||||
|
import { PlatformFeature } from '@/lib/platform'
|
||||||
|
|
||||||
function SetupScreen() {
|
function SetupScreen() {
|
||||||
const { t } = useTranslation()
|
const { t } = useTranslation()
|
||||||
@ -21,7 +23,7 @@ function SetupScreen() {
|
|||||||
<div className="flex h-full flex-col flex-justify-center">
|
<div className="flex h-full flex-col flex-justify-center">
|
||||||
<HeaderPage></HeaderPage>
|
<HeaderPage></HeaderPage>
|
||||||
<div className="h-full px-8 overflow-y-auto flex flex-col gap-2 justify-center ">
|
<div className="h-full px-8 overflow-y-auto flex flex-col gap-2 justify-center ">
|
||||||
<div className="w-4/6 mx-auto">
|
<div className="w-full lg:w-4/6 mx-auto">
|
||||||
<div className="mb-8 text-left">
|
<div className="mb-8 text-left">
|
||||||
<h1 className="font-editorialnew text-main-view-fg text-4xl">
|
<h1 className="font-editorialnew text-main-view-fg text-4xl">
|
||||||
{t('setup:welcome')}
|
{t('setup:welcome')}
|
||||||
@ -31,22 +33,24 @@ function SetupScreen() {
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex gap-4 flex-col">
|
<div className="flex gap-4 flex-col">
|
||||||
<Card
|
{PlatformFeatures[PlatformFeature.LOCAL_INFERENCE] && (
|
||||||
header={
|
<Card
|
||||||
<Link
|
header={
|
||||||
to={route.hub.index}
|
<Link
|
||||||
search={{
|
to={route.hub.index}
|
||||||
...(!isProd ? { step: 'setup_local_provider' } : {}),
|
search={{
|
||||||
}}
|
...(!isProd ? { step: 'setup_local_provider' } : {}),
|
||||||
>
|
}}
|
||||||
<div>
|
>
|
||||||
<h1 className="text-main-view-fg font-medium text-base">
|
<div>
|
||||||
{t('setup:localModel')}
|
<h1 className="text-main-view-fg font-medium text-base">
|
||||||
</h1>
|
{t('setup:localModel')}
|
||||||
</div>
|
</h1>
|
||||||
</Link>
|
</div>
|
||||||
}
|
</Link>
|
||||||
></Card>
|
}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
<Card
|
<Card
|
||||||
header={
|
header={
|
||||||
<Link
|
<Link
|
||||||
@ -65,7 +69,7 @@ function SetupScreen() {
|
|||||||
</h1>
|
</h1>
|
||||||
</Link>
|
</Link>
|
||||||
}
|
}
|
||||||
></Card>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -21,7 +21,7 @@ export function PromptAnalytic() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="fixed bottom-4 right-4 z-50 p-4 shadow-lg bg-main-view w-100 border border-main-view-fg/8 rounded-lg">
|
<div className="fixed bottom-4 right-4 z-50 p-4 shadow-lg bg-main-view w-4/5 md:w-100 border border-main-view-fg/8 rounded-lg">
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
<IconFileTextShield className="text-accent" />
|
<IconFileTextShield className="text-accent" />
|
||||||
<h2 className="font-medium text-main-view-fg/80">
|
<h2 className="font-medium text-main-view-fg/80">
|
||||||
@ -45,7 +45,9 @@ export function PromptAnalytic() {
|
|||||||
>
|
>
|
||||||
{t('deny')}
|
{t('deny')}
|
||||||
</Button>
|
</Button>
|
||||||
<Button onClick={() => handleProductAnalytics(true)}>{t('allow')}</Button>
|
<Button onClick={() => handleProductAnalytics(true)}>
|
||||||
|
{t('allow')}
|
||||||
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
|
|||||||
@ -56,6 +56,13 @@
|
|||||||
@layer base {
|
@layer base {
|
||||||
body {
|
body {
|
||||||
@apply overflow-hidden;
|
@apply overflow-hidden;
|
||||||
|
background-color: white;
|
||||||
|
min-height: 100vh;
|
||||||
|
min-height: -webkit-fill-available;
|
||||||
|
padding-top: env(safe-area-inset-top, 0px);
|
||||||
|
padding-bottom: env(safe-area-inset-bottom);
|
||||||
|
padding-left: env(safe-area-inset-left);
|
||||||
|
padding-right: env(safe-area-inset-right);
|
||||||
::-webkit-scrollbar {
|
::-webkit-scrollbar {
|
||||||
width: 6px;
|
width: 6px;
|
||||||
height: 6px;
|
height: 6px;
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import { PlatformFeature } from './types'
|
import { PlatformFeature } from './types'
|
||||||
import { isPlatformTauri } from './utils'
|
import { isPlatformTauri, isPlatformIOS, isPlatformAndroid } from './utils'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Platform Features Configuration
|
* Platform Features Configuration
|
||||||
@ -12,28 +12,35 @@ import { isPlatformTauri } from './utils'
|
|||||||
*/
|
*/
|
||||||
export const PlatformFeatures: Record<PlatformFeature, boolean> = {
|
export const PlatformFeatures: Record<PlatformFeature, boolean> = {
|
||||||
// Hardware monitoring and GPU usage
|
// Hardware monitoring and GPU usage
|
||||||
[PlatformFeature.HARDWARE_MONITORING]: isPlatformTauri(),
|
[PlatformFeature.HARDWARE_MONITORING]:
|
||||||
|
isPlatformTauri() && !isPlatformIOS() && !isPlatformAndroid(),
|
||||||
|
|
||||||
// Local model inference (llama.cpp)
|
// Local model inference (llama.cpp)
|
||||||
[PlatformFeature.LOCAL_INFERENCE]: isPlatformTauri(),
|
[PlatformFeature.LOCAL_INFERENCE]:
|
||||||
|
isPlatformTauri() && !isPlatformIOS() && !isPlatformAndroid(),
|
||||||
|
|
||||||
// Local API server
|
// Local API server
|
||||||
[PlatformFeature.LOCAL_API_SERVER]: isPlatformTauri(),
|
[PlatformFeature.LOCAL_API_SERVER]:
|
||||||
|
isPlatformTauri() && !isPlatformIOS() && !isPlatformAndroid(),
|
||||||
|
|
||||||
// Hub/model downloads
|
// Hub/model downloads
|
||||||
[PlatformFeature.MODEL_HUB]: isPlatformTauri(),
|
[PlatformFeature.MODEL_HUB]:
|
||||||
|
isPlatformTauri() && !isPlatformIOS() && !isPlatformAndroid(),
|
||||||
|
|
||||||
// System integrations (logs, file explorer, etc.)
|
// System integrations (logs, file explorer, etc.)
|
||||||
[PlatformFeature.SYSTEM_INTEGRATIONS]: isPlatformTauri(),
|
[PlatformFeature.SYSTEM_INTEGRATIONS]:
|
||||||
|
isPlatformTauri() && !isPlatformIOS() && !isPlatformAndroid(),
|
||||||
|
|
||||||
// HTTPS proxy
|
// HTTPS proxy
|
||||||
[PlatformFeature.HTTPS_PROXY]: isPlatformTauri(),
|
[PlatformFeature.HTTPS_PROXY]:
|
||||||
|
isPlatformTauri() && !isPlatformIOS() && !isPlatformAndroid(),
|
||||||
|
|
||||||
// Default model providers (OpenAI, Anthropic, etc.) - disabled for web-only Jan builds
|
// Default model providers (OpenAI, Anthropic, etc.) - disabled for web-only Jan builds
|
||||||
[PlatformFeature.DEFAULT_PROVIDERS]: isPlatformTauri(),
|
[PlatformFeature.DEFAULT_PROVIDERS]: isPlatformTauri(),
|
||||||
|
|
||||||
// Analytics and telemetry - disabled for web
|
// Analytics and telemetry - disabled for web
|
||||||
[PlatformFeature.ANALYTICS]: isPlatformTauri(),
|
[PlatformFeature.ANALYTICS]:
|
||||||
|
isPlatformTauri() && !isPlatformIOS() && !isPlatformAndroid(),
|
||||||
|
|
||||||
// Web-specific automatic model selection from jan provider - enabled for web only
|
// Web-specific automatic model selection from jan provider - enabled for web only
|
||||||
[PlatformFeature.WEB_AUTO_MODEL_SELECTION]: !isPlatformTauri(),
|
[PlatformFeature.WEB_AUTO_MODEL_SELECTION]: !isPlatformTauri(),
|
||||||
@ -45,10 +52,12 @@ export const PlatformFeatures: Record<PlatformFeature, boolean> = {
|
|||||||
[PlatformFeature.MCP_AUTO_APPROVE_TOOLS]: !isPlatformTauri(),
|
[PlatformFeature.MCP_AUTO_APPROVE_TOOLS]: !isPlatformTauri(),
|
||||||
|
|
||||||
// MCP servers settings page - disabled for web
|
// MCP servers settings page - disabled for web
|
||||||
[PlatformFeature.MCP_SERVERS_SETTINGS]: isPlatformTauri(),
|
[PlatformFeature.MCP_SERVERS_SETTINGS]:
|
||||||
|
isPlatformTauri() && !isPlatformIOS() && !isPlatformAndroid(),
|
||||||
|
|
||||||
// Extensions settings page - disabled for web
|
// Extensions settings page - disabled for web
|
||||||
[PlatformFeature.EXTENSIONS_SETTINGS]: isPlatformTauri(),
|
[PlatformFeature.EXTENSIONS_SETTINGS]:
|
||||||
|
isPlatformTauri() && !isPlatformIOS() && !isPlatformAndroid(),
|
||||||
|
|
||||||
// Assistant functionality - disabled for web
|
// Assistant functionality - disabled for web
|
||||||
[PlatformFeature.ASSISTANTS]: isPlatformTauri(),
|
[PlatformFeature.ASSISTANTS]: isPlatformTauri(),
|
||||||
@ -60,5 +69,9 @@ export const PlatformFeatures: Record<PlatformFeature, boolean> = {
|
|||||||
[PlatformFeature.GOOGLE_ANALYTICS]: !isPlatformTauri(),
|
[PlatformFeature.GOOGLE_ANALYTICS]: !isPlatformTauri(),
|
||||||
|
|
||||||
// Alternate shortcut bindings - enabled for web only (to avoid browser conflicts)
|
// Alternate shortcut bindings - enabled for web only (to avoid browser conflicts)
|
||||||
[PlatformFeature.ALTERNATE_SHORTCUT_BINDINGS]: !isPlatformTauri(),
|
[PlatformFeature.ALTERNATE_SHORTCUT_BINDINGS]:
|
||||||
}
|
!isPlatformTauri() && !isPlatformIOS() && !isPlatformAndroid(),
|
||||||
|
|
||||||
|
// Shortcut
|
||||||
|
[PlatformFeature.SHORTCUT]: !isPlatformIOS() && !isPlatformAndroid(),
|
||||||
|
}
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
/**
|
/**
|
||||||
* Supported platforms
|
* Supported platforms
|
||||||
*/
|
*/
|
||||||
export type Platform = 'tauri' | 'web'
|
export type Platform = 'tauri' | 'web' | 'ios' | 'android'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Platform Feature Enum
|
* Platform Feature Enum
|
||||||
@ -16,6 +16,8 @@ export enum PlatformFeature {
|
|||||||
// Hardware monitoring and GPU usage
|
// Hardware monitoring and GPU usage
|
||||||
HARDWARE_MONITORING = 'hardwareMonitoring',
|
HARDWARE_MONITORING = 'hardwareMonitoring',
|
||||||
|
|
||||||
|
SHORTCUT = 'shortcut',
|
||||||
|
|
||||||
// Local model inference (llama.cpp)
|
// Local model inference (llama.cpp)
|
||||||
LOCAL_INFERENCE = 'localInference',
|
LOCAL_INFERENCE = 'localInference',
|
||||||
|
|
||||||
@ -30,16 +32,16 @@ export enum PlatformFeature {
|
|||||||
|
|
||||||
// HTTPS proxy
|
// HTTPS proxy
|
||||||
HTTPS_PROXY = 'httpsProxy',
|
HTTPS_PROXY = 'httpsProxy',
|
||||||
|
|
||||||
// Default model providers (OpenAI, Anthropic, etc.)
|
// Default model providers (OpenAI, Anthropic, etc.)
|
||||||
DEFAULT_PROVIDERS = 'defaultProviders',
|
DEFAULT_PROVIDERS = 'defaultProviders',
|
||||||
|
|
||||||
// Analytics and telemetry
|
// Analytics and telemetry
|
||||||
ANALYTICS = 'analytics',
|
ANALYTICS = 'analytics',
|
||||||
|
|
||||||
// Web-specific automatic model selection from jan provider
|
// Web-specific automatic model selection from jan provider
|
||||||
WEB_AUTO_MODEL_SELECTION = 'webAutoModelSelection',
|
WEB_AUTO_MODEL_SELECTION = 'webAutoModelSelection',
|
||||||
|
|
||||||
// Model provider settings page management
|
// Model provider settings page management
|
||||||
MODEL_PROVIDER_SETTINGS = 'modelProviderSettings',
|
MODEL_PROVIDER_SETTINGS = 'modelProviderSettings',
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,8 @@
|
|||||||
import { Platform, PlatformFeature } from './types'
|
import { Platform, PlatformFeature } from './types'
|
||||||
|
|
||||||
declare const IS_WEB_APP: boolean
|
declare const IS_WEB_APP: boolean
|
||||||
|
declare const IS_IOS: boolean
|
||||||
|
declare const IS_ANDROID: boolean
|
||||||
|
|
||||||
export const isPlatformTauri = (): boolean => {
|
export const isPlatformTauri = (): boolean => {
|
||||||
if (typeof IS_WEB_APP === 'undefined') {
|
if (typeof IS_WEB_APP === 'undefined') {
|
||||||
@ -12,7 +14,21 @@ export const isPlatformTauri = (): boolean => {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const isPlatformIOS = (): boolean => {
|
||||||
|
return IS_IOS
|
||||||
|
}
|
||||||
|
|
||||||
|
export const isPlatformAndroid = (): boolean => {
|
||||||
|
return IS_ANDROID
|
||||||
|
}
|
||||||
|
|
||||||
|
export const isIOS = (): boolean => isPlatformIOS()
|
||||||
|
|
||||||
|
export const isAndroid = (): boolean => isPlatformAndroid()
|
||||||
|
|
||||||
export const getCurrentPlatform = (): Platform => {
|
export const getCurrentPlatform = (): Platform => {
|
||||||
|
if (isPlatformIOS()) return 'ios'
|
||||||
|
if (isPlatformAndroid()) return 'android'
|
||||||
return isPlatformTauri() ? 'tauri' : 'web'
|
return isPlatformTauri() ? 'tauri' : 'web'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -111,13 +111,17 @@ const AppLayout = () => {
|
|||||||
return (
|
return (
|
||||||
<Fragment>
|
<Fragment>
|
||||||
<AnalyticProvider />
|
<AnalyticProvider />
|
||||||
{PlatformFeatures[PlatformFeature.GOOGLE_ANALYTICS] && <GoogleAnalyticsProvider />}
|
{PlatformFeatures[PlatformFeature.GOOGLE_ANALYTICS] && (
|
||||||
|
<GoogleAnalyticsProvider />
|
||||||
|
)}
|
||||||
<KeyboardShortcutsProvider />
|
<KeyboardShortcutsProvider />
|
||||||
<main className="relative h-svh text-sm antialiased select-none bg-app">
|
<main className="relative h-svh text-sm antialiased select-none bg-app">
|
||||||
{/* Fake absolute panel top to enable window drag */}
|
{/* Fake absolute panel top to enable window drag */}
|
||||||
<div className="absolute w-full h-10 z-10" data-tauri-drag-region />
|
<div className="absolute w-full h-10 z-10" data-tauri-drag-region />
|
||||||
<DialogAppUpdater />
|
<DialogAppUpdater />
|
||||||
{PlatformFeatures[PlatformFeature.LOCAL_INFERENCE] && <BackendUpdater />}
|
{PlatformFeatures[PlatformFeature.LOCAL_INFERENCE] && (
|
||||||
|
<BackendUpdater />
|
||||||
|
)}
|
||||||
|
|
||||||
{/* Use ResizablePanelGroup only on larger screens */}
|
{/* Use ResizablePanelGroup only on larger screens */}
|
||||||
{!isSmallScreen && isLeftPanelOpen ? (
|
{!isSmallScreen && isLeftPanelOpen ? (
|
||||||
@ -158,11 +162,11 @@ const AppLayout = () => {
|
|||||||
{/* Main content panel */}
|
{/* Main content panel */}
|
||||||
<div
|
<div
|
||||||
className={cn(
|
className={cn(
|
||||||
'h-full flex w-full p-1 ',
|
'h-svh flex w-full md:p-1',
|
||||||
isLeftPanelOpen && 'w-full md:w-[calc(100%-198px)]'
|
isLeftPanelOpen && 'w-full md:w-[calc(100%-198px)]'
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
<div className="bg-main-view text-main-view-fg border border-main-view-fg/5 w-full rounded-lg overflow-hidden">
|
<div className="bg-main-view text-main-view-fg border border-main-view-fg/5 w-full md:rounded-lg overflow-hidden">
|
||||||
<Outlet />
|
<Outlet />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -57,35 +57,45 @@ function Index() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex h-full flex-col justify-center py-5">
|
<div className="flex h-full flex-col justify-center pb-[calc(env(safe-area-inset-bottom)+env(safe-area-inset-top))]">
|
||||||
<HeaderPage>
|
<HeaderPage>
|
||||||
{PlatformFeatures[PlatformFeature.ASSISTANTS] && <DropdownAssistant />}
|
{PlatformFeatures[PlatformFeature.ASSISTANTS] && <DropdownAssistant />}
|
||||||
</HeaderPage>
|
</HeaderPage>
|
||||||
<div className={cn(
|
<div
|
||||||
"h-full overflow-y-auto flex flex-col gap-2 justify-center px-3 sm:px-4 md:px-8 py-4 md:py-0",
|
className={cn(
|
||||||
)}>
|
'h-full overflow-y-auto flex flex-col gap-2 justify-center px-3 sm:px-4 md:px-8 py-4 md:py-0'
|
||||||
<div className={cn(
|
)}
|
||||||
"mx-auto",
|
>
|
||||||
// Full width on mobile, constrained on desktop
|
<div
|
||||||
isMobile ? "w-full max-w-full" : "w-full md:w-4/6"
|
className={cn(
|
||||||
)}>
|
'mx-auto',
|
||||||
<div className={cn(
|
// Full width on mobile, constrained on desktop
|
||||||
"text-center",
|
isMobile ? 'w-full max-w-full' : 'w-full md:w-4/6'
|
||||||
// Adjust spacing for mobile
|
)}
|
||||||
isMobile ? "mb-6" : "mb-8"
|
>
|
||||||
)}>
|
<div
|
||||||
<h1 className={cn(
|
className={cn(
|
||||||
"font-editorialnew text-main-view-fg",
|
'text-center',
|
||||||
// Responsive title size
|
// Adjust spacing for mobile
|
||||||
isMobile ? "text-2xl sm:text-3xl" : "text-4xl"
|
isMobile ? 'mb-6' : 'mb-8'
|
||||||
)}>
|
)}
|
||||||
|
>
|
||||||
|
<h1
|
||||||
|
className={cn(
|
||||||
|
'font-editorialnew text-main-view-fg',
|
||||||
|
// Responsive title size
|
||||||
|
isMobile ? 'text-2xl sm:text-3xl' : 'text-4xl'
|
||||||
|
)}
|
||||||
|
>
|
||||||
{t('chat:welcome')}
|
{t('chat:welcome')}
|
||||||
</h1>
|
</h1>
|
||||||
<p className={cn(
|
<p
|
||||||
"text-main-view-fg/70 mt-2",
|
className={cn(
|
||||||
// Responsive description size
|
'text-main-view-fg/70 mt-2',
|
||||||
isMobile ? "text-base" : "text-lg"
|
// Responsive description size
|
||||||
)}>
|
isMobile ? 'text-base' : 'text-lg'
|
||||||
|
)}
|
||||||
|
>
|
||||||
{t('chat:description')}
|
{t('chat:description')}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -31,7 +31,7 @@ function Appareances() {
|
|||||||
const { resetCodeBlockStyle } = useCodeblock()
|
const { resetCodeBlockStyle } = useCodeblock()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex flex-col h-full">
|
<div className="flex flex-col h-full pb-[calc(env(safe-area-inset-bottom)+env(safe-area-inset-top))]">
|
||||||
<HeaderPage>
|
<HeaderPage>
|
||||||
<h1 className="font-medium">{t('common:settings')}</h1>
|
<h1 className="font-medium">{t('common:settings')}</h1>
|
||||||
</HeaderPage>
|
</HeaderPage>
|
||||||
|
|||||||
@ -161,7 +161,7 @@ function General() {
|
|||||||
}, [t, checkForUpdate])
|
}, [t, checkForUpdate])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex flex-col h-full">
|
<div className="flex flex-col h-full pb-[calc(env(safe-area-inset-bottom)+env(safe-area-inset-top))]">
|
||||||
<HeaderPage>
|
<HeaderPage>
|
||||||
<h1 className="font-medium">{t('common:settings')}</h1>
|
<h1 className="font-medium">{t('common:settings')}</h1>
|
||||||
</HeaderPage>
|
</HeaderPage>
|
||||||
@ -181,28 +181,29 @@ function General() {
|
|||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
{!AUTO_UPDATER_DISABLED && PlatformFeatures[PlatformFeature.SYSTEM_INTEGRATIONS] && (
|
{!AUTO_UPDATER_DISABLED &&
|
||||||
<CardItem
|
PlatformFeatures[PlatformFeature.SYSTEM_INTEGRATIONS] && (
|
||||||
title={t('settings:general.checkForUpdates')}
|
<CardItem
|
||||||
description={t('settings:general.checkForUpdatesDesc')}
|
title={t('settings:general.checkForUpdates')}
|
||||||
className="flex-col sm:flex-row items-start sm:items-center sm:justify-between gap-y-2"
|
description={t('settings:general.checkForUpdatesDesc')}
|
||||||
actions={
|
className="flex-col sm:flex-row items-start sm:items-center sm:justify-between gap-y-2"
|
||||||
<Button
|
actions={
|
||||||
variant="link"
|
<Button
|
||||||
size="sm"
|
variant="link"
|
||||||
className="p-0"
|
size="sm"
|
||||||
onClick={handleCheckForUpdate}
|
className="p-0"
|
||||||
disabled={isCheckingUpdate}
|
onClick={handleCheckForUpdate}
|
||||||
>
|
disabled={isCheckingUpdate}
|
||||||
<div className="cursor-pointer rounded-sm hover:bg-main-view-fg/15 bg-main-view-fg/10 transition-all duration-200 ease-in-out px-2 py-1 gap-1">
|
>
|
||||||
{isCheckingUpdate
|
<div className="cursor-pointer rounded-sm hover:bg-main-view-fg/15 bg-main-view-fg/10 transition-all duration-200 ease-in-out px-2 py-1 gap-1">
|
||||||
? t('settings:general.checkingForUpdates')
|
{isCheckingUpdate
|
||||||
: t('settings:general.checkForUpdates')}
|
? t('settings:general.checkingForUpdates')
|
||||||
</div>
|
: t('settings:general.checkForUpdates')}
|
||||||
</Button>
|
</div>
|
||||||
}
|
</Button>
|
||||||
/>
|
}
|
||||||
)}
|
/>
|
||||||
|
)}
|
||||||
<CardItem
|
<CardItem
|
||||||
title={t('common:language')}
|
title={t('common:language')}
|
||||||
actions={<LanguageSwitcher />}
|
actions={<LanguageSwitcher />}
|
||||||
@ -211,165 +212,173 @@ function General() {
|
|||||||
|
|
||||||
{/* Data folder - Desktop only */}
|
{/* Data folder - Desktop only */}
|
||||||
{PlatformFeatures[PlatformFeature.SYSTEM_INTEGRATIONS] && (
|
{PlatformFeatures[PlatformFeature.SYSTEM_INTEGRATIONS] && (
|
||||||
<Card title={t('common:dataFolder')}>
|
<Card title={t('common:dataFolder')}>
|
||||||
<CardItem
|
<CardItem
|
||||||
title={t('settings:dataFolder.appData', {
|
title={t('settings:dataFolder.appData', {
|
||||||
ns: 'settings',
|
ns: 'settings',
|
||||||
})}
|
})}
|
||||||
align="start"
|
align="start"
|
||||||
className="flex-col sm:flex-row items-start sm:items-center sm:justify-between gap-y-2"
|
className="flex-col sm:flex-row items-start sm:items-center sm:justify-between gap-y-2"
|
||||||
description={
|
description={
|
||||||
<>
|
<>
|
||||||
<span>
|
<span>
|
||||||
{t('settings:dataFolder.appDataDesc', {
|
{t('settings:dataFolder.appDataDesc', {
|
||||||
ns: 'settings',
|
ns: 'settings',
|
||||||
})}
|
})}
|
||||||
|
|
||||||
</span>
|
</span>
|
||||||
<div className="flex items-center gap-2 mt-1 ">
|
<div className="flex items-center gap-2 mt-1 ">
|
||||||
<div className="">
|
<div className="">
|
||||||
<span
|
<span
|
||||||
title={janDataFolder}
|
title={janDataFolder}
|
||||||
className="bg-main-view-fg/10 text-xs px-1 py-0.5 rounded-sm text-main-view-fg/80 line-clamp-1 w-fit"
|
className="bg-main-view-fg/10 text-xs px-1 py-0.5 rounded-sm text-main-view-fg/80 line-clamp-1 w-fit"
|
||||||
|
>
|
||||||
|
{janDataFolder}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<button
|
||||||
|
onClick={() =>
|
||||||
|
janDataFolder && copyToClipboard(janDataFolder)
|
||||||
|
}
|
||||||
|
className="cursor-pointer flex items-center justify-center rounded hover:bg-main-view-fg/15 bg-main-view-fg/10 transition-all duration-200 ease-in-out p-1"
|
||||||
|
title={
|
||||||
|
isCopied
|
||||||
|
? t('settings:general.copied')
|
||||||
|
: t('settings:general.copyPath')
|
||||||
|
}
|
||||||
>
|
>
|
||||||
{janDataFolder}
|
{isCopied ? (
|
||||||
</span>
|
<div className="flex items-center gap-1">
|
||||||
|
<IconCopyCheck
|
||||||
|
size={12}
|
||||||
|
className="text-accent"
|
||||||
|
/>
|
||||||
|
<span className="text-xs leading-0">
|
||||||
|
{t('settings:general.copied')}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<IconCopy
|
||||||
|
size={12}
|
||||||
|
className="text-main-view-fg/50"
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<button
|
</>
|
||||||
onClick={() =>
|
}
|
||||||
janDataFolder && copyToClipboard(janDataFolder)
|
actions={
|
||||||
}
|
<>
|
||||||
className="cursor-pointer flex items-center justify-center rounded hover:bg-main-view-fg/15 bg-main-view-fg/10 transition-all duration-200 ease-in-out p-1"
|
<Button
|
||||||
title={
|
variant="link"
|
||||||
isCopied
|
size="sm"
|
||||||
? t('settings:general.copied')
|
className="p-0"
|
||||||
: t('settings:general.copyPath')
|
title={t('settings:dataFolder.appData')}
|
||||||
}
|
onClick={handleDataFolderChange}
|
||||||
>
|
>
|
||||||
{isCopied ? (
|
<div className="cursor-pointer flex items-center justify-center rounded-sm hover:bg-main-view-fg/15 bg-main-view-fg/10 transition-all duration-200 ease-in-out px-2 py-1 gap-1">
|
||||||
<div className="flex items-center gap-1">
|
<IconFolder
|
||||||
<IconCopyCheck size={12} className="text-accent" />
|
|
||||||
<span className="text-xs leading-0">
|
|
||||||
{t('settings:general.copied')}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
<IconCopy
|
|
||||||
size={12}
|
size={12}
|
||||||
className="text-main-view-fg/50"
|
className="text-main-view-fg/50"
|
||||||
/>
|
/>
|
||||||
)}
|
<span>{t('settings:general.changeLocation')}</span>
|
||||||
</button>
|
</div>
|
||||||
</div>
|
</Button>
|
||||||
</>
|
{selectedNewPath && (
|
||||||
}
|
<ChangeDataFolderLocation
|
||||||
actions={
|
currentPath={janDataFolder || ''}
|
||||||
<>
|
newPath={selectedNewPath}
|
||||||
<Button
|
onConfirm={confirmDataFolderChange}
|
||||||
variant="link"
|
open={isDialogOpen}
|
||||||
size="sm"
|
onOpenChange={(open) => {
|
||||||
className="p-0"
|
setIsDialogOpen(open)
|
||||||
title={t('settings:dataFolder.appData')}
|
if (!open) {
|
||||||
onClick={handleDataFolderChange}
|
setSelectedNewPath(null)
|
||||||
>
|
}
|
||||||
<div className="cursor-pointer flex items-center justify-center rounded-sm hover:bg-main-view-fg/15 bg-main-view-fg/10 transition-all duration-200 ease-in-out px-2 py-1 gap-1">
|
}}
|
||||||
<IconFolder
|
>
|
||||||
size={12}
|
<div />
|
||||||
className="text-main-view-fg/50"
|
</ChangeDataFolderLocation>
|
||||||
/>
|
)}
|
||||||
<span>{t('settings:general.changeLocation')}</span>
|
</>
|
||||||
</div>
|
}
|
||||||
</Button>
|
/>
|
||||||
{selectedNewPath && (
|
<CardItem
|
||||||
<ChangeDataFolderLocation
|
title={t('settings:dataFolder.appLogs', {
|
||||||
currentPath={janDataFolder || ''}
|
ns: 'settings',
|
||||||
newPath={selectedNewPath}
|
})}
|
||||||
onConfirm={confirmDataFolderChange}
|
description={t('settings:dataFolder.appLogsDesc')}
|
||||||
open={isDialogOpen}
|
className="flex-col sm:flex-row items-start sm:items-center sm:justify-between gap-y-2"
|
||||||
onOpenChange={(open) => {
|
actions={
|
||||||
setIsDialogOpen(open)
|
<div className="flex items-center gap-2">
|
||||||
if (!open) {
|
<Button
|
||||||
setSelectedNewPath(null)
|
variant="link"
|
||||||
|
size="sm"
|
||||||
|
className="p-0"
|
||||||
|
onClick={handleOpenLogs}
|
||||||
|
title={t('settings:dataFolder.appLogs')}
|
||||||
|
>
|
||||||
|
<div className="cursor-pointer flex items-center justify-center rounded-sm hover:bg-main-view-fg/15 bg-main-view-fg/10 transition-all duration-200 ease-in-out px-2 py-1 gap-1">
|
||||||
|
<IconLogs
|
||||||
|
size={12}
|
||||||
|
className="text-main-view-fg/50"
|
||||||
|
/>
|
||||||
|
<span>{t('settings:general.openLogs')}</span>
|
||||||
|
</div>
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
variant="link"
|
||||||
|
size="sm"
|
||||||
|
className="p-0"
|
||||||
|
onClick={async () => {
|
||||||
|
if (janDataFolder) {
|
||||||
|
try {
|
||||||
|
const logsPath = `${janDataFolder}/logs`
|
||||||
|
await serviceHub
|
||||||
|
.opener()
|
||||||
|
.revealItemInDir(logsPath)
|
||||||
|
} catch (error) {
|
||||||
|
console.error(
|
||||||
|
'Failed to reveal logs folder:',
|
||||||
|
error
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
|
title={t('settings:general.revealLogs')}
|
||||||
>
|
>
|
||||||
<div />
|
<div className="cursor-pointer flex items-center justify-center rounded-sm hover:bg-main-view-fg/15 bg-main-view-fg/10 transition-all duration-200 ease-in-out px-2 py-1 gap-1">
|
||||||
</ChangeDataFolderLocation>
|
<IconFolder
|
||||||
)}
|
size={12}
|
||||||
</>
|
className="text-main-view-fg/50"
|
||||||
}
|
/>
|
||||||
/>
|
<span>{openFileTitle()}</span>
|
||||||
<CardItem
|
</div>
|
||||||
title={t('settings:dataFolder.appLogs', {
|
</Button>
|
||||||
ns: 'settings',
|
</div>
|
||||||
})}
|
}
|
||||||
description={t('settings:dataFolder.appLogsDesc')}
|
/>
|
||||||
className="flex-col sm:flex-row items-start sm:items-center sm:justify-between gap-y-2"
|
</Card>
|
||||||
actions={
|
|
||||||
<div className="flex items-center gap-2">
|
|
||||||
<Button
|
|
||||||
variant="link"
|
|
||||||
size="sm"
|
|
||||||
className="p-0"
|
|
||||||
onClick={handleOpenLogs}
|
|
||||||
title={t('settings:dataFolder.appLogs')}
|
|
||||||
>
|
|
||||||
<div className="cursor-pointer flex items-center justify-center rounded-sm hover:bg-main-view-fg/15 bg-main-view-fg/10 transition-all duration-200 ease-in-out px-2 py-1 gap-1">
|
|
||||||
<IconLogs size={12} className="text-main-view-fg/50" />
|
|
||||||
<span>{t('settings:general.openLogs')}</span>
|
|
||||||
</div>
|
|
||||||
</Button>
|
|
||||||
<Button
|
|
||||||
variant="link"
|
|
||||||
size="sm"
|
|
||||||
className="p-0"
|
|
||||||
onClick={async () => {
|
|
||||||
if (janDataFolder) {
|
|
||||||
try {
|
|
||||||
const logsPath = `${janDataFolder}/logs`
|
|
||||||
await serviceHub.opener().revealItemInDir(logsPath)
|
|
||||||
} catch (error) {
|
|
||||||
console.error(
|
|
||||||
'Failed to reveal logs folder:',
|
|
||||||
error
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
title={t('settings:general.revealLogs')}
|
|
||||||
>
|
|
||||||
<div className="cursor-pointer flex items-center justify-center rounded-sm hover:bg-main-view-fg/15 bg-main-view-fg/10 transition-all duration-200 ease-in-out px-2 py-1 gap-1">
|
|
||||||
<IconFolder
|
|
||||||
size={12}
|
|
||||||
className="text-main-view-fg/50"
|
|
||||||
/>
|
|
||||||
<span>{openFileTitle()}</span>
|
|
||||||
</div>
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
</Card>
|
|
||||||
)}
|
)}
|
||||||
{/* Advanced - Desktop only */}
|
{/* Advanced - Desktop only */}
|
||||||
{PlatformFeatures[PlatformFeature.SYSTEM_INTEGRATIONS] && (
|
{PlatformFeatures[PlatformFeature.SYSTEM_INTEGRATIONS] && (
|
||||||
<Card title="Advanced">
|
<Card title="Advanced">
|
||||||
<CardItem
|
<CardItem
|
||||||
title={t('settings:others.resetFactory', {
|
title={t('settings:others.resetFactory', {
|
||||||
ns: 'settings',
|
ns: 'settings',
|
||||||
})}
|
})}
|
||||||
description={t('settings:others.resetFactoryDesc', {
|
description={t('settings:others.resetFactoryDesc', {
|
||||||
ns: 'settings',
|
ns: 'settings',
|
||||||
})}
|
})}
|
||||||
actions={
|
actions={
|
||||||
<FactoryResetDialog onReset={resetApp}>
|
<FactoryResetDialog onReset={resetApp}>
|
||||||
<Button variant="destructive" size="sm">
|
<Button variant="destructive" size="sm">
|
||||||
{t('common:reset')}
|
{t('common:reset')}
|
||||||
</Button>
|
</Button>
|
||||||
</FactoryResetDialog>
|
</FactoryResetDialog>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
</Card>
|
</Card>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{/* Other */}
|
{/* Other */}
|
||||||
|
|||||||
@ -443,7 +443,7 @@ function ProviderDetail() {
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Joyride
|
<Joyride
|
||||||
run={isSetup}
|
run={IS_IOS || IS_ANDROID ? false : isSetup}
|
||||||
floaterProps={{
|
floaterProps={{
|
||||||
hideArrow: true,
|
hideArrow: true,
|
||||||
}}
|
}}
|
||||||
@ -465,7 +465,7 @@ function ProviderDetail() {
|
|||||||
skip: t('providers:joyride.skip'),
|
skip: t('providers:joyride.skip'),
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<div className="flex flex-col h-full">
|
<div className="flex flex-col h-full pb-[calc(env(safe-area-inset-bottom)+env(safe-area-inset-top))]">
|
||||||
<HeaderPage>
|
<HeaderPage>
|
||||||
<h1 className="font-medium">{t('common:settings')}</h1>
|
<h1 className="font-medium">{t('common:settings')}</h1>
|
||||||
</HeaderPage>
|
</HeaderPage>
|
||||||
|
|||||||
@ -124,7 +124,7 @@ function ThreadDetail() {
|
|||||||
if (!messages || !threadModel) return null
|
if (!messages || !threadModel) return null
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex flex-col h-full">
|
<div className="flex flex-col h-[calc(100dvh-(env(safe-area-inset-bottom)+env(safe-area-inset-top)))]">
|
||||||
<HeaderPage>
|
<HeaderPage>
|
||||||
<div className="flex items-center justify-between w-full pr-2">
|
<div className="flex items-center justify-between w-full pr-2">
|
||||||
{PlatformFeatures[PlatformFeature.ASSISTANTS] && (
|
{PlatformFeatures[PlatformFeature.ASSISTANTS] && (
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user