diff --git a/Augendiagnose/res/drawable/circle.xml b/Augendiagnose/res/drawable/circle.xml deleted file mode 100644 index 303ff1ea..00000000 --- a/Augendiagnose/res/drawable/circle.xml +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/Augendiagnose/res/values-de/strings.xml b/Augendiagnose/res/values-de/strings.xml index e0eb6d2d..8ad3a565 100644 --- a/Augendiagnose/res/values-de/strings.xml +++ b/Augendiagnose/res/values-de/strings.xml @@ -47,7 +47,6 @@ Tauschen Andere Fotos - Kreis IT 1 IT 2 IT 3 diff --git a/Augendiagnose/res/values-de/strings_releasenotes.xml b/Augendiagnose/res/values-de/strings_releasenotes.xml index 21c9f5a0..d58d9f15 100644 --- a/Augendiagnose/res/values-de/strings_releasenotes.xml +++ b/Augendiagnose/res/values-de/strings_releasenotes.xml @@ -48,7 +48,7 @@ Kamera benutzen. Bitte informieren Sie mich, wenn solche Probleme auftreten.

Neues Overlay. Verbessertes Zooming des Overlays. Verbesserte Darstellung. Hilfeseiten für die wichtigsten Aktivitäten hinzugefügt. Die Overlay-Position wird in den Bilddateien gespeichert. - Ein weiteres (italienisches) Overlay. Bugfixes. + Ein weiteres (italienisches) Overlay. Startinformation für neue Nutzer. Bugfixes. \ No newline at end of file diff --git a/Augendiagnose/res/values/strings.xml b/Augendiagnose/res/values/strings.xml index 71309515..0ce36a33 100644 --- a/Augendiagnose/res/values/strings.xml +++ b/Augendiagnose/res/values/strings.xml @@ -47,7 +47,6 @@ Switch Other Pictures - Circle IT 1 IT 2 IT 3 diff --git a/Augendiagnose/res/values/strings_releasenotes.xml b/Augendiagnose/res/values/strings_releasenotes.xml index c53f3fa2..bef9fe25 100644 --- a/Augendiagnose/res/values/strings_releasenotes.xml +++ b/Augendiagnose/res/values/strings_releasenotes.xml @@ -61,7 +61,7 @@ when using the app for the first time with a new device or with a new camera. Pl Added a second custom overlay. Improved overlay pinching. Corrected some display issues. Added various help screens. Enabled storage of Overlay position within JPG file. - Added one more (Italian) overlay. Bugfixes. + Added one more (Italian) overlay. Added start screen for new users. Bugfixes. \ No newline at end of file diff --git a/Augendiagnose/src/de/eisfeldj/augendiagnose/activities/DisplayOneActivityOverlay.java b/Augendiagnose/src/de/eisfeldj/augendiagnose/activities/DisplayOneActivityOverlay.java index 1cfabde0..a056d30d 100644 --- a/Augendiagnose/src/de/eisfeldj/augendiagnose/activities/DisplayOneActivityOverlay.java +++ b/Augendiagnose/src/de/eisfeldj/augendiagnose/activities/DisplayOneActivityOverlay.java @@ -69,8 +69,6 @@ protected void onCreate(Bundle savedInstanceState) { imageView.mLockButton = (ToggleButton) findViewById(R.id.toggleButtonLink); if (!Application.isAuthorized()) { - toggleOverlayButtons[3].setEnabled(false); - toggleOverlayButtons[3].setVisibility(View.GONE); toggleOverlayButtons[4].setEnabled(false); toggleOverlayButtons[4].setVisibility(View.GONE); toggleOverlayButtons[5].setEnabled(false); diff --git a/Augendiagnose/src/de/eisfeldj/augendiagnose/components/EyeImageView.java b/Augendiagnose/src/de/eisfeldj/augendiagnose/components/EyeImageView.java index eb394b98..59a7d840 100644 --- a/Augendiagnose/src/de/eisfeldj/augendiagnose/components/EyeImageView.java +++ b/Augendiagnose/src/de/eisfeldj/augendiagnose/components/EyeImageView.java @@ -1,5 +1,6 @@ package de.eisfeldj.augendiagnose.components; +import android.app.Activity; import android.content.Context; import android.util.AttributeSet; import android.widget.ImageView; @@ -30,14 +31,14 @@ public EyeImageView(Context context, AttributeSet attrs, int defStyle) { * * @param eyePhoto */ - public void setEyePhoto(final EyePhoto eyePhoto, final Runnable postActivities) { + public void setEyePhoto(final Activity activity, final EyePhoto eyePhoto, final Runnable postActivities) { this.eyePhoto = eyePhoto; // Fill pictures in separate thread, for performance reasons new Thread() { @Override public void run() { eyePhoto.precalculateImageBitmap(MediaStoreUtil.MINI_THUMB_SIZE); - post(new Runnable() { + activity.runOnUiThread(new Runnable() { @Override public void run() { setImageBitmap(eyePhoto.getImageBitmap(MediaStoreUtil.MINI_THUMB_SIZE)); diff --git a/Augendiagnose/src/de/eisfeldj/augendiagnose/components/ListPicturesForNameArrayAdapter.java b/Augendiagnose/src/de/eisfeldj/augendiagnose/components/ListPicturesForNameArrayAdapter.java index e6cf2afe..e848f907 100644 --- a/Augendiagnose/src/de/eisfeldj/augendiagnose/components/ListPicturesForNameArrayAdapter.java +++ b/Augendiagnose/src/de/eisfeldj/augendiagnose/components/ListPicturesForNameArrayAdapter.java @@ -1,5 +1,6 @@ package de.eisfeldj.augendiagnose.components; +import android.app.Activity; import android.content.Context; import android.view.View; import android.view.ViewGroup; @@ -14,8 +15,8 @@ */ public class ListPicturesForNameArrayAdapter extends ListPicturesForNameBaseArrayAdapter { - public ListPicturesForNameArrayAdapter(Context context, EyePhotoPair[] eyePhotoPairs) { - super(context, eyePhotoPairs); + public ListPicturesForNameArrayAdapter(Activity activity, EyePhotoPair[] eyePhotoPairs) { + super(activity, eyePhotoPairs); } public ListPicturesForNameArrayAdapter(Context context) { @@ -44,7 +45,7 @@ public View getView(final int position, View convertView, ViewGroup parent) { @Override public void onClick(View v) { ImageSelectionAndDisplayHandler.getInstance().cleanSelectedView(); - DisplayTwoActivity.startActivity(ListPicturesForNameArrayAdapter.this.context, eyePhotoPairs[position] + DisplayTwoActivity.startActivity(ListPicturesForNameArrayAdapter.this.activity, eyePhotoPairs[position] .getRightEye().getAbsolutePath(), eyePhotoPairs[position].getLeftEye().getAbsolutePath()); } diff --git a/Augendiagnose/src/de/eisfeldj/augendiagnose/components/ListPicturesForNameBaseArrayAdapter.java b/Augendiagnose/src/de/eisfeldj/augendiagnose/components/ListPicturesForNameBaseArrayAdapter.java index a0a5ee64..523fc915 100644 --- a/Augendiagnose/src/de/eisfeldj/augendiagnose/components/ListPicturesForNameBaseArrayAdapter.java +++ b/Augendiagnose/src/de/eisfeldj/augendiagnose/components/ListPicturesForNameBaseArrayAdapter.java @@ -1,5 +1,6 @@ package de.eisfeldj.augendiagnose.components; +import android.app.Activity; import android.content.Context; import android.view.LayoutInflater; import android.view.View; @@ -13,7 +14,7 @@ * Array adapter class to display an eye photo pair in a list. */ public abstract class ListPicturesForNameBaseArrayAdapter extends ArrayAdapter { - protected final Context context; + protected final Activity activity; /** * Keep up to 25 rows in memory before reusing views. @@ -22,15 +23,15 @@ public abstract class ListPicturesForNameBaseArrayAdapter extends ArrayAdapter { - protected final Context context; + protected final Activity activity; protected EyePhoto[] eyePhotos; - public SelectTwoPicturesArrayAdapter(Context context, EyePhoto[] eyePhotos) { - super(context, R.layout.text_view_initializing, eyePhotos); - this.context = context; + public SelectTwoPicturesArrayAdapter(Activity activity, EyePhoto[] eyePhotos) { + super(activity, R.layout.text_view_initializing, eyePhotos); + this.activity = activity; this.eyePhotos = eyePhotos; } public SelectTwoPicturesArrayAdapter(Context context) { super(context, R.layout.adapter_list_pictures_for_name); - this.context = context; + this.activity = (Activity) context; } /** @@ -34,9 +35,9 @@ public SelectTwoPicturesArrayAdapter(Context context) { */ @Override public View getView(final int position, View convertView, ViewGroup parent) { - final EyeImageView eyeImageView = (EyeImageView) LayoutInflater.from(context).inflate( + final EyeImageView eyeImageView = (EyeImageView) LayoutInflater.from(activity).inflate( R.layout.adapter_select_two_pictures, parent, false); - eyeImageView.setEyePhoto(eyePhotos[position], new Runnable() { + eyeImageView.setEyePhoto(activity, eyePhotos[position], new Runnable() { @Override public void run() { TwoImageSelectionHandler.getInstance().highlightIfSelected(eyeImageView);