upd

HapticX · Sep 8, 2024 · f8c922a · f8c922a
1 parent e168cec
commit f8c922a
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 35 deletions.
diff --git a/src/happyx_native/android/tmpl/app/src/main/AndroidManifest.xml b/src/happyx_native/android/tmpl/app/src/main/AndroidManifest.xml
@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
     <application
         android:allowBackup="true"

diff --git a/tests/android_tests/android/app/build.gradle b/tests/android_tests/android/app/build.gradle
@@ -27,5 +27,5 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.android.material:material:1.10.0'
+    implementation "androidx.webkit:webkit:1.11.0"
 }
diff --git a/tests/android_tests/android/app/src/main/AndroidManifest.xml b/tests/android_tests/android/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
     <application
         android:allowBackup="true"
@@ -13,7 +14,6 @@
         android:usesCleartextTraffic="true"
         android:supportsRtl="true"
         android:networkSecurityConfig="@xml/network_security_config"
-        android:theme="@style/Theme.Tmpl"
         tools:targetApi="34">
         <activity
             android:name=".MainActivity"

diff --git a/tests/android_tests/android/app/src/main/java/com/hapticx/tmpl/MainActivity.java b/tests/android_tests/android/app/src/main/java/com/hapticx/tmpl/MainActivity.java
@@ -17,14 +17,14 @@ public class MainActivity extends Activity {
     protected void onCreate(Bundle s) {
         super.onCreate(s);
         setContentView(R.layout.activity_main);
-
+        getActionBar().hide();
         w = findViewById(R.id.webView);
 
         if (!paused) {
             new Thread(() -> Native.start(this)).start();
 
             Native n = new Native(this);
-            n.uiLoop();
+            new Thread(n::uiLoop).start();
         }
         setupWebView();
     }
@@ -45,10 +45,10 @@ public void onPageFinished(WebView v, String u) {
         ws.setDomStorageEnabled(true);
         ws.setBuiltInZoomControls(true);
         ws.setDisplayZoomControls(false);
-        ws.setSupportZoom(true);
+        ws.setSupportZoom(false);
         ws.setDefaultTextEncodingName("utf-8");
 
-        w.loadUrl("http://localhost:5123/");
+        w.loadUrl("http://localhost:15123/");
     }
 
     @Override

diff --git a/tests/android_tests/android/app/src/main/res/values-night/themes.xml b/tests/android_tests/android/app/src/main/res/values-night/themes.xml
@@ -1,16 +1,2 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.Tmpl" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
 </resources>
diff --git a/tests/android_tests/android/app/src/main/res/values/themes.xml b/tests/android_tests/android/app/src/main/res/values/themes.xml
@@ -1,16 +1,2 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.Tmpl" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
 </resources>