diff --git a/.github/workflows/build-apk.yml b/.github/workflows/build-apk.yml new file mode 100644 index 0000000..efeed53 --- /dev/null +++ b/.github/workflows/build-apk.yml @@ -0,0 +1,55 @@ +name: build-apk + +on: + workflow_dispatch: + push: + branches: + - main + tags: + - 'v*' + pull_request: + +permissions: + contents: write + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4.1.7 + + - name: Set up Java + uses: actions/setup-java@v4.2.1 + with: + distribution: temurin + java-version: '17' + + - name: Set up Android SDK + uses: android-actions/setup-android@v3.2.2 + + - name: Install required SDK components + run: | + yes | sdkmanager "platforms;android-34" "build-tools;34.0.0" + + - name: Build debug APK + run: | + chmod +x ./gradlew + ./gradlew :app:assembleDebug + mkdir -p bin + cp app/build/outputs/apk/debug/app-debug.apk bin/ve-debug.apk + + - name: Upload APK artifact + uses: actions/upload-artifact@v4.3.3 + with: + name: ve-debug-apk + path: ${{ github.workspace }}/bin/ve-debug.apk + if-no-files-found: error + + - name: Publish release asset on tag + if: startsWith(github.ref, 'refs/tags/v') + uses: softprops/action-gh-release@v2.0.8 + with: + files: | + ${{ github.workspace }}/bin/ve-debug.apk diff --git a/.gitignore b/.gitignore index e10bf40..d5a00c9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,13 @@ *~ bin/ gen/ +obj/ .project .settings/ +.gradle/ +app/build/ +build/ res/values-*/strings.xml various/play-featured-graphics.png - diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 688c806..7af2298 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,22 +1,12 @@ - + - - - - + android:theme="@style/AppTheme" > @@ -33,27 +24,15 @@ - - - - - diff --git a/README.md b/README.md index 88d9537..94f6329 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,130 @@ Vé is named after one of [Odin's two brothers](http://en.wikipedia.org/wiki/Vil Vé is open source software, released under the GPL licence, which means you can use it for free, for personal or other purposes. You can even redistribute it, modified or not, provided you do so under the same licence, which means you have to provide your source files for any changes. You can read the [full licence text here](https://github.com/pryds/ve/blob/master/COPYING). +Project structure +----------------- + +At a high level, the app is made of: + +* `MainActivity`: the main translation editor screen. +* `TranslatableString` and `TranslatableStringCollection`: PO parsing/writing model layer. +* `SettingsActivity`/`SettingsFragment`: translator metadata preferences. +* `res/`: layouts, strings, menus and drawables. + +Manual smoke test (baseline) +---------------------------- + +Run this checklist after each small modernization change: + +1. **Open PO file** + * Use **Open file** and load a valid `.po` file. + * Confirm original/translated text areas are populated. +2. **Navigate strings** + * Tap **Previous** and **Next**. + * Confirm string number and content update correctly. +3. **Edit translation** + * Change text in translated field. + * Confirm metadata counters update. +4. **Save file** + * Tap **Save file** and verify success toast. + * Reopen the file and verify edited text persists. +5. **Settings read/write** + * Open **Settings**, edit translator fields, save/back out. + * Return and confirm values persist and are used on save. + +Current architecture map +------------------------ + +* **UI layer (Java + framework widgets)**: + * `MainActivity` drives the translation editor. + * `SettingsActivity` + `SettingsFragment` handle translator identity/preferences. +* **Model/parsing layer**: + * `TranslatableString` stores PO entry/header data. + * `TranslatableStringCollection` parses PO files and serializes back to PO output. +* **Resources/config**: + * `res/layout/activity_main.xml` is the primary editor screen. + * `res/menu/main_activity_actions.xml` defines top app actions. +* **Build system**: + * Gradle-based project (`settings.gradle`, root `build.gradle`, `app/build.gradle`). + +Current limitations +------------------- + +* File parsing/saving is still done on the main thread (can cause UI jank on large files). +* Storage now uses SAF document URIs for open/save flows. +* `MainActivity` contains multiple responsibilities (navigation, editing, persistence trigger, UI state). +* Automated tests are still limited; manual smoke testing remains important. + +Modernization roadmap (incremental) +----------------------------------- + +1. **UI polish without behavior changes** + * Improve spacing/typography/section labeling on main editor. +2. **MainActivity maintainability refactor** + * Cache views, split screen-update helpers, preserve current behavior. +3. **Editor UX improvements** + * Avoid unnecessary text resets, preserve cursor position, clarify plural-form state. +4. **Architecture and async improvements** + * Move parse/save work off main thread and continue decoupling UI/model responsibilities. + +How to modernize Vé for newer Android versions +---------------------------------------------- + +This codebase now builds with Gradle, targets Android API level 34 (`targetSdk 34`), and uses a modern minimum API level 24 (`minSdk 24`). + +1. **Maintain modern Android baseline** + * Keep dependencies and build tooling current. +2. **Continue modern platform cleanup** + * Replace remaining legacy utilities and disabled legacy features. +3. **Run compatibility validation** + * Test on recent Android versions/emulators (Android 12, 13, 14+) and verify open/edit/save PO flows. + +How to improve the codebase +--------------------------- + +For the highest long-term quality and maintainability: + +* Add automated testing (unit tests for PO parser and serialization, plus instrumentation tests for file open/save flows). +* Move parsing/saving work off the main thread to avoid UI jank on large files. +* Introduce architecture boundaries (for example ViewModel + repository-style separation) to reduce Activity complexity. +* Continue reducing synchronous file/parse work on UI thread and validate UX on large files. +* Add static quality gates (Android Lint, CI workflow, formatting/lint checks). +* Audit and remove dead/disabled features or fully modernize them (for example legacy in-app billing/backups). + +Build/testing quick start (Gradle) +---------------------------------- + +This repository now uses Gradle (`gradlew`, root `build.gradle`, `app/build.gradle`) as the build system. + +1. Configure an Android SDK path using one of: + * `local.properties` with `sdk.dir=/absolute/path/to/android-sdk` + * `ANDROID_HOME` + * `ANDROID_SDK_ROOT` +2. Ensure your SDK contains: + * `platforms;android-34` + * `build-tools;34.0.0` + * App currently uses `targetSdkVersion` 34 and `minSdk` 24. + * File open/save flows use SAF-based document URIs. +3. Run: + * `./gradlew :app:assembleDebug` to build a debug APK + * Output APK path: `app/build/outputs/apk/debug/app-debug.apk` + * Debug package name is `eu.pryds.ve.debug` (via `applicationIdSuffix ".debug"`), so it can install alongside release builds and avoid update/signature conflicts. + +APK exposure for testing (artifact/release) +------------------------------------------- + +This repository now includes GitHub Actions workflow: + +* Workflow file: `.github/workflows/build-apk.yml` +* Trigger manually from **Actions → build-apk → Run workflow**, or via pull requests/pushes. +* Download the APK from workflow artifacts named **ve-debug-apk**. +* If you push a tag like `v0.1.5`, the workflow also uploads `ve-debug.apk` as a release asset. + +Install notes for debug APKs +---------------------------- + +If Android shows **“invalid package”** while installing a debug APK over an existing install, uninstall the previously installed app variant first and then install the new APK. This typically happens when signatures differ between old and new builds, or when installing a build with a different applicationId/package variant. + Contributing to Vé ------------------ @@ -25,3 +149,16 @@ Donations of any amount that you see fit are kindly accepted through Bitcoin add ![Donate Bitcoins](https://raw.github.com/pryds/ve/master/various/ve-donations-qr.png) +Contributor workflow (step-by-step) +----------------------------------- + +1. **Sync and branch** + * Pull latest changes and create a focused branch for one small change set. +2. **Build** + * Run `./gradlew :app:assembleDebug`. +3. **Run targeted checks** + * Run any relevant existing checks for your change area. +4. **Install and verify** + * Install debug APK and execute the **Manual smoke test (baseline)** checklist above. +5. **Submit small PR** + * Keep PR scope narrow (one modernization slice), include test notes and smoke-test results. diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..a568658 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,53 @@ +apply plugin: 'com.android.application' + +android { + namespace 'eu.pryds.ve' + compileSdk 34 + + defaultConfig { + applicationId "eu.pryds.ve" + minSdk 24 + targetSdk 34 + versionCode 9 + versionName "0.1.5" + } + + sourceSets { + main { + manifest.srcFile '../AndroidManifest.xml' + java.srcDirs = ['../src'] + res.srcDirs = ['../res'] + assets.srcDirs = ['../assets'] + jniLibs.srcDirs = ['../libs'] + aidl.srcDirs = ['../src'] + } + } + + buildFeatures { + aidl true + } + + buildTypes { + debug { + applicationIdSuffix ".debug" + versionNameSuffix "-debug" + } + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), '../proguard-project.txt' + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } +} + +dependencies { + implementation fileTree(dir: '../libs', include: ['*.jar']) + implementation 'androidx.activity:activity:1.9.3' + implementation 'androidx.appcompat:appcompat:1.7.0' + implementation 'androidx.fragment:fragment:1.8.2' + implementation 'androidx.preference:preference:1.2.1' +} diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..54ad198 --- /dev/null +++ b/build.gradle @@ -0,0 +1,22 @@ +buildscript { + def agpVersion = project.findProperty("androidGradlePluginVersion") ?: "8.4.2" + repositories { + google() + mavenCentral() + } + dependencies { + classpath "com.android.tools.build:gradle:${agpVersion}" + } +} + +allprojects { + repositories { + google() + mavenCentral() + } + + configurations.configureEach { + exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk7' + exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8' + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..1ac772f --- /dev/null +++ b/gradle.properties @@ -0,0 +1,5 @@ +org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 +android.useAndroidX=true +androidGradlePluginVersion=8.4.2 +# Keep legacy switch-case over R.id working: nonFinalResIds=false => generate final IDs. +android.nonFinalResIds=false diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..d997cfc Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..df97d72 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..739907d --- /dev/null +++ b/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# 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 +# +# https://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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..e509b2d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,93 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/proguard-project.txt b/proguard-project.txt index f2fe155..3acffce 100644 --- a/proguard-project.txt +++ b/proguard-project.txt @@ -1,11 +1,10 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. +# ProGuard/R8 settings are configured from Gradle (`app/build.gradle`). # -# Add project specific ProGuard rules here. +# Add project-specific keep/obfuscation rules here. # By default, the flags in this file are appended to flags specified # in ${sdk.dir}/tools/proguard/proguard-android.txt # You can edit the include path and order by changing the ProGuard -# include property in project.properties. +# include property in Gradle configuration. # # For more details, see # http://developer.android.com/guide/developing/tools/proguard.html diff --git a/project.properties b/project.properties deleted file mode 100644 index 4ab1256..0000000 --- a/project.properties +++ /dev/null @@ -1,14 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-19 diff --git a/res/layout/activity_file_chooser.xml b/res/layout/activity_file_chooser.xml deleted file mode 100644 index 196bcd6..0000000 --- a/res/layout/activity_file_chooser.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml index ada6522..9acb4eb 100644 --- a/res/layout/activity_main.xml +++ b/res/layout/activity_main.xml @@ -8,21 +8,33 @@ android:paddingTop="@dimen/activity_vertical_margin" android:orientation="vertical" tools:context=".MainActivity" > - - + + - - - +