Merge remote-tracking branch 'origin/main'

Akylas · Jan 9, 2025 · 19c446f · 19c446f
2 parents c5fa05f + a347966
commit 19c446f
Show file tree

Hide file tree

Showing 3 changed files with 1,052 additions and 1,032 deletions.
diff --git a/app/components/settings/Settings.svelte b/app/components/settings/Settings.svelte
@@ -953,7 +953,7 @@
             android:paddingBottom={windowInsetBottom + bottomOffset}>
             <Template key="header" let:item>
                 <gridlayout rows="auto,auto">
-                    {#if __ANDROID__}
+                    {#if __ANDROID__ || inAppAvailable}
                         <gridlayout columns="*,auto,auto" margin="10 16 0 16">
                             <stacklayout
                                 backgroundColor="#ea4bae"
@@ -966,16 +966,24 @@
                                 <label color="white" fontFamily={$fonts.mdi} fontSize={26} marginRight={10} text="mdi-heart" verticalAlignment="center" />
                                 <label color="white" fontSize={12} text={item.title} textWrap={true} verticalAlignment="center" />
                             </stacklayout>
-                            <image
-                                borderRadius={6}
-                                col={1}
-                                height={40}
-                                margin="0 10 0 10"
-                                rippleColor="white"
-                                src="~/assets/images/librepay.png"
-                                verticalAlignment="center"
-                                on:tap={(event) => onTap({ id: 'sponsor', type: 'librepay' }, event)} />
-                            <image borderRadius={6} col={2} height={40} rippleColor="#f96754" src="~/assets/images/patreon.png" on:tap={(event) => onTap({ id: 'sponsor', type: 'patreon' }, event)} />
+                            {#if __ANDROID__}
+                                <image
+                                    borderRadius={6}
+                                    col={1}
+                                    height={40}
+                                    margin="0 10 0 10"
+                                    rippleColor="white"
+                                    src="~/assets/images/librepay.png"
+                                    verticalAlignment="center"
+                                    on:tap={(event) => onTap({ id: 'sponsor', type: 'librepay' }, event)} />
+                                <image
+                                    borderRadius={6}
+                                    col={2}
+                                    height={40}
+                                    rippleColor="#f96754"
+                                    src="~/assets/images/patreon.png"
+                                    on:tap={(event) => onTap({ id: 'sponsor', type: 'patreon' }, event)} />
+                            {/if}
                         </gridlayout>
                     {/if}
 

diff --git a/app/i18n/en.json b/app/i18n/en.json
@@ -66,6 +66,18 @@
     "import_settings": "import settings",
     "import_settings_desc": "import all settings from a previous backup",
     "importing": "importing",
+    "inapp": {
+        "bigtip": "a very nice donation",
+        "bigtip_desc": "new features are coming!",
+        "largertip": "a pint",
+        "largertip_desc": "ideas are going to flow!",
+        "largetip": "a beer",
+        "largetip_desc": "chill out and go back to work!",
+        "mediumtip": "a big coffee",
+        "mediumtip_desc": "my eyes are open!",
+        "smalltip": "a coffee",
+        "smalltip_desc": "everything helps to work at night!"
+    },
     "inverse_images": "inverse images colors",
     "inverse_images_desc": "can make images render better on eink devices",
     "ios": {