diff --git a/OsmAnd/assets/help/style.css b/OsmAnd/assets/help/style.css index 07686a4c91..ef05699931 100644 --- a/OsmAnd/assets/help/style.css +++ b/OsmAnd/assets/help/style.css @@ -1,6 +1,7 @@ + body{padding:0; margin:0; } a {color:#536DFE;} - .main{width:480px; margin:0 auto; font-family:arial; font-size:11pt;} + .main{width:320px; margin:0 auto; font-family:arial; font-size:11pt;} .list li{padding-bottom:10px; color:#000; } .list li a{ text-decoration:none;} .subtitle{border-bottom:1px solid #F3F3F3; font-size:13pt; margin-top:10px; font-weight:bold;} @@ -32,3 +33,4 @@ li.help { text-align:justify} img.help { width:auto; height:auto; max-width: 50%;} p.img {text-align: center}*/ + diff --git a/OsmAnd/assets/style.css b/OsmAnd/assets/style.css index 3fad902219..31fdce9156 100644 --- a/OsmAnd/assets/style.css +++ b/OsmAnd/assets/style.css @@ -1,7 +1,36 @@ - h3 { text-align: center} - h4 { text-align: center} - div {border-width: 1px; padding: 10px; - border: groove; margin-left:auto;margin-right:auto; } - li { text-align:justify;"} - img { max-width: 75%; width: auto; height: auto; } - p.img {text-align: center} + + body{padding:0; margin:0; } + a {color:#536DFE;} + .main{width:480px; margin:0 auto; font-family:arial; font-size:11pt;} + .list li{padding-bottom:10px; color:#000; } + .list li a{ text-decoration:none;} + .subtitle{border-bottom:1px solid #F3F3F3; font-size:13pt; margin-top:10px; font-weight:bold;} + .blocksubtitle{font-weight:bold; margin-top:10px;} + h1{background-color:#FF8F00; font-size:15pt; color:#fff; padding-left:15px; padding-top:30px; padding-bottom:15px; font-weight:bold; + -webkit-border-radius: 4px;-moz-border-radius: 4px;border-radius: 4px; margin-top:-5px;} + .content{padding:15px;} + .content ul{padding-left:20px;} + /************home page*****************/ + .mainlist{list-style-type: none; margin:0; padding:0;} + .mainlist li{border-bottom: 1px solid #F3F3F3; padding:15px; } + .mainlist li.last{border-bottom:none;} + h1.sub{background-color:#536DFE; margin-top:0;} + h1.sub small{display:block; font-weight:normal; color:#ACB9FF; margin-top:5px;} + + /*****features**********************/ + .featuretitle{border-bottom:1px solid #F3F3F3; font-size:14pt; margin-top:10px; font-weight:bold;} + .features li{padding-bottom:10px;} + /*************frequently asked questions**************/ + .toc .list li{color:#D2D2D2;} + .toc .subtitle{font-weight:normal;} + + .screenshot{max-width:100%; max-height:100%;} + .imgcontainer{margin:30px; padding:7px; border:1px solid #ddd;} + /*div {border-width: 1px; padding: 10px; + border: groove; margin-left:auto;margin-right:auto; width:480pt} + h3.help { text-align: center} + h4.help { text-align: center} + li.help { text-align:justify} + img.help { width:auto; height:auto; max-width: 50%;} + p.img {text-align: center}*/ + diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle index d069630d87..7a65ef403b 100644 --- a/OsmAnd/build.gradle +++ b/OsmAnd/build.gradle @@ -141,12 +141,10 @@ android { buildTypes { debug { - minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt' signingConfig signingConfigs.development } release { - minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt' signingConfig signingConfigs.publishing } @@ -267,13 +265,13 @@ task cleanupDuplicatesInCore() { // doesn't work for legacy debug builds doLast { file("libgnustl/armeabi").mkdirs() - println file("libs/armeabi/libgnustl_shared.so").renameTo(file("libgnustl/armeabi/libgnustl_shared.so")) + file("libs/armeabi/libgnustl_shared.so").renameTo(file("libgnustl/armeabi/libgnustl_shared.so")) file("libgnustl/armeabi-v7a").mkdirs() - println file("libs/armeabi-v7a/libgnustl_shared.so").renameTo(file("libgnustl/armeabi-v7a/libgnustl_shared.so")) + file("libs/armeabi-v7a/libgnustl_shared.so").renameTo(file("libgnustl/armeabi-v7a/libgnustl_shared.so")) file("libgnustl/mips").mkdirs() - println file("libs/mips/libgnustl_shared.so").renameTo(file("libgnustl/mips/libgnustl_shared.so")) + file("libs/mips/libgnustl_shared.so").renameTo(file("libgnustl/mips/libgnustl_shared.so")) file("libgnustl/x86").mkdirs() - println file("libs/x86/libgnustl_shared.so").renameTo(file("libgnustl/x86/libgnustl_shared.so")) + file("libs/x86/libgnustl_shared.so").renameTo(file("libgnustl/x86/libgnustl_shared.so")) } } tasks.withType(JavaCompile) { diff --git a/OsmAnd/build.xml b/OsmAnd/build.xml index a3424d4f41..51081874d9 100644 --- a/OsmAnd/build.xml +++ b/OsmAnd/build.xml @@ -92,7 +92,7 @@ - + diff --git a/OsmAnd/proguard-project.txt b/OsmAnd/proguard-project.txt index d104746117..af6f471692 100755 --- a/OsmAnd/proguard-project.txt +++ b/OsmAnd/proguard-project.txt @@ -10,8 +10,12 @@ -keep class !android.support.v7.internal.view.menu.**,android.support.** {*;} -keep class net.osmand.** { *; } -keep interface net.osmand.** { *; } --keep class com.** { *; } --keep interface com.** { *; } + +-keep class com.google.** { *; } +-keep interface com.google.** { *; } +-keep class com.jwetherell.** { *; } +-keep interface com.jwetherell.** { *; } + -keep class btools.** { *; } -keep interface btools.** { *; } -keep class alice.** { *; } diff --git a/OsmAnd/src/com/gafmedia/Graph/PieItem.java b/OsmAnd/src/com/gafmedia/Graph/PieItem.java deleted file mode 100644 index 47eb517da6..0000000000 --- a/OsmAnd/src/com/gafmedia/Graph/PieItem.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.gafmedia.Graph; -public class PieItem { - public int Count; - public String Label; - public float Percent; - public int Color; -} diff --git a/OsmAnd/src/com/gafmedia/Graph/View_PieChart.java b/OsmAnd/src/com/gafmedia/Graph/View_PieChart.java deleted file mode 100644 index 03e41c61aa..0000000000 --- a/OsmAnd/src/com/gafmedia/Graph/View_PieChart.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.gafmedia.Graph; - -import java.util.List; - -import android.content.Context; -import android.graphics.BitmapFactory; -import android.graphics.BitmapFactory.Options; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.RectF; -import android.util.AttributeSet; -import android.view.View; - -public class View_PieChart extends View { - private static final int WAIT = 0; - private static final int IS_READY_TO_DRAW = 1; - private static final int IS_DRAW = 2; - private static final float START_INC = 30; - private Paint mBgPaints = new Paint(); - private Paint mLinePaints = new Paint(); - private int mOverlayId; - private int mWidth; - private int mHeight; - private int mGapLeft; - private int mGapRight; - private int mGapTop; - private int mGapBottom; - private int mBgColor; - private int mState = WAIT; - private float mStart; - private float mSweep; - private int mMaxConnection; - private List mDataArray; - //-------------------------------------------------------------------------------------- - public View_PieChart (Context context){ - super(context); - } - //-------------------------------------------------------------------------------------- - public View_PieChart(Context context, AttributeSet attrs) { - super(context, attrs); - } - //-------------------------------------------------------------------------------------- - @Override - protected void onDraw(Canvas canvas) { - super.onDraw(canvas); - //------------------------------------------------------ - if (mState != IS_READY_TO_DRAW) return; - canvas.drawColor(mBgColor); - //------------------------------------------------------ - mBgPaints.setAntiAlias(true); - mBgPaints.setStyle(Paint.Style.FILL); - mBgPaints.setColor(0x88FF0000); - mBgPaints.setStrokeWidth(0.5f); - //------------------------------------------------------ - mLinePaints.setAntiAlias(true); - mLinePaints.setStyle(Paint.Style.STROKE); - mLinePaints.setColor(0xff000000); - mLinePaints.setStrokeWidth(0.5f); - //------------------------------------------------------ - RectF mOvals = new RectF( mGapLeft, mGapTop, mWidth - mGapRight, mHeight - mGapBottom); - //------------------------------------------------------ - mStart = START_INC; - PieItem Item; - for (int i = 0; i < mDataArray.size(); i++) { - Item = (PieItem) mDataArray.get(i); - mBgPaints.setColor(Item.Color); - mSweep = (float) 360 * ( (float)Item.Count / (float)mMaxConnection ); - canvas.drawArc(mOvals, mStart, mSweep, true, mBgPaints); - canvas.drawArc(mOvals, mStart, mSweep, true, mLinePaints); - mStart += mSweep; - } - //------------------------------------------------------ - Options options = new BitmapFactory.Options(); - options.inScaled = false; -// Bitmap OverlayBitmap = BitmapFactory.decodeResource(getResources(), mOverlayId, options); -// canvas.drawBitmap(OverlayBitmap, 0.0f, 0.0f, null); - //------------------------------------------------------ - mState = IS_DRAW; - } - //-------------------------------------------------------------------------------------- - public void setGeometry(int width, int height, int GapLeft, int GapRight, int GapTop, int GapBottom, int OverlayId) { - mWidth = width; - mHeight = height; - mGapLeft = GapLeft; - mGapRight = GapRight; - mGapTop = GapTop; - mGapBottom = GapBottom; - mOverlayId = OverlayId; - } - //-------------------------------------------------------------------------------------- - public void setSkinParams(int bgColor) { - mBgColor = bgColor; - } - //-------------------------------------------------------------------------------------- - public void setData(List data, int MaxConnection) { - mDataArray = data; - mMaxConnection = MaxConnection; - mState = IS_READY_TO_DRAW; - } - //-------------------------------------------------------------------------------------- - public void setState(int State) { - mState = State; - } - //-------------------------------------------------------------------------------------- - public int getColorValue( int Index ) { - if (mDataArray == null) return 0; - if (Index < 0){ - return ((PieItem)mDataArray.get(0)).Color; - } else if (Index >= mDataArray.size()){ - return ((PieItem)mDataArray.get(mDataArray.size()-1)).Color; - } else { - return ((PieItem)mDataArray.get(mDataArray.size()-1)).Color; - } - } -} \ No newline at end of file