Browse Source

Fix some issues

master
Daniel 2 months ago
parent
commit
20144d660d
6 changed files with 21 additions and 13 deletions
  1. +3
    -3
      .gitmodules
  2. +8
    -0
      Makefile
  3. +0
    -1
      backend/fbrp
  4. +1
    -0
      backend/haplous
  5. +1
    -1
      src/main/assets/ui
  6. +8
    -8
      src/main/java/MainActivity.java

+ 3
- 3
.gitmodules View File

@@ -1,9 +1,9 @@
[submodule "backend/fbrp"]
path = backend/fbrp
url = https://code.heb12.com/heb12/fbrp
[submodule "backend/biblec"]
path = backend/biblec
url = https://code.heb12.com/heb12/biblec
[submodule "src/main/assets/ui"]
path = src/main/assets/ui
url = https://github.com/heb12/ui
[submodule "backend/haplous"]
path = backend/haplous
url = https://code.heb12.com/heb12/haplous

+ 8
- 0
Makefile View File

@@ -6,6 +6,14 @@ gflag += --info
all:
export ANDROID_HOME=/usr/lib/android-sdk; sudo gradle build $(gflag)

adb:
adb uninstall com.heb12.android
adb install build/outputs/apk/debug/android-debug.apk
adb shell monkey -p 'com.heb12.android' -v 1

clean:
rm -rf .externalNativeBuild .gradle build

setup:
touch local.properties
echo 'sdk.dir=/usr/lib/android-sdk/' > local.properties


+ 0
- 1
backend/fbrp

@@ -1 +0,0 @@
Subproject commit d7d4160f45f4f7b5bdcfabc79623ce217556cdf5

+ 1
- 0
backend/haplous

@@ -0,0 +1 @@
Subproject commit ba7cd122d711d5c9ce9a6382ea8cedb3a30d0ba7

+ 1
- 1
src/main/assets/ui

@@ -1 +1 @@
Subproject commit f7f053c17ebf431296496b6455cb9c1d8f7c64a7
Subproject commit 2436ef2fef04da4f759aff03165c6e6ec4d48ad8

+ 8
- 8
src/main/java/MainActivity.java View File

@@ -15,14 +15,14 @@ public class MainActivity extends Activity {
public native String cloadTranslation(String indexLocation, String textLocation);
public native String[] cgetVerses(String ref);

@Override
public void onCreate(Bundle savedInstanceState) {
@Override
public void onCreate(Bundle savedInstanceState) {
// Don't want the ugly top bar
requestWindowFeature(Window.FEATURE_NO_TITLE);
requestWindowFeature(Window.FEATURE_NO_TITLE);

super.onCreate(savedInstanceState);
super.onCreate(savedInstanceState);

WebView webview = new WebView(this);
WebView webview = new WebView(this);
webview.setWebContentsDebuggingEnabled(true);

WebSettings settings = webview.getSettings();
@@ -31,13 +31,13 @@ public class MainActivity extends Activity {
settings.setDomStorageEnabled(true);
settings.setLoadWithOverviewMode(true);

webview.loadUrl("file:///android_asset/index.html");
webview.loadUrl("file:///android_asset/ui/output.html");
webview.addJavascriptInterface(new backend(), "b");

setContentView(webview);
setContentView(webview);

// Load web translation
}
}

public class backend {
@JavascriptInterface


Loading…
Cancel
Save