From 2cddda1de7af5c99ced36b2ad22a6412cbdd026f Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Mon, 11 Nov 2013 20:37:14 +0100 Subject: [PATCH 1/7] remove ScrollView, to be able to scale NavigationView to height of screen, issue #91 --- res/layout-land/activity_main.xml | 45 ++++++++++++++----------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/res/layout-land/activity_main.xml b/res/layout-land/activity_main.xml index fb4b0fb9b..f4741c66d 100644 --- a/res/layout-land/activity_main.xml +++ b/res/layout-land/activity_main.xml @@ -1,35 +1,30 @@ - - + android:layout_centerVertical="true" + android:layout_toLeftOf="@+id/navigationView_ToDest" /> - + - - - + - - \ No newline at end of file + From ab163230c9935ee901bf01077b53399e4c6025f1 Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Mon, 11 Nov 2013 21:30:58 +0100 Subject: [PATCH 2/7] get layout_height and layout_width parameters, issue #91 --- src/org/ruleant/ariadne/NavigationView.java | 33 +++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/org/ruleant/ariadne/NavigationView.java b/src/org/ruleant/ariadne/NavigationView.java index 23e998c3d..f04c3dbd7 100644 --- a/src/org/ruleant/ariadne/NavigationView.java +++ b/src/org/ruleant/ariadne/NavigationView.java @@ -22,6 +22,7 @@ package org.ruleant.ariadne; import android.content.Context; +import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; @@ -54,6 +55,16 @@ public class NavigationView extends ImageView { */ private int mMode = 0; + /** + * Attribute layout_width. + */ + private int mAttributeLayoutWidth = ViewGroup.LayoutParams.MATCH_PARENT; + + /** + * Attribute layout_height. + */ + private int mAttributeLayoutHeight = ViewGroup.LayoutParams.WRAP_CONTENT; + /** * X coordinate. */ @@ -120,6 +131,28 @@ public NavigationView(final Context context, final AttributeSet attributes) { super(context, attributes); + int[] lookForAttributes = new int[] { android.R.attr.layout_width, + android.R.attr.layout_height }; + + TypedArray foundAttributes = context.getTheme().obtainStyledAttributes( + attributes, + lookForAttributes, + 0, 0); + + // TODO debug, getInteger throws ArrayIndexOutOfBoundsException + try { + mAttributeLayoutWidth = foundAttributes.getInteger( + android.R.attr.layout_width, + ViewGroup.LayoutParams.MATCH_PARENT); + mAttributeLayoutHeight = foundAttributes.getInteger( + android.R.attr.layout_height, + ViewGroup.LayoutParams.WRAP_CONTENT); + } catch (ArrayIndexOutOfBoundsException e) { + e.printStackTrace(); + } finally { + foundAttributes.recycle(); + } + init(); } From b3fd57b2e47dd8d5b9634e4d7f92dae2bc2d8f26 Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Tue, 12 Nov 2013 19:36:34 +0100 Subject: [PATCH 3/7] get layout_height and layout_width parameters, issue #91 --- src/org/ruleant/ariadne/NavigationView.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/org/ruleant/ariadne/NavigationView.java b/src/org/ruleant/ariadne/NavigationView.java index f04c3dbd7..a36da1809 100644 --- a/src/org/ruleant/ariadne/NavigationView.java +++ b/src/org/ruleant/ariadne/NavigationView.java @@ -139,14 +139,11 @@ public NavigationView(final Context context, lookForAttributes, 0, 0); - // TODO debug, getInteger throws ArrayIndexOutOfBoundsException try { mAttributeLayoutWidth = foundAttributes.getInteger( - android.R.attr.layout_width, - ViewGroup.LayoutParams.MATCH_PARENT); + 0, ViewGroup.LayoutParams.MATCH_PARENT); mAttributeLayoutHeight = foundAttributes.getInteger( - android.R.attr.layout_height, - ViewGroup.LayoutParams.WRAP_CONTENT); + 1, ViewGroup.LayoutParams.WRAP_CONTENT); } catch (ArrayIndexOutOfBoundsException e) { e.printStackTrace(); } finally { From b32c120ecdea4d9732e306f5143948d4754a979c Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Tue, 12 Nov 2013 19:42:49 +0100 Subject: [PATCH 4/7] adjust height/width according to attribute setting, issue #91 --- src/org/ruleant/ariadne/NavigationView.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/org/ruleant/ariadne/NavigationView.java b/src/org/ruleant/ariadne/NavigationView.java index a36da1809..5f06cf72f 100644 --- a/src/org/ruleant/ariadne/NavigationView.java +++ b/src/org/ruleant/ariadne/NavigationView.java @@ -213,7 +213,15 @@ public final void onDraw(final Canvas canvas) { if (getWidth() != getHeight()) { ViewGroup.LayoutParams layoutParams = getLayoutParams(); - layoutParams.height = getWidth(); + // adjust height/width according to attribute setting + if (mAttributeLayoutHeight + == ViewGroup.LayoutParams.WRAP_CONTENT) { + layoutParams.height = getWidth(); + } else if (mAttributeLayoutWidth + == ViewGroup.LayoutParams.WRAP_CONTENT) { + layoutParams.width = getHeight(); + } + setLayoutParams(layoutParams); } From 5955fe515cab2654154ea4b0513faccc2803b443 Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Tue, 12 Nov 2013 19:44:47 +0100 Subject: [PATCH 5/7] leave more space for Crouton --- res/layout-land/activity_main.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/layout-land/activity_main.xml b/res/layout-land/activity_main.xml index f4741c66d..5965b4337 100644 --- a/res/layout-land/activity_main.xml +++ b/res/layout-land/activity_main.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="horizontal" - android:paddingTop="25dp" + android:paddingTop="30dp" tools:context=".MainActivity" > Date: Tue, 12 Nov 2013 20:17:23 +0100 Subject: [PATCH 6/7] fix coding style : no space after { --- src/org/ruleant/ariadne/NavigationView.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/ruleant/ariadne/NavigationView.java b/src/org/ruleant/ariadne/NavigationView.java index 5f06cf72f..93ca7ceb1 100644 --- a/src/org/ruleant/ariadne/NavigationView.java +++ b/src/org/ruleant/ariadne/NavigationView.java @@ -131,8 +131,8 @@ public NavigationView(final Context context, final AttributeSet attributes) { super(context, attributes); - int[] lookForAttributes = new int[] { android.R.attr.layout_width, - android.R.attr.layout_height }; + int[] lookForAttributes = new int[] {android.R.attr.layout_width, + android.R.attr.layout_height}; TypedArray foundAttributes = context.getTheme().obtainStyledAttributes( attributes, From 86f404198277f1b3955df187415ef2d801c6474b Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Tue, 12 Nov 2013 20:22:30 +0100 Subject: [PATCH 7/7] update JavaDoc [skip ci] --- doc/allclasses-frame.html | 5 +- doc/allclasses-noframe.html | 5 +- doc/constant-values.html | 4 +- doc/deprecated-list.html | 4 +- doc/help-doc.html | 4 +- doc/index-all.html | 61 +- doc/index.html | 2 +- doc/org/ruleant/ariadne/AboutActivity.html | 8 +- .../ariadne/AbstractAriadneActivity.html | 590 ------------------ doc/org/ruleant/ariadne/DetailsActivity.html | 178 +++++- .../LocationService.LocationBinder.html | 4 +- doc/org/ruleant/ariadne/LocationService.html | 14 +- doc/org/ruleant/ariadne/MainActivity.html | 145 +++-- doc/org/ruleant/ariadne/NavigationView.html | 4 +- ...tingsActivity.DebugPreferenceFragment.html | 4 +- ...ngsActivity.GeneralPreferenceFragment.html | 4 +- doc/org/ruleant/ariadne/SettingsActivity.html | 4 +- .../ariadne/class-use/AboutActivity.html | 4 +- .../class-use/AbstractAriadneActivity.html | 168 ----- .../ariadne/class-use/DetailsActivity.html | 4 +- .../LocationService.LocationBinder.html | 4 +- .../ariadne/class-use/LocationService.html | 51 +- .../ariadne/class-use/MainActivity.html | 4 +- .../ariadne/class-use/NavigationView.html | 4 +- ...tingsActivity.DebugPreferenceFragment.html | 4 +- ...ngsActivity.GeneralPreferenceFragment.html | 4 +- .../ariadne/class-use/SettingsActivity.html | 4 +- .../ariadne/lib/AbstractGeoCoordinate.html | 4 +- .../ruleant/ariadne/lib/AriadneLocation.html | 4 +- doc/org/ruleant/ariadne/lib/DebugLevel.html | 4 +- doc/org/ruleant/ariadne/lib/FormatUtils.html | 4 +- doc/org/ruleant/ariadne/lib/Latitude.html | 4 +- doc/org/ruleant/ariadne/lib/Longitude.html | 4 +- doc/org/ruleant/ariadne/lib/Navigator.html | 4 +- .../ariadne/lib/StoredDestination.html | 4 +- .../ruleant/ariadne/lib/StoredLocation.html | 9 +- .../lib/class-use/AbstractGeoCoordinate.html | 4 +- .../lib/class-use/AriadneLocation.html | 10 +- .../ariadne/lib/class-use/DebugLevel.html | 4 +- .../ariadne/lib/class-use/FormatUtils.html | 4 +- .../ariadne/lib/class-use/Latitude.html | 4 +- .../ariadne/lib/class-use/Longitude.html | 4 +- .../ariadne/lib/class-use/Navigator.html | 4 +- .../lib/class-use/StoredDestination.html | 4 +- .../ariadne/lib/class-use/StoredLocation.html | 4 +- .../ruleant/ariadne/lib/package-frame.html | 4 +- .../ruleant/ariadne/lib/package-summary.html | 4 +- doc/org/ruleant/ariadne/lib/package-tree.html | 4 +- doc/org/ruleant/ariadne/lib/package-use.html | 4 +- doc/org/ruleant/ariadne/package-frame.html | 5 +- doc/org/ruleant/ariadne/package-summary.html | 23 +- doc/org/ruleant/ariadne/package-tree.html | 10 +- doc/org/ruleant/ariadne/package-use.html | 50 +- .../UnitConversionInterface.html | 4 +- .../class-use/UnitConversionInterface.html | 4 +- .../ruleant/unitconversion/package-frame.html | 4 +- .../unitconversion/package-summary.html | 4 +- .../ruleant/unitconversion/package-tree.html | 4 +- .../ruleant/unitconversion/package-use.html | 4 +- doc/overview-frame.html | 4 +- doc/overview-summary.html | 4 +- doc/overview-tree.html | 10 +- 62 files changed, 396 insertions(+), 1124 deletions(-) delete mode 100644 doc/org/ruleant/ariadne/AbstractAriadneActivity.html delete mode 100644 doc/org/ruleant/ariadne/class-use/AbstractAriadneActivity.html diff --git a/doc/allclasses-frame.html b/doc/allclasses-frame.html index c23dc77aa..70fe23340 100644 --- a/doc/allclasses-frame.html +++ b/doc/allclasses-frame.html @@ -2,10 +2,10 @@ - + All Classes (Ariadne 0.1-dev API) - + @@ -13,7 +13,6 @@

All Classes