From baf9f48fe9c90799722aac718758f42c0da9fee9 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 11 Nov 2022 16:31:56 -0500
Subject: [PATCH] Replace the Android Studio demo app with the Chaquopy demo
app
Just a few build script customizations to make it build in the flake
environment
---
app/app/.gitignore | 5 +-
app/app/build.gradle | 130 ++++--
app/app/proguard-rules.pro | 31 +-
.../privatestorage/ExampleInstrumentedTest.kt | 24 --
app/app/src/main/AndroidManifest.xml | 48 ++-
.../chaquo/python/demo/JavaDemoActivity.java | 63 +++
.../chaquo/python/demo/JavaTestActivity.java | 98 +++++
.../python/demo/TestAndroidReflect.java | 21 +
.../example/privatestorage/FirstFragment.kt | 44 --
.../example/privatestorage/MainActivity.kt | 58 ---
.../example/privatestorage/SecondFragment.kt | 44 --
app/app/src/main/python/chaquopy/__init__.py | 0
.../src/main/python/chaquopy/demo/__init__.py | 0
.../src/main/python/chaquopy/demo/ui_demo.py | 136 ++++++
app/app/src/main/python/main.py | 14 -
.../drawable-v24/ic_launcher_foreground.xml | 30 --
.../res/drawable/ic_launcher_background.xml | 170 --------
.../main/res/layout/activity_java_demo.xml | 41 ++
app/app/src/main/res/layout/activity_main.xml | 34 --
app/app/src/main/res/layout/content_main.xml | 19 -
.../src/main/res/layout/fragment_first.xml | 28 --
.../src/main/res/layout/fragment_second.xml | 27 --
app/app/src/main/res/menu/menu_main.xml | 10 -
app/app/src/main/res/menu/view_source.xml | 9 +
.../res/mipmap-anydpi-v26/ic_launcher.xml | 5 -
.../mipmap-anydpi-v26/ic_launcher_round.xml | 5 -
.../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 1404 -> 0 bytes
.../res/mipmap-hdpi/ic_launcher_round.webp | Bin 2898 -> 0 bytes
.../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 982 -> 0 bytes
.../res/mipmap-mdpi/ic_launcher_round.webp | Bin 1772 -> 0 bytes
.../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 1900 -> 0 bytes
.../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 3918 -> 0 bytes
.../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 2884 -> 0 bytes
.../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 5914 -> 0 bytes
.../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 3844 -> 0 bytes
.../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 7778 -> 0 bytes
app/app/src/main/res/navigation/nav_graph.xml | 28 --
app/app/src/main/res/raw/sound.ogg | Bin 0 -> 13247 bytes
app/app/src/main/res/values-land/dimens.xml | 3 -
app/app/src/main/res/values-night/themes.xml | 16 -
.../src/main/res/values-w1240dp/dimens.xml | 3 -
app/app/src/main/res/values-w600dp/dimens.xml | 3 -
app/app/src/main/res/values/colors.xml | 12 +-
app/app/src/main/res/values/dimens.xml | 3 -
app/app/src/main/res/values/strings.xml | 43 +-
app/app/src/main/res/values/themes.xml | 25 --
app/app/src/main/res/xml/activity_main.xml | 30 ++
app/app/src/main/res/xml/activity_ui_demo.xml | 10 +
app/app/src/main/res/xml/backup_rules.xml | 13 -
.../main/res/xml/data_extraction_rules.xml | 19 -
.../python/utils/BufferedLiveEventTest.java | 91 ++++
.../example/privatestorage/ExampleUnitTest.kt | 17 -
.../java/com/chaquo/python/utils/App.java | 20 +
.../python/utils/BufferedLiveEvent.java | 45 ++
.../chaquo/python/utils/ConsoleActivity.java | 398 ++++++++++++++++++
.../com/chaquo/python/utils/MainActivity.java | 40 ++
.../python/utils/PythonConsoleActivity.java | 118 ++++++
.../python/utils/PythonTestActivity.java | 34 ++
.../com/chaquo/python/utils/ReplActivity.java | 40 ++
.../chaquo/python/utils/SingleLiveEvent.java | 88 ++++
.../java/com/chaquo/python/utils/Utils.java | 14 +
app/app/src/utils/python/chaquopy/__init__.py | 0
.../utils/python/chaquopy/utils/__init__.py | 0
.../utils/python/chaquopy/utils/console.py | 103 +++++
.../src/utils/python/chaquopy/utils/repl.py | 18 +
.../utils/res/drawable-hdpi/ic_launcher.png | Bin 0 -> 3902 bytes
.../ic_vertical_align_bottom.png | Bin 0 -> 252 bytes
.../drawable-hdpi/ic_vertical_align_top.png | Bin 0 -> 252 bytes
.../utils/res/drawable-mdpi/ic_launcher.png | Bin 0 -> 2540 bytes
.../ic_vertical_align_bottom.png | Bin 0 -> 179 bytes
.../drawable-mdpi/ic_vertical_align_top.png | Bin 0 -> 174 bytes
.../utils/res/drawable-xhdpi/ic_launcher.png | Bin 0 -> 5626 bytes
.../ic_vertical_align_bottom.png | Bin 0 -> 248 bytes
.../drawable-xhdpi/ic_vertical_align_top.png | Bin 0 -> 246 bytes
.../utils/res/drawable-xxhdpi/ic_launcher.png | Bin 0 -> 8876 bytes
.../ic_vertical_align_bottom.png | Bin 0 -> 392 bytes
.../drawable-xxhdpi/ic_vertical_align_top.png | Bin 0 -> 399 bytes
.../utils/res/layout-land/activity_menu.xml | 55 +++
.../src/utils/res/layout/activity_console.xml | 53 +++
.../src/utils/res/layout/activity_menu.xml | 59 +++
app/app/src/utils/res/menu/top_bottom.xml | 14 +
.../utils/res/values-sw360dp-v13/support.xml | 8 +
app/app/src/utils/res/values/console.xml | 29 ++
app/app/src/utils/res/values/utils.xml | 22 +
84 files changed, 1849 insertions(+), 719 deletions(-)
delete mode 100644 app/app/src/androidTest/java/com/example/privatestorage/ExampleInstrumentedTest.kt
create mode 100644 app/app/src/main/java/com/chaquo/python/demo/JavaDemoActivity.java
create mode 100644 app/app/src/main/java/com/chaquo/python/demo/JavaTestActivity.java
create mode 100644 app/app/src/main/java/com/chaquo/python/demo/TestAndroidReflect.java
delete mode 100644 app/app/src/main/java/com/example/privatestorage/FirstFragment.kt
delete mode 100644 app/app/src/main/java/com/example/privatestorage/MainActivity.kt
delete mode 100644 app/app/src/main/java/com/example/privatestorage/SecondFragment.kt
create mode 100644 app/app/src/main/python/chaquopy/__init__.py
create mode 100644 app/app/src/main/python/chaquopy/demo/__init__.py
create mode 100644 app/app/src/main/python/chaquopy/demo/ui_demo.py
delete mode 100644 app/app/src/main/python/main.py
delete mode 100644 app/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
delete mode 100644 app/app/src/main/res/drawable/ic_launcher_background.xml
create mode 100644 app/app/src/main/res/layout/activity_java_demo.xml
delete mode 100644 app/app/src/main/res/layout/activity_main.xml
delete mode 100644 app/app/src/main/res/layout/content_main.xml
delete mode 100644 app/app/src/main/res/layout/fragment_first.xml
delete mode 100644 app/app/src/main/res/layout/fragment_second.xml
delete mode 100644 app/app/src/main/res/menu/menu_main.xml
create mode 100644 app/app/src/main/res/menu/view_source.xml
delete mode 100644 app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
delete mode 100644 app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
delete mode 100644 app/app/src/main/res/mipmap-hdpi/ic_launcher.webp
delete mode 100644 app/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
delete mode 100644 app/app/src/main/res/mipmap-mdpi/ic_launcher.webp
delete mode 100644 app/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
delete mode 100644 app/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
delete mode 100644 app/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
delete mode 100644 app/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
delete mode 100644 app/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
delete mode 100644 app/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
delete mode 100644 app/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
delete mode 100644 app/app/src/main/res/navigation/nav_graph.xml
create mode 100644 app/app/src/main/res/raw/sound.ogg
delete mode 100644 app/app/src/main/res/values-land/dimens.xml
delete mode 100644 app/app/src/main/res/values-night/themes.xml
delete mode 100644 app/app/src/main/res/values-w1240dp/dimens.xml
delete mode 100644 app/app/src/main/res/values-w600dp/dimens.xml
delete mode 100644 app/app/src/main/res/values/dimens.xml
delete mode 100644 app/app/src/main/res/values/themes.xml
create mode 100644 app/app/src/main/res/xml/activity_main.xml
create mode 100644 app/app/src/main/res/xml/activity_ui_demo.xml
delete mode 100644 app/app/src/main/res/xml/backup_rules.xml
delete mode 100644 app/app/src/main/res/xml/data_extraction_rules.xml
create mode 100644 app/app/src/test/java/com/chaquo/python/utils/BufferedLiveEventTest.java
delete mode 100644 app/app/src/test/java/com/example/privatestorage/ExampleUnitTest.kt
create mode 100644 app/app/src/utils/java/com/chaquo/python/utils/App.java
create mode 100644 app/app/src/utils/java/com/chaquo/python/utils/BufferedLiveEvent.java
create mode 100644 app/app/src/utils/java/com/chaquo/python/utils/ConsoleActivity.java
create mode 100644 app/app/src/utils/java/com/chaquo/python/utils/MainActivity.java
create mode 100644 app/app/src/utils/java/com/chaquo/python/utils/PythonConsoleActivity.java
create mode 100644 app/app/src/utils/java/com/chaquo/python/utils/PythonTestActivity.java
create mode 100644 app/app/src/utils/java/com/chaquo/python/utils/ReplActivity.java
create mode 100644 app/app/src/utils/java/com/chaquo/python/utils/SingleLiveEvent.java
create mode 100644 app/app/src/utils/java/com/chaquo/python/utils/Utils.java
create mode 100644 app/app/src/utils/python/chaquopy/__init__.py
create mode 100644 app/app/src/utils/python/chaquopy/utils/__init__.py
create mode 100644 app/app/src/utils/python/chaquopy/utils/console.py
create mode 100644 app/app/src/utils/python/chaquopy/utils/repl.py
create mode 100644 app/app/src/utils/res/drawable-hdpi/ic_launcher.png
create mode 100644 app/app/src/utils/res/drawable-hdpi/ic_vertical_align_bottom.png
create mode 100644 app/app/src/utils/res/drawable-hdpi/ic_vertical_align_top.png
create mode 100644 app/app/src/utils/res/drawable-mdpi/ic_launcher.png
create mode 100644 app/app/src/utils/res/drawable-mdpi/ic_vertical_align_bottom.png
create mode 100644 app/app/src/utils/res/drawable-mdpi/ic_vertical_align_top.png
create mode 100644 app/app/src/utils/res/drawable-xhdpi/ic_launcher.png
create mode 100644 app/app/src/utils/res/drawable-xhdpi/ic_vertical_align_bottom.png
create mode 100644 app/app/src/utils/res/drawable-xhdpi/ic_vertical_align_top.png
create mode 100644 app/app/src/utils/res/drawable-xxhdpi/ic_launcher.png
create mode 100644 app/app/src/utils/res/drawable-xxhdpi/ic_vertical_align_bottom.png
create mode 100644 app/app/src/utils/res/drawable-xxhdpi/ic_vertical_align_top.png
create mode 100644 app/app/src/utils/res/layout-land/activity_menu.xml
create mode 100644 app/app/src/utils/res/layout/activity_console.xml
create mode 100644 app/app/src/utils/res/layout/activity_menu.xml
create mode 100644 app/app/src/utils/res/menu/top_bottom.xml
create mode 100644 app/app/src/utils/res/values-sw360dp-v13/support.xml
create mode 100644 app/app/src/utils/res/values/console.xml
create mode 100644 app/app/src/utils/res/values/utils.xml
diff --git a/app/app/.gitignore b/app/app/.gitignore
index 42afabf..a8f6ac7 100644
--- a/app/app/.gitignore
+++ b/app/app/.gitignore
@@ -1 +1,4 @@
-/build
\ No newline at end of file
+/build
+
+# Auto-generated by code in build.gradle.
+src/main/assets/source
\ No newline at end of file
diff --git a/app/app/build.gradle b/app/app/build.gradle
index 8cf92ef..68903d5 100644
--- a/app/app/build.gradle
+++ b/app/app/build.gradle
@@ -1,7 +1,21 @@
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
- id 'com.chaquo.python'
+ id 'com.chaquo.python' // Must come after com.android.application
+}
+
+afterEvaluate {
+ def assetsSrcDir = "src/main/assets/source"
+ delete assetsSrcDir
+ mkdir assetsSrcDir
+ for (filename in ["src/main/python/chaquopy/demo/ui_demo.py",
+ "src/main/java/com/chaquo/python/demo/JavaDemoActivity.java"]) {
+ assert file(filename).exists()
+ copy {
+ from filename
+ into assetsSrcDir
+ }
+ }
}
android {
@@ -15,51 +29,111 @@ android {
}
defaultConfig {
- applicationId "com.example.privatestorage"
+ applicationId "com.chaquo.python.demo3"
minSdk 27
targetSdk 32
- versionCode 1
- versionName "1.0"
-
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
- ndk {
- abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
- }
+ versionCode 20221111
+ versionName "2022.11.11"
python {
version "3.9"
buildPython "python3.9"
+
+ // Android UI demo
+ pip {
+ install "Pygments==2.2.0" // Also used in Java API demo
+ }
+ staticProxy "chaquopy.demo.ui_demo"
+
+ // Python unit tests
+ pip {
+ // In newer versions, importing murmurhash automatically imports and
+ // extracts murmurhash/mrmr.so, which would complicate the tests.
+ install "murmurhash==0.28.0" // Requires chaquopy-libcxx
+ }
+ staticProxy("chaquopy.test.static_proxy.basic", "chaquopy.test.static_proxy.header",
+ "chaquopy.test.static_proxy.method")
+ pyc {
+ // For testing bytecode compilation on device, and also to include test source
+ // code in stack traces.
+ src false
+
+ // For testing bytecode compilation during build.
+ pip true
+ }
}
- }
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+ ndk {
+ abiFilters "armeabi-v7a", "arm64-v8a", "x86_64"
}
+
+ // Chaquopy generates extra internal-use constructors on static proxy classes.
+ lintOptions {
+ disable "ValidFragment"
+ }
+
+ // Remove other languages imported from Android support libraries.
+ resConfigs "en"
}
+
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
- kotlinOptions {
- jvmTarget = '1.8'
+
+ // For testing with minifyEnabled (see release/README.md).
+ buildTypes {
+ releaseMinify {
+ initWith release
+ minifyEnabled true
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
}
- buildFeatures {
- viewBinding true
+
+ def keystore = file('../chaquo.jks')
+ if (keystore.exists()) {
+ signingConfigs {
+ config {
+ storeFile keystore
+ keyAlias 'key0'
+ keyPassword 'android'
+ storePassword 'android'
+ }
+ }
+ buildTypes.all { it.signingConfig signingConfigs.config }
+ }
+
+ sourceSets {
+ for (path in [
+ "/home/exarkun/Work/python/chaquopy/product/runtime/src/test", // Unit tests
+ "src/utils" // Files shared with pkgtest app
+ ]) {
+ main {
+ java { srcDir "$path/java" }
+ python { srcDir "$path/python" }
+ res { srcDir "$path/res" }
+ }
+ }
}
}
dependencies {
+ implementation fileTree(dir: 'libs', include: ['*.jar'])
+ // appcompat version 1.2.0 is required to fix an incompatibility with WebView on API level
+ // 21 (https://stackoverflow.com/questions/41025200).
+ implementation 'androidx.appcompat:appcompat:1.2.0-beta01'
+ implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+ implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
+ implementation 'androidx.preference:preference:1.1.1'
+ implementation 'junit:junit:4.12'
+ implementation 'org.hamcrest:hamcrest-library:2.2'
+
+ // I went to https://maven.google.com/web/index.html and searched for
+ // androidx.arch.core and a hit came up. I clicked on it and guessed that
+ // the testing library is what we need. I clicked on the newest version
+ // and it gave me an option to copy this string so I did and I put it
+ // HERE!
+ implementation 'androidx.arch.core:core-testing:2.1.0'
- implementation 'androidx.core:core-ktx:1.7.0'
- implementation 'androidx.appcompat:appcompat:1.3.0'
- implementation 'com.google.android.material:material:1.4.0'
- implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
- implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
- implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
- testImplementation 'junit:junit:4.13.2'
- androidTestImplementation 'androidx.test.ext:junit:1.1.3'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+ testImplementation 'junit:junit:4.12'
}
diff --git a/app/app/proguard-rules.pro b/app/app/proguard-rules.pro
index 481bb43..9b00913 100644
--- a/app/app/proguard-rules.pro
+++ b/app/app/proguard-rules.pro
@@ -1,21 +1,26 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
-
# Uncomment this to preserve the line number information for
# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
+-keepattributes SourceFile,LineNumberTable
# If you keep the line number information, uncomment this to
# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
+#-renamesourcefileattribute SourceFile
+
+# Android UI demo
+-keep class chaquopy.demo.ui_demo.** { *; }
+-keep class androidx.appcompat.app.** { *; }
+-keep class androidx.core.app.** { *; }
+-keep class androidx.fragment.app.** { *; }
+-keep class androidx.preference.** { *; }
+
+# Java unit tests
+-keep class com.chaquo.java.** { *; }
+-keep class org.junit.** { *; }
+
+# Python unit tests
+-keep class package1.** { *; } # TestImport
+-keepattributes Exceptions # TestProxy.test_exception
+-keep class chaquopy.test.static_proxy.** { *; } # TestStaticProxy
diff --git a/app/app/src/androidTest/java/com/example/privatestorage/ExampleInstrumentedTest.kt b/app/app/src/androidTest/java/com/example/privatestorage/ExampleInstrumentedTest.kt
deleted file mode 100644
index 5f53827..0000000
--- a/app/app/src/androidTest/java/com/example/privatestorage/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.example.privatestorage
-
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.ext.junit.runners.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
- @Test
- fun useAppContext() {
- // Context of the app under test.
- val appContext = InstrumentationRegistry.getInstrumentation().targetContext
- assertEquals("com.example.privatestorage", appContext.packageName)
- }
-}
\ No newline at end of file
diff --git a/app/app/src/main/AndroidManifest.xml b/app/app/src/main/AndroidManifest.xml
index b239017..f7c8caf 100644
--- a/app/app/src/main/AndroidManifest.xml
+++ b/app/app/src/main/AndroidManifest.xml
@@ -1,29 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- package="com.example.privatestorage">
+<manifest package="com.chaquo.python.demo"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools">
+
+ <uses-permission android:name="android.permission.INTERNET"/>
+ <uses-permission android:name="android.permission.VIBRATE"/>
<application
+ android:name="com.chaquo.python.utils.App"
android:allowBackup="true"
- android:dataExtractionRules="@xml/data_extraction_rules"
- android:fullBackupContent="@xml/backup_rules"
- android:icon="@mipmap/ic_launcher"
+ android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
- android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
- android:theme="@style/Theme.PrivateStorage"
- tools:targetApi="31">
- <activity
- android:name=".MainActivity"
- android:exported="true"
+ android:theme="@style/AppTheme"
+ tools:ignore="AllowBackup">
+ <activity android:name="com.chaquo.python.utils.MainActivity"
android:label="@string/app_name"
- android:theme="@style/Theme.PrivateStorage.NoActionBar">
+ android:exported="true">
<intent-filter>
- <action android:name="android.intent.action.MAIN" />
-
- <category android:name="android.intent.category.LAUNCHER" />
+ <action android:name="android.intent.action.MAIN"/>
+ <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
+ <!-- Contrary to documentation, singleTask does not always create a new task:
+ https://issuetracker.google.com/issues/36921210-->
+ <activity android:name="com.chaquo.python.utils.ReplActivity"
+ android:label="@string/repl"
+ android:launchMode="singleInstance">
+ </activity>
+ <activity android:name="chaquopy.demo.ui_demo.UIDemoActivity"
+ android:label="@string/ui_demo">
+ </activity>
+ <activity android:name=".JavaDemoActivity"
+ android:label="@string/java_demo">
+ </activity>
+ <activity android:name=".JavaTestActivity"
+ android:label="@string/java_unit_test">
+ </activity>
+ <activity android:name="com.chaquo.python.utils.PythonTestActivity"
+ android:label="@string/python_unit_test">
+ </activity>
</application>
</manifest>
\ No newline at end of file
diff --git a/app/app/src/main/java/com/chaquo/python/demo/JavaDemoActivity.java b/app/app/src/main/java/com/chaquo/python/demo/JavaDemoActivity.java
new file mode 100644
index 0000000..644aaa8
--- /dev/null
+++ b/app/app/src/main/java/com/chaquo/python/demo/JavaDemoActivity.java
@@ -0,0 +1,63 @@
+package com.chaquo.python.demo;
+
+import android.content.*;
+import android.os.*;
+import android.util.*;
+import android.webkit.*;
+import android.widget.*;
+import androidx.appcompat.app.*;
+import com.chaquo.python.*;
+import java.io.*;
+
+public class JavaDemoActivity extends AppCompatActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_java_demo);
+ TextView tvCaption = (TextView) findViewById(R.id.tvCaption);
+ tvCaption.setText(R.string.java_demo_caption);
+
+ WebView wvSource = (WebView) findViewById(R.id.wvSource);
+ try {
+ viewSource(this, wvSource, "JavaDemoActivity.java");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private static final String ASSET_SOURCE_DIR = "source";
+ private static final String EXTRA_CSS =
+ "body { background-color: #eeeeee; font-size: 85%; }";
+
+ // Compare with the equivalent Python code in chaquopy/demo/ui_demo.py
+ private static void viewSource(Context context, WebView wv,
+ String filename) throws IOException {
+ InputStream stream = context.getAssets().open
+ (ASSET_SOURCE_DIR + "/" + filename);
+ BufferedReader reader =
+ new BufferedReader(new InputStreamReader(stream));
+ String text = "";
+ String line;
+ while ((line = reader.readLine()) != null) {
+ text += line + "\n";
+ }
+
+ Python py = Python.getInstance();
+ PyObject pygments = py.getModule("pygments");
+ PyObject formatters = py.getModule("pygments.formatters");
+ PyObject lexers = py.getModule("pygments.lexers");
+
+ PyObject formatter = formatters.callAttr("HtmlFormatter");
+ PyObject lexer = lexers.callAttr("get_lexer_for_filename", filename);
+ String body = pygments.callAttr("highlight", text, lexer, formatter)
+ .toString();
+
+ String html = String.format(
+ "<html><head><style>%s\n%s</style></head><body>%s</body></html>",
+ formatter.callAttr("get_style_defs"), EXTRA_CSS, body);
+ wv.loadData(Base64.encodeToString(html.getBytes("ASCII"),
+ Base64.DEFAULT),
+ "text/html", "base64");
+ }
+}
diff --git a/app/app/src/main/java/com/chaquo/python/demo/JavaTestActivity.java b/app/app/src/main/java/com/chaquo/python/demo/JavaTestActivity.java
new file mode 100644
index 0000000..fe6dd0e
--- /dev/null
+++ b/app/app/src/main/java/com/chaquo/python/demo/JavaTestActivity.java
@@ -0,0 +1,98 @@
+package com.chaquo.python.demo;
+
+import android.app.*;
+import com.chaquo.python.utils.*;
+import java.io.*;
+import org.junit.runner.*;
+import org.junit.runner.notification.*;
+
+public class JavaTestActivity extends ConsoleActivity {
+
+ @Override protected Class<? extends JavaTestTask> getTaskClass() {
+ return JavaTestTask.class;
+ }
+
+ // =============================================================================================
+
+ public static class JavaTestTask extends Task {
+
+ public JavaTestTask(Application app) {
+ super(app);
+ }
+
+ @Override public void run() {
+ JUnitCore juc = new JUnitCore();
+ juc.addListener(new Listener());
+ juc.run(com.chaquo.java.TestSuite.class);
+ }
+
+ private class Listener extends RunListener {
+ private ByteArrayOutputStream stdout = new ByteArrayOutputStream();
+ private ByteArrayOutputStream stderr = new ByteArrayOutputStream();
+
+ @Override
+ public void testRunStarted(Description description) throws Exception {
+ System.setOut(new PrintStream(stdout));
+ System.setErr(new PrintStream(stderr));
+ }
+
+ @Override
+ public void testStarted(Description description) throws Exception {
+ output(description.toString() + "\n");
+ }
+
+ @Override
+ public void testIgnored(Description description) throws Exception {
+ output("IGNORED\n");
+ }
+
+ @Override
+ public void testFinished(Description description) throws Exception {
+ output(stdout.toString());
+ stdout.reset();
+ outputError(stderr.toString());
+ stderr.reset();
+ }
+
+ @Override
+ public void testFailure(Failure failure) throws Exception {
+ String trace = failure.getTrace();
+ StringBuilder filteredTrace = new StringBuilder();
+ boolean filterOn = false;
+ int lineNum = 0;
+ for (String line : trace.split("\n")) {
+ lineNum++;
+ if (lineNum > 1 && line.matches(".*org.junit.*")) {
+ filterOn = true;
+ } else {
+ if (filterOn) {
+ filteredTrace.append("...\n");
+ filterOn = false;
+ }
+ filteredTrace.append(line).append("\n");
+ }
+ }
+ outputError(filteredTrace);
+ }
+
+ @Override
+ public void testAssumptionFailure(Failure failure) {
+ outputError("ASSUMPTION FAILED\n");
+ }
+
+ @Override
+ public void testRunFinished(Result result) throws Exception {
+ String message = String.format(
+ "Ran %s tests in %.3f seconds (%s failed, %s ignored)\n",
+ result.getRunCount(), result.getRunTime() / 1000.0,
+ result.getFailureCount(), result.getIgnoreCount());
+ if (result.getFailureCount() > 0) {
+ outputError(message);
+ } else {
+ output(message);
+ }
+ }
+ }
+ }
+
+}
diff --git a/app/app/src/main/java/com/chaquo/python/demo/TestAndroidReflect.java b/app/app/src/main/java/com/chaquo/python/demo/TestAndroidReflect.java
new file mode 100644
index 0000000..c5f4845
--- /dev/null
+++ b/app/app/src/main/java/com/chaquo/python/demo/TestAndroidReflect.java
@@ -0,0 +1,21 @@
+package com.chaquo.python.demo;
+
+import android.view.textclassifier.*;
+
+@SuppressWarnings("unused")
+public class TestAndroidReflect {
+ public TextClassifier tcFieldPublic;
+ protected TextClassifier tcFieldProtected;
+
+ public TextClassifier tcMethodPublic() { return null; }
+ protected TextClassifier tcMethodProtected() { return null; }
+
+ public int iFieldPublic;
+ protected int iFieldProtected;
+
+ public int iMethodPublic() { return 0; }
+ protected int iMethodProtected() { return 0; }
+
+ @Override
+ protected void finalize() {}
+}
diff --git a/app/app/src/main/java/com/example/privatestorage/FirstFragment.kt b/app/app/src/main/java/com/example/privatestorage/FirstFragment.kt
deleted file mode 100644
index 66b9381..0000000
--- a/app/app/src/main/java/com/example/privatestorage/FirstFragment.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.example.privatestorage
-
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.navigation.fragment.findNavController
-import com.example.privatestorage.databinding.FragmentFirstBinding
-
-/**
- * A simple [Fragment] subclass as the default destination in the navigation.
- */
-class FirstFragment : Fragment() {
-
- private var _binding: FragmentFirstBinding? = null
-
- // This property is only valid between onCreateView and
- // onDestroyView.
- private val binding get() = _binding!!
-
- override fun onCreateView(
- inflater: LayoutInflater, container: ViewGroup?,
- savedInstanceState: Bundle?
- ): View? {
-
- _binding = FragmentFirstBinding.inflate(inflater, container, false)
- return binding.root
-
- }
-
- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
- super.onViewCreated(view, savedInstanceState)
-
- binding.buttonFirst.setOnClickListener {
- findNavController().navigate(R.id.action_FirstFragment_to_SecondFragment)
- }
- }
-
- override fun onDestroyView() {
- super.onDestroyView()
- _binding = null
- }
-}
\ No newline at end of file
diff --git a/app/app/src/main/java/com/example/privatestorage/MainActivity.kt b/app/app/src/main/java/com/example/privatestorage/MainActivity.kt
deleted file mode 100644
index 96af474..0000000
--- a/app/app/src/main/java/com/example/privatestorage/MainActivity.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.example.privatestorage
-
-import android.os.Bundle
-import com.google.android.material.snackbar.Snackbar
-import androidx.appcompat.app.AppCompatActivity
-import androidx.navigation.findNavController
-import androidx.navigation.ui.AppBarConfiguration
-import androidx.navigation.ui.navigateUp
-import androidx.navigation.ui.setupActionBarWithNavController
-import android.view.Menu
-import android.view.MenuItem
-import com.example.privatestorage.databinding.ActivityMainBinding
-
-class MainActivity : AppCompatActivity() {
-
- private lateinit var appBarConfiguration: AppBarConfiguration
- private lateinit var binding: ActivityMainBinding
-
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
-
- binding = ActivityMainBinding.inflate(layoutInflater)
- setContentView(binding.root)
-
- setSupportActionBar(binding.toolbar)
-
- val navController = findNavController(R.id.nav_host_fragment_content_main)
- appBarConfiguration = AppBarConfiguration(navController.graph)
- setupActionBarWithNavController(navController, appBarConfiguration)
-
- binding.fab.setOnClickListener { view ->
- Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
- .setAction("Action", null).show()
- }
- }
-
- override fun onCreateOptionsMenu(menu: Menu): Boolean {
- // Inflate the menu; this adds items to the action bar if it is present.
- menuInflater.inflate(R.menu.menu_main, menu)
- return true
- }
-
- override fun onOptionsItemSelected(item: MenuItem): Boolean {
- // Handle action bar item clicks here. The action bar will
- // automatically handle clicks on the Home/Up button, so long
- // as you specify a parent activity in AndroidManifest.xml.
- return when (item.itemId) {
- R.id.action_settings -> true
- else -> super.onOptionsItemSelected(item)
- }
- }
-
- override fun onSupportNavigateUp(): Boolean {
- val navController = findNavController(R.id.nav_host_fragment_content_main)
- return navController.navigateUp(appBarConfiguration)
- || super.onSupportNavigateUp()
- }
-}
\ No newline at end of file
diff --git a/app/app/src/main/java/com/example/privatestorage/SecondFragment.kt b/app/app/src/main/java/com/example/privatestorage/SecondFragment.kt
deleted file mode 100644
index ff498cc..0000000
--- a/app/app/src/main/java/com/example/privatestorage/SecondFragment.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.example.privatestorage
-
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.navigation.fragment.findNavController
-import com.example.privatestorage.databinding.FragmentSecondBinding
-
-/**
- * A simple [Fragment] subclass as the second destination in the navigation.
- */
-class SecondFragment : Fragment() {
-
- private var _binding: FragmentSecondBinding? = null
-
- // This property is only valid between onCreateView and
- // onDestroyView.
- private val binding get() = _binding!!
-
- override fun onCreateView(
- inflater: LayoutInflater, container: ViewGroup?,
- savedInstanceState: Bundle?
- ): View? {
-
- _binding = FragmentSecondBinding.inflate(inflater, container, false)
- return binding.root
-
- }
-
- override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
- super.onViewCreated(view, savedInstanceState)
-
- binding.buttonSecond.setOnClickListener {
- findNavController().navigate(R.id.action_SecondFragment_to_FirstFragment)
- }
- }
-
- override fun onDestroyView() {
- super.onDestroyView()
- _binding = null
- }
-}
\ No newline at end of file
diff --git a/app/app/src/main/python/chaquopy/__init__.py b/app/app/src/main/python/chaquopy/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/app/app/src/main/python/chaquopy/demo/__init__.py b/app/app/src/main/python/chaquopy/demo/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/app/app/src/main/python/chaquopy/demo/ui_demo.py b/app/app/src/main/python/chaquopy/demo/ui_demo.py
new file mode 100644
index 0000000..a9910ea
--- /dev/null
+++ b/app/app/src/main/python/chaquopy/demo/ui_demo.py
@@ -0,0 +1,136 @@
+from java import dynamic_proxy, jboolean, jvoid, Override, static_proxy
+
+from android.app import AlertDialog
+from android.content import Context, DialogInterface
+from android.graphics.drawable import ColorDrawable
+from android.os import Bundle
+from androidx.appcompat.app import AppCompatActivity
+from androidx.fragment.app import DialogFragment
+from androidx.preference import Preference, PreferenceFragmentCompat
+from android.view import Menu, MenuItem, View
+from java.lang import String
+
+from com.chaquo.python.demo import R
+
+
+class UIDemoActivity(static_proxy(AppCompatActivity)):
+ @Override(jvoid, [Bundle])
+ def onCreate(self, state):
+ AppCompatActivity.onCreate(self, state)
+ if state is None:
+ state = Bundle()
+ self.setContentView(R.layout.activity_menu)
+ self.findViewById(R.id.tvCaption).setText(R.string.demo_caption)
+
+ self.title_drawable = ColorDrawable()
+ self.getSupportActionBar().setBackgroundDrawable(self.title_drawable)
+ self.title_drawable.setColor(
+ state.getInt("title_color", self.getResources().getColor(R.color.blue)))
+
+ self.wvSource = self.findViewById(R.id.wvSource)
+ view_source(self, self.wvSource, "ui_demo.py")
+ self.wvSource.setVisibility(state.getInt("source_visibility", View.GONE))
+
+ self.getSupportFragmentManager().beginTransaction()\
+ .replace(R.id.flMenu, MenuFragment()).commit()
+
+ @Override(jvoid, [Bundle])
+ def onSaveInstanceState(self, state):
+ state.putInt("source_visibility", self.wvSource.getVisibility())
+ state.putInt("title_color", self.title_drawable.getColor())
+
+ @Override(jboolean, [Menu])
+ def onCreateOptionsMenu(self, menu):
+ self.getMenuInflater().inflate(R.menu.view_source, menu)
+ return True
+
+ @Override(jboolean, [MenuItem])
+ def onOptionsItemSelected(self, item):
+ id = item.getItemId()
+ if id == R.id.menu_source:
+ vis = self.wvSource.getVisibility()
+ new_vis = View.VISIBLE if (vis == View.GONE) else View.GONE
+ self.wvSource.setVisibility(new_vis)
+ return True
+ else:
+ return False
+
+
+class MenuFragment(static_proxy(PreferenceFragmentCompat)):
+ @Override(jvoid, [Bundle, String])
+ def onCreatePreferences(self, state, rootKey):
+ self.addPreferencesFromResource(R.xml.activity_ui_demo)
+
+ from android.media import AudioManager, SoundPool
+ self.sound_pool = SoundPool(1, AudioManager.STREAM_MUSIC, 0)
+ self.sound_id = self.sound_pool.load(self.getActivity(), R.raw.sound, 1)
+
+ @Override(jboolean, [Preference])
+ def onPreferenceTreeClick(self, pref):
+ method = getattr(self, pref.getKey())
+ if method:
+ method(self.getActivity())
+ return True
+ else:
+ return False
+
+ def demo_dialog(self, activity):
+ ColorDialog().show(self.getFragmentManager(), "color")
+
+ def demo_toast(self, activity):
+ from android.widget import Toast
+ Toast.makeText(activity, R.string.demo_toast_text,
+ Toast.LENGTH_SHORT).show()
+
+ def demo_sound(self, activity):
+ self.sound_pool.play(self.sound_id, 1, 1, 0, 0, 1)
+
+ def demo_vibrate(self, activity):
+ activity.getSystemService(Context.VIBRATOR_SERVICE)\
+ .vibrate(200)
+
+
+class ColorDialog(static_proxy(DialogFragment)):
+ @Override(AlertDialog, [Bundle])
+ def onCreateDialog(self, state):
+ activity = self.getActivity()
+ builder = AlertDialog.Builder(activity)
+ builder.setTitle(R.string.demo_dialog_title)
+ builder.setMessage(R.string.demo_dialog_text)
+
+ class Listener(dynamic_proxy(DialogInterface.OnClickListener)):
+ def __init__(self, color_res):
+ super(Listener, self).__init__()
+ self.color = activity.getResources().getColor(color_res)
+
+ def onClick(self, dialog, which):
+ activity.title_drawable.setColor(self.color)
+
+ builder.setNegativeButton(R.string.red, Listener(R.color.red))
+ builder.setNeutralButton(R.string.green, Listener(R.color.green))
+ builder.setPositiveButton(R.string.blue, Listener(R.color.blue))
+ return builder.create()
+
+
+ASSET_SOURCE_DIR = "source"
+EXTRA_CSS = "body { background-color: #eeeeee; font-size: 85%; }"
+
+# Compare with the equivalent Java code in JavaDemoActivity.java
+def view_source(context, web_view, filename):
+ from base64 import b64encode
+ from os.path import join
+ from pygments import highlight
+ from pygments.formatters import HtmlFormatter
+ from pygments.lexers import get_lexer_for_filename
+
+ from java.io import BufferedReader, InputStreamReader
+
+ stream = context.getAssets().open(join(ASSET_SOURCE_DIR, filename))
+ reader = BufferedReader(InputStreamReader(stream))
+ text = "\n".join(iter(reader.readLine, None))
+
+ formatter = HtmlFormatter()
+ body = highlight(text, get_lexer_for_filename(filename), formatter)
+ html = ("<html><head><style>{}\n{}</style></head><body>{}</body></html>"
+ .format(formatter.get_style_defs(), EXTRA_CSS, body)).encode()
+ web_view.loadData(b64encode(html).decode(), "text/html", "base64")
diff --git a/app/app/src/main/python/main.py b/app/app/src/main/python/main.py
deleted file mode 100644
index 30d202f..0000000
--- a/app/app/src/main/python/main.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from kivy.app import App
-from kivy.uix.label import Label
-
-class MainApp(App):
- def build(self):
- label = Label(text='Hello from Kivy',
- size_hint=(.5, .5),
- pos_hint={'center_x': .5, 'center_y': .5})
-
- return label
-
-if __name__ == '__main__':
- app = MainApp()
- app.run()
diff --git a/app/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
deleted file mode 100644
index 2b068d1..0000000
--- a/app/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:aapt="http://schemas.android.com/aapt"
- android:width="108dp"
- android:height="108dp"
- android:viewportWidth="108"
- android:viewportHeight="108">
- <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
- <aapt:attr name="android:fillColor">
- <gradient
- android:endX="85.84757"
- android:endY="92.4963"
- android:startX="42.9492"
- android:startY="49.59793"
- android:type="linear">
- <item
- android:color="#44000000"
- android:offset="0.0" />
- <item
- android:color="#00000000"
- android:offset="1.0" />
- </gradient>
- </aapt:attr>
- </path>
- <path
- android:fillColor="#FFFFFF"
- android:fillType="nonZero"
- android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
- android:strokeWidth="1"
- android:strokeColor="#00000000" />
-</vector>
\ No newline at end of file
diff --git a/app/app/src/main/res/drawable/ic_launcher_background.xml b/app/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9..0000000
--- a/app/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="108dp"
- android:height="108dp"
- android:viewportWidth="108"
- android:viewportHeight="108">
- <path
- android:fillColor="#3DDC84"
- android:pathData="M0,0h108v108h-108z" />
- <path
- android:fillColor="#00000000"
- android:pathData="M9,0L9,108"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M19,0L19,108"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M29,0L29,108"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M39,0L39,108"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M49,0L49,108"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M59,0L59,108"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M69,0L69,108"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M79,0L79,108"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M89,0L89,108"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M99,0L99,108"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M0,9L108,9"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M0,19L108,19"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M0,29L108,29"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M0,39L108,39"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M0,49L108,49"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M0,59L108,59"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M0,69L108,69"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M0,79L108,79"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M0,89L108,89"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M0,99L108,99"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M19,29L89,29"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M19,39L89,39"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M19,49L89,49"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M19,59L89,59"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M19,69L89,69"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M19,79L89,79"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M29,19L29,89"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M39,19L39,89"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M49,19L49,89"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M59,19L59,89"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M69,19L69,89"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
- <path
- android:fillColor="#00000000"
- android:pathData="M79,19L79,89"
- android:strokeWidth="0.8"
- android:strokeColor="#33FFFFFF" />
-</vector>
diff --git a/app/app/src/main/res/layout/activity_java_demo.xml b/app/app/src/main/res/layout/activity_java_demo.xml
new file mode 100644
index 0000000..303916b
--- /dev/null
+++ b/app/app/src/main/res/layout/activity_java_demo.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:context="com.chaquo.python.demo.JavaDemoActivity">
+
+ <TextView
+ android:id="@+id/tvCaption"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginEnd="8dp"
+ android:layout_marginLeft="8dp"
+ android:layout_marginRight="8dp"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="8dp"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintHorizontal_bias="0.0"/>
+
+ <WebView
+ android:id="@+id/wvSource"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:layout_marginBottom="0dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginLeft="8dp"
+ android:layout_marginRight="8dp"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="8dp"
+ android:visibility="visible"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/tvCaption"
+ app:layout_constraintVertical_bias="0.0"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/app/src/main/res/layout/activity_main.xml b/app/app/src/main/res/layout/activity_main.xml
deleted file mode 100644
index 11daef1..0000000
--- a/app/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- tools:context=".MainActivity">
-
- <com.google.android.material.appbar.AppBarLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:theme="@style/Theme.PrivateStorage.AppBarOverlay">
-
- <androidx.appcompat.widget.Toolbar
- android:id="@+id/toolbar"
- android:layout_width="match_parent"
- android:layout_height="?attr/actionBarSize"
- android:background="?attr/colorPrimary"
- app:popupTheme="@style/Theme.PrivateStorage.PopupOverlay" />
-
- </com.google.android.material.appbar.AppBarLayout>
-
- <include layout="@layout/content_main" />
-
- <com.google.android.material.floatingactionbutton.FloatingActionButton
- android:id="@+id/fab"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom|end"
- android:layout_marginEnd="@dimen/fab_margin"
- android:layout_marginBottom="16dp"
- app:srcCompat="@android:drawable/ic_dialog_email" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/app/src/main/res/layout/content_main.xml b/app/app/src/main/res/layout/content_main.xml
deleted file mode 100644
index e416e1c..0000000
--- a/app/app/src/main/res/layout/content_main.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
- <fragment
- android:id="@+id/nav_host_fragment_content_main"
- android:name="androidx.navigation.fragment.NavHostFragment"
- android:layout_width="0dp"
- android:layout_height="0dp"
- app:defaultNavHost="true"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:navGraph="@navigation/nav_graph" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/app/src/main/res/layout/fragment_first.xml b/app/app/src/main/res/layout/fragment_first.xml
deleted file mode 100644
index fb44a3d..0000000
--- a/app/app/src/main/res/layout/fragment_first.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- tools:context=".FirstFragment">
-
- <TextView
- android:id="@+id/textview_first"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/hello_first_fragment"
- app:layout_constraintBottom_toTopOf="@id/button_first"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-
- <Button
- android:id="@+id/button_first"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/next"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/textview_first" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/app/src/main/res/layout/fragment_second.xml b/app/app/src/main/res/layout/fragment_second.xml
deleted file mode 100644
index bd90524..0000000
--- a/app/app/src/main/res/layout/fragment_second.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- tools:context=".SecondFragment">
-
- <TextView
- android:id="@+id/textview_second"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- app:layout_constraintBottom_toTopOf="@id/button_second"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent" />
-
- <Button
- android:id="@+id/button_second"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/previous"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toBottomOf="@id/textview_second" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/app/src/main/res/menu/menu_main.xml b/app/app/src/main/res/menu/menu_main.xml
deleted file mode 100644
index 33462d3..0000000
--- a/app/app/src/main/res/menu/menu_main.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- tools:context="com.example.privatestorage.MainActivity">
- <item
- android:id="@+id/action_settings"
- android:orderInCategory="100"
- android:title="@string/action_settings"
- app:showAsAction="never" />
-</menu>
\ No newline at end of file
diff --git a/app/app/src/main/res/menu/view_source.xml b/app/app/src/main/res/menu/view_source.xml
new file mode 100644
index 0000000..1e34fee
--- /dev/null
+++ b/app/app/src/main/res/menu/view_source.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+
+ <item android:id="@+id/menu_source"
+ android:title="@string/view_source"
+ app:showAsAction="always|withText"/>
+
+</menu>
\ No newline at end of file
diff --git a/app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index eca70cf..0000000
--- a/app/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
- <background android:drawable="@drawable/ic_launcher_background" />
- <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
deleted file mode 100644
index eca70cf..0000000
--- a/app/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
- <background android:drawable="@drawable/ic_launcher_background" />
- <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/app/src/main/res/mipmap-hdpi/ic_launcher.webp
deleted file mode 100644
index c209e78ecd372343283f4157dcfd918ec5165bb3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1404
zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r
zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN
zXl<@<#Cm<R)d19?=)E<{+g@mp0C)CAX%7ksNnpX=jPlJEkqD9%o*fC(U7iySOYHHS
zCLH@bXPyI|^Z)Mc^PG7Oc+NfBJO`d7p5;U`M53Wbd!w|M(MUoNRc2m{@^!wFKzL?&
zx_RAc-^9Azxo%DmXW^9GV0~;n_G9&dym)|QrMEx!y_F=oDunn;1y)cvAc6z{0MHiz
zodGIH07w8nF%*bGq9Gv`YHnm80|d1T$uW=u4vGV%tX#>e5f5yr2h%@8TWh?)bSK`O
z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF!
z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!<r*4*+?g*sysFgiN}}d!-T(>jH(_Z*nzTK4
zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG
z?Fe{#<RA5Hg_mG&BZS>9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~
zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd
zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK
zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG<W<SKpuS2eaDGkL-J-
z!+&UV_N0e<DV*|igwqdC*l{lj0T&&`uq=ycU@f9x0i8jzLa(y*X(YV?PCtUw;ks}p
z4zFn7N(-OG^(9ot1ZhYISOWe9?+l%f6v41n+j<OM$_uJgNP?ZJy}hEMMH=;WiG4I`
zs(bIWwSD<LJnAN(E(Xjr4k(^UYF37F_3f{;E%%FEa&I3I0GbdH@{pD5$m+1PN5CW)
zyZ&*9o#8wstdx@^rci;0B4BP2+H4Y<KbJI5L(bXG(k@`Kp=d>8I5h*uf{rn48Z!_@
z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqro<oln8GL@_6LPC)kg1!M)Y!|NCn7b*0sG
zEN=&c2xMM<>a($ne7EUK;#3V<N-jQ7j($tREa0F&-HzYCQtR#fTCZMRN*ZSm;T7a+
zuxa$}zDL8R9wGYkHb$+gJoiM@z+u{u7a_VUBwtd)bPzHxH}C`W=^2PsBr`s7taBMG
zm#Ss=-o`)W8%%x%>YkXaew%Kh^3OrMht<?zOY6P}#rBhn_hrWY$_P`{#CBR9w?+E6
zt7r#NN-tjxFY{9q75P<|L<ZJBHwn4FhG(&i>jYN?XEoY`tRPQsAkH-DSL^QqyN0>^
zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y
z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu
z4)<UE%?IC0Du41FrE~F_qc8nOq>P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6
z>%NbT+5*@L5(I9<vs%8>j@06@(!<!eaZcF<_le1MVaYMg=gRy*f2#IaBH-mJIpy+L
z=Gsbhd6=3>{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W
Kmw_-CKmY()leWbG
diff --git a/app/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
deleted file mode 100644
index b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2898
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
diff --git a/app/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/app/src/main/res/mipmap-mdpi/ic_launcher.webp
deleted file mode 100644
index 4f0f1d64e58ba64d180ce43ee13bf9a17835fbca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 982
zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^
z^1csucXz7-Qrhzl9HuH<!ckn_w-(t15itRHmqN0O$B3XH(E|jyV^QXq8=yM`Q**vy
zpEpgQd+no=J<Tlv&+_>B%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N
zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}<p
z;bEy|mw1;}P&gp|0ssKe4*;D3Dlh;r06r}ehC-pC4mGy`3;|+W04+#B4r_x~@mHHy
z)H}bD|I2-n_L$pW;*I)~?=#N<)`92&<$3IR`#<SH6@I&FRQa6xBmQ5wPwJ2PAI(ne
z$L2Yb@JHxb`+bLk*AjR$^`b?pr|?!6=+AboIQ2D-p)UI7x(J0|5(5~ur$_+)`>C%4
zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{
ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT
zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh
zOBLA>$~P3r4b*NcqR;y6pwyhZ<hjKiZs6mOSFB&+cIl`GV$93-<ciUjF#*1^<p~gh
ziQ_{)r0dA7$It&Fe=obxu8n!+elxmgqxPbUL!FxW0;AOfqz@8JOz9Qbm)m-9!^7D)
z480@BoIIb<oT``+rVla8L)8fXO&6}3P9n4v$`6WG<DUNWuKb9J9rUsAn7d-_YWT^U
z{NXl@OAPIJ!>3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu
z(U^&XLW^Q<WhKYr9rXr6*~Tmpuq6NjnD6;;NNBGIg-1ZvfACQ4{ocrwM0)?`oL2ts
zCXY5KT@`(ir63J0?%+_(-dDgf<6R$u{lCdy6Zi5d+Bf;1OXyD;xe3#Gug*&T|0o41
zD8;$|JvUv&@vsLIH&C5+S{!k&{~Z54^y@9r>X7F9Z*SRPpQl{B%x)_AMp^}_v~?j7
zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0
z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@
E0Of=7!T<mO
diff --git a/app/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
deleted file mode 100644
index 62b611da081676d42f6c3f78a2c91e7bcedddedb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1772
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
O>FJ$wK}0tWNB{uH;AM~i
diff --git a/app/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
deleted file mode 100644
index 948a3070fe34c611c42c0d3ad3013a0dce358be0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1900
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
diff --git a/app/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
deleted file mode 100644
index 1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3918
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
diff --git a/app/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
deleted file mode 100644
index 28d4b77f9f036a47549d47db79c16788749dca10..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2884
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
diff --git a/app/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9287f5083623b375139afb391af71cc533a7dd37..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 5914
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�(p-{x$&=IACIfoAR<Nvvu>!za)F-^da-t3#0Dycnp
zwO~NVXwXCl;jE<}>%@<pC<8PLRXJuvO4y>xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r
z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv
zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m
z!GmimlG$=wgXCnr6j@m<1gAL46#T~5<Pf8lV3fF#Ppu>Bnm=2{^@>|t&`9mkEPddj
zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx
z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@<t56P}GC(ea
zcuDo~%vU?vTqAIp#flPNMI2`5;t8&98^HQwmsAsoPNK_fx^Bggb1WVe*N(RqH8#4x
zCQN_rN*!W39u4A)O3%B(eX4-oO~1PlFj1j%A~@Wj>9A|X;;IA>8!oX+y(BKJ$EzV*
znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o
z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE?
zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG)
zaZ7j)dq!O}{?#8Y7~7i6fHh4{`<bqO>pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek
zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m#
z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU
zuSa6v^kXi0x<PZ)*(STjdw~o@Rw-Or2Ax?U!if0^R7qyS!JDYN`R9pBUrvi5{Lgqu
za0I&Zd*A54UPC}|lJz-2f!1VYM+A-ElFU{V`W)8LtCk5Mx|)Il)$QH*gA63%JZFt}
zGq@eFEWXJ~R>Ps?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf
zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q
w)2!4MKjfSAeN<ek%udeE*tim(T?PyxRjZ^lIknLzS6Fbvpe_110000002i;2E&u=k
diff --git a/app/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
deleted file mode 100644
index aa7d6427e6fa1074b79ccd52ef67ac15c5637e85..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3844
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
G0001O&w8c+
diff --git a/app/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
deleted file mode 100644
index 9126ae37cbc3587421d6889eadd1d91fbf1994d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 7778
zcmV-o9-ZM*Nk&Fm9smGWMM6+kP&il$0000G0002L006%L06|PpNM;KF009|=ZQC}G
z?WFVnhub3}`X3k)f7gJdHv?Xy!R81AlJ*B*AtF+%2T777MNUTbu9%sbnHg^^{r@jg
z*GbiFHdh@YCSU?QVcWL6ZMJROew>#A4mU}enR_!cGmIYQ;qwfchWtFEXL)AK%*;=j
znYne+hS4EMy3S)C*mZ1KI>!+)0V@9!N<vFAw%bSx)5&s%!VB9)5>6H$Y}~MJ{rYuf
zz^KljIWvFi<cP&X*lv%IdKPZD;Oa}RxZ=WXTQ_f5SBivP>-?#?V@LPR&c6Nn{!=XM
z>}-h$S76;$H{E{Y%@^zlmOl^efBwa%UU+jJD9UVukQ3ti_kH-?H*RC0?M1W%FCvMB
zM_+v6fk$6X2sx)-p~B3&Kl{nscK}pNLM*qjtpaf9>AU{-iPKQZR8yCg!TY}Qg*(;)
z)gdvCcB%kppZc$VdvsK@)3l1{&DG!d_6OHOS`y=ITLEVu`unSKA2E%JD*DVX{LJ}K
z9l>hMRDqxQh0lnpGHpVYneX}eA3Pt|2v%=q;rt)``R|#bDyB)OXY&vI_@|*}h}G?^
z@aZ4_!7cQPX`!fW_?{oT1NTwHs#l5L-0`E|y@48<3Q^HFf8=Idi<poq)!h6e-w-t>
zpJYD%1MkII!~|7I^WGo)IF=?{>ACnjJ_WUi39C}!Q{QnheVJqeKKqq5^o5CBde(g9
zvw$X6^jz_^E2$wSw4!q5*RG(C2_^XO$HBn_55vbl44OnTTRwRaePP0vo{K)U1#99&
z<>rq7V&V(<&@I%MFoN5zrY}sz=(*-L&}1QQ*a%`u25h{cFj===17eB_uGuzG&byQ<
zrm8BJZl4r_E$3k|Wo6FW0-6M7>qac5uFQsQcmkLWGfeH74S3Z_rJ!jgN++!@i=HW8
zkyjI(oPH-+-N#Qc^-mpNO`bc6r=2-<%&Wy5K1vfFJB(L_IkpS6fY^NmuL8qsgj>MD
zn~BHH9WM~32_3vd=W&B)k7F9q%stJx+b_L_X-4zr^LVUMCmyCTA3sWtkvsmME?Xiy
z?xOSfB=_$oY06~J-HcCq&)qcW{j;uP;?Dm}=hkq?zh&n!;m((-G-u_t|6x399Q;>A
zgNpxoJNj{u|MFDH7Rhq@FCAl0dE|ddnl!oh9{Lq?@JDoR6L<VshF8r0_5hVetvvR3
zUa9QP{tlg6#T|cqYLF{a{Z~(rG;8wQAGxkbcBg-f;&yT2caC>;C941IK`ISfdE$4S
zE0AUQ8+2|Ncl_q5QkSp#AODp~(^mfP&%Au@@|TBQwoP`UU+V{6u8|)6ZA{~uKmQ*M
zmrMTDU8S~8Eqi{^v0Ug&5Upcm#y7Z1(RbgZAG8jB$eRwCspQ)>5;U)oGZ&E5aeR*K
z8Yt`Y0$G))Yd(Y3KH}tA4`-_QmNke5hU_|nq=xtyjwW(_o<J(bXz&TLG*KqE+J2b|
zzGMf@yloAVGVyLu8$qUB0*aL7J!IELCX-VpLrK)~9;`MJCx<$?q(odYLqjiF1(aQ#
zL@ODYw5>?itz>B>WM&^63bNdQ)k@-IgDHW*RW$Xo9#R<IvZbwNj6)I=m!3rJ1R1ab
z2r2SX+N#$AB#3}6!qHGpW<lbPOR(BWoXkKL%kIL~nqp#++Ky;w$go6AM8rlKdq5Y2
z(2QEE+W<&V$_+GEA2Ij~w6?iAbps?Q2F=yh2@>zrTrCn7L2H{9Amq|qNg@#eZY=|P
zCoI?2s+L)zsM%WX(NbVEY^`C>lFjIBYmJ6@DKJ0ZT4&F&WHW!dwa%QzOG!?jY_2(S
zDcEzZbz*2Q!43|z))9yOP9X1Xt%DXzwY(3tl-TR=Qb_MbZYRrooh;dYYmS!U<ZgRO
zPVYNRQ_syhy#$k<o5k&9_8xKKcLFP4qp4@lDp|7eON3j=!K=ngvNK;As+}}?A#E=O
zoNvBGL+^hj&C*@-@GH2L%&xby`W!OyNy2U9;JIO(gR%4JUah41RARgoaLwm;(ad|F
z%xacy_j&lKc6#Zp9NA05srmrn7IN_DDAJr$pN|}*jW~LL_UB~W*EgSRr5B&8BjcrE
zSL&UF+sDEEL#oZWI%~cEfLcgL?yQ;STy6LL>_as1(=YVB?Q_A|tNu5Ut&_q3jbfDM
zoFxT^uEuH`nX3*sB%K?GuHUkweYReBwnHqh3P)~`+s3+Tj!rDA1e)8vuBv5J*IsxC
zkd^~b(aGzArj08{>cnzOuy04C+C`}gb|Yz-1avxeWzev3NzcHb<pG3uZzt6%N_M`H
z63Z^ZKqoGZc8Lo{3_x10h0fhGO0|hnn_f$^(nSX^2^uxdKSsxjo4qPli^yf&E(~ZT
z1mV|r$Sq=R+vNgcB?V-eJF|f%of#c231}t2Hhy-ks#-%;>z_&4W@QCr$z3~w=8Ua-
z`;vfG1~BP8CyLb=F7t1am~ph_#|O%$khSJ9%Vtcn)YmpgQxF?xM<vI^;GRAEI=6(o
z!@KAW9tUBYeDbWUR*=;{nzD_?0kAXj(FnJKLyxD@W^C=OI{Dn1XoVQOdR%qPoISf=
z9>^_Vb+5fnpB^W0I`f%X8gb9#X{Q-yJG0{Z56aWeI&zPxnf5pdJA38bM`cYnS#x)%
z`n1tFf$i)W-hGm(f9mde^=X@NcV_lFb=P`4&CI&H=IArijGwdCk&X@uQ$5xmj!~^?
z#$ROCI)V-~t%L%GS#wo@U27ddR`4`3)WoB{R-4snfNrfee|kI8^bu#yDgYqOwas9#
zmcb`3!kRJ`Cr=_tq)8aMt{aGtUZsqwVlj6DgCGre>AEt&x8H_in!x@uwgExIh|-mA
zjdaC(29~CTVSaaF7HPbql&*9Uo8P@f)>LqCXclr}peS7_1BQ28u9PO8Eq1@`l3q9o
zkfKCaO2?T?ZyA6loW<#9_c^O=m<&h}CA!ineAD@=(gbq`vyT|tiJ6#^B1$P;;qax`
z55k&Q?wEh#87niLo*+n4L@65J(Nz~=Ya%7^(miLb(E>A3B@|Jjl;FU&D>o|9#7PJH
z?|a<zSu;Ip07(%g)WPBHm#+z16D28}dg#ALW>go!o;WC^h=|T7PVBg(DAB}72cyUS
zb(f>Bwbr!F1eTCO5fpj<{PqhY5>143p?~5ZA5H40);=@M#MYvrB6gqHbU_!GSY??i
z%s=>-ciA4*zOOZHds0a(kWewZ4h(k8h(ua7HX)Au&mY~H8KY6(_cb$_<O0w_RIGh(
zj5b~uP$jJb+Xd>&fA@QjIW-*heP3%$d!m5^AdnT}`12qA^c@!g3DOwZ5WwE2?)-yU
z!)Vx#Mtxt?FzFTwK!77sy7)sMzUd->w4^bxtpM2j!b1<f<x~!bqtR&8*R*Y>pjgyk
zGKwWGeb4)^zjy{9Es&PU1}gwg?|J#L$KJB7ett9@4M%-nGtIQr0>Fl@8-yh`-+1ed
zS6r}(MeSvgSoFmH*_WPu@i?}!AB~2?;i&IxrkNg~cQ9Som98tcq)k^|eeER|Zl77t
za-TVUc;DNvzVXJ%w52+#weN?+;i#{f#!Oc&z?81*N>^e~ltRS%ZI@lR{rs()HmqG!
zx*}ZrI-EZ}ckJMiy>A^oofwDfC~IH)z8{VHKGT@#E5I(Ll&+MnMCl>~AV7+>Gi%mF
zkU1QlKASdR0B80!YhP<$Ywi0?W2Ux45oPfxv9QolWzJPD^weBfvo4<Lv~8xkBt=At
z1tlUBk`xLcfCSQM+v&`#3$kXW7iH=TEsRjnVxh%BfWeFBVy@2gLQEqHp@pGPNU;b4
zVK9rNold70VoXyCgwUc$LP9JwHn#Di7=vk2fj|g>SONxP3<lG-Vxd@6fLYWmG!qwA
zP&gpY5&!^@QvjU-D!>5106sAmh(e+vAs0GboFD@PvNs)jNPvarhW}0YliZEg{Gazv
z+JDIpoojRVPr<*C|BTq<`6ga{5q^8^!|0cxe=rZ!zxH3%f5ZO0cQ*Z<^$Yt2{|Ek0
zyT|*F+CO@K;(owBKtGg!S^xj-Z~rga2m6nxKl9J=fBSuNKW_dLKWhJKeg^-Xe`^1?
z`TyJj)8E!#>_3Y?uKrwqq3LJ#SGU>AzUO|6`nR^u&3FNN_j<GeeqH_3zoS&&2>GOc
zw)Nw`wr3yIKhgcee6IaN=ws>M{6677%)hPwx&HzC(f&u~&)6@b2kNRzBDQAP0*H73
zq%McOmRk{B3i47qRe=DA*$&odrbEJZ*pV9XXa&p@wlW~@Yfs>V{yiTtplMhgM*-Bz
zsSnlq&pG;z0OUN%$~$<ZO!D9T#`!1$`I`)uEDsTp3AbG(+{8$XAm|$7F$y3bNSK&o
zhMQ9>3=g1UF+G*>+17eRbBf3=y79J}KR8owon@$1Z7MIrvvWWH)34nK2SD)GsrJ{l
z1Cl#oVo3A8qY3e=aF)qzms~FG#2$LzT=gs&aVMOj>(%{y<&O0cG!nCiESl~x=^dF{
zKvj8F1K8Ng171wwM5Fh4KoQw`_c6#y$(5cAm7e}~nJ#A*fx+c9;y#&W!#VukR)ugk
zK<lHF5iU?+a7q%LIY(gu+6HC@fZla2JM0Ile!_1KZv9N%EWfH8UHOSr(*_6U#b-Cb
zai)>p3=+;Ut+IYn%m+r4d*<`L2h%aDnX5}^!5R|H;(34AoVWjRx(msBZvk;rCI*|~
zdOijqI@9Z{Vu!~jvHW{lBa$rnl4+!s_5sfK3bCGk-B%iDe&@-}<f8H?NUz%;&9H88
zKeI&VsF;x;0RI0CWD-A=n<aDIbr2zA<Y!3Wi(DHhnBH?R)$`P~*0>+%fOKU|(9?V1
zHE8&@<R$bW%n4d_;X)D(J`BN4--OoA!GW*A7BtPjaSmp`zgPw*Oe`>4z)Kx!RAvAs
z!Wic9=o#(bg?kc-G68-m(jZ`^=XGUXb)}t(%&~sjFnV^sEX%hSy6UKC4iOhgV=BHV
z2w`4g7Y=s#Vu2B_?#VQ|hP39@eArgfX>-0S+dd&^mx0*wp}>)x;c4RUgxz%;oNe?&
z-7-lJ@Y^2^C;=qJsxx5|xF)*pTGhch2B&kxtn;f!7=gznk}I3}Dh}(CoMX<eGe%cp
z=v9i^xLO*DOYAZWh--Ne8Y1JFpkNLk|K_#vEpqOoMnt%@<hp8sD_<1p5We4-TpTv=
z@dBVR@NqKZ79EWW+IW3m@25-^MwFGYc|3Iaf{t{r;5BIY87t(~JYkd-!RZM95t^|g
z07?EzPs4Z1gIL&LXZM}_wC~D}fm!$9AF#Z|NLd2|?&*W35Smz$R&Hh=C8hAKESEx;
z7UL1wsQ2@>gA5-p&kS2<sXj@I%7<}I553&2vzZWIw);>02!l?!fT3t|HG*rIP~mS*
z$Wjo}jq3}z$Qq!9yrtd3fM0N629ZM?<L02(oRsk|cKnS1tXi7sM+ObQ;AZLyiGDYy
z1RgK8pSjl}{cQh;nYY)=9K%s6{tG&%9FL;!g~bmGX~a4g!n&7zzE^gC-I1bT&W``}
z66$KuBZCs7b+dQQBIP@BJSdX=5219?|NB>LU$nv@Tv9b7I;D|;0H2dsA~g7Z7zp1|
zB)XmrkMgF6OQr|R)HHD^TE{Y#j!~SR?b`Xt3Qs`B+x<<kW!i9<O`?sx%JHr)b{N_2
zsIq=l(WQUySmI-3X^7>hxexYeAjMUWdZ-*n9%(1)Wb(n2U<><7&9dwGJmrob)4%H?
zlQ%z+L-^$dFhhH|@u$%97Qz?*Ynh2VG@q|?8vY&L74&fs&_b&3$x&Oyjl~LQDRRap
zJU4U*R+(2Dd!G+lh8!V{<r1^+GAeYtGH~*MH@9IPqULc;?zD%ZNz2PCP@GD{4SECK
zPY*^?z2ea0Y)plNuqxlsmeQ^&V)zAS)RXazR|EI17g$lgY~r6eW5A-QFMHbn4F^J8
zK?Z#1jQ&ia6vN5$+;lZLMvOdX!IncZ+^BZpbtA`^!X(k2teqsW>pT_UJn+^1Qg6$`
zqkNm(a#hWyc6SP+p5=C4HL8-m`pO`5o~`-LI?_h5CsH?F_%?nDodmz&pWR20WTpJE
z?N|wSzLjMUK8E)a2tI}Lf<e1!ycmj;OhldY>;+;*M|h3Y(U#>)g1>zk9|Hd}oZAa2
zLYBWBoSW!Ts!RwXr^8h+U*@{9{zqS^iH)O<vJb;bYH<NbE9~U+1jXCB%D6D6++2OF
zC8hT}ItR8a8Ks4QSsg8TAvp2qTg7+tOXd=rH`PP_B@#$Ony(BV|E}YZJ0sKl#WIN9
z;n_@S>p<;r`Uw~nc}<^$V~_i%$GFjaG?X1@E|M`h)nekvFKt`Dh-f>@|0-`Xoq)o`
zx;JmzDfOV9qCx|EVpogEe0LK~tGS?5$$L_i6P$P6wIsCQaP_;d{{N=iV@+8LI}o#(
zvo*Ejy=IIn{rdIQh1&q-{EuohpVOjJ^Q3lD*YTp37$^RRgn8ihpdu5{Ct%5-KO!VL
zcNB6dUajXI9jkm-P|i3~GB-A(X`P1Oqqb$tcku<Vg(&6)R*R}%pmBmf#me#Ed}K@H
z8>)UJw0w3GeUijb__#QT4j%64z%EeB7S?jlWwx_7&+EEvB|6N=kV}DwnyAlX=?j`)
zmU#!$*^@NIu#n_d7;WoJV@*Fbv9|yJO4;n|BNF2xy(54RyB>t~8lUOUW$&2%Nwi1y
zx6JxW88>U2$#qhl^6KUbtmg9}D0o5vYDT7kWJthLGkpGnN4T>{St^_EU>4;DmLF9o
zr|LqsA8_MoNLQ=}w?8u!ziSZ@PC#Y<#9uJFo-ozVo6D;<8j^1$c|qAE3ZTE5i~zmE
z$BU5lw6l=EWsg^y^;8>r9qH{xfL|~PZYK#md$zZ0?o11gV<*WSW~cgy2GYGQir%wf
zt4iW8D+;s*;RGrmd(-T<@2&j(Cb9xhV*l-x`TpK`xq|7p?5R%5*s!69?2c!cC*VY*
z2DE^9pvOPLU!1e}wA8S8opcTJ3`NB>hY=JQnL~QFXR4K8A$BqJnoEB$wn-%u@E6Mh
zCfMF4kusv3N!(aHC}4)Xs^xoOwXd%e^6pi5|DZo=Q25j+6HlJ^7FodH6y1bMROR^q
zGu6)fopS`h%Sw<;ZH%TEPf+#81-#_v+@8nlR0jLcIDKQtLleOC)6yLZgC!D9X3GgS
zohwU{v$jl=quD#Go^hB{`@Qw*a%`(^jyT~=q^bWgGzRj;|12J55HWdCWV}EB|K=%N
z3Nq-qxJJ`>^|1MNN+q}zTB&ooE3j==AgK@^UW<^oSbeALa2peF)Th6{@sj0KyMNHZ
zksk1+MXN2tv+22A%cQOGpS9)77(uP9mh+!5T5ERLvF@b}$+WvXM45Z?-kCa)fb~f1
znVbTD$Gx-0Zxc`0D@YgHakge6SL0H`-vN_x?AP0>iGH0_EE&=v83hMJgaKAI0jJXm
zVxVz;X<$v6WW7}fxROO7vr#YLP;;lij5VrX{;>7kK6TtOH&6|Ar^xo>00%+u$C4@#
z>!jOt6*3><171+WxoZnKDTzJtDRw+T030;yI}~uV@9fCnei^I*j>Bp&mzP2d=FPb_
zCM*l_+$LDR3B*a!A$g#>xsrZvw0lckxmMg>0aQd7tPyN=t{dgXb;Ie+T8{fZH=gdu
zM7Rg9c(kg(Jg0?ARRRl=AONFKrvFj)lTY$KfT%6^6s`mk*ABGhsce*LsoD>K{z_M2
ziPpnu+lw22PfF!CoId^6n*G4H(Ix+#+N{C(da7<o)nCVrQ%K)QqP`yFXo7PsA<-DU
zVMn^-y!SU^P0>t1BYMGEaE#PdpOLxsVD5riQXHp@OX;`S`8VnpM~)I920w~<3|mo0
zf8~Az`*?2?H&gZ&*K&bRkV@qzvMlRHXys8*Ze2+1c?5o!^+$&MHxB@4Ee5cke52R!
zmn7AZtY6ST%ixgU5)%$<dO~q_W%Rzmn(4tRfE<xMHx$P1`u}U6@H!GZ8tEEf&cv?)
z2u#O+2S1%b{)tq(t>%QcwHj7Es-Qu^kLAPwy%7pGBw_4Q9#da^W2$}axNHr03)_nw
z5?yuNmXrI5HgS46)c5&}B)Tts49oU92>3xBLLy}FMUW=84DQbVq^;7_e7|(Sdz|&J
z73N+M`rc2rt*oSWu#7S{*s~nH6HRHJS1SmzeXk|;CA)FI4bat3<%}nkB<VHA4gqfj
zl0c&fw1Dm2e6sUf&4R3pS7y>%;;?=F>B7ms9QSxv#@+69;@>QaR?RE<L$*e~^=r_E
zM6(YEnz4sUr&1M;q>YX4&)=itG>rM{<{A79Rmk)`5ON#GL`*KX%}Ihk3w(RtM-WLt
z?f&FLF}4N^yE!(pZ&Yj&Bc`~K0@4_}*0Om?wN|}4WJ>WL;G^H2*QpgEkGA~OET-Km
zkwz|5{6dnz1U<2Pe9DNL>3g5FEIvp1jzP&2<zv~g6q4yB4PSXe1Yq;eeDSaCI$tYe
zd<>K#z~j%g6!7B;^zF+o95?fV{3mnB8*RMhCDNp>Am-3e@jNfMj?jHV$MWjk!DDKP
zkAz$Y?Sr)!GUOX}qTQ5aMh|wq1uq}~joWyKl=b_LboM#w<m`%Ex?PAOCx}KyqH|0m
zMm>i{CMuz5x6BKlA<Gnnv$B=BB8%!h*H_i-Tweiu!rKyF(6w*ztog$E7?Dn;Fsr}3
zwL`Q@oV!vslT%h4VY@}nshA9|>-<piE(ABvkYO1QD9p$yEigj)f0Cj)(&2(rbxw!V
zM%K+Ek6bSac+S_7S3O;ceo@ZQD*wDR2Tdkd<OJ+c^*EYsqI1UL^Zaq0<O)p`PIMLK
z$1kyCgIO}nO`jTwAU=at!sp{m4~1u%tP8UWy5ibk$HVQF2OM{>qy++cM01D3b7`uD
z#l6M4pI;JCypO8<S|y?OHJ-^u$MQEUXk0j9S7^e0R+yzxu2rgvqnc)8!Jfj(0GJ|#
zfKI96iqjA9&64W)LsvsI)xDh5KN*z0vDJ-~+G=~=<hD=9tEx-(&J83f7aO9jLLwyc
z;)4VHlpQ`2zPH@0X%*RsWbnz+<jsLc$^=v`tAFMl7Ri{#5|T|4UeNV&U@X@+G+gki
zfR-9a$JT8f!5P4x41Tc%J^4K-;T$xK1`JU-Q{7rnzr@AVEUhJG=PT@Pep_x+ESPlz
z0tx?tzq#;5IlYwr`sZ)IA1-}@5w1dCdU(X7bVp3{CgA;vt3_>JZ6?U&wNxR!{4oB_
zlV!x9+-&Qy6{%MQ{~yoZGkKiTSC`YS_j22~G;xUV855g2&C(zm^V!(wpcm@zn{%!g
z4}JGo(s<W9*jHf`0Z`sZNImo*zS9^}e$Hhx6?SOff0@ASakX~#!(k|vo}w9fd(?cy
zwAK`)3tyun^cNZw)rZ*mX~fh|mazC{&Xr^!lQTy`eUQx>GZ1O~to-}le<P>Um<p!Q
z<gGQ5FG|(-vlFWdETkYksRqG0&L`FE-FQ8}8w0Km*&aVL&VPE3Z_R*=0!8ED0m=#v
zHm`a~(XYG#7=I=)B-;aP4B#qGPKdDR=l}rFl{hVhe};PI53gQSx3a&9v!900Va<9R
z={~tB8-KUBmq5Ncp~B2(Z_K}=b7a=UI4je&_uXB0(>Y2RIYtNPVDpE$%vda+HD#3m
z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl
z7lySlzMbifH17-m-Lwa_F&e7nO<lMXsPt#CNgKF%HdwG@ztDK#niqC%M#bR!wQc6I
zA52LFM%an*93hR1a$6-Q5Y3MEutAX4S=G&3@BbBIaUu5=j(<^FKOPJ4u~mgGD`9GY
z#;IN>H?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W
z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0
z_d10#i44Q*rFr<T(^i|y7FsZ?QiUH5fV)rQ^pCDAt`%;DE`N^_wDGgG|9V5D{T+0f
zLdvJGflLYa)DxONTTEv{RtDYn&LmiVPZ7_9xNeE>8MC>*)v$EJvz``(pb{e&*6k+b
zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX
oeb?AaKtwrnc|$|zzw9vfv<y6>n^aJJ!zd)XFXqqy0000001=f@-~a#s
diff --git a/app/app/src/main/res/navigation/nav_graph.xml b/app/app/src/main/res/navigation/nav_graph.xml
deleted file mode 100644
index b698442..0000000
--- a/app/app/src/main/res/navigation/nav_graph.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<navigation xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/nav_graph"
- app:startDestination="@id/FirstFragment">
-
- <fragment
- android:id="@+id/FirstFragment"
- android:name="com.example.privatestorage.FirstFragment"
- android:label="@string/first_fragment_label"
- tools:layout="@layout/fragment_first">
-
- <action
- android:id="@+id/action_FirstFragment_to_SecondFragment"
- app:destination="@id/SecondFragment" />
- </fragment>
- <fragment
- android:id="@+id/SecondFragment"
- android:name="com.example.privatestorage.SecondFragment"
- android:label="@string/second_fragment_label"
- tools:layout="@layout/fragment_second">
-
- <action
- android:id="@+id/action_SecondFragment_to_FirstFragment"
- app:destination="@id/FirstFragment" />
- </fragment>
-</navigation>
\ No newline at end of file
diff --git a/app/app/src/main/res/raw/sound.ogg b/app/app/src/main/res/raw/sound.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..c9b030f06b1e306700d2269c9313f229eeac4cfe
GIT binary patch
literal 13247
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
a=+2}Csk|kYgee(xY?+ymWj@}@=KEhoYo;~;
literal 0
HcmV?d00001
diff --git a/app/app/src/main/res/values-land/dimens.xml b/app/app/src/main/res/values-land/dimens.xml
deleted file mode 100644
index 22d7f00..0000000
--- a/app/app/src/main/res/values-land/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
- <dimen name="fab_margin">48dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/app/src/main/res/values-night/themes.xml b/app/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index f06919c..0000000
--- a/app/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
- <!-- Base application theme. -->
- <style name="Theme.PrivateStorage" 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" tools:targetApi="l">?attr/colorPrimaryVariant</item>
- <!-- Customize your theme here. -->
- </style>
-</resources>
\ No newline at end of file
diff --git a/app/app/src/main/res/values-w1240dp/dimens.xml b/app/app/src/main/res/values-w1240dp/dimens.xml
deleted file mode 100644
index d73f4a3..0000000
--- a/app/app/src/main/res/values-w1240dp/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
- <dimen name="fab_margin">200dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/app/src/main/res/values-w600dp/dimens.xml b/app/app/src/main/res/values-w600dp/dimens.xml
deleted file mode 100644
index 22d7f00..0000000
--- a/app/app/src/main/res/values-w600dp/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
- <dimen name="fab_margin">48dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/app/src/main/res/values/colors.xml b/app/app/src/main/res/values/colors.xml
index f8c6127..2d0885c 100644
--- a/app/app/src/main/res/values/colors.xml
+++ b/app/app/src/main/res/values/colors.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <color name="purple_200">#FFBB86FC</color>
- <color name="purple_500">#FF6200EE</color>
- <color name="purple_700">#FF3700B3</color>
- <color name="teal_200">#FF03DAC5</color>
- <color name="teal_700">#FF018786</color>
- <color name="black">#FF000000</color>
- <color name="white">#FFFFFFFF</color>
-</resources>
\ No newline at end of file
+ <color name="red">#b53f3f</color>
+ <color name="green">#3f8e3d</color>
+ <color name="blue">@color/colorPrimary</color>
+</resources>
diff --git a/app/app/src/main/res/values/dimens.xml b/app/app/src/main/res/values/dimens.xml
deleted file mode 100644
index 125df87..0000000
--- a/app/app/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
- <dimen name="fab_margin">16dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/app/src/main/res/values/strings.xml b/app/app/src/main/res/values/strings.xml
index 0fdfc53..6d00cac 100644
--- a/app/app/src/main/res/values/strings.xml
+++ b/app/app/src/main/res/values/strings.xml
@@ -1,12 +1,33 @@
<resources>
- <string name="app_name">PrivateStorage</string>
- <string name="action_settings">Settings</string>
- <!-- Strings used for fragments for navigation -->
- <string name="first_fragment_label">First Fragment</string>
- <string name="second_fragment_label">Second Fragment</string>
- <string name="next">Next</string>
- <string name="previous">Previous</string>
-
- <string name="hello_first_fragment">Hello first fragment</string>
- <string name="hello_second_fragment">Hello second fragment. Arg: %1$s</string>
-</resources>
\ No newline at end of file
+
+ <string name="app_id">com.chaquo.python.demo3</string>
+ <string name="app_name">Chaquopy demo</string>
+
+ <string name="ui_demo">Android UI demo</string>
+ <string name="ui_demo_summary">Demonstrates writing an app entirely in Python</string>
+ <string name="demo_caption">This activity was written entirely in Python using the Chaquopy
+ Python API. To view its source code, press the button above.</string>
+ <string name="view_source">View source</string>
+ <string name="demo_dialog">Dialog box</string>
+ <string name="demo_dialog_title">Dialog from Python</string>
+ <string name="demo_dialog_text">Select title color</string>
+ <string name="red">Red</string>
+ <string name="green">Green</string>
+ <string name="blue">Blue</string>
+ <string name="demo_notify">Notification</string>
+ <string name="demo_notify_title">Notification from Python</string>
+ <string name="demo_notify_text">Lorem ipsum dolor sit amet</string>
+ <string name="demo_toast">Toast</string>
+ <string name="demo_toast_text">Toast from Python</string>
+ <string name="demo_sound">Sound</string>
+ <string name="demo_vibrate">Vibration</string>
+
+ <string name="java_demo">Java API demo</string>
+ <string name="java_demo_summary">Demonstrates using a Python library from Java code</string>
+ <string name="java_demo_caption">This activity uses the Chaquopy Java API and the Python
+ Pygments library to format a copy of its own source code as HTML.</string>
+
+ <string name="java_unit_test">Java unit tests</string>
+ <string name="python_unit_test">Python unit tests</string>
+
+</resources>
diff --git a/app/app/src/main/res/values/themes.xml b/app/app/src/main/res/values/themes.xml
deleted file mode 100644
index 04b38ca..0000000
--- a/app/app/src/main/res/values/themes.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
- <!-- Base application theme. -->
- <style name="Theme.PrivateStorage" 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" tools:targetApi="l">?attr/colorPrimaryVariant</item>
- <!-- Customize your theme here. -->
- </style>
-
- <style name="Theme.PrivateStorage.NoActionBar">
- <item name="windowActionBar">false</item>
- <item name="windowNoTitle">true</item>
- </style>
-
- <style name="Theme.PrivateStorage.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
- <style name="Theme.PrivateStorage.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
-</resources>
\ No newline at end of file
diff --git a/app/app/src/main/res/xml/activity_main.xml b/app/app/src/main/res/xml/activity_main.xml
new file mode 100644
index 0000000..8d586b1
--- /dev/null
+++ b/app/app/src/main/res/xml/activity_main.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orderingFromXml="true">
+
+ <Preference android:title="@string/repl" android:summary="@string/repl_summary">
+ <intent android:targetPackage="@string/app_id"
+ android:targetClass="com.chaquo.python.utils.ReplActivity"/>
+ </Preference>
+
+ <Preference android:title="@string/ui_demo" android:summary="@string/ui_demo_summary">
+ <intent android:targetPackage="@string/app_id"
+ android:targetClass="chaquopy.demo.ui_demo.UIDemoActivity"/>
+ </Preference>
+
+ <Preference android:title="@string/java_demo" android:summary="@string/java_demo_summary">
+ <intent android:targetPackage="@string/app_id"
+ android:targetClass="com.chaquo.python.demo.JavaDemoActivity"/>
+ </Preference>
+
+ <Preference android:title="@string/java_unit_test">
+ <intent android:targetPackage="@string/app_id"
+ android:targetClass="com.chaquo.python.demo.JavaTestActivity"/>
+ </Preference>
+
+ <Preference android:title="@string/python_unit_test">
+ <intent android:targetPackage="@string/app_id"
+ android:targetClass="com.chaquo.python.utils.PythonTestActivity"/>
+ </Preference>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/app/app/src/main/res/xml/activity_ui_demo.xml b/app/app/src/main/res/xml/activity_ui_demo.xml
new file mode 100644
index 0000000..4b3fcff
--- /dev/null
+++ b/app/app/src/main/res/xml/activity_ui_demo.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orderingFromXml="true">
+
+ <Preference android:title="@string/demo_dialog" android:key="demo_dialog"/>
+ <Preference android:title="@string/demo_toast" android:key="demo_toast"/>
+ <Preference android:title="@string/demo_sound" android:key="demo_sound"/>
+ <Preference android:title="@string/demo_vibrate" android:key="demo_vibrate"/>
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/app/app/src/main/res/xml/backup_rules.xml b/app/app/src/main/res/xml/backup_rules.xml
deleted file mode 100644
index fa0f996..0000000
--- a/app/app/src/main/res/xml/backup_rules.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
- Sample backup rules file; uncomment and customize as necessary.
- See https://developer.android.com/guide/topics/data/autobackup
- for details.
- Note: This file is ignored for devices older that API 31
- See https://developer.android.com/about/versions/12/backup-restore
--->
-<full-backup-content>
- <!--
- <include domain="sharedpref" path="."/>
- <exclude domain="sharedpref" path="device.xml"/>
--->
-</full-backup-content>
\ No newline at end of file
diff --git a/app/app/src/main/res/xml/data_extraction_rules.xml b/app/app/src/main/res/xml/data_extraction_rules.xml
deleted file mode 100644
index 9ee9997..0000000
--- a/app/app/src/main/res/xml/data_extraction_rules.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
- Sample data extraction rules file; uncomment and customize as necessary.
- See https://developer.android.com/about/versions/12/backup-restore#xml-changes
- for details.
--->
-<data-extraction-rules>
- <cloud-backup>
- <!-- TODO: Use <include> and <exclude> to control what is backed up.
- <include .../>
- <exclude .../>
- -->
- </cloud-backup>
- <!--
- <device-transfer>
- <include .../>
- <exclude .../>
- </device-transfer>
- -->
-</data-extraction-rules>
\ No newline at end of file
diff --git a/app/app/src/test/java/com/chaquo/python/utils/BufferedLiveEventTest.java b/app/app/src/test/java/com/chaquo/python/utils/BufferedLiveEventTest.java
new file mode 100644
index 0000000..7156b52
--- /dev/null
+++ b/app/app/src/test/java/com/chaquo/python/utils/BufferedLiveEventTest.java
@@ -0,0 +1,91 @@
+package com.chaquo.python.utils;
+
+import androidx.annotation.*;
+import androidx.arch.core.executor.testing.*;
+import androidx.lifecycle.*;
+import androidx.lifecycle.Observer;
+import java.util.*;
+import org.junit.*;
+import org.junit.rules.*;
+
+import static androidx.lifecycle.Lifecycle.Event.*;
+import static org.junit.Assert.*;
+
+public class BufferedLiveEventTest implements LifecycleOwner {
+
+ @Rule public TestRule instantExecutorRule = new InstantTaskExecutorRule();
+ @Rule public ExpectedException thrown = ExpectedException.none();
+
+ private LifecycleRegistry lifecycle = new LifecycleRegistry(this);
+
+ private BufferedLiveEvent<String> ble = new BufferedLiveEvent<>();
+
+ private static class MockObserver<T> implements Observer<T> {
+ public List<T> observed = new ArrayList<>();
+
+ @Override public void onChanged(@Nullable T t) {
+ observed.add(t);
+ }
+ }
+
+ private MockObserver<String> observer = new MockObserver<>();
+
+ @Before public void setUp() throws Exception {
+ ble.observe(this, observer);
+ assertObserved();
+ }
+
+ @NonNull @Override public Lifecycle getLifecycle() {
+ return lifecycle;
+ }
+
+ @Test public void startStopStart() {
+ ble.setValue("a");
+ assertObserved();
+ lifecycle.handleLifecycleEvent(ON_START);
+ assertObserved("a");
+ ble.setValue("b");
+ assertObserved("b");
+ ble.setValue("c");
+ lifecycle.handleLifecycleEvent(ON_STOP);
+ ble.setValue("d");
+ ble.setValue("e");
+ assertObserved("c");
+ lifecycle.handleLifecycleEvent(ON_START);
+ assertObserved("d", "e");
+ }
+
+ @Test public void nullValue() {
+ lifecycle.handleLifecycleEvent(ON_START);
+ ble.setValue("a");
+ ble.setValue(null);
+ ble.setValue("b");
+ assertObserved("a", null, "b");
+ }
+
+ @Test public void observeMultiple() {
+ thrown.expect(IllegalStateException.class);
+ thrown.expectMessage("Cannot register multiple observers on a SingleLiveEvent");
+ ble.observe(this, new Observer<String>() {
+ @Override public void onChanged(@Nullable String s) {}
+ });
+ }
+
+ @Test public void observeRemoveObserve() {
+ lifecycle.handleLifecycleEvent(ON_START);
+ ble.setValue("a");
+ assertObserved("a");
+ ble.removeObserver(observer);
+ ble.setValue("c");
+ ble.setValue("d");
+ assertObserved();
+ ble.observe(this, observer);
+ assertObserved("c", "d");
+ }
+
+ public void assertObserved(String... expected) {
+ assertEquals(Arrays.asList(expected), observer.observed);
+ observer.observed.clear();
+ }
+
+}
diff --git a/app/app/src/test/java/com/example/privatestorage/ExampleUnitTest.kt b/app/app/src/test/java/com/example/privatestorage/ExampleUnitTest.kt
deleted file mode 100644
index 171bd4c..0000000
--- a/app/app/src/test/java/com/example/privatestorage/ExampleUnitTest.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.example.privatestorage
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
- @Test
- fun addition_isCorrect() {
- assertEquals(4, 2 + 2)
- }
-}
\ No newline at end of file
diff --git a/app/app/src/utils/java/com/chaquo/python/utils/App.java b/app/app/src/utils/java/com/chaquo/python/utils/App.java
new file mode 100644
index 0000000..6526a42
--- /dev/null
+++ b/app/app/src/utils/java/com/chaquo/python/utils/App.java
@@ -0,0 +1,20 @@
+package com.chaquo.python.utils;
+
+import android.content.*;
+import androidx.preference.*;
+import com.chaquo.python.android.*;
+
+
+public class App extends PyApplication {
+
+ public static App context;
+ public static SharedPreferences prefs;
+
+ @Override
+ public void onCreate() {
+ super.onCreate();
+ context = this;
+ prefs = PreferenceManager.getDefaultSharedPreferences(this);
+ }
+
+}
\ No newline at end of file
diff --git a/app/app/src/utils/java/com/chaquo/python/utils/BufferedLiveEvent.java b/app/app/src/utils/java/com/chaquo/python/utils/BufferedLiveEvent.java
new file mode 100644
index 0000000..573e99d
--- /dev/null
+++ b/app/app/src/utils/java/com/chaquo/python/utils/BufferedLiveEvent.java
@@ -0,0 +1,45 @@
+package com.chaquo.python.utils;
+
+import android.os.*;
+import androidx.annotation.*;
+import java.util.*;
+
+/** Similar to SimpleLiveEvent, but any values set while inactive will be buffered. As soon as
+ * we have an active observer, it will be notified of those values in the same order as they were
+ * set. */
+public class BufferedLiveEvent<T> extends SingleLiveEvent<T> {
+
+ private ArrayList<T> mBuffer = new ArrayList<>();
+ private Handler mHandler;
+
+ /** Unlike in the base class, multiple calls to postData will always result in multiple values
+ * being notified to the observer. */
+ @Override public void postValue(@Nullable final T value) {
+ // Delay initialization for unit tests.
+ if (mHandler == null) {
+ mHandler = new Handler(Looper.getMainLooper());
+ }
+ mHandler.post(new Runnable() {
+ @Override public void run() {
+ setValue(value);
+ }
+ });
+ }
+
+ @Override public void setValue(@Nullable T t) {
+ if (hasActiveObservers() && mBuffer.isEmpty()) { // See onActive
+ super.setValue(t);
+ } else {
+ mBuffer.add(t);
+ }
+ }
+
+ @Override protected void onActive() {
+ // Don't use a foreach loop, an observer might call setValue and lengthen the buffer.
+ for (int i = 0; i < mBuffer.size(); i++) {
+ super.setValue(mBuffer.get(i));
+ }
+ mBuffer.clear();
+ }
+
+}
diff --git a/app/app/src/utils/java/com/chaquo/python/utils/ConsoleActivity.java b/app/app/src/utils/java/com/chaquo/python/utils/ConsoleActivity.java
new file mode 100644
index 0000000..a07807c
--- /dev/null
+++ b/app/app/src/utils/java/com/chaquo/python/utils/ConsoleActivity.java
@@ -0,0 +1,398 @@
+package com.chaquo.python.utils;
+
+import androidx.annotation.NonNull;
+import android.app.*;
+import android.graphics.*;
+import android.os.*;
+import android.text.*;
+import android.text.style.*;
+import android.view.*;
+import android.view.inputmethod.*;
+import android.widget.*;
+import androidx.annotation.*;
+import androidx.appcompat.app.*;
+import androidx.core.content.*;
+import androidx.lifecycle.*;
+
+public abstract class ConsoleActivity extends AppCompatActivity
+implements ViewTreeObserver.OnGlobalLayoutListener, ViewTreeObserver.OnScrollChangedListener {
+
+ // Because tvOutput has freezesText enabled, letting it get too large can cause a
+ // TransactionTooLargeException. The limit isn't in the saved state itself, but in the
+ // Binder transaction which transfers it to the system server. So it doesn't happen if
+ // you're rotating the screen, but it does happen when you press Back.
+ //
+ // The exception message shows the size of the failed transaction, so I can determine from
+ // experiment that the limit is about 500 KB, and each character consumes 4 bytes.
+ private final int MAX_SCROLLBACK_LEN = 100000;
+
+ private EditText etInput;
+ private ScrollView svOutput;
+ private TextView tvOutput;
+ private int outputWidth = -1, outputHeight = -1;
+
+ enum Scroll {
+ TOP, BOTTOM
+ }
+ private Scroll scrollRequest;
+
+ public static class ConsoleModel extends ViewModel {
+ boolean pendingNewline = false; // Prevent empty line at bottom of screen
+ int scrollChar = 0; // Character offset of the top visible line.
+ int scrollAdjust = 0; // Pixels by which that line is scrolled above the top
+ // (prevents movement when keyboard hidden/shown).
+ }
+ private ConsoleModel consoleModel;
+
+ protected Task task;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ consoleModel = ViewModelProviders.of(this).get(ConsoleModel.class);
+ task = ViewModelProviders.of(this).get(getTaskClass());
+ setContentView(resId("layout", "activity_console"));
+ createInput();
+ createOutput();
+ }
+
+ protected abstract Class<? extends Task> getTaskClass();
+
+ private void createInput() {
+ etInput = findViewById(resId("id", "etInput"));
+
+ // Strip formatting from pasted text.
+ etInput.addTextChangedListener(new TextWatcher() {
+ public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+ public void onTextChanged(CharSequence s, int start, int before, int count) {}
+ public void afterTextChanged(Editable e) {
+ for (CharacterStyle cs : e.getSpans(0, e.length(), CharacterStyle.class)) {
+ e.removeSpan(cs);
+ }
+ }
+ });
+
+ // At least on API level 28, if an ACTION_UP is lost during a rotation, then the app
+ // (or any other app which takes focus) will receive an endless stream of ACTION_DOWNs
+ // until the key is pressed again. So we react to ACTION_UP instead.
+ etInput.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+ @Override
+ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
+ if (actionId == EditorInfo.IME_ACTION_DONE ||
+ (event != null && event.getAction() == KeyEvent.ACTION_UP)) {
+ String text = etInput.getText().toString() + "\n";
+ etInput.setText("");
+ output(span(text, new StyleSpan(Typeface.BOLD)));
+ scrollTo(Scroll.BOTTOM);
+ task.onInput(text);
+ }
+
+ // If we return false on ACTION_DOWN, we won't be given the ACTION_UP.
+ return true;
+ }
+ });
+
+ task.inputEnabled.observe(this, new Observer<Boolean>() {
+ @Override public void onChanged(@Nullable Boolean enabled) {
+ InputMethodManager imm = (InputMethodManager) getSystemService(INPUT_METHOD_SERVICE);
+ if (enabled) {
+ etInput.setVisibility(View.VISIBLE);
+ etInput.setEnabled(true);
+
+ // requestFocus alone doesn't always bring up the soft keyboard during startup
+ // on the Nexus 4 with API level 22: probably some race condition. (After
+ // rotation with input *already* enabled, the focus may be overridden by
+ // onRestoreInstanceState, which will run after this observer.)
+ etInput.requestFocus();
+ imm.showSoftInput(etInput, InputMethodManager.SHOW_IMPLICIT);
+ } else {
+ // Disable rather than hide, otherwise tvOutput gets a gray background on API
+ // level 26, like tvCaption in the main menu when you press an arrow key.
+ etInput.setEnabled(false);
+ imm.hideSoftInputFromWindow(tvOutput.getWindowToken(), 0);
+ }
+ }
+ });
+ }
+
+ private void createOutput() {
+ svOutput = findViewById(resId("id", "svOutput"));
+ svOutput.getViewTreeObserver().addOnGlobalLayoutListener(this);
+
+ tvOutput = findViewById(resId("id", "tvOutput"));
+ if (Build.VERSION.SDK_INT >= 23) {
+ // noinspection WrongConstant
+ tvOutput.setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE);
+ }
+ // Don't start observing task.output yet: we need to restore the scroll position first so
+ // we maintain the scrolled-to-bottom state.
+ }
+
+ @Override protected void onRestoreInstanceState(@NonNull Bundle savedInstanceState) {
+ // Don't restore the UI state unless we have the non-UI state as well.
+ if (task.getState() != Thread.State.NEW) {
+ super.onRestoreInstanceState(savedInstanceState);
+ }
+ }
+
+ @Override protected void onResume() {
+ super.onResume();
+ // Needs to be in onResume rather than onStart because onRestoreInstanceState runs
+ // between them.
+ if (task.getState() == Thread.State.NEW) {
+ task.start();
+ }
+ }
+
+ @Override protected void onPause() {
+ super.onPause();
+ saveScroll(); // Necessary to save bottom position in case we've never scrolled.
+ }
+
+ // This callback is run after onResume, after each layout pass. If a view's size, position
+ // or visibility has changed, the new values will be visible here.
+ @Override public void onGlobalLayout() {
+ if (outputWidth != svOutput.getWidth() || outputHeight != svOutput.getHeight()) {
+ // Can't register this listener in onCreate on API level 15
+ // (https://stackoverflow.com/a/35054919).
+ if (outputWidth == -1) {
+ svOutput.getViewTreeObserver().addOnScrollChangedListener(this);
+ }
+
+ // Either we've just started up, or the keyboard has been hidden or shown.
+ outputWidth = svOutput.getWidth();
+ outputHeight = svOutput.getHeight();
+ restoreScroll();
+ } else if (scrollRequest != null) {
+ int y = -1;
+ switch (scrollRequest) {
+ case TOP:
+ y = 0;
+ break;
+ case BOTTOM:
+ y = tvOutput.getHeight();
+ break;
+ }
+
+ // Don't use smooth scroll, because if an output call happens while it's animating
+ // towards the bottom, isScrolledToBottom will believe we've left the bottom and
+ // auto-scrolling will stop. Don't use fullScroll either, because not only does it use
+ // smooth scroll, it also grabs focus.
+ svOutput.scrollTo(0, y);
+ scrollRequest = null;
+ }
+ }
+
+ @Override public void onScrollChanged() {
+ saveScroll();
+ }
+
+ // After a rotation, a ScrollView will restore the previous pixel scroll position. However, due
+ // to re-wrapping, this may result in a completely different piece of text being visible. We'll
+ // try to maintain the text position of the top line, unless the view is scrolled to the bottom,
+ // in which case we'll maintain that. Maintaining the bottom line will also cause a scroll
+ // adjustment when the keyboard's hidden or shown.
+ private void saveScroll() {
+ if (isScrolledToBottom()) {
+ consoleModel.scrollChar = tvOutput.getText().length();
+ consoleModel.scrollAdjust = 0;
+ } else {
+ int scrollY = svOutput.getScrollY();
+ Layout layout = tvOutput.getLayout();
+ if (layout != null) { // See note in restoreScroll
+ int line = layout.getLineForVertical(scrollY);
+ consoleModel.scrollChar = layout.getLineStart(line);
+ consoleModel.scrollAdjust = scrollY - layout.getLineTop(line);
+ }
+ }
+ }
+
+ private void restoreScroll() {
+ removeCursor();
+
+ // getLayout sometimes returns null even when called from onGlobalLayout. The
+ // documentation says this can happen if the "text or width has recently changed", but
+ // does not define "recently". See Electron Cash issues #1330 and #1592.
+ Layout layout = tvOutput.getLayout();
+ if (layout != null) {
+ int line = layout.getLineForOffset(consoleModel.scrollChar);
+ svOutput.scrollTo(0, layout.getLineTop(line) + consoleModel.scrollAdjust);
+ }
+
+ // If we are now scrolled to the bottom, we should stick there. (scrollTo probably won't
+ // trigger onScrollChanged unless the scroll actually changed.)
+ saveScroll();
+
+ task.output.removeObservers(this);
+ task.output.observe(this, new Observer<CharSequence>() {
+ @Override public void onChanged(@Nullable CharSequence text) {
+ output(text);
+ }
+ });
+ }
+
+ private boolean isScrolledToBottom() {
+ int visibleHeight = (svOutput.getHeight() - svOutput.getPaddingTop() -
+ svOutput.getPaddingBottom());
+ int maxScroll = Math.max(0, tvOutput.getHeight() - visibleHeight);
+ return (svOutput.getScrollY() >= maxScroll);
+ }
+
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ MenuInflater mi = getMenuInflater();
+ mi.inflate(resId("menu", "top_bottom"), menu);
+ return true;
+ }
+
+ @Override public boolean onOptionsItemSelected(MenuItem item) {
+ int id = item.getItemId();
+ if (id == resId("id", "menu_top")) {
+ scrollTo(Scroll.TOP);
+ } else if (id == resId("id", "menu_bottom")) {
+ scrollTo(Scroll.BOTTOM);
+ } else {
+ return false;
+ }
+ return true;
+ }
+
+ public static Spannable span(CharSequence text, Object... spans) {
+ Spannable spanText = new SpannableStringBuilder(text);
+ for (Object span : spans) {
+ spanText.setSpan(span, 0, text.length(), 0);
+ }
+ return spanText;
+ }
+
+ private void output(CharSequence text) {
+ removeCursor();
+ if (consoleModel.pendingNewline) {
+ tvOutput.append("\n");
+ consoleModel.pendingNewline = false;
+ }
+ if (text.charAt(text.length() - 1) == '\n') {
+ tvOutput.append(text.subSequence(0, text.length() - 1));
+ consoleModel.pendingNewline = true;
+ } else {
+ tvOutput.append(text);
+ }
+
+ Editable scrollback = (Editable) tvOutput.getText();
+ if (scrollback.length() > MAX_SCROLLBACK_LEN) {
+ scrollback.delete(0, MAX_SCROLLBACK_LEN / 10);
+ }
+
+ // Changes to the TextView height won't be reflected by getHeight until after the
+ // next layout pass, so isScrolledToBottom is safe here.
+ if (isScrolledToBottom()) {
+ scrollTo(Scroll.BOTTOM);
+ }
+ }
+
+ // Don't actually scroll until the next onGlobalLayout, when we'll know what the new TextView
+ // height is.
+ private void scrollTo(Scroll request) {
+ // The "top" button should take priority over an auto-scroll.
+ if (scrollRequest != Scroll.TOP) {
+ scrollRequest = request;
+ svOutput.requestLayout();
+ }
+ }
+
+ // Because we've set textIsSelectable, the TextView will create an invisible cursor (i.e. a
+ // zero-length selection) during startup, and re-create it if necessary whenever the user taps
+ // on the view. When a TextView is focused and it has a cursor, it will adjust its containing
+ // ScrollView whenever the text changes in an attempt to keep the cursor on-screen.
+ // textIsSelectable implies focusable, so if there are no other focusable views in the layout,
+ // then it will always be focused.
+ //
+ // To avoid interference from this, we'll remove any cursor before we adjust the scroll.
+ // A non-zero-length selection is left untouched and may affect the scroll in the normal way,
+ // which is fine because it'll only exist if the user deliberately created it.
+ private void removeCursor() {
+ Spannable text = (Spannable) tvOutput.getText();
+ int selStart = Selection.getSelectionStart(text);
+ int selEnd = Selection.getSelectionEnd(text);
+
+ // When textIsSelectable is set, the buffer type after onRestoreInstanceState is always
+ // Spannable, regardless of the value of bufferType. It would then become Editable (and
+ // have a cursor added), during the first call to append(). Make that happen now so we can
+ // remove the cursor before append() is called.
+ if (!(text instanceof Editable)) {
+ tvOutput.setText(text, TextView.BufferType.EDITABLE);
+ text = (Editable) tvOutput.getText();
+
+ // setText removes any existing selection, at least on API level 26.
+ if (selStart >= 0) {
+ Selection.setSelection(text, selStart, selEnd);
+ }
+ }
+
+ if (selStart >= 0 && selStart == selEnd) {
+ Selection.removeSelection(text);
+ }
+
+ }
+
+ public int resId(String type, String name) {
+ return Utils.resId(this, type, name);
+ }
+
+ // =============================================================================================
+
+ public static abstract class Task extends AndroidViewModel {
+
+ private Thread.State state = Thread.State.NEW;
+
+ public void start() {
+ new Thread(() -> {
+ try {
+ Task.this.run();
+ output(spanColor("[Finished]", resId("color", "console_meta")));
+ } finally {
+ inputEnabled.postValue(false);
+ state = Thread.State.TERMINATED;
+ }
+ }).start();
+ state = Thread.State.RUNNABLE;
+ }
+
+ public Thread.State getState() { return state; }
+
+ public MutableLiveData<Boolean> inputEnabled = new MutableLiveData<>();
+ public BufferedLiveEvent<CharSequence> output = new BufferedLiveEvent<>();
+
+ public Task(Application app) {
+ super(app);
+ inputEnabled.setValue(false);
+ }
+
+ /** Override this method to provide the task's implementation. It will be called on a
+ * background thread. */
+ public abstract void run();
+
+ /** Called on the UI thread each time the user enters some input, A trailing newline is
+ * always included. The base class implementation does nothing. */
+ public void onInput(String text) {}
+
+ public void output(final CharSequence text) {
+ if (text.length() == 0) return;
+ output.postValue(text);
+ }
+
+ public void outputError(CharSequence text) {
+ output(spanColor(text, resId("color", "console_error")));
+ }
+
+ public Spannable spanColor(CharSequence text, int colorId) {
+ int color = ContextCompat.getColor(this.getApplication(), colorId);
+ return span(text, new ForegroundColorSpan(color));
+ }
+
+ public int resId(String type, String name) {
+ return Utils.resId(getApplication(), type, name);
+ }
+ }
+
+}
diff --git a/app/app/src/utils/java/com/chaquo/python/utils/MainActivity.java b/app/app/src/utils/java/com/chaquo/python/utils/MainActivity.java
new file mode 100644
index 0000000..d47d762
--- /dev/null
+++ b/app/app/src/utils/java/com/chaquo/python/utils/MainActivity.java
@@ -0,0 +1,40 @@
+package com.chaquo.python.utils;
+
+import android.content.pm.*;
+import android.os.*;
+import android.text.method.*;
+import android.widget.*;
+import androidx.appcompat.app.*;
+import androidx.preference.*;
+
+public class MainActivity extends AppCompatActivity {
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ try {
+ String version = getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
+ setTitle(getTitle() + " " + version);
+ } catch (PackageManager.NameNotFoundException ignored) {}
+
+ setContentView(resId("layout", "activity_menu"));
+ ((TextView)findViewById(resId("id", "tvCaption")))
+ .setText(resId("string", "main_caption"));
+ getSupportFragmentManager().beginTransaction()
+ .replace(resId("id", "flMenu"), new MenuFragment())
+ .commit();
+
+ ((TextView)findViewById(resId("id", "tvCaption"))).setMovementMethod(LinkMovementMethod.getInstance());
+ }
+
+ public static class MenuFragment extends PreferenceFragmentCompat {
+ @Override
+ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+ addPreferencesFromResource(Utils.resId(getContext(), "xml", "activity_main"));
+ }
+ }
+
+ public int resId(String type, String name) {
+ return Utils.resId(this, type, name);
+ }
+}
diff --git a/app/app/src/utils/java/com/chaquo/python/utils/PythonConsoleActivity.java b/app/app/src/utils/java/com/chaquo/python/utils/PythonConsoleActivity.java
new file mode 100644
index 0000000..893a914
--- /dev/null
+++ b/app/app/src/utils/java/com/chaquo/python/utils/PythonConsoleActivity.java
@@ -0,0 +1,118 @@
+package com.chaquo.python.utils;
+
+import android.app.*;
+import android.os.*;
+import android.text.*;
+import android.util.*;
+import android.widget.*;
+import androidx.lifecycle.*;
+import com.chaquo.python.*;
+
+/** Base class for a console-based activity that will run Python code. sys.stdout and sys.stderr
+ * will be directed to the output view whenever the activity is resumed. If the Python code
+ * caches their values, it can direct output to the activity even when it's paused.
+ *
+ * Unless inputType is InputType.TYPE_NULL, sys.stdin will also be redirected whenever
+ * the activity is resumed. The input box will initially be hidden, and will be displayed the
+ * first time sys.stdin is read. */
+public abstract class PythonConsoleActivity extends ConsoleActivity {
+
+ protected Task task;
+
+ @Override protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ task = ViewModelProviders.of(this).get(getTaskClass());
+ if (task.inputType != InputType.TYPE_NULL) {
+ ((TextView) findViewById(resId("id", "etInput"))).setInputType(task.inputType);
+ }
+ }
+
+ protected abstract Class<? extends Task> getTaskClass();
+
+ @Override protected void onResume() {
+ task.resumeStreams();
+ super.onResume(); // Starts the task thread.
+ }
+
+ @Override protected void onPause() {
+ super.onPause();
+ if (! isChangingConfigurations()) {
+ task.pauseStreams();
+ }
+ }
+
+ // =============================================================================================
+
+ public static abstract class Task extends ConsoleActivity.Task {
+
+ protected Python py = Python.getInstance();
+ private PyObject console = py.getModule("chaquopy.utils.console");
+ private PyObject sys = py.getModule("sys");
+ int inputType;
+ private PyObject stdin, stdout, stderr;
+ private PyObject realStdin, realStdout, realStderr;
+
+ public Task(Application app) {
+ this(app, InputType.TYPE_CLASS_TEXT);
+ }
+
+ public Task(Application app, int inputType) {
+ super(app);
+ this.inputType = inputType;
+ if (inputType != InputType.TYPE_NULL) {
+ realStdin = sys.get("stdin");
+ stdin = console.callAttr("ConsoleInputStream", this);
+ }
+
+ realStdout = sys.get("stdout");
+ realStderr = sys.get("stderr");
+ stdout = redirectOutput(realStdout, "output");
+ stderr = redirectOutput(realStderr, "outputError");
+ }
+
+ // We're not using method references, because that would prevent using this code with
+ // old versions of Chaquopy.
+ private PyObject redirectOutput(PyObject stream, String methodName) {
+ return console.callAttr("ConsoleOutputStream", stream, this, methodName);
+ }
+
+ public void resumeStreams() {
+ if (stdin != null) {
+ sys.put("stdin", stdin);
+ }
+ sys.put("stdout", stdout);
+ sys.put("stderr", stderr);
+ }
+
+ public void pauseStreams() {
+ if (realStdin != null) {
+ sys.put("stdin", realStdin);
+ }
+ sys.put("stdout", realStdout);
+ sys.put("stderr", realStderr);
+ }
+
+ @SuppressWarnings("unused") // Called from Python
+ public void onInputState(boolean blocked) {
+ if (blocked) {
+ inputEnabled.postValue(true);
+ }
+ }
+
+ @Override public void onInput(String text) {
+ if (text != null) {
+ // Messages which are empty (or only consist of newlines) will not be logged.
+ Log.i("python.stdin", text.equals("\n") ? " " : text);
+ }
+ stdin.callAttr("on_input", text);
+ }
+
+ @Override protected void onCleared() {
+ super.onCleared();
+ if (stdin != null) {
+ onInput(null); // Signals EOF
+ }
+ }
+ }
+
+}
diff --git a/app/app/src/utils/java/com/chaquo/python/utils/PythonTestActivity.java b/app/app/src/utils/java/com/chaquo/python/utils/PythonTestActivity.java
new file mode 100644
index 0000000..d169462
--- /dev/null
+++ b/app/app/src/utils/java/com/chaquo/python/utils/PythonTestActivity.java
@@ -0,0 +1,34 @@
+package com.chaquo.python.utils;
+
+import android.app.*;
+import android.text.*;
+import com.chaquo.python.*;
+
+public class PythonTestActivity extends PythonConsoleActivity {
+
+ @Override protected Class<? extends Task> getTaskClass() {
+ return Task.class;
+ }
+
+ // =============================================================================================
+
+ public static class Task extends PythonConsoleActivity.Task {
+ public Task(Application app) {
+ super(app, InputType.TYPE_NULL); // test_android expects stdin to return EOF.
+ }
+
+ @SuppressWarnings("unused") // For pkgtest app.
+ public Task(Application app, int inputType) {
+ super(app, inputType);
+ }
+
+ @Override public void run() {
+ PyObject unittest = py.getModule("unittest");
+ PyObject runner = unittest.callAttr("TextTestRunner", new Kwarg("verbosity", 2));
+ PyObject loader = unittest.get("defaultTestLoader");
+ PyObject suite = loader.callAttr("loadTestsFromModule", py.getModule("chaquopy.test"));
+ runner.callAttr("run", suite);
+ }
+ }
+
+}
diff --git a/app/app/src/utils/java/com/chaquo/python/utils/ReplActivity.java b/app/app/src/utils/java/com/chaquo/python/utils/ReplActivity.java
new file mode 100644
index 0000000..4ebdf0b
--- /dev/null
+++ b/app/app/src/utils/java/com/chaquo/python/utils/ReplActivity.java
@@ -0,0 +1,40 @@
+package com.chaquo.python.utils;
+
+import android.app.*;
+import android.text.*;
+
+public class ReplActivity extends PythonConsoleActivity {
+
+ @Override protected Class<? extends Task> getTaskClass() {
+ return Task.class;
+ }
+
+ // Maintain REPL state unless the loop has been terminated, e.g. by typing `exit()`. Requires
+ // the activity to be in its own task (see AndroidManifest).
+ @Override public void onBackPressed() {
+ if (task.getState() == Thread.State.RUNNABLE) {
+ moveTaskToBack(true);
+ } else {
+ super.onBackPressed();
+ }
+ }
+
+ // =============================================================================================
+
+ public static class Task extends PythonConsoleActivity.Task {
+ // VISIBLE_PASSWORD is necessary to prevent some versions of the Google keyboard from
+ // displaying the suggestion bar.
+ public Task(Application app) {
+ super(app, (InputType.TYPE_CLASS_TEXT +
+ InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS +
+ InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD));
+ }
+
+ @Override public void run() {
+ py.getModule("chaquopy.utils.repl")
+ .callAttr("AndroidConsole", App.context)
+ .callAttr("interact");
+ }
+ }
+
+}
diff --git a/app/app/src/utils/java/com/chaquo/python/utils/SingleLiveEvent.java b/app/app/src/utils/java/com/chaquo/python/utils/SingleLiveEvent.java
new file mode 100644
index 0000000..895be1e
--- /dev/null
+++ b/app/app/src/utils/java/com/chaquo/python/utils/SingleLiveEvent.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2017 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.chaquo.python.utils;
+
+import androidx.annotation.MainThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.Observer;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * A lifecycle-aware observable that sends only new updates after subscription, used for events like
+ * navigation and Snackbar messages.
+ * <p>
+ * This avoids a common problem with events: on configuration change (like rotation) an update
+ * can be emitted if the observer is active. This LiveData only calls the observable if there's an
+ * explicit call to setValue() or call().
+ * <p>
+ * Note that only one observer is going to be notified of changes.
+ */
+public class SingleLiveEvent<T> extends MutableLiveData<T> {
+
+ private static final String TAG = "SingleLiveEvent";
+
+ private Observer<? super T> mObserver;
+ private Observer<T> mObserverWrapper;
+
+ private final AtomicBoolean mPending = new AtomicBoolean(false);
+
+ @MainThread
+ public void observe(@NonNull LifecycleOwner owner, @NonNull Observer<? super T> observer) {
+ if (mObserver != null) {
+ throw new IllegalStateException
+ ("Cannot register multiple observers on a SingleLiveEvent");
+ }
+
+ mObserver = observer;
+ mObserverWrapper = new Observer<T>() {
+ @Override
+ public void onChanged(@Nullable T t) {
+ if (mPending.compareAndSet(true, false)) {
+ mObserver.onChanged(t);
+ }
+ }
+ };
+ super.observe(owner, mObserverWrapper);
+ }
+
+ @Override
+ public void removeObserver(@NonNull Observer<? super T> observer) {
+ if (observer == mObserverWrapper || // Will happen when lifecycle owner is destroyed.
+ observer == mObserver) {
+ super.removeObserver(mObserverWrapper);
+ mObserver = mObserverWrapper = null;
+ }
+ }
+
+ @MainThread
+ public void setValue(@Nullable T t) {
+ mPending.set(true);
+ super.setValue(t);
+ }
+
+ /**
+ * Used for cases where T is Void, to make calls cleaner.
+ */
+ @MainThread
+ public void call() {
+ setValue(null);
+ }
+}
\ No newline at end of file
diff --git a/app/app/src/utils/java/com/chaquo/python/utils/Utils.java b/app/app/src/utils/java/com/chaquo/python/utils/Utils.java
new file mode 100644
index 0000000..8e6f687
--- /dev/null
+++ b/app/app/src/utils/java/com/chaquo/python/utils/Utils.java
@@ -0,0 +1,14 @@
+package com.chaquo.python.utils;
+
+import android.content.*;
+import android.content.res.*;
+
+public class Utils {
+ /** Make this package easy to copy to other apps by avoiding direct "R" references. (It
+ * would be better to do this by distributing it along with its resources in an AAR, but
+ * Chaquopy doesn't support getting Python code from an AAR yet.)*/
+ public static int resId(Context context, String type, String name) {
+ Resources resources = context.getResources();
+ return resources.getIdentifier(name, type, context.getApplicationInfo().packageName);
+ }
+}
diff --git a/app/app/src/utils/python/chaquopy/__init__.py b/app/app/src/utils/python/chaquopy/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/app/app/src/utils/python/chaquopy/utils/__init__.py b/app/app/src/utils/python/chaquopy/utils/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/app/app/src/utils/python/chaquopy/utils/console.py b/app/app/src/utils/python/chaquopy/utils/console.py
new file mode 100644
index 0000000..261eba0
--- /dev/null
+++ b/app/app/src/utils/python/chaquopy/utils/console.py
@@ -0,0 +1,103 @@
+from io import TextIOBase
+from queue import Queue
+
+
+class ConsoleInputStream(TextIOBase):
+ """Receives input in on_input in one thread (non-blocking), and provides a read interface
+ in another thread (blocking).
+ """
+ def __init__(self, task):
+ self.task = task
+ self.queue = Queue()
+ self.buffer = ""
+ self.eof = False
+
+ @property
+ def encoding(self):
+ return "UTF-8"
+
+ @property
+ def errors(self):
+ return "strict" # UTF-8 encoding should never fail.
+
+ def readable(self):
+ return True
+
+ def on_input(self, input):
+ if self.eof:
+ raise ValueError("Can't add more input after EOF")
+ if input is None:
+ self.eof = True
+ self.queue.put(input)
+
+ def read(self, size=None):
+ if size is not None and size < 0:
+ size = None
+ buffer = self.buffer
+ while (self.queue is not None) and ((size is None) or (len(buffer) < size)):
+ if self.queue.empty():
+ self.task.onInputState(True)
+ input = self.queue.get()
+ self.task.onInputState(False)
+ if input is None: # EOF
+ self.queue = None
+ else:
+ buffer += input
+
+ result = buffer if (size is None) else buffer[:size]
+ self.buffer = buffer[len(result):]
+ return result
+
+ def readline(self, size=None):
+ if size is not None and size < 0:
+ size = None
+ chars = []
+ while (size is None) or (len(chars) < size):
+ c = self.read(1)
+ if not c:
+ break
+ chars.append(c)
+ if c == "\n":
+ break
+
+ return "".join(chars)
+
+
+class ConsoleOutputStream(TextIOBase):
+ """Passes each write to the underlying stream, and also to the given method, which must take
+ a single string argument.
+ """
+ def __init__(self, stream, obj, method_name):
+ self.stream = stream
+ self.method = getattr(obj, method_name)
+
+ try:
+ from java.android.stream import BytesOutputWrapper
+ except ImportError:
+ pass # Stay compatible with old versions of Chaquopy.
+ else:
+ self.buffer = BytesOutputWrapper(self)
+
+ def __repr__(self):
+ return f"<ConsoleOutputStream {self.stream}>"
+
+ @property
+ def encoding(self):
+ return self.stream.encoding
+
+ @property
+ def errors(self):
+ return self.stream.errors
+
+ def writable(self):
+ return self.stream.writable()
+
+ def write(self, s):
+ # Pass the write to the underlying stream first, so that if it throws an exception, the
+ # app crashes in the same way whether it's using ConsoleOutputStream or not (#5712).
+ result = self.stream.write(s)
+ self.method(s)
+ return result
+
+ def flush(self):
+ self.stream.flush()
diff --git a/app/app/src/utils/python/chaquopy/utils/repl.py b/app/app/src/utils/python/chaquopy/utils/repl.py
new file mode 100644
index 0000000..bd1e948
--- /dev/null
+++ b/app/app/src/utils/python/chaquopy/utils/repl.py
@@ -0,0 +1,18 @@
+from code import InteractiveConsole
+import sys
+
+
+class AndroidConsole(InteractiveConsole):
+ """`interact` must be run on a background thread, because it blocks waiting for input.
+ """
+ def __init__(self, context):
+ InteractiveConsole.__init__(self, locals={"context": context.getApplicationContext()})
+
+ def interact(self, banner=None):
+ if banner is None:
+ banner = ("Python {} on {}\n".format(sys.version, sys.platform) +
+ "The current application context is available in the variable 'context'.")
+ try:
+ InteractiveConsole.interact(self, banner)
+ except SystemExit:
+ pass
diff --git a/app/app/src/utils/res/drawable-hdpi/ic_launcher.png b/app/app/src/utils/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..de6b168c4e549e63de6ad83ecc7dbf1cd43a1b46
GIT binary patch
literal 3902
zcmV-E55e$>P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00004b3#c}2nYxW
zd<bNS00009a7bBm0005+0005+0dpiVQvd(}8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H14!cQ2K~#90?VNd#RrQs}Kfn8yUTK<U>7E7}Fb#;dL?r}Df(nR$
z0s=ZQshJq_hgy{>W>PaXm^c$8qOm5{OeR>Vnq*Q*CDBncD6%>kl~ojikxiBcT7(vb
z?q=z3dU^fcyJ!A*@7{OUw{<smC3C8pe(&7#JHK<j_k7RqcNZG|U;17aKD}`y{4Vf$
z$B~W59?In4H%jsyujM*m@eel74F%NMrOy<v&u9F#6gfPnQi^6bNWAg*nl%*U<0Iz;
zgMsdLQ7F;4ck;t4R|3I&CcYM;>w%T%GORlq3$0$wqd+)UA2|c`+CSgFhgj@QfKfGd
zk3roSK;`PEzeNttnyB>XBLKViU*6i>oS&b(D5A8`a)DU5sJLp{BM&_Rgz}rd|3pNd
z1wtL2k+Xlb^2iBb7ZA(UPhJ46d*a>`(OA!a0aVu1-XE&FXL7#2`a|U4UDFY@1cc4+
zTzs>siBEy!fS#+byptN-6<84$>C}SZ!C$_8{z}NN3HFDG9{*QBHDBsE^0mk78-eXW
zBp+XS1N71l@4FC-$DaonGHT4+iFZDHM{oS~mB<Hk9sq6wiNCn{>^9&O@G&6y`0G`3
zt$uW4@zgQWh^AGvHGR5!+m9c;2Wa!Nmu&>8{(3Flopl7%BwfYFC|y;c$BThdlvb>i
zenoV-DyR-5eo;e?qXmx>==f0Gxcz*(c;tOT5}frRA`?Ej(6zT_{@yLXuYga;6QEu#
z(VzZ&QKx!({gb-L^Mi(0O`mY@-!46|dCdzz+^{*i<FWA*2RF}Gnm$LAnnO=#DH@>b
zC{!YDmHds4B)fz{2L*xxi9@si{lL5ykR2+Z-XdD^hPw5&Gxls|KL$+DMIt|WxnU=8
z2slrk;3VScy=eD7^Lo8Tptj@6#lu^ldw9<LRqINMf`Nx3N*)oNQ6q{vSXz681>=qp
z(&8XSykd!6k{`vPCuuLKa8<%i^!PzdY5zfC(Tl_jL}HgtB2sniqbqOUxa@<iz|Vn}
z-Xzy2`<F#eZ@3SoUPmF3NTeYY4u3&(lo&}SbFVIH<2zH{p>Eh`m<Nm>6CA6a6gWyF
zQJ9)#jA_#e@p_bYODra>5B|f4KV7$@c{{L;JeGE=^hr}yN@5~JL>Cnbg=<B(0H4fV
zMEIn05RdPg$A*R*aD!tRU{h#j#iYP-20$@Ny9J;t5^bxiMF;lMOK=jddm)P+-&muU
z%5$2gzADMHnE(SMnYdXKB4&|@2+PJF;jzhk$Ve@-KbcBw)#I!>0g-r5G^+l+pkl{L
zH9o)P-H?0%(w024{`<PpR)|mxDFCeCm|;7>G4$X5;$D_~;V|CRQlR`m@BqwKiHYyA
zIA<a;zBOq2j%|77nL9vZSFJ0b91gt%GC$P<Qs5-QOI42vPBQM4t)MBLAI^A_DV2@b
z!7+M{qlw%467J*T)B%Ft))jrOe8#)qvmeM#asp`CQyZqnLTW8SjT0OrZYMZK$X0Ny
z<AxS=^2>Q^DG7C3W-?Z++^FU5Unyzt)ZdP^mM$B5&l|q`G%v}zNiThR{a?mI+D<Dt
zR&i3x)F=ND%OES|TDpr^d!o+nC?hydedhQF6>D>fhjt!p*f^yovvo?c0%+O4Y+9@b
z0>2fJLTik!zGDsBO05j~*G}C?cPyBsmUDKms_<y&X{yJNf-qyNhL^m%@0U}rOKWJ6
zi~!xedc(rF&hKzsjCv*Nq?W0(^c}mcAOdYYVRoMzmpb5;sEb<GubIIyq%f>TPP)Eu
z$9uoJd2BZJY40m9{=ueMp^#b+6p9GezGIEMG!)^E(I4~Ws&kAe>f}Oa2|aqiMJ;PS
zPIv=K=Z;Yg$z|PYorzk)iAzKI{pnf`G*=NoXGBS7+N6U4RaRaeSUS0~@ugRH(UH#9
zw@H6})y83+1sni1(h3gPsda1Rr>vN^lhRPcOy)|Ykk#+b;z-K~TlJVHn^g4}$A%Pi
zvu^PVj-}mi)k=Ji>+tNJ+u6`C!4~`Mn$tWrV=Li6+@=>vwF412-_o(GX8s@N0bPDL
z_)tt#XIQ;pfMcH|b?&Q*ukyt7?KW@#$_u(!HRCM?hr8U=a)4vV<wzkBT{A6gS(!RJ
zMSpQ<iVGZot!Kxv=8w}Iak~q#a%joS1Fzil3~4UfJpo$y?3O2$VxBWbC$$z_S5ILu
zY7ad5c~CgQ-QybUS`TWOTLFQXZVktaTBZ|Xy0EtXM!&px{nR8nqV7Av=E+I^j2~0>
zH=BNX{bGEua48q8+Hyk>{d*=YJbI#0rlZT+t(oF%lw-;+yQqaZ-d$O3kwVN$$*@~)
z?kc6V$NwQkkFL?!R+gGi+~9}^N@?M#*AMyelqpo=(Q;e>g$nea2`cPIEvvdM60#)Y
zPN+3vzYFU{tyBWSnfAdRsd_K-gTmbelv8h)^1_G>96u>73D$h~TQi@+<Kcr1pkuq1
zFVf&E*1!|L-8}?>osDCB6A}rq<Lp=)wVaLKn8Wzo+8xGTJr2+<rC1t@GQGOdH|d*(
zH&In`)gGCndc>lOl#Y9ViE~{KA8cO=1JNh5p_UQ%`xi#CrD38Yk%YW_ypE%nhPe)T
zQOnSuZ7<KTq+50Hk5k{Fve>;!R}^&fPt&)jrIwQo^{pcZUH_$-kK=f_Xm)Qo_O(0P
zySk=iLoI8fYd)C9k(Lq69dm-=#aH>Pqm0d`Ca~+=Xp60VNl*E<`#*NE(hZCkSV^fa
zy~=OyS<7#Z+{*jstI<*1GW;_hs@u=-qD~t)eqz$QwJcUtK6EzlMPMJvM?@)r;_>CB
z1>KZ~BV11Q4(D#!d5_1Cx6h2@t&hi=dJ}{+0a~eL$f2eYbj5-c1*3LQOlr9u4JnN9
zcT?W;^zWX}O)U{28i#YOB{2e_ijnuNc<9{vAMFQvAW1PfzG9G4G9MBCqSSq{>!g+e
zg4theRbkOv23V`damA7RE_CZbwtsS+^@tZH86_KPS!4La`5LbF6leey6;(5Vu_RZt
zL=TFezF$Nu2BEgR#g?cawLFX8OYcD~KmQ`|%F&yWwvGm!B~o7C_}eCIUO7IQ9)bmk
z5G*O1z{sgLle`Sm0CYXDz!+3F^n6-s<$59N37AJCHf&F{4rSZfai*VK!0{75YKg!f
zKC9;B#UYZoLnokA!KhnryPIUQ)&P`}+l?UVhFviC7hcq|#+~hjXeMeom;ayapOISf
za|R+awTyVWq9IoAxr+`xY<tL1K4ip1pc+t`99uFL^eW?cNhrb%Lz`TiD;tGeiDtiB
z&W5@dI!pNOt_4JOhtoX3@e^H#<y#lh))Pt^8Y~gCf<dEzF@UC_%D&_XlUbu1Y^wB$
zI;$u>wOrOd)cv5Tihq0m_Ozf_efuBtrq=5BW^wXLg$*22!UdHiDoE3aGr^21DYsRh
zp-_vu##yQ5sn3F1sqfyKQLCR<Pu{@ych4mf&-^-Mw$zI0@Z7$cyxr)&shDUdf`(Sa
zq?uy@rRl^+TTKw5I2d70%}2IGofPuZXGbj`>N*kz`2EMVeEY2>G<BBx1LFgZQ?7Iu
z@SSao*!0na)L;v>%t=KUR#{UG6l&;H7}T<!(g!9UBB*qCwe$(Ke1NnhYL&w+BY1Gr
zgZ%dBEp){Kb{`&<YjKANL}D7R)=%QEw|tdD%_F?QaY$itc?mEms8p=T%k}W0cJ3VA
z!2h19O$DEZTF#Zo3XV0QY^dcW9nmn)@1M?#M{j1qxO(P}J;}r&&F1|HXZ6GdPF|{D
zTjO>7&*|~BbQOD6l_NOwcaath0mVw{zd7g7p^p|`Zi|dU#JqUb5!xdKtll@9o}Pfs
zv+jJ8%?^UiR`k?Y=Qu(6+GZocP@Hkatqd!<N|=};0FhXL=8gi+U#;M3%&T|l=92D6
z$`Y5Z+8a)sX*#^|Kb44tlu}i|kes6X^N_O!K*n1T1MYR+&slW!^1cO+hV;Pl6f*=}
z2c?o7!=#UH+f|D)NsIH^Np$lyF)?2mOL{Qul}ZgrjL+@`R9&}zmc)xOmg&tbbd*?(
ztu4lQJ;%t$%4|KJc(1LnG<4S^ckR6p3`F%x0s+gjUr?4uFG@L<@}z5JP9PY$8XzlW
ze3sPPV3Ncu>C?!@w97(7Fy|F<ycwe;1(Y>bbEPvrTkkd)W~nWLQi<Q2e|`F!z|S;m
zV)j7AcEqlCA2GkXRthm!FQ=Pa!0{AwXJWZ>w{9P-;Q0EmU-cWSU{4Q~K*)8|UR<Xk
z>BK7;F+lVJ%WZG!^S~sPe5z8s!0~s0d6{8`-~o=s-f}<42;a5&!vc=Y(mNs#Ak8G4
z`W&g{1jpAFkLvLP$9FEfftGS>o5BRgt{))OGN<c%YB>SaQuY~W;fgLjwd_|A1D{%c
zyX-`h?gwh6Mhq}&rM=uR{G?R29+Z(<;!M<Q!U009bU37;mh(hddQcYBGLPg=t#lWn
zeo16Qt+edw1+@&ZE%W_JEz1lU#UC6$`#z+W12nUO@}ZXV=0{&pEBy)We`+}^%Dqv{
zfm(*XFR5j?{Jg1UNb*txPrCf6P|MecPxZK0F%J*<P|K$O9H^D9DsrWkA*qdGA5hEG
z_cOIJ0+ESYS@fwmlDZa4M=g6*Tx)8j%cK|7!k=1V9!Q9HllJo5pVZ3Yj9zPM8RBuV
zYP!C5)G}rp0Mv3;o~B!GOJ+qaM-}~vQOk*=rfHg)YIfAJoZ$gLEk7`_rB<fxkf!Up
zySEHPYNd0Z1+~%+cUF&;Vh*d^sb!nF_tZ*Dk1VK_X?#X%ImT;xK+gAyTI5HqbQRYd
zYFT~cODz#-Z*PtOqQ&A}I}xSZ61R=+A8MJ?3@~bmKrE(TeD@6^Kvet2S9aG&I--9c
z*AuV3rsn?hqm~FnWAT;)doKMq&<sS(N6piwF{N}=)#9QeykEottXqO>DA_#@&my$A
zh`%p^_Vdk=Q^)CUYN8of51g|O&`A7ejzR|T-zB>S(nI2J4MhR@KcV3EIYu7mJ^%m!
M07*qoM6N<$f^fZv#{d8T
literal 0
HcmV?d00001
diff --git a/app/app/src/utils/res/drawable-hdpi/ic_vertical_align_bottom.png b/app/app/src/utils/res/drawable-hdpi/ic_vertical_align_bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..547b89a83ee66b364d74f5c52d691c748e402b0a
GIT binary patch
literal 252
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUt!=5gVAr-gYPTR<J$UwyPvg?}W
zAB}o^qF;ndS3gSnuetAla2BW8Qqw&rb{0&V^l)Agb77x=(?7j?zk5FjSS=O3#-Y%_
zz=TYEh%6IL6c@a4>|B(9MaDt9?QuU31n=iP|5leH<WOcnMUTRjh*^OXEV4IF`Q+YR
z{!rI2%5Kiqs)hT{p1hW$cJAb}9HHka)n=T<Sura$->skAlRr1-jBY&l^%K%+;?pCA
re(CJ<uX(QH+3j$VsYT$^=RFJ?V?8t`Hi+8;y~E(?>gTe~DWM4fzd&R5
literal 0
HcmV?d00001
diff --git a/app/app/src/utils/res/drawable-hdpi/ic_vertical_align_top.png b/app/app/src/utils/res/drawable-hdpi/ic_vertical_align_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..e046e60eff197290d2ddf0a05bab0c59ec06368b
GIT binary patch
literal 252
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpUt!=5gVAr-gYPCv-iY#`wBc4<id
z+vk-6np^B6{loSgsrNEhb>hs__%b23g1I=brPAQ!I^Sjir>v)Y-yi9&Sp6ijhUI{f
zgZ4Zn7hd~+tQIaE>n26#DW%l(-8r)O=!1tJ?jP0rB{eUS>Biyr-+xLU3d)U1)3Cf+
z>Xr35chjr2m-!!ly|yx7w$PCks(%#f(!R|wDfwkrb2*#g#9J@%kG}-%T5M<EEKS;B
o8rkiC?cWoigHeD3hvMEU#+Lt<&kNI^_kg54UHx3vIVCg!06mIkb^rhX
literal 0
HcmV?d00001
diff --git a/app/app/src/utils/res/drawable-mdpi/ic_launcher.png b/app/app/src/utils/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4df75b91dfc65e13f90f61fbdd8b697ee275ec8
GIT binary patch
literal 2540
zcmV<I2^02-P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm0003>0003>0qKSLq5uE@8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H1328}0K~!jg-I;rER979xzvtYW-Oc+!UJ#%pAtVZfT0mo4EYJ)j
zwiE^{HiM3TXj?lfQ*;#T1FNEyYG-U`Wa=LdBi1s-BJwJMK`NjWXb{>G0)$sd6PiF?
zW|M4o_nx1B+<Wdl_wFW}Q2O%B?A&{9&g1+2ozL%_y&K^Fy)0R`qwaxUY~27L<Aa*h
zXjt%*;E{Qc14v2KmM0tx;XJPUAN$<H&pZOacPj*rROtAE=}gDkuAb=a0464CpU}W7
zKYs9!k*IMwbz<>q0429V<VeNPjo%1^de=O6@i>5?MC}tA0MH*9>{;jc`6g6->$z`Y
z6w7+EC3159e9pAmw=VSU-dx{t9zaW?KBF;!eZTtZUqm>3D!<^il}XcUroU&UaS9O_
zBV&Ce8fp2)+7kx>Gy)Kb`st$_e`qM!^+aG?;VV_u%fEBDvHnp2|FtJSSu-VM@M>Mt
zX9#9gaD#HeSPIjObVgcGP;`)@;zpE(n~kv6G%(;hR8U>t2*8kI7!3;_;=1_szu)Zn
z{jqas25@aO!q_Mc06@}xPj1~!x_;N?{Vy%8Soq-eL4zKt%<ruId`VOByrQ?k5S5n9
z50P`P))~PtjJ8O`_(xYCHa50RK3+Y&_4Hsw^ruz*^C<xJ06K5A0et4W8)oN^n{-S>
zqd{;jQxKWD0F-6k!1w38ilX%1VGPI%S+hEA1c`ReP_XUQ_Vr&_-S{$qhS6#owSh&y
z+%-ctj18Q#c?44%fy^rr2tb-Xgtb-sQJL4~h?N)<0gNH;iddh4P^9JZ)uHdrT=Dug
z0O4C=VD=vxk_tOop5a`741g|(Z1EsKSmI$B3Fu)wyI=>Vq<6c;LW+lJisZdz(l%^R
z-(d8wTaLfB>fy)H{+<lf{cw9he;V6L#O?x|NUP`&xmSURP@K_?=d1q)&J1NVMKB5F
zSsc^=425yA@ltT*oVpVYP?FtShTTT*TfgfQ{ptJ^;1)0EBDh7X*Gs+G*n4G~rID0T
zRgqrNYCFL1L+Pw(Y5PvRFsl|o(wGd?KE16}kJ5e+3g!GN_o^W~KUI`K*xLNb5x7?j
zsDpTl#*s0zJnO|{FU(quVYYnD`=IX0ow)+qF=8kpRU83j**CDFq7icn+R!<eg6>ej
z5w3_Q0=kBhQCoZtX-P^hk|){(G<WA<)0x|Gq;)c~lS9Z$9`H)?=jHhCubQD9+FalL
zj@PZn0I|~Q^V^`YPdRg%0xR?0#jo$#i;A2Ml;?C{ad9(Fv=`y}V2Xo~+?A|;3nyMe
zUP?cPL+4CqF1}vB6mMKFKx1b<c3vpQ?80jppBl9N5(tdJKOr}5erWLO_M@lKqbhbG
zv~=C}HPG0i*u(^ul{G<Qa`zzU+`zK3rdX6L@c<AJ+z}iHotMteKv*~u4B~jPsnQW|
z695DPykynNxxWRF8P~wZEl(E;uKh@gcUHiRf?tcoL^4?qySSI8Wxo?06XJ-M7s6m9
zHaF!n_c>#Zo1g1j_Ol<%UIc|4+dv8nt>=uTIl|p+A8eTt6U75>7h5$49VdE(Yr%9y
z8pV7T6*tEiSTv<Mu6T27uC@9XtOAfH+iL(oXO@p|31)A6y?rA0qC?icbEzjAz2N|I
z1O4b4Ova|hJFxdksU2Vy9Vu7m0uPilxeX|*Tawj{{FDK745T6_5W?4Hp2V`LO-c~d
zvCZ)}HO<WlrdFKoyLjvj0HFhbFno^|rS)m?(2)~HiD7$l1^#}%+;f;Y+o~FUBH&!t
zICS)<B0n{#h*vQLmQHQL(y2{$U5Gf*x9)p~{J0TJMRw8TFSP>u0JNJ3G4bU|>D}Or
zTsw+-V8OLAj`(=!$hsjI_FS2!2zHD2mf_Hm_j@jvA<TV&q?C+#KuH+@aB5gGnE|Dl
z{t$}Ndh8DNbc&#ux(6NCX>F~|pU+gHJLFTMKZ1DI$1Oe>PQvEKS;7#|!L*DiH8pnw
z@bQR`-zx{cBd^Vcj_Y)lB4s@eI?mPE$$}9de*W6MCUPSbZ}e4DLIB@Ba6h`kelD>H
z<QC2Xkj(-AXJvfvnRLm8j#NB0blis-2sqL<3D5rLP7LQ^By@xz{PajQF81We$bmpe
z@}*7%kjpt^<0YG=nKw|D+4&yPiQj(n*-AWdxCR5By?-Qh1|l454%Oh`JGa?`leO(}
z-IoO*ixWf+l*494`I|B5c)zH*#X}MAKEYMg0N_ANF_!OGiI>mMz+hBUwn-)W076j>
zJ1>-@ZdV<SUMqq;{naQ5;;8@vdMHf$`g(%BLlKb-07W=W6DS|&ua9$Fo1zFX->--W
zB+T#h#F+V9I7|@<5Ul4OZr%m3uC*LbC6%HwzXN4y*H~6^1OU+0pM<M@<M77yLWG7m
z1A+j8iVk9Ok_e)G03ximwl-tWo;~9M1n}`H0zfz0a&+-mNZ?LkkOl}lTtX0t3%Ooa
z55u~#-l!On{mRP)39B7r<_&qG?=6Nw_8TD?U;+YUm~V+fd2Z*D(mpzbtE(S6^*db{
z#u8oke^JxSrI!h9;wI}dc{ohP8bC4|gtfxVPB3!4|Hc-wPFu!dy<HLn12}Pz29O|d
znG;OeS{d1~Bh9z~U>66G^@YyabFA<=6WU4cY|!?3EtA(auC$9MUP)S+>FykLZ^L#w
zc`v021OVjQ;%OLxP7nDE%HKTok%@7HDpz&)an2b}J9yeE!R3%0RdnKrBaaz1`j8VQ
zh`ze5x=w6T#Cz*9p!W3cKyh{S;n8tI7$e{oq2shs(1{W6v=_omb}oc)iT^mDqtfn5
z;IX44Cmtm__JZC#I<`q`Xzr}&&7hN5ybB%KBLO<G;+^*PN?2zOcMBv%ymS9Sqhp&=
z&>_VB-8K*#MFkzJ{$ZnIkEbR$JiiOQU+Bb$x5eB9I@Z1Xs==8vRRVOB`WVr%4XNnB
zZA7XZ6*|hQcz)a+2^~4x`-qMdi1_W?<}3rk6@6!vj|w`r8T+|Bv#f)R2@xF|IwOlu
zgbsO(j1?VeQh*Eq;Nd9V8XGzzlu@8#w^Ptjkw}P+)j!-HZ2>T(|7-W*=jT>emFYUW
zn=`JP%WwV)O-!+%hGUrMlaNbI*88LrQCS25B)~v`P&hIB1A>J4KTPF+gEBC}00RsP
z4T_e1yMliL&??_>G69qV$if)^_4*-|Fn~4ySN;c4c>}fvZ+oo(0000<MNUMnLSTZ~
CWxB@z
literal 0
HcmV?d00001
diff --git a/app/app/src/utils/res/drawable-mdpi/ic_vertical_align_bottom.png b/app/app/src/utils/res/drawable-mdpi/ic_vertical_align_bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..8129d9c84979b13b8c486f5628f87a947ffc6d5f
GIT binary patch
literal 179
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJDo+>3kcwN$2@<S}8+<<e|6gye
zV8?v)++se7(gQ1)-DC}3H3YI>IP8?Cu#WAKnZ~^KCk;D29)&uban*Kz!TeECrTgMX
zM}=!kOFbSGvAoqi{+Q!eWZzN2FWY6#3Nk1E+>l@3ruZ~F>mf&w%!N+%^^?1AxAif*
c9qeFY$SAcd^!+Tj2j~h0Pgg&ebxsLQ0I2OmdjJ3c
literal 0
HcmV?d00001
diff --git a/app/app/src/utils/res/drawable-mdpi/ic_vertical_align_top.png b/app/app/src/utils/res/drawable-mdpi/ic_vertical_align_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee3154d695136cfaa0575028bf98540bca5e5c43
GIT binary patch
literal 174
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJQcoAhkcwN$2@<S}8MuG^|6i{z
zFn^&@o^%jjN268KEQ>6Y+>1&ZUoma`<`7jU(DD89T|tj&hl4Es$}}D=`en(~|8z?^
z%Y}qIg>}xSu5(Y&nb)rp$9yE_O9z*^3cCfri=IU3ffdYdvIegj0@-^C*n651nHhAP
W?UqeEy~7#k00vK2KbLh*2~7Z3wLJm=
literal 0
HcmV?d00001
diff --git a/app/app/src/utils/res/drawable-xhdpi/ic_launcher.png b/app/app/src/utils/res/drawable-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..da669bd1ed126650354d90d10b6dacc9b7a0a3e8
GIT binary patch
literal 5626
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
UxT6lJ-~a#s07*qoM6N<$g2!D8+W-In
literal 0
HcmV?d00001
diff --git a/app/app/src/utils/res/drawable-xhdpi/ic_vertical_align_bottom.png b/app/app/src/utils/res/drawable-xhdpi/ic_vertical_align_bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..299f7768ca824216892a55c52429a8474cdf989c
GIT binary patch
literal 248
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=`#oJ8Ln>~)y>7^L$U(&Q;+G`#
zZIAqdcA98US5R7a+_pEk-Qc2y;QuEvKT^BOIT}mms(4=F_tuR4WXoO-G6xqBD0pBP
zAHU-_$AQvEGo4i$a`zoSabjor>Fu50#I87XnD0|^y7N&~;8Fj7riF7q8VlT#{?F*N
z`|*8;jQSeJMBB&i0@uvz8aAB!IO$OBhHt|EU;i)Jt;*mh`v3j(eR3d6RXito?PXYW
V*reW1bdeiK#M9N!Wt~$(695r&TLl0B
literal 0
HcmV?d00001
diff --git a/app/app/src/utils/res/drawable-xhdpi/ic_vertical_align_top.png b/app/app/src/utils/res/drawable-xhdpi/ic_vertical_align_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..b828e5385a8d71157a742e595e0cf656084332f8
GIT binary patch
literal 246
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=dp%toLn>~)y>8ES$Uvg~;krk9
z>mIqzv6(elz2L=z%00oe91ki={AYRSJx|<7>{s=)Etge1CxvJ(EjjaC?1>D}1cn8s
z2fp<QJj{uSo}^S0yY6#juT9;#=SDJzF8?^b*Ot#I@s9<E{;}`<ACCQ~6SR}KFMmk<
z@o&c;i8VDXY>yu+naIcsEAD@@@6-M|-JUtx=igNA5<SP-aM@%2A&}`fz$6vV`fNtq
V4Ac1Hh`MT!B2QO8mvv4FO#o7iTU7u6
literal 0
HcmV?d00001
diff --git a/app/app/src/utils/res/drawable-xxhdpi/ic_launcher.png b/app/app/src/utils/res/drawable-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..441d8ce411cef94f3b48de56b3c5873d67d7e1d1
GIT binary patch
literal 8876
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
literal 0
HcmV?d00001
diff --git a/app/app/src/utils/res/drawable-xxhdpi/ic_vertical_align_bottom.png b/app/app/src/utils/res/drawable-xxhdpi/ic_vertical_align_bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..1972f48ce3f2162b1089a8063410a714ef0a5faa
GIT binary patch
literal 392
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>VD$HNaSW-r_4d|AufqWn?jOSn
zv$%u8Us~_nS+3=07kZF=g+|l5Yx{zK#hy@@cCBP*yk{Nzzi7_~^S(?_Tr3DQ2M7up
zO?->RfA_rYd!t+SdI^UD1B(Cy69)q$O9KOw0|TQ%1A~AA0|DU|zZ?6KC*N4}SZw2Z
zVWxY@-_v8(->J4qVGQ4R{6_ZgFaNd|9k5qt$+>;MWal-tZw48R`&DeVw{Ks)rD*-t
z2mJs0Tb6qX?MwD<uh)3Etf?ip`p0#@J#~F4>W1!{CeKj5>3L@28<l4sWkSU&)}5A<
z<{ptb>6e5geGVx7U)bg+0|P^I4ey+JA7%aSoB7uA_RT(@tS`I&@XN>7T%DFRd|LUy
s{pkBjy<FErJwQJKy#^+Lx`5z;M0L%a>-IT|n;Jn}Pgg&ebxsLQ0OYKeJOBUy
literal 0
HcmV?d00001
diff --git a/app/app/src/utils/res/drawable-xxhdpi/ic_vertical_align_top.png b/app/app/src/utils/res/drawable-xxhdpi/ic_vertical_align_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3208dd207821a02bff00fae87d26c73f623acd9
GIT binary patch
literal 399
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U<~tgaSW-r_4d|AFJ?!P)`t?&
ztw;7aekgpSvsNWE?(CsB&aSzUwadTq`Aj^tX1Bs-=Ffi%c5RsOTfhD8&D{||b3j1(
z#qT;{OP77pXT6`yVqoG>XaExpmzeUD&PO_RS9Zmm)l8VFnj_`=>%Dh=3sB2i+4lGu
zhiVS*?|GxdKksPzj?bSz^iMpmaxml+U%mWGzjG;*I@~X7hFjm&XHRx74Ov%qZm!>|
z#Z6m_^<J$=c+2A%;NF_$E*lzP{c1(itw49tD}7e07L;8HWZk;BPiuv2X^7+76^jKA
z@9*E!cjs_rcMUJkw$uA1i`Q-mDZT#1yme3bmU$c6i=}@`2uyIvQ;*4iy7-()VrIts
z`ZZkZe7YEz92gjZ-VktL;80*-5div!fsqC1Exf`EVDMo74@PCF9WK-F?N$T{c)I$z
JtaD0e0sxMBmh=Ds
literal 0
HcmV?d00001
diff --git a/app/app/src/utils/res/layout-land/activity_menu.xml b/app/app/src/utils/res/layout-land/activity_menu.xml
new file mode 100644
index 0000000..5c86052
--- /dev/null
+++ b/app/app/src/utils/res/layout-land/activity_menu.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:layout_editor_absoluteY="73dp"
+ tools:layout_editor_absoluteX="0dp">
+
+ <TextView
+ android:id="@+id/tvCaption"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginRight="8dp"
+ app:layout_constraintRight_toRightOf="parent"
+ android:layout_marginLeft="8dp"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ android:layout_marginTop="8dp"
+ app:layout_constraintHorizontal_bias="0.0"/>
+
+ <WebView
+ android:id="@+id/wvSource"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:layout_marginBottom="0dp"
+ android:layout_marginLeft="0dp"
+ android:layout_marginRight="8dp"
+ android:layout_marginTop="8dp"
+ android:visibility="gone"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintLeft_toRightOf="@+id/flMenu"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/tvCaption"
+ app:layout_constraintVertical_bias="0.0"
+ app:layout_constraintHorizontal_weight="2"/>
+
+ <FrameLayout
+ android:id="@+id/flMenu"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:layout_marginBottom="0dp"
+ android:layout_marginLeft="8dp"
+ android:layout_marginRight="8dp"
+ android:layout_marginTop="8dp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintRight_toLeftOf="@+id/wvSource"
+ app:layout_constraintTop_toBottomOf="@+id/tvCaption"
+ app:layout_constraintVertical_bias="1.0"
+ app:layout_constraintHorizontal_weight="1">
+
+ </FrameLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/app/src/utils/res/layout/activity_console.xml b/app/app/src/utils/res/layout/activity_console.xml
new file mode 100644
index 0000000..d31a327
--- /dev/null
+++ b/app/app/src/utils/res/layout/activity_console.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:context="com.chaquo.python.utils.ConsoleActivity">
+
+ <EditText
+ android:id="@+id/etInput"
+ android:visibility="gone"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="7dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginLeft="8dp"
+ android:layout_marginRight="8dp"
+ android:layout_marginStart="8dp"
+ android:ems="10"
+ android:imeOptions="actionDone|flagNoFullscreen"
+ android:singleLine="true"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintRight_toRightOf="parent"
+ style="@style/Code">
+ <requestFocus/>
+ </EditText>
+
+ <ScrollView
+ android:id="@+id/svOutput"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:layout_marginBottom="0dp"
+ android:layout_marginLeft="0dp"
+ android:layout_marginRight="0dp"
+ android:layout_marginTop="0dp"
+ app:layout_constraintBottom_toTopOf="@id/etInput"
+ app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintVertical_bias="0.0">
+
+ <TextView
+ android:id="@+id/tvOutput"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ style="@style/ConsoleOutput"/>
+ </ScrollView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/app/src/utils/res/layout/activity_menu.xml b/app/app/src/utils/res/layout/activity_menu.xml
new file mode 100644
index 0000000..10d0620
--- /dev/null
+++ b/app/app/src/utils/res/layout/activity_menu.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <TextView
+ android:id="@+id/tvCaption"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_marginEnd="8dp"
+ android:layout_marginLeft="8dp"
+ android:layout_marginRight="8dp"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="8dp"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintHorizontal_bias="0.0"/>
+
+ <WebView
+ android:id="@+id/wvSource"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:layout_marginBottom="0dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginLeft="0dp"
+ android:layout_marginRight="0dp"
+ android:layout_marginStart="8dp"
+ android:layout_marginTop="8dp"
+ android:visibility="gone"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/flMenu"
+ app:layout_constraintVertical_bias="0.0"/>
+
+ <FrameLayout
+ android:id="@+id/flMenu"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ android:layout_marginEnd="8dp"
+ android:layout_marginLeft="8dp"
+ android:layout_marginRight="8dp"
+ android:layout_marginStart="8dp"
+ app:layout_constraintBottom_toTopOf="@id/wvSource"
+ app:layout_constraintHorizontal_bias="0.0"
+ app:layout_constraintLeft_toLeftOf="parent"
+ app:layout_constraintRight_toRightOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/tvCaption"
+ android:layout_marginTop="8dp"
+ app:layout_constraintVertical_bias="0.0"
+ android:layout_marginBottom="0dp">
+
+ </FrameLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/app/src/utils/res/menu/top_bottom.xml b/app/app/src/utils/res/menu/top_bottom.xml
new file mode 100644
index 0000000..babc553
--- /dev/null
+++ b/app/app/src/utils/res/menu/top_bottom.xml
@@ -0,0 +1,14 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+
+ <item android:id="@+id/menu_top"
+ android:title="@string/top"
+ android:icon="@drawable/ic_vertical_align_top"
+ app:showAsAction="ifRoom"/>
+
+ <item android:id="@+id/menu_bottom"
+ android:title="@string/bottom"
+ android:icon="@drawable/ic_vertical_align_bottom"
+ app:showAsAction="ifRoom"/>
+
+</menu>
\ No newline at end of file
diff --git a/app/app/src/utils/res/values-sw360dp-v13/support.xml b/app/app/src/utils/res/values-sw360dp-v13/support.xml
new file mode 100644
index 0000000..ede5ac1
--- /dev/null
+++ b/app/app/src/utils/res/values-sw360dp-v13/support.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+ <!-- Remove padding on left (https://stackoverflow.com/a/52960668). -->
+ <bool name="config_materialPreferenceIconSpaceReserved"
+ tools:ignore="MissingDefaultResource,PrivateResource">false</bool>
+
+</resources>
\ No newline at end of file
diff --git a/app/app/src/utils/res/values/console.xml b/app/app/src/utils/res/values/console.xml
new file mode 100644
index 0000000..e8943b8
--- /dev/null
+++ b/app/app/src/utils/res/values/console.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+ <string name="repl">Python console</string>
+ <string name="repl_summary">Interactive read-eval-print loop</string>
+
+ <string name="top">Top</string>
+ <string name="bottom">Bottom</string>
+
+ <color name="console_error">#b53f3f</color>
+ <color name="console_meta">#304ffe</color>
+
+ <style name="Code">
+ <item name="android:textSize">14sp</item>
+ <item name="android:typeface">monospace</item>
+
+ <!-- In API level 21 only, the default sans-serif fontFamily takes priority over the
+ `typeface` attribute (https://stackoverflow.com/q/29076599). -->
+ <item name="android:fontFamily">monospace</item>
+ </style>
+
+ <style name="ConsoleOutput" parent="Code">
+ <item name="android:layout_marginLeft">8dp</item>
+ <item name="android:layout_marginRight">8dp</item>
+ <item name="android:textIsSelectable">true</item>
+ <item name="android:freezesText">true</item>
+ </style>
+
+</resources>
diff --git a/app/app/src/utils/res/values/utils.xml b/app/app/src/utils/res/values/utils.xml
new file mode 100644
index 0000000..94e92a9
--- /dev/null
+++ b/app/app/src/utils/res/values/utils.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+ <!-- Base application theme. -->
+ <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+ <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+
+ <item name="colorPrimary">@color/colorPrimary</item>
+ <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+ <item name="colorAccent">@color/colorAccent</item>
+ </style>
+
+ <color name="colorPrimary">#3F51B5</color>
+ <color name="colorPrimaryDark">#303F9F</color>
+ <color name="colorAccent">#FF4081</color>
+
+ <string name="main_caption">For more information see the
+ <a href="https://chaquo.com/chaquopy/">Chaquopy website</a>, or view this app\'s source
+ code <a href="https://github.com/chaquo/chaquopy/tree/master/demo">on GitHub</a>.
+ </string>
+
+</resources>
\ No newline at end of file
--
GitLab