Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update fonts

Browse source
This commit is contained in:
Victor Shcherb 2015-09-09 18:22:47 +02:00
parent 32a0b65183
commit ee4ee52943
36 changed files with 42 additions and 299 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd-java/src/net/osmand/NativeLibrary.java
View file

@ -281,13 +281,13 @@ public class NativeLibrary {
return lhs < rhs ? -1 : (lhs == rhs ? 0 : 1);
}
public static void loadFontData(String dir) {
File dr = new File(dir);
if (dr.listFiles() == null) {
public void loadFontData(File dr) {
File[] lf = dr.listFiles();
if (lf == null) {
System.err.println("No fonts loaded from " + dr.getAbsolutePath());
return;
}
ArrayList<File> lst = new ArrayList<File>(Arrays.asList(dr.listFiles()));
ArrayList<File> lst = new ArrayList<File>(Arrays.asList(lf));
Collections.sort(lst, new Comparator<File>() {

1
OsmAnd/.gitignore vendored
View file

@ -3,6 +3,7 @@ dist/
res/values/no_translate.xml
assets/specialphrases/*
assets/voice/*
assets/fonts/*
gen/
local.properties
raw/

15
OsmAnd/assets/bundled_assets.xml
View file

@ -43,14 +43,11 @@
<asset source="voice/ru/config.p" destination="voice/ru/_config.p" mode="overwriteOnlyIfExists" />
<!-- TODO delete deprecated
<asset source="voice/fr-ov/config.p" destination="voice/fr/_config.p" mode="overwriteOnlyIfExists" />
<asset source="voice/he-ov/config.p" destination="voice/he/_config.p" mode="overwriteOnlyIfExists" />
<asset source="voice/it-Chiara-ov/config.p" destination="voice/it-Chiara/_config.p" mode="overwriteOnlyIfExists" />
<asset source="voice/it-Roberto-ov/config.p" destination="voice/it-Roberto/_config.p" mode="overwriteOnlyIfExists" />
<asset source="voice/ru2-ov/config.p" destination="voice/ru2/_config.p" mode="overwriteOnlyIfExists" />
<asset source="voice/ru3-ov/config.p" destination="voice/ru3/_config.p" mode="overwriteOnlyIfExists" />
<asset source="voice/sk-Ruzena-ov/config.p" destination="voice/sk-Ruzena/_config.p" mode="overwriteOnlyIfExists" />
-->
<asset source="fonts/OpenSans-Italic.ttf" destination="fonts/OpenSans-Italic.ttf" mode="alwaysOverwriteOrCopy" />
<asset source="fonts/OpenSans-Regular.ttf" destination="fonts/OpenSans-Regular.ttf" mode="alwaysOverwriteOrCopy" />
<asset source="fonts/OpenSans-Semibold.ttf" destination="fonts/OpenSans-Semibold.ttf" mode="alwaysOverwriteOrCopy" />
<asset source="fonts/OpenSans-SemiboldItalic.ttf" destination="fonts/OpenSans-SemiboldItalic.ttf" mode="alwaysOverwriteOrCopy" />
<asset source="sounds/camera_click.ogg" destination="sounds/camera_click.ogg" mode="copyOnlyIfDoesNotExist" />
</assets>

BIN
OsmAnd/assets/fonts/Roboto-Medium.ttf
View file

Binary file not shown.

BIN
OsmAnd/assets/fonts/Roboto-Regular.ttf
View file

Binary file not shown.

11
OsmAnd/build.gradle
View file

@ -19,7 +19,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 21
buildToolsVersion "23.0.0"
buildToolsVersion "23.0.1"
signingConfigs {
development {
@ -190,6 +190,14 @@ task collectVoiceAssets(type: Sync) {
include "**/*.p"
}
task collectFonts(type: Copy) {
from "../../resources/fonts"
from "../../resources/rendering_styles/fonts/OpenSans"
into "assets/fonts"
include "*.ttf"
}
task collectHelpContentsAssets(type: Sync) {
from "../../help/help"
into "assets/help"
@ -237,6 +245,7 @@ task copyStyleIcons(type: Copy) {
task collectExternalResources << {}
collectExternalResources.dependsOn collectVoiceAssets,
collectFonts,
collectHelpContentsAssets,
collectRoutingResources,
collectRenderingStylesResources,

8
OsmAnd/build.xml
View file

@ -81,6 +81,14 @@
<include name="voice/**/*.p" />
</fileset>
</copy>
<copy todir="assets/fonts">
<fileset dir="../../resources/fonts">
<include name="*.ttf" />
</fileset>
<fileset dir="../../resources/rendering_styles/fonts/OpenSans">
<include name="*.ttf" />
</fileset>
</copy>
<copy todir="res/">
<fileset dir="../../resources/rendering_styles/style-icons/" >
<include name="**/*" />

7
OsmAnd/src/net/osmand/plus/AppInitializer.java
View file

@ -442,11 +442,16 @@ public class AppInitializer implements IProgress {
osmandSettings.NATIVE_RENDERING_FAILED.set(true);
startTask(app.getString(R.string.init_native_library), -1);
RenderingRulesStorage storage = app.getRendererRegistry().getCurrentSelectedRenderer();
boolean initialized = NativeOsmandLibrary.getLibrary(storage, app) != null;
NativeOsmandLibrary lib = NativeOsmandLibrary.getLibrary(storage, app);
boolean initialized = lib != null;
osmandSettings.NATIVE_RENDERING_FAILED.set(false);
if (!initialized) {
LOG.info("Native library could not be loaded!");
} else {
File ls = app.getAppPath("fonts");
lib.loadFontData(ls);
}
}
app.getResourceManager().initMapBoundariesCacheNative();
}

2
eclipse-compile/appcompat/build.gradle
View file

@ -6,7 +6,7 @@ dependencies {
android {
compileSdkVersion 21
buildToolsVersion "21.1.2"
buildToolsVersion "23.0.1"
defaultConfig {
minSdkVersion 9

2
eclipse-compile/cardview/build.gradle
View file

@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion 21
buildToolsVersion "21.1.2"
buildToolsVersion "23.0.1"
defaultConfig {
minSdkVersion 7

2
eclipse-compile/design/build.gradle
View file

@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
android {
compileSdkVersion 21
buildToolsVersion "21.1.2"
buildToolsVersion "23.0.1"
defaultConfig {
minSdkVersion 9

8
plugins/OsmAnd-AddressPlugin/gen/net/osmand/addressPlugin/BuildConfig.java
View file

@ -1,8 +0,0 @@
/*___Generated_by_IDEA___*/
package net.osmand.addressPlugin;
/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
public final class BuildConfig {
public final static boolean DEBUG = Boolean.parseBoolean(null);
}

7
plugins/OsmAnd-AddressPlugin/gen/net/osmand/addressPlugin/Manifest.java
View file

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package net.osmand.addressPlugin;
/* This stub is only used by the IDE. It is NOT the Manifest class actually packed into the APK */
public final class Manifest {
}

7
plugins/OsmAnd-AddressPlugin/gen/net/osmand/addressPlugin/R.java
View file

@ -1,7 +0,0 @@
/*___Generated_by_IDEA___*/
package net.osmand.addressPlugin;
/* This stub is only used by the IDE. It is NOT the R class actually packed into the APK */
public final class R {
}

2
plugins/Osmand-Nautical/build.gradle
View file

@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 21
buildToolsVersion "21.1.2"
buildToolsVersion "23.0.1"
signingConfigs {
development {

2
plugins/Osmand-ParkingPlugin/build.gradle
View file

@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 21
buildToolsVersion "21.1.2"
buildToolsVersion "23.0.1"
signingConfigs {
development {

2
plugins/Osmand-SRTMPlugin/build.gradle
View file

@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 21
buildToolsVersion "21.1.2"
buildToolsVersion "23.0.1"
signingConfigs {
development {

9
plugins/Osmand-Sherpafy/.classpath
View file

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>

4
plugins/Osmand-Sherpafy/.gitignore vendored
View file

@ -1,4 +0,0 @@
bin
gen
raw
obj

33
plugins/Osmand-Sherpafy/.project
View file

@ -1,33 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>Osmand-Sherpafy</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>

24
plugins/Osmand-Sherpafy/AndroidManifest.xml
View file

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="net.osmand.sherpafy"
android:versionCode="6"
android:versionName="1.0" >
<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="16" />
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
<supports-screens android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true"
android:xlargeScreens="true" android:anyDensity="true" />
<application
android:icon="@drawable/icon"
android:label="@string/app_name" >
<activity
android:name=".SherpafyPluginActivity"
android:label="@string/app_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>

67
plugins/Osmand-Sherpafy/build.gradle
View file

@ -1,67 +0,0 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 21
buildToolsVersion "21.1.2"
signingConfigs {
development {
storeFile file("../../keystores/debug.keystore")
storePassword "android"
keyAlias "androiddebugkey"
keyPassword "android"
}
publishing {
storeFile file("../../osmand_key")
storePassword System.getenv("OSMAND_APK_PASSWORD")
keyAlias "androiddebugkey"
keyPassword System.getenv("OSMAND_APK_PASSWORD")
}
}
defaultConfig {
minSdkVersion 9
targetSdkVersion 21
}
lintOptions {
abortOnError false
}
sourceSets {
main {
manifest.srcFile "AndroidManifest.xml"
jni.srcDirs = []
jniLibs.srcDirs = []
aidl.srcDirs = ["src"]
java.srcDirs = ["src"]
resources.srcDirs = ["src"]
renderscript.srcDirs = ["src"]
res.srcDirs = ["res"]
assets.srcDirs = ["assets"]
}
}
buildTypes {
debug {
signingConfig signingConfigs.development
}
release {
signingConfig signingConfigs.publishing
}
}
}
repositories {
ivy {
name = "OsmAndBinariesIvy"
url = "http://builder.osmand.net"
layout "pattern", {
artifact "ivy/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"
}
}
}
dependencies {
}

20
plugins/Osmand-Sherpafy/proguard-project.txt
View file

@ -1,20 +0,0 @@
# To enable ProGuard in your project, edit project.properties
# to define the proguard.config property as described in that file.
#
# Add project specific ProGuard 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.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
# Add any project specific keep options here:
# 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 *;
#}

14
plugins/Osmand-Sherpafy/project.properties
View file

@ -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

BIN
plugins/Osmand-Sherpafy/res/drawable-hdpi/ic_launcher.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.2 KiB

BIN
plugins/Osmand-Sherpafy/res/drawable-hdpi/icon.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 7.1 KiB

BIN
plugins/Osmand-Sherpafy/res/drawable-ldpi/ic_launcher.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.7 KiB

BIN
plugins/Osmand-Sherpafy/res/drawable-ldpi/icon.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.6 KiB

BIN
plugins/Osmand-Sherpafy/res/drawable-mdpi/ic_launcher.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 5.1 KiB

BIN
plugins/Osmand-Sherpafy/res/drawable-mdpi/icon.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4 KiB

BIN
plugins/Osmand-Sherpafy/res/drawable-xhdpi/ic_launcher.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 14 KiB

BIN
plugins/Osmand-Sherpafy/res/drawable-xhdpi/icon.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 10 KiB

13
plugins/Osmand-Sherpafy/res/layout/main.xml
View file

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent" >
<TextView
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center_vertical|center_horizontal"
android:text="@string/parking_plugin_installed"
android:textSize="22sp"/>
</FrameLayout>

8
plugins/Osmand-Sherpafy/res/values/strings.xml
View file

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="shared_string_no">No</string>
<string name="shared_string_yes">Yes</string>
<string name="osmand_app_not_found">OsmAnd is not installed</string>
<string name="app_name">Sherpafy</string>
<string name="parking_plugin_installed">OsmAnd Sherpafy is installed and enabled in OsmAnd settings.</string>
</resources>

63
plugins/Osmand-Sherpafy/src/net/osmand/sherpafy/SherpafyPluginActivity.java
View file

@ -1,63 +0,0 @@
package net.osmand.sherpafy;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.ActivityNotFoundException;
import android.content.ComponentName;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.net.Uri;
import android.os.Bundle;
public class SherpafyPluginActivity extends Activity {
private static final String OSMAND_COMPONENT = "net.osmand"; //$NON-NLS-1$
private static final String OSMAND_COMPONENT_PLUS = "net.osmand.plus"; //$NON-NLS-1$
private static final String OSMAND_ACTIVITY = "net.osmand.plus.sherpafy.TourViewActivity"; //$NON-NLS-1$
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
Intent intentPlus = new Intent();
intentPlus.setComponent(new ComponentName(OSMAND_COMPONENT_PLUS, OSMAND_ACTIVITY));
intentPlus.setFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
ResolveInfo resolved = getPackageManager().resolveActivity(intentPlus, PackageManager.MATCH_DEFAULT_ONLY);
if(resolved != null) {
stopService(intentPlus);
startActivity(intentPlus);
finish();
} else {
Intent intentNormal = new Intent();
intentNormal.setFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
intentNormal.setComponent(new ComponentName(OSMAND_COMPONENT, OSMAND_ACTIVITY));
resolved = getPackageManager().resolveActivity(intentNormal, PackageManager.MATCH_DEFAULT_ONLY);
if (resolved != null) {
stopService(intentNormal);
intentNormal.putExtra("SHERPAFY", true);
startActivity(intentNormal);
finish();
} else {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setMessage(getString(R.string.osmand_app_not_found));
builder.setPositiveButton(getString(R.string.shared_string_yes), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("market://search?q=pname:" + OSMAND_COMPONENT_PLUS));
try {
stopService(intent);
startActivity(intent);
} catch (ActivityNotFoundException e) {
}
}
});
builder.setNegativeButton(getString(R.string.shared_string_no), null);
builder.show();
}
}
}
}

2
plugins/Osmand-Skimaps/build.gradle
View file

@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 21
buildToolsVersion "21.1.2"
buildToolsVersion "23.0.1"
signingConfigs {
development {