diff --git a/app/src/main/res/drawable-xhdpi/routes_selected.png b/app/src/main/res/drawable-xhdpi/routes_selected.png new file mode 100644 index 000000000..e31599672 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/routes_selected.png differ diff --git a/app/src/main/res/drawable/routes.xml b/app/src/main/res/drawable/routes.xml new file mode 100644 index 000000000..c86f360e4 --- /dev/null +++ b/app/src/main/res/drawable/routes.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/prepare.py b/prepare.py deleted file mode 100755 index ea19073b6..000000000 --- a/prepare.py +++ /dev/null @@ -1,473 +0,0 @@ -#!/usr/bin/env python - -############################################################################ -# prepare.py -# Copyright (C) 2016 Belledonne Communications, Grenoble France -# -############################################################################ -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -############################################################################ - -import fnmatch -import os -import re -import sys -from distutils.spawn import find_executable -from logging import error, warning, info -from subprocess import Popen -sys.dont_write_bytecode = True -sys.path.insert(0, 'submodules/cmake-builder') -try: - import prepare -except Exception as e: - error( - "Could not find prepare module: {}, probably missing submodules/cmake-builder? Try running:\n" - "git submodule sync && git submodule update --init --recursive".format(e)) - exit(1) - - - -class AndroidTarget(prepare.Target): - - def __init__(self, arch): - prepare.Target.__init__(self, 'android-' + arch) - current_path = os.path.dirname(os.path.realpath(__file__)) - self.config_file = 'configs/config-android.cmake' - self.toolchain_file = 'toolchains/toolchain-android-' + arch + '.cmake' - self.output = 'liblinphone-sdk/android-' + arch - self.external_source_path = os.path.join(current_path, 'submodules') - external_builders_path = os.path.join(current_path, 'cmake_builder') - self.additional_args = [ - "-DLINPHONE_BUILDER_EXTERNAL_BUILDERS_PATH=" + external_builders_path - ] - - -class AndroidArmTarget(AndroidTarget): - - def __init__(self): - AndroidTarget.__init__(self, 'arm') - self.additional_args += ['-DENABLE_VIDEO=NO'] - - -class AndroidArmv7Target(AndroidTarget): - - def __init__(self): - AndroidTarget.__init__(self, 'armv7') - - -class AndroidArm64Target(AndroidTarget): - - def __init__(self): - AndroidTarget.__init__(self, 'arm64') - - -class AndroidX86Target(AndroidTarget): - - def __init__(self): - AndroidTarget.__init__(self, 'x86') - - -class AndroidX86_64Target(AndroidTarget): - - def __init__(self): - AndroidTarget.__init__(self,'x86_64') - - -android_targets = { - 'arm': AndroidArmTarget(), - 'armv7': AndroidArmv7Target(), - 'arm64': AndroidArm64Target(), - 'x86': AndroidX86Target(), - 'x86_64': AndroidX86_64Target() -} - -android_virtual_targets = { - 'all': ['armv7', 'arm64', 'x86', 'x86_64'] -} - -class AndroidPreparator(prepare.Preparator): - - def __init__(self, targets=android_targets): - prepare.Preparator.__init__(self, targets, default_targets=['armv7', 'arm64'], virtual_targets=android_virtual_targets) - self.min_supported_ndk = 16 - self.max_supported_ndk = 18 - self.unsupported_ndk_version = None - self.min_cmake_version = "3.10" - self.release_with_debug_info = True - self.veryclean = True - self.show_gpl_disclaimer = True - self.argparser.add_argument('-ac', '--all-codecs', help="Enable all codecs, including the non-free ones", action='store_true') - - def parse_args(self): - prepare.Preparator.parse_args(self) - - if self.args.all_codecs: - self.additional_args += ["-DENABLE_GPL_THIRD_PARTIES=YES"] - self.additional_args += ["-DENABLE_NON_FREE_CODECS=YES"] - self.additional_args += ["-DENABLE_AMRNB=YES"] - self.additional_args += ["-DENABLE_AMRWB=YES"] - self.additional_args += ["-DENABLE_BV16=YES"] - self.additional_args += ["-DENABLE_CODEC2=YES"] - self.additional_args += ["-DENABLE_G729=YES"] - self.additional_args += ["-DENABLE_GSM=YES"] - self.additional_args += ["-DENABLE_ILBC=YES"] - self.additional_args += ["-DENABLE_ISAC=YES"] - self.additional_args += ["-DENABLE_OPUS=YES"] - self.additional_args += ["-DENABLE_SILK=YES"] - self.additional_args += ["-DENABLE_SPEEX=YES"] - self.additional_args += ["-DENABLE_FFMPEG=YES"] - self.additional_args += ["-DENABLE_H263=YES"] - self.additional_args += ["-DENABLE_H263P=YES"] - self.additional_args += ["-DENABLE_MPEG4=YES"] - self.additional_args += ["-DENABLE_OPENH264=YES"] - self.additional_args += ["-DENABLE_VPX=YES"] - # self.additional_args += ["-DENABLE_X264=YES"] # Do not activate x264 because it has text relocation issues - - def list_feature_target(self): - return android_targets['armv7'] - - def check_ndk_version(self): - retval = True - ndk_build = find_executable('ndk-build') - ndk_path = os.path.dirname(ndk_build) - # NDK prior to r11 had a RELEASE.TXT file holding the version number - release_file = os.path.join(ndk_path, 'RELEASE.TXT') - if os.path.isfile(release_file): - version = open(release_file).read().strip() - res = re.match('^r(\d+)(.*)$', version) - version = int(res.group(1)) - retval = False - else: - # Hack to find the NDK version since the RELEASE.TXT file is no longer there - python_config_files = [] - for root, dirnames, filenames in os.walk(ndk_path): - for filename in fnmatch.filter(filenames, 'python-config'): - python_config_files.append(os.path.join(root, filename)) - if len(python_config_files) > 0: - version = open(python_config_files[0]).readlines()[0] - res = re.match('^.*/(aosp-)?ndk-r(\d+).*$', version) - if res is not None: # Will be if NDK < 16 - version = int(res.group(2)) - retval = False - else: - release_file = os.path.join(ndk_path, 'source.properties') # Since NDK 16 - if os.path.isfile(release_file): - version = open(release_file).read().strip() - res = re.findall(r'(?:(\d+))', version) - version = int(res[0]) - retval = False - else: - error("Could not get Android NDK version!") - sys.exit(-1) - else: - error("Could not get Android NDK version!") - sys.exit(-1) - if retval == False and (version < self.min_supported_ndk or version > self.max_supported_ndk): - self.unsupported_ndk_version = version - retval = True - return retval - - def check_environment(self): - ret = 0 - ret_ndk = not self.check_is_installed('ndk-build', 'Android NDK r{}'.format(self.max_supported_ndk)) - if not ret_ndk: - ret_ndk = self.check_ndk_version() - ret |= ret_ndk - ret |= prepare.Preparator.check_environment(self) - return ret - - def show_environment_errors(self): - if self.unsupported_ndk_version is not None: - error("Unsupported Android NDK r{}. Please install version r{}.".format(self.unsupported_ndk_version, self.max_supported_ndk)) - else: - prepare.Preparator.show_environment_errors(self) - - def clean(self): - prepare.Preparator.clean(self) - if os.path.isfile('Makefile'): - os.remove('Makefile') - if os.path.isdir('WORK') and not os.listdir('WORK'): - os.rmdir('WORK') - if os.path.isdir('liblinphone-sdk') and not os.listdir('liblinphone-sdk'): - os.rmdir('liblinphone-sdk') - - def prepare(self): - self.download_gradle() - prepare.Preparator.prepare(self) - - def download_gradle(self): - os.system('./gradlew') - - def generate_makefile(self, generator, project_file=''): - platforms = self.args.target - arch_targets = "" - for arch in platforms: - arch_targets += """ -{arch}: {arch}-build - -{arch}-build: -\t{generator} WORK/android-{arch}/cmake -\t@echo "Done" -""".format(arch=arch, generator=generator) - makefile = """ -archs={archs} -TOPDIR=$(shell pwd) - -.PHONY: all -.NOTPARALLEL: all generate-apk install release - -all: generate-apk - -build: $(addsuffix -build, $(archs)) - -clean: java-clean - -install: install-apk run-linphone - -install-test: -\t$(MAKE) -C liblinphone_tester copy-libs -\t$(MAKE) -C liblinphone_tester copy-files -\t./gradlew -b liblinphone_tester/build.gradle clean -\t./gradlew -b liblinphone_tester/build.gradle assembleDebug -\t./gradlew -b liblinphone_tester/build.gradle installDebug - -java-clean: -\t./gradlew clean - - -copy-libs: -\trm -rf liblinphone-sdk/res -\trm -rf libs-debug/armeabi -\trm -rf libs/armeabi -\tif test -d "liblinphone-sdk/android-arm"; then \\ -\t\tmkdir -p libs-debug/armeabi && \\ -\t\tcp -f liblinphone-sdk/android-arm/lib/lib*.so libs-debug/armeabi && \\ -\t\tcp -f liblinphone-sdk/android-arm/lib/mediastreamer/plugins/*.so libs-debug/armeabi && \\ -\t\tmkdir -p libs/armeabi && \\ -\t\tcp -f liblinphone-sdk/android-arm/lib/lib*.so libs/armeabi && \\ -\t\tcp -f liblinphone-sdk/android-arm/lib/mediastreamer/plugins/*.so libs/armeabi && \\ -\t\tsh WORK/android-arm/strip.sh libs/armeabi/*.so; \\ -\tfi -\tif test -f "liblinphone-sdk/android-arm/bin/gdbserver"; then \\ -\t\tcp -f liblinphone-sdk/android-arm/bin/gdbserver libs-debug/armeabi && \\ -\t\tcp -f liblinphone-sdk/android-arm/bin/gdb.setup libs-debug/armeabi && \\ -\t\tcp -f liblinphone-sdk/android-arm/bin/gdbserver libs/armeabi && \\ -\t\tcp -f liblinphone-sdk/android-arm/bin/gdb.setup libs/armeabi; \\ -\tfi -\tif test -f "liblinphone-sdk/android-arm/lib/wrap.sh"; then \\ -\t\tmkdir -p liblinphone-sdk/res/lib/armeabi && \\ -\t\tcp -f liblinphone-sdk/android-arm/lib/wrap.sh liblinphone-sdk/res/lib/armeabi; \\ -\tfi -\trm -rf libs-debug/armeabi-v7a -\trm -rf libs/armeabi-v7a -\tif test -d "liblinphone-sdk/android-armv7"; then \\ -\t\tmkdir -p libs-debug/armeabi-v7a && \\ -\t\tcp -f liblinphone-sdk/android-armv7/lib/lib*.so libs-debug/armeabi-v7a && \\ -\t\tcp -f liblinphone-sdk/android-armv7/lib/mediastreamer/plugins/*.so libs-debug/armeabi-v7a && \\ -\t\tmkdir -p libs/armeabi-v7a && \\ -\t\tcp -f liblinphone-sdk/android-armv7/lib/lib*.so libs/armeabi-v7a && \\ -\t\tcp -f liblinphone-sdk/android-armv7/lib/mediastreamer/plugins/*.so libs/armeabi-v7a && \\ -\t\tsh WORK/android-armv7/strip.sh libs/armeabi-v7a/*.so; \\ -\tfi -\tif test -f "liblinphone-sdk/android-armv7/bin/gdbserver"; then \\ -\t\tcp -f liblinphone-sdk/android-armv7/bin/gdbserver libs-debug/armeabi-v7a && \\ -\t\tcp -f liblinphone-sdk/android-armv7/bin/gdb.setup libs-debug/armeabi-v7a && \\ -\t\tcp -f liblinphone-sdk/android-armv7/bin/gdbserver libs/armeabi-v7a && \\ -\t\tcp -f liblinphone-sdk/android-armv7/bin/gdb.setup libs/armeabi-v7a; \\ -\tfi -\tif test -f "liblinphone-sdk/android-armv7/lib/wrap.sh"; then \\ -\t\tmkdir -p liblinphone-sdk/res/lib/armeabi-v7a && \\ -\t\tcp -f liblinphone-sdk/android-armv7/lib/wrap.sh liblinphone-sdk/res/lib/armeabi-v7a; \\ -\tfi -\trm -rf libs-debug/arm64-v8a -\trm -rf libs/arm64-v8a -\tif test -d "liblinphone-sdk/android-arm64"; then \\ -\t\tmkdir -p libs-debug/arm64-v8a && \\ -\t\tcp -f liblinphone-sdk/android-arm64/lib/lib*.so libs-debug/arm64-v8a && \\ -\t\tcp -f liblinphone-sdk/android-arm64/lib/mediastreamer/plugins/*.so libs-debug/arm64-v8a && \\ -\t\tmkdir -p libs/arm64-v8a && \\ -\t\tcp -f liblinphone-sdk/android-arm64/lib/lib*.so libs/arm64-v8a && \\ -\t\tcp -f liblinphone-sdk/android-arm64/lib/mediastreamer/plugins/*.so libs/arm64-v8a && \\ -\t\tsh WORK/android-arm64/strip.sh libs/arm64-v8a/*.so; \\ -\tfi -\tif test -f "liblinphone-sdk/android-arm64/bin/gdbserver"; then \\ -\t\tcp -f liblinphone-sdk/android-arm64/bin/gdbserver libs-debug/arm64-v8a && \\ -\t\tcp -f liblinphone-sdk/android-arm64/bin/gdb.setup libs-debug/arm64-v8a && \\ -\t\tcp -f liblinphone-sdk/android-arm64/bin/gdbserver libs/arm64-v8a && \\ -\t\tcp -f liblinphone-sdk/android-arm64/bin/gdb.setup libs/arm64-v8a; \\ -\tfi -\tif test -f "liblinphone-sdk/android-arm64/lib/wrap.sh"; then \\ -\t\tmkdir -p liblinphone-sdk/res/lib/arm64-v8a && \\ -\t\tcp -f liblinphone-sdk/android-arm64/lib/wrap.sh liblinphone-sdk/res/lib/arm64-v8a; \\ -\tfi -\trm -rf libs-debug/x86 -\trm -rf libs/x86 -\tif test -d "liblinphone-sdk/android-x86"; then \\ -\t\tmkdir -p libs-debug/x86 && \\ -\t\tcp -f liblinphone-sdk/android-x86/lib/lib*.so libs-debug/x86 && \\ -\t\tcp -f liblinphone-sdk/android-x86/lib/mediastreamer/plugins/*.so libs-debug/x86 && \\ -\t\tmkdir -p libs/x86 && \\ -\t\tcp -f liblinphone-sdk/android-x86/lib/lib*.so libs/x86 && \\ -\t\tcp -f liblinphone-sdk/android-x86/lib/mediastreamer/plugins/*.so libs/x86 && \\ -\t\tsh WORK/android-x86/strip.sh libs/x86/*.so; \\ -\tfi -\tif test -f "liblinphone-sdk/android-x86/bin/gdbserver"; then \\ -\t\tcp -f liblinphone-sdk/android-x86/bin/gdbserver libs-debug/x86 && \\ -\t\tcp -f liblinphone-sdk/android-x86/bin/gdb.setup libs-debug/x86 && \\ -\t\tcp -f liblinphone-sdk/android-x86/bin/gdbserver libs/x86 && \\ -\t\tcp -f liblinphone-sdk/android-x86/bin/gdb.setup libs/x86; \\ -\tfi -\tif test -f "liblinphone-sdk/android-x86/lib/wrap.sh"; then \\ -\t\tmkdir -p liblinphone-sdk/res/lib/x86 && \\ -\t\tcp -f liblinphone-sdk/android-x86/lib/wrap.sh liblinphone-sdk/res/lib/x86; \\ -\tfi - -copy-libs-mediastreamer: -\trm -rf submodules/mediastreamer2/java/libs/armeabi -\tif test -d "liblinphone-sdk/android-arm"; then \\ -\t\tmkdir -p submodules/mediastreamer2/java/libs/armeabi && \\ -\t\tcp -f liblinphone-sdk/android-arm/lib/*mediastreamer*.so submodules/mediastreamer2/java/libs/armeabi && \\ -\t\tsh WORK/android-arm/strip.sh submodules/mediastreamer2/java/libs/armeabi/*.so; \\ -\tfi -\trm -rf submodules/mediastreamer2/java/libs/armeabi-v7a -\tif test -d "liblinphone-sdk/android-armv7"; then \\ -\t\tmkdir -p submodules/mediastreamer2/java/libs/armeabi-v7a && \\ -\t\tcp -f liblinphone-sdk/android-armv7/lib/*mediastreamer*.so submodules/mediastreamer2/java/libs/armeabi-v7a && \\ -\t\tsh WORK/android-armv7/strip.sh submodules/mediastreamer2/java/libs/armeabi-v7a/*.so; \\ -\tfi -\trm -rf submodules/mediastreamer2/java/libs/arm64-v8a -\tif test -d "liblinphone-sdk/android-arm64"; then \\ -\t\tmkdir -p submodules/mediastreamer2/java/libs/arm64-v8a && \\ -\t\tcp -f liblinphone-sdk/android-arm64/lib/*mediastreamer*.so submodules/mediastreamer2/java/libs/arm64-v8a && \\ -\t\tsh WORK/android-arm64/strip.sh submodules/mediastreamer2/java/libs/arm64-v8a/*.so; \\ -\tfi -\trm -rf submodules/mediastreamer2/java/libs/x86 -\tif test -d "liblinphone-sdk/android-x86"; then \\ -\t\tmkdir -p submodules/mediastreamer2/java/libs/x86 && \\ -\t\tcp -f liblinphone-sdk/android-x86/lib/*mediastreamer*.so submodules/mediastreamer2/java/libs/x86 && \\ -\t\tsh WORK/android-x86/strip.sh submodules/mediastreamer2/java/libs/x86/*.so; \\ -\tfi - -generate-apk: java-clean build copy-libs -\t./gradlew assembleDebug - -quick: clean install-apk run-linphone - -install-apk: -\t./gradlew installDebug - -uninstall: -\t./gradlew uninstallAll - -release: java-clean build copy-libs -\t./gradlew assembleRelease - -unsigned: java-clean build copy-libs -\t./gradlew assemblePackaged - -generate-release-sdk: liblinphone-android-sdk-release - -generate-sdk: liblinphone-android-sdk-debug - -generate-javadoc: -\t./gradlew -q androidJavadocsJar -\t./gradlew -q sourcesJar - -debug-sdk: java-clean build copy-libs generate-javadoc generate-apk -\t./gradlew -q sdkZip - -liblinphone-android-sdk: java-clean build copy-libs generate-javadoc release -\t./gradlew -q sdkZip - -linphone-android-sdk: java-clean build copy-libs -\t./gradlew -b linphoneAndroidSdk.gradle androidJavadocsJar -\t./gradlew -b linphoneAndroidSdk.gradle sourcesJar - -linphone-android-sdk-release: linphone-android-sdk -\t./gradlew -b linphoneAndroidSdk.gradle assembleRelease -\t./gradlew -b linphoneAndroidSdk.gradle sdkZip - -linphone-android-sdk-debug: linphone-android-sdk -\t./gradlew -b linphoneAndroidSdk.gradle debugRelease -\t./gradlew -b linphoneAndroidSdk.gradle sdkZip - -mediastreamer2-sdk: build copy-libs-mediastreamer -\t@cd $(TOPDIR)/submodules/mediastreamer2/java && \\ -\t./gradlew -b mediastreamerSdk.gradle assembleRelease -\t@cd $(TOPDIR)/submodules/mediastreamer2/java && \\ -\t./gradlew -b mediastreamerSdk.gradle sdkZip - -liblinphone_tester: -\t$(MAKE) -C liblinphone_tester - -run-linphone: -\t./gradlew runApplication - -run-liblinphone-tests: -\t@cd liblinphone_tester && \\ -\tmake run-all-tests - -run-all-tests: clean install -\tpatch -p1 < test.patch -\t./gradlew grantDebugPermissions -\t./gradlew connectedAndroidTest -\tpatch -Rp1 < test.patch - -pull-transifex: -\ttx pull -af - -push-transifex: -\ttx push -s -f --no-interactive - -{arch_targets} - -help-prepare-options: -\t@echo "prepare.py was previously executed with the following options:" -\t@echo " {options}" - -help: help-prepare-options -\t@echo "" -\t@echo "(please read the README.md file first)" -\t@echo "" -\t@echo "Available architectures: {archs}" -\t@echo "" -\t@echo "Available targets:" -\t@echo "" -\t@echo " * all or generate-apk: builds all architectures and creates the linphone application APK" -\t@echo " * generate-sdk: builds all architectures and creates the liblinphone SDK" -\t@echo " * install: install the linphone application APK (run this only after generate-apk)" -\t@echo " * uninstall: uninstall the linphone application" -\t@echo "" -""".format(archs=' '.join(platforms), arch_opts='|'.join(platforms), - first_arch=platforms[0], options=' '.join(sys.argv), - arch_targets=arch_targets, generator=generator) - f = open('Makefile', 'w') - f.write(makefile) - f.close() - - - -def main(): - preparator = AndroidPreparator() - preparator.parse_args() - if preparator.check_environment() != 0: - preparator.show_environment_errors() - return 1 - return preparator.run() - -if __name__ == "__main__": - sys.exit(main())