Merge pull request #2 from sdip15fa/dev

feat: use google play asset delivery
sdip15fa · Jan 27, 2024 · 748b5aa · 748b5aa
2 parents 4a3dbe8 + 5c18037
commit 748b5aa
Show file tree

Hide file tree

Showing 19 changed files with 86 additions and 244 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,12 +1,12 @@
 on:
   pull_request:
-      branches:
-        - master
-        - dev
+    branches:
+      - master
+      - dev
   push:
-      branches:
-        - master
-        - dev
+    branches:
+      - master
+      - dev
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -16,7 +16,7 @@ jobs:
         with:
           lfs: true
           submodules: "recursive"
-        
+
       - name: Set outputs
         id: vars
         run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
@@ -38,6 +38,9 @@ jobs:
 
       - name: create build directory
         run: mkdir build
+
+      - name: 🚀 Build aab
+        run: NODE_OPTIONS=--max_old_space_size=4096 eas build --local --non-interactive --platform android --profile aab --output build/${{ steps.vars.outputs.sha_short }}.aab
 
       - name: 🚀 Build app (android production)
         run: eas build --local --non-interactive --platform android --profile production --output build/${{ steps.vars.outputs.sha_short }}.production.apk
@@ -49,8 +52,13 @@ jobs:
         with:
           name: android production apk
           path: build/${{ steps.vars.outputs.sha_short }}.production.apk # or path/to/artifact
-          
+
       - uses: actions/upload-artifact@v4
         with:
           name: android development apk
           path: build/${{ steps.vars.outputs.sha_short }}.development.apk # or path/to/artifact
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: android app bundle
+          path: build/${{ steps.vars.outputs.sha_short }}.aab # or path/to/artifact
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -86,14 +86,4 @@ jobs:
           asset_path: build/v${{ env.RELEASE_VERSION }}.aab
           asset_name: v${{ env.RELEASE_VERSION }}.aab
           asset_content_type: application/x-authorware-bin
-
-      - name: Upload obb
-        id: upload-obb
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: assets/models/models.zip
-          asset_name: main.1.me.wcyat.safecantonese.ai.obb
-          asset_content_type: application/zip
+
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "assets/models"]
-	path = assets/models
+	path = android/models_asset_pack/src/main/assets/models
 	url = https://huggingface.co/safecantonese/ggml-models
diff --git a/README.md b/README.md
@@ -21,10 +21,6 @@ yarn install
 eas build --platform android --profile production --local
 ```
 
-### OBB
-
-The app utilizes obb to store model files. The zip file can be found in `assets/models/models.zip`. Please rename it to main.1.me.wcyat.safecantonese.ai.obb and place it in `/storage/emulated/0/Android/obb/me.wcyat.safecantoneseai/`.
-
 ## Support
 
 [telegram group](https://t.me/safecantoneseai)

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -86,8 +86,8 @@ android {
         applicationId 'me.wcyat.safecantoneseai'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.5.0"
+        versionCode 1610
+        versionName "1.6.1"
 
         buildConfigField("boolean", "REACT_NATIVE_UNSTABLE_USE_RUNTIME_SCHEDULER_ALWAYS", (findProperty("reactNative.unstable_useRuntimeSchedulerAlways") ?: true).toString())
     }
@@ -117,6 +117,7 @@ android {
 
         }
     }
+    assetPacks = [":models_asset_pack"]
 }
 
 // Apply static values from `gradle.properties` to the `android.packagingOptions`

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
       <data android:scheme="https"/>
     </intent>
   </queries>
-  <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme" android:requestLegacyExternalStorage="true">
+  <application android:name=".MainApplication" android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:allowBackup="true" android:theme="@style/AppTheme">
     <meta-data android:name="expo.modules.updates.ENABLED" android:value="false"/>
     <meta-data android:name="expo.modules.updates.EXPO_SDK_VERSION" android:value="49.0.0"/>
     <meta-data android:name="expo.modules.updates.EXPO_UPDATES_CHECK_ON_LAUNCH" android:value="ALWAYS"/>

diff --git a/android/models_asset_pack/build.gradle b/android/models_asset_pack/build.gradle
@@ -0,0 +1,11 @@
+// In the asset pack’s build.gradle file:
+plugins {
+  id 'com.android.asset-pack'
+}
+
+assetPack {
+    packName = "models_asset_pack" // Directory name for the asset pack
+    dynamicDelivery {
+        deliveryType = "install-time"
+    }
+}
diff --git a/android/models_asset_pack/src/main/assets/models b/android/models_asset_pack/src/main/assets/models
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -12,3 +12,4 @@ includeBuild(new File(["node", "--print", "require.resolve('@react-native/gradle
 include ':react-native-share-menu', ':app'
 project(':react-native-share-menu').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-share-menu/android')
 
+include ':models_asset_pack'
diff --git a/app.json b/app.json
@@ -4,7 +4,7 @@
     "name": "safecantonese.ai",
     "slug": "safecantonese-ai",
     "scheme": "me.wcyat.safecantoneseai",
-    "version": "1.5.0",
+    "version": "1.6.1",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "userInterfaceStyle": "light",

diff --git a/app/_layout.tsx b/app/_layout.tsx
@@ -7,7 +7,9 @@ import AppContextProvider from "../context/AppContext";
 import RootContextProvider from "../context/RootContext";
 import TipProvider from "react-native-tip";
 import LicenseScreen from "../components/LicenseScreen";
-import ExtractModelsScreen from "../components/ExtractModelsScreen";
+import { LogBox } from 'react-native';
+
+LogBox.ignoreLogs(['new NativeEventEmitter']); // Ignore log notification by message
 
 export default function Layout() {
   const router = useRouter();
@@ -24,50 +26,46 @@ export default function Layout() {
     <LicenseScreen>
       <RootContextProvider>
         <AppContextProvider>
-
-            <ExtractModelsScreen>
-              <TipProvider statusBarTranslucent />
-              <Tabs
-                screenOptions={{
-                  headerTintColor: "purple",
-                }}
-              >
-                <Tabs.Screen
-                  name="index"
-                  options={{
-                    headerTitle: "Home - safecantonese.ai",
-                    title: "Home",
-                    tabBarIcon: (props) => <Icon name="home" {...props} />,
-                  }}
-                />
-                <Tabs.Screen
-                  name="history"
-                  options={{
-                    headerTitle: "History - safecantonese.ai",
-                    title: "History",
-                    tabBarIcon: (props) => <Icon name="history" {...props} />,
-                  }}
-                />
-                <Tabs.Screen
-                  name="models"
-                  options={{
-                    headerTitle: "Models - safecantonese.ai",
-                    title: "Models",
-                    tabBarIcon: (props) => <Icon name="gears" {...props} />,
-                  }}
-                />
-                <Tabs.Screen
-                  name="about"
-                  options={{
-                    // This tab will no longer show up in the tab bar.
-                    headerTitle: "About - safecantonese.ai",
-                    title: "About",
-                    tabBarIcon: (props) => <Icon name="info" {...props} />,
-                  }}
-                />
-              </Tabs>
-            </ExtractModelsScreen>
-
+          <TipProvider statusBarTranslucent />
+          <Tabs
+            screenOptions={{
+              headerTintColor: "purple",
+            }}
+          >
+            <Tabs.Screen
+              name="index"
+              options={{
+                headerTitle: "Home - safecantonese.ai",
+                title: "Home",
+                tabBarIcon: (props) => <Icon name="home" {...props} />,
+              }}
+            />
+            <Tabs.Screen
+              name="history"
+              options={{
+                headerTitle: "History - safecantonese.ai",
+                title: "History",
+                tabBarIcon: (props) => <Icon name="history" {...props} />,
+              }}
+            />
+            <Tabs.Screen
+              name="models"
+              options={{
+                headerTitle: "Models - safecantonese.ai",
+                title: "Models",
+                tabBarIcon: (props) => <Icon name="gears" {...props} />,
+              }}
+            />
+            <Tabs.Screen
+              name="about"
+              options={{
+                // This tab will no longer show up in the tab bar.
+                headerTitle: "About - safecantonese.ai",
+                title: "About",
+                tabBarIcon: (props) => <Icon name="info" {...props} />,
+              }}
+            />
+          </Tabs>
         </AppContextProvider>
       </RootContextProvider>
     </LicenseScreen>

diff --git a/app/about.tsx b/app/about.tsx
@@ -49,11 +49,11 @@ export default function Page() {
             style={{ color: "blue", margin: 5 }}
             onPress={() =>
               Linking.openURL(
-                "https://github.com/sdip15fa/safecantonese.ai.app/releases/tag/1.5.0"
+                "https://github.com/sdip15fa/safecantonese.ai.app/releases/tag/1.6.1"
               )
             }
           >
-            1.5.0
+            1.6.1
           </Text>
           <Text text40 style={{ margin: 5 }}>
             Source Code
@@ -78,7 +78,7 @@ export default function Page() {
             style={{ color: "blue", margin: 5 }}
             onPress={() =>
               Linking.openURL(
-                "https://github.com/sdip15fa/safecantonese.ai.app/blob/1.5.0/LICENSE.md"
+                "https://github.com/sdip15fa/safecantonese.ai.app/blob/1.6.1/LICENSE.md"
               )
             }
           >
@@ -88,7 +88,7 @@ export default function Page() {
           style={{ color: "blue", margin: 5 }}
             onPress={() => {
               Linking.openURL(
-                "https://github.com/sdip15fa/safecantonese.ai.app/blob/1.5.0/third-party-licenses.txt"
+                "https://github.com/sdip15fa/safecantonese.ai.app/blob/1.6.1/third-party-licenses.txt"
               );
             }}
           >

diff --git a/assets/models b/assets/models
diff --git a/components/ExtractModelsScreen.tsx b/components/ExtractModelsScreen.tsx
diff --git a/context/AppContext.tsx b/context/AppContext.tsx
@@ -5,7 +5,6 @@ import { Model } from "../hooks/useModels";
 import useShareIntent from "../hooks/useShareIntent";
 import { RootContext } from "./RootContext";
 import { useTranscribe } from "../hooks/useTranscribe";
-import useObb, { OBB } from "../hooks/useObb";
 
 interface AppContextInterface {
   history: {
@@ -34,7 +33,6 @@ interface AppContextInterface {
     mimetype: string | null;
     extraData?: object;
   };
-  obb: OBB[];
 }
 
 export const AppContext = createContext<AppContextInterface>(
@@ -48,15 +46,13 @@ export default function AppContextProvider(props: {
   const { models } = useContext(RootContext);
   const transcribe = useTranscribe();
   const { history } = useContext(RootContext);
-  const obb = useObb();
   return (
     <AppContext.Provider
       value={{
         shareIntent,
         models,
         history,
         transcribe,
-        obb
       }}
     >
       {props.children}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,4 @@ includeBuild(new File(["node", "--print", "require.resolve('@react-native/gradle
		include ':react-native-share-menu', ':app'
		project(':react-native-share-menu').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-share-menu/android')

		include ':models_asset_pack'