Update version, gemini models, and new progress dialoge, and charxjpeg

kwaroran · Feb 6, 2025 · 1b171ca · 1b171ca
1 parent 0242fd2
commit 1b171ca
Show file tree

Hide file tree

Showing 18 changed files with 231 additions and 82 deletions.
diff --git a/package.json b/package.json
@@ -91,6 +91,7 @@
   "devDependencies": {
     "@capacitor/assets": "^3.0.4",
     "@capacitor/cli": "^5.6.0",
+    "@rollup/plugin-strip": "^3.0.4",
     "@sveltejs/vite-plugin-svelte": "^4.0.0",
     "@swc/core": "1.5.7",
     "@tailwindcss/typography": "^0.5.10",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -29,7 +29,7 @@
   },
   "productName": "RisuAI",
   "mainBinaryName": "RisuAI",
-  "version": "149.0.0",
+  "version": "149.1.0",
   "identifier": "co.aiclient.risu",
   "plugins": {
     "updater": {

diff --git a/src/App.svelte b/src/App.svelte
@@ -18,7 +18,6 @@
     import MobileFooter from './lib/Mobile/MobileFooter.svelte';
     import CustomGUISettingMenu from './lib/Setting/Pages/CustomGUISettingMenu.svelte';
     import { checkCharOrder } from './ts/globalApi.svelte';
-    import Googli from './lib/UI/Googli.svelte';
 
   
     let didFirstSetup: boolean  = $derived(DBState.db?.didFirstSetup)
@@ -51,9 +50,6 @@
             </div>
 
             <span class="text-sm mt-2 text-textcolor2">{LoadingStatusState.text}</span>
-
-            <Googli className="mt-4" />
-
         </div>
     {:else if $CustomGUISettingMenuStore}
         <CustomGUISettingMenu />

diff --git a/src/lib/Others/AlertComp.svelte b/src/lib/Others/AlertComp.svelte
@@ -25,6 +25,7 @@
     import { getCurrentCharacter } from "src/ts/storage/database.svelte";
     import { message } from "@tauri-apps/plugin-dialog";
     import HypaV3Modal from './HypaV3Modal.svelte';
+  import Googli from "../UI/Googli.svelte";
     let btn
     let input = $state('')
     let cardExportType = $state('realm')
@@ -107,10 +108,22 @@
                 }}>Terms of Service</a> to continue</div>
             {:else if $alertStore.type !== 'select' && $alertStore.type !== 'requestdata' && $alertStore.type !== 'addchar' && $alertStore.type !== 'hypaV2' && $alertStore.type !== 'chatOptions'}
                 <span class="text-gray-300">{$alertStore.msg}</span>
-                {#if $alertStore.submsg}
+                {#if $alertStore.submsg && $alertStore.type !== 'progress'}
                     <span class="text-gray-500 text-sm">{$alertStore.submsg}</span>
                 {/if}
             {/if}
+            {#if $alertStore.type === 'progress'}
+                <div class="w-full min-w-64 md:min-w-138 h-2 bg-darkbg border border-darkborderc rounded-md mt-6">
+                    <div class="h-full bg-gradient-to-r from-blue-500 to-purple-800 saving-animation transition-[width]" style:width={$alertStore.submsg + '%'}></div>
+                </div>
+                <div class="w-full flex justify-center mt-6">
+                    <span class="text-gray-500 text-sm">{$alertStore.submsg + '%'}</span>
+                </div>
+                <div class="w-full flex justify-center">
+                    <Googli className="mt-14" />                    
+                </div>
+            {/if}
+
             {#if $alertStore.type === 'ask'}
                 <div class="flex gap-2 w-full">
                     <Button className="mt-4 flex-grow" onclick={() => {

diff --git a/src/lib/Others/SavePopupIcon.svelte b/src/lib/Others/SavePopupIcon.svelte
@@ -20,23 +20,4 @@
   }}>
       <AlertOctagon size={24} />
   </button>
-{/if}
-
-<style>
-  .saving-animation {
-    animation: saving-anime 1s infinite;
-    background-size: 200% auto;
-  }
-
-  @keyframes saving-anime {
-    0% {
-      background-position: 0 0;
-    }
-    50% {
-      background-position: 100% 100%;
-    }
-    100% {
-      background-position: 0 0;
-    }
-  }
-</style>
+{/if}
diff --git a/src/lib/UI/Googli.svelte b/src/lib/UI/Googli.svelte
@@ -1,27 +1,43 @@
 <script lang="ts">
     import { onMount } from "svelte";
 
-    export let className: string = "";
+    interface Props {
+        className?: string;
+    } 
+
+    let { className = $bindable() }:Props = $props();
+
     onMount(() => {
         if(!import.meta.env.VITE_AD_CLIENT){
             return
         }
-        //@ts-ignore
-        (window.adsbygoogle = window.adsbygoogle || []).push({});
+        try{
+            //@ts-ignore
+            (window.adsbygoogle = window.adsbygoogle || []).push({});
+        }catch{}
     });
 </script>
 
-{#if !import.meta.env.VITE_AD_CLIENT}
-    <div
-        class={className}
-    >
-        <ins
-            class="adsbygoogle"
-            style="display:block"
-            data-ad-client={import.meta.env.VITE_AD_CLIENT}
-            data-ad-slot={import.meta.env.VITE_AD_SLOT}
-            data-ad-format="auto"
-            data-full-width-responsive="true"
-        ></ins>
-    </div>
+{#if import.meta.env.VITE_AD_CLIENT}
+    {#if import.meta.env.VITE_AD_CLIENT === 'TEST'}
+        <div
+            class={className}
+        >
+            <div
+                class="bg-slate-500"
+                style={window.innerWidth > 728 ? "display:block !important;width:728px;height:90px" : "display:block !important;width:300px;height:100px"}
+            >TEST</div>
+        </div>
+    {:else}
+        <div
+            class={className}
+        >
+            <ins
+                class="adsbygoogle"
+                style={window.innerWidth > 728 ? "display:block !important;width:728px;height:90px" : "display:block !important;width:300px;height:100px"}
+                data-ad-client={window.innerWidth > 728 ? import.meta.env.VITE_AD_CLIENT : import.meta.env.VITE_AD_CLIENT_MOBILE}
+                data-ad-slot={window.innerWidth > 728 ? import.meta.env.VITE_AD_SLOT : import.meta.env.VITE_AD_SLOT_MOBILE}
+            ></ins>
+        </div>
+    {/if}
 {/if}
diff --git a/src/lib/UI/Realm/RealmPopUp.svelte b/src/lib/UI/Realm/RealmPopUp.svelte
@@ -8,6 +8,7 @@
     import RealmLicense from "./RealmLicense.svelte";
     import MultiLangDisplay from "../GUI/MultiLangDisplay.svelte";
     import { tooltip } from "src/ts/gui/tooltip";
+  import Googli from "../Googli.svelte";
 
     interface Props {
         openedData: hubType;
@@ -50,6 +51,7 @@
                 <span class="text-textcolor2" use:tooltip={language.popularityLevelDesc}>
                     {language.popularityLevel.replace('{}', openedData.download.toString())}
                 </span>
+
                 <div class="border-l-selected border-l ml-1 mr-1"></div>
                 {#if openedData.hasEmotion}
                     <button class="text-textcolor2 hover:text-green-500 transition-colors" onclick={((e) => {
@@ -69,6 +71,9 @@
             </div>
 
         </div>
+
+        <Googli />
+
         <div class="flex flex-row-reverse gap-2">
             <button class="text-textcolor2 hover:text-red-500" onclick={(async (e) => {
                 e.stopPropagation()

diff --git a/src/styles.css b/src/styles.css
@@ -272,6 +272,23 @@ html, body{
   z-index: 100;
 }
 
+.saving-animation {
+  animation: saving-anime 1s infinite;
+  background-size: 200% auto;
+}
+
+@keyframes saving-anime {
+  0% {
+    background-position: 0 0;
+  }
+  50% {
+    background-position: 100% 100%;
+  }
+  100% {
+    background-position: 0 0;
+  }
+}
+
 .flexium{
   display: flex;
   flex-direction: row;

diff --git a/src/ts/alert.ts b/src/ts/alert.ts
@@ -10,7 +10,7 @@ export interface alertData{
     type: 'error'|'normal'|'none'|'ask'|'wait'|'selectChar'
             |'input'|'toast'|'wait2'|'markdown'|'select'|'login'
             |'tos'|'cardexport'|'requestdata'|'addchar'|'hypaV2'|'selectModule'
-            |'chatOptions'|'pukmakkurit'|'branches'|'hypaV3',
+            |'chatOptions'|'pukmakkurit'|'branches'|'hypaV3'|'progress',
     msg: string,
     submsg?: string
 }