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

Improving FontFitTextView and using it in the layers/settings list

Browse source
This commit is contained in:
Pavol Zibrita 2012-08-23 23:36:31 +02:00
parent 7d2dc04100
commit 96a71caa26
4 changed files with 15 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/layout/layers_list_activity_item.xml
View file

@ -9,7 +9,7 @@
android:layout_marginRight="5dip"
android:weightSum="1" >
<TextView
<net.osmand.plus.activities.FontFitTextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

2
OsmAnd/src/net/osmand/plus/activities/DownloadIndexActivity.java
View file

@ -62,8 +62,6 @@ import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
import android.os.StatFs;
import android.provider.Settings;
import android.provider.Settings.SettingNotFoundException;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.LayoutInflater;

45
OsmAnd/src/net/osmand/plus/activities/FontFitTextView.java
View file

@ -1,8 +1,9 @@
package net.osmand.plus.activities;
import android.content.Context;
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.text.TextPaint;
import android.text.TextUtils.TruncateAt;
import android.util.AttributeSet;
import android.widget.TextView;
@ -11,38 +12,35 @@ import android.widget.TextView;
*/
public class FontFitTextView extends TextView {
private static float MAX_TEXT_SIZE = 20;
public FontFitTextView(Context context) {
this(context, null);
}
public FontFitTextView(Context context, AttributeSet attrs) {
super(context, attrs);
float size = this.getTextSize();
if (size > MAX_TEXT_SIZE)
setTextSize(MAX_TEXT_SIZE);
setSingleLine();
setEllipsize(TruncateAt.MARQUEE);
}
// Default constructor override
public FontFitTextView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
float size = this.getTextSize();
if (size > MAX_TEXT_SIZE)
setTextSize(MAX_TEXT_SIZE);
setSingleLine();
setEllipsize(TruncateAt.MARQUEE);
}
private void refitText(String text, int textWidth) {
if (textWidth > 0) {
Drawable left = getCompoundDrawables()[0];
Drawable right = getCompoundDrawables()[2];
float availableWidth = textWidth - this.getPaddingLeft()
- this.getPaddingRight();
- this.getPaddingRight() - this.getCompoundDrawablePadding()
- (left != null ? left.getMinimumWidth() : 0)
- (right != null ? right.getMinimumWidth() : 0);
setTextScaleX(1f);
TextPaint tp = getPaint();
Rect rect = new Rect();
tp.getTextBounds(text, 0, text.length(), rect);
float size = rect.width();
float size = tp.measureText(text);
if (size > availableWidth)
setTextScaleX(availableWidth / size);
@ -51,11 +49,9 @@ public class FontFitTextView extends TextView {
@Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
int parentWidth = MeasureSpec.getSize(widthMeasureSpec);
int parentHeight = MeasureSpec.getSize(heightMeasureSpec);
refitText(this.getText().toString(), parentWidth);
this.setMeasuredDimension(parentWidth, parentHeight);
super.onMeasure(widthMeasureSpec, heightMeasureSpec);
}
@Override
@ -71,17 +67,4 @@ public class FontFitTextView extends TextView {
}
}
// /**
// * Resize text after measuring
// */
// @Override
// protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
// if(changed) { // || mNeedsResize) {
// int widthLimit = (right - left) - getCompoundPaddingLeft() - getCompoundPaddingRight();
// int heightLimit = (bottom - top) - getCompoundPaddingBottom() - getCompoundPaddingTop();
// resizeText(widthLimit, heightLimit);
// }
// super.onLayout(changed, left, top, right, bottom);
// }
}

6
OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
View file

@ -26,7 +26,6 @@ import net.osmand.render.RenderingRuleProperty;
import net.osmand.render.RenderingRulesStorage;
import android.app.AlertDialog;
import android.app.AlertDialog.Builder;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
@ -45,11 +44,7 @@ import android.view.Gravity;
import android.view.View;
import android.view.View.MeasureSpec;
import android.view.ViewGroup;
import android.view.Window;
import android.view.WindowManager;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.AdapterView.OnItemSelectedListener;
import android.widget.ArrayAdapter;
import android.widget.CheckBox;
import android.widget.CompoundButton;
@ -59,7 +54,6 @@ import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.LinearLayout.LayoutParams;
import android.widget.ListAdapter;
import android.widget.ListView;
import android.widget.TextView;
import android.widget.Toast;