| @@ -4,26 +4,31 @@ | |||
| * $LastChangedBy$ | |||
| * $LastChangedDate$ | |||
| * | |||
| * Copyright (c) 2005 syseca AG, Switzerland | |||
| * Copyright (c) 2011 spherIC, Switzerland | |||
| * All rights reserved. | |||
| * | |||
| * This software is the confidential and proprietary information | |||
| * of syseca AG. ("Confidential Information"). You shall not | |||
| * of spherIC. ("Confidential Information"). You shall not | |||
| * disclose such Confidential Information and shall use it only | |||
| * in accordance with the terms of the license agreement you | |||
| * entered into with syseca AG. | |||
| * entered into with spherIC. | |||
| */ | |||
| package ch.spherIC; | |||
| import android.app.Activity; | |||
| import android.app.Dialog; | |||
| import android.content.pm.PackageManager; | |||
| import android.content.pm.PackageManager.NameNotFoundException; | |||
| import android.view.View; | |||
| import android.view.View.OnClickListener; | |||
| import android.widget.Button; | |||
| import android.widget.ImageView; | |||
| import android.widget.TextView; | |||
| import ch.spherIC.settings.SettingsDlg; | |||
| @@ -47,21 +52,21 @@ public final class DialogFactory { | |||
| switch (dlgCode) { | |||
| case EasyBracketMain.ABOUT_DLG: | |||
| dlg = createAboutDialog(parent); | |||
| break; | |||
| case EasyBracketMain.ABOUT_DLG: | |||
| dlg = createAboutDialog(parent); | |||
| break; | |||
| case EasyBracketMain.SETTINGS_DLG: | |||
| dlg = createSettingsDialog(parent); | |||
| break; | |||
| case EasyBracketMain.SETTINGS_DLG: | |||
| dlg = createSettingsDialog(parent); | |||
| break; | |||
| case EasyBracketMain.USERGUIDE_DLG: | |||
| dlg = createUserGuideDialog(parent); | |||
| break; | |||
| case EasyBracketMain.USERGUIDE_DLG: | |||
| dlg = createUserGuideDialog(parent); | |||
| break; | |||
| default: | |||
| dlg = null; | |||
| break; | |||
| default: | |||
| dlg = null; | |||
| break; | |||
| } | |||
| return dlg; | |||
| @@ -81,8 +86,7 @@ public final class DialogFactory { | |||
| dialog.setTitle(parent.getResources().getText(R.string.menuAbout) + " EasyBracketing..."); | |||
| try { | |||
| versionName = parent.getPackageManager().getPackageInfo("ch.spherIC", PackageManager.GET_CONFIGURATIONS) | |||
| .versionName; | |||
| versionName = parent.getPackageManager().getPackageInfo("ch.spherIC", PackageManager.GET_CONFIGURATIONS).versionName; | |||
| } catch (NameNotFoundException e) { | |||
| versionName = "-"; | |||
| } | |||
| @@ -133,8 +137,7 @@ public final class DialogFactory { | |||
| dialog.setTitle(parent.getResources().getText(R.string.menuUserGuide)); | |||
| try { | |||
| versionName = parent.getPackageManager().getPackageInfo("ch.spherIC", PackageManager.GET_CONFIGURATIONS) | |||
| .versionName; | |||
| versionName = parent.getPackageManager().getPackageInfo("ch.spherIC", PackageManager.GET_CONFIGURATIONS).versionName; | |||
| } catch (NameNotFoundException e) { | |||
| versionName = "-"; | |||
| } | |||
| @@ -4,14 +4,14 @@ | |||
| * $LastChangedBy$ | |||
| * $LastChangedDate$ | |||
| * | |||
| * Copyright (c) 2005 syseca AG, Switzerland | |||
| * Copyright (c) 2011 spherIC, Switzerland | |||
| * All rights reserved. | |||
| * | |||
| * This software is the confidential and proprietary information | |||
| * of syseca AG. ("Confidential Information"). You shall not | |||
| * of spherIC. ("Confidential Information"). You shall not | |||
| * disclose such Confidential Information and shall use it only | |||
| * in accordance with the terms of the license agreement you | |||
| * entered into with syseca AG. | |||
| * entered into with spherIC. | |||
| */ | |||
| package ch.spherIC; | |||
| @@ -4,18 +4,19 @@ | |||
| * $LastChangedBy$ | |||
| * $LastChangedDate$ | |||
| * | |||
| * Copyright (c) 2005 syseca AG, Switzerland | |||
| * Copyright (c) 2011 spherIC, Switzerland | |||
| * All rights reserved. | |||
| * | |||
| * This software is the confidential and proprietary information | |||
| * of syseca AG. ("Confidential Information"). You shall not | |||
| * of spherIC. ("Confidential Information"). You shall not | |||
| * disclose such Confidential Information and shall use it only | |||
| * in accordance with the terms of the license agreement you | |||
| * entered into with syseca AG. | |||
| * entered into with spherIC. | |||
| */ | |||
| package ch.spherIC.components; | |||
| import android.content.Context; | |||
| import android.util.AttributeSet; | |||
| @@ -4,18 +4,19 @@ | |||
| * $LastChangedBy$ | |||
| * $LastChangedDate$ | |||
| * | |||
| * Copyright (c) 2005 syseca AG, Switzerland | |||
| * Copyright (c) 2011 spherIC, Switzerland | |||
| * All rights reserved. | |||
| * | |||
| * This software is the confidential and proprietary information | |||
| * of syseca AG. ("Confidential Information"). You shall not | |||
| * of spherIC. ("Confidential Information"). You shall not | |||
| * disclose such Confidential Information and shall use it only | |||
| * in accordance with the terms of the license agreement you | |||
| * entered into with syseca AG. | |||
| * entered into with spherIC. | |||
| */ | |||
| package ch.spherIC.components; | |||
| import android.content.Context; | |||
| import android.util.AttributeSet; | |||
| @@ -4,19 +4,21 @@ | |||
| * $LastChangedBy$ | |||
| * $LastChangedDate$ | |||
| * | |||
| * Copyright (c) 2005 syseca AG, Switzerland | |||
| * Copyright (c) 2011 spherIC, Switzerland | |||
| * All rights reserved. | |||
| * | |||
| * This software is the confidential and proprietary information | |||
| * of syseca AG. ("Confidential Information"). You shall not | |||
| * of spherIC. ("Confidential Information"). You shall not | |||
| * disclose such Confidential Information and shall use it only | |||
| * in accordance with the terms of the license agreement you | |||
| * entered into with syseca AG. | |||
| * entered into with spherIC. | |||
| */ | |||
| package ch.spherIC.components; | |||
| import android.content.Context; | |||
| import android.util.AttributeSet; | |||
| import android.widget.Spinner; | |||
| @@ -4,24 +4,29 @@ | |||
| * $LastChangedBy$ | |||
| * $LastChangedDate$ | |||
| * | |||
| * Copyright (c) 2005 syseca AG, Switzerland | |||
| * Copyright (c) 2011 spherIC, Switzerland | |||
| * All rights reserved. | |||
| * | |||
| * This software is the confidential and proprietary information | |||
| * of syseca AG. ("Confidential Information"). You shall not | |||
| * of spherIC. ("Confidential Information"). You shall not | |||
| * disclose such Confidential Information and shall use it only | |||
| * in accordance with the terms of the license agreement you | |||
| * entered into with syseca AG. | |||
| * entered into with spherIC. | |||
| */ | |||
| package ch.spherIC.components; | |||
| import android.content.Context; | |||
| import android.content.res.TypedArray; | |||
| import android.graphics.Canvas; | |||
| import android.graphics.Paint; | |||
| import android.graphics.Rect; | |||
| import android.util.AttributeSet; | |||
| import android.widget.TextView; | |||
| import ch.spherIC.R; | |||
| @@ -83,8 +88,8 @@ public class XTextView extends TextView { | |||
| this.drawborderWidth = a.getDimensionPixelSize(R.styleable.XTextView_drawBorderWidth, 1); | |||
| if (this.drawborder) { | |||
| setPadding(getPaddingLeft() + this.drawborderWidth, getPaddingTop() + this.drawborderWidth, | |||
| getPaddingRight() + this.drawborderWidth, getPaddingBottom() + this.drawborderWidth); | |||
| setPadding(getPaddingLeft() + this.drawborderWidth, getPaddingTop() + this.drawborderWidth, getPaddingRight() + this.drawborderWidth, | |||
| getPaddingBottom() + this.drawborderWidth); | |||
| } | |||
| } | |||
| @@ -4,21 +4,21 @@ | |||
| * $LastChangedBy$ | |||
| * $LastChangedDate$ | |||
| * | |||
| * Copyright (c) 2005 syseca AG, Switzerland | |||
| * Copyright (c) 2011 spherIC, Switzerland | |||
| * All rights reserved. | |||
| * | |||
| * This software is the confidential and proprietary information | |||
| * of syseca AG. ("Confidential Information"). You shall not | |||
| * of spherIC. ("Confidential Information"). You shall not | |||
| * disclose such Confidential Information and shall use it only | |||
| * in accordance with the terms of the license agreement you | |||
| * entered into with syseca AG. | |||
| * entered into with spherIC. | |||
| */ | |||
| package ch.spherIC.resultlist; | |||
| import java.text.DecimalFormat; | |||
| import android.graphics.Bitmap; | |||
| import java.text.DecimalFormat; | |||
| /** | |||
| * Exposure result class. | |||
| @@ -4,32 +4,39 @@ | |||
| * $LastChangedBy$ | |||
| * $LastChangedDate$ | |||
| * | |||
| * Copyright (c) 2005 syseca AG, Switzerland | |||
| * Copyright (c) 2011 spherIC, Switzerland | |||
| * All rights reserved. | |||
| * | |||
| * This software is the confidential and proprietary information | |||
| * of syseca AG. ("Confidential Information"). You shall not | |||
| * of spherIC. ("Confidential Information"). You shall not | |||
| * disclose such Confidential Information and shall use it only | |||
| * in accordance with the terms of the license agreement you | |||
| * entered into with syseca AG. | |||
| * entered into with spherIC. | |||
| */ | |||
| package ch.spherIC.resultlist; | |||
| import java.util.List; | |||
| import android.app.Activity; | |||
| import android.content.Context; | |||
| import android.util.DisplayMetrics; | |||
| import android.view.Gravity; | |||
| import android.view.View; | |||
| import android.view.ViewGroup; | |||
| import android.widget.BaseAdapter; | |||
| import android.widget.ImageView; | |||
| import android.widget.LinearLayout; | |||
| import android.widget.TextView; | |||
| import android.widget.LinearLayout.LayoutParams; | |||
| import android.widget.TextView; | |||
| import ch.spherIC.R; | |||
| import java.util.List; | |||
| /** | |||
| * Exposure adapter view class. | |||
| @@ -54,8 +61,7 @@ class ExposureAdapterView extends LinearLayout { | |||
| // Nbr | |||
| TextView nbrControl = new TextView(context); | |||
| LinearLayout.LayoutParams nbrParams = new LinearLayout.LayoutParams(Math.round(0.14583f * width), | |||
| LayoutParams.WRAP_CONTENT, 0.2f); | |||
| LinearLayout.LayoutParams nbrParams = new LinearLayout.LayoutParams(Math.round(0.14583f * width), LayoutParams.WRAP_CONTENT, 0.2f); | |||
| nbrParams.setMargins(3, 1, 1, 1); | |||
| nbrControl.setGravity(Gravity.CENTER_HORIZONTAL | Gravity.CENTER_VERTICAL); | |||
| nbrControl.setTextAppearance(context, R.style.ResultExposureText); | |||
| @@ -64,8 +70,7 @@ class ExposureAdapterView extends LinearLayout { | |||
| // Aperture | |||
| TextView apertureControl = new TextView(context); | |||
| LinearLayout.LayoutParams apertureParams = new LinearLayout.LayoutParams(Math.round(0.20833f * width), | |||
| LayoutParams.WRAP_CONTENT, 0.2f); | |||
| LinearLayout.LayoutParams apertureParams = new LinearLayout.LayoutParams(Math.round(0.20833f * width), LayoutParams.WRAP_CONTENT, 0.2f); | |||
| apertureParams.setMargins(1, 1, 1, 1); | |||
| apertureControl.setGravity(Gravity.CENTER_HORIZONTAL | Gravity.CENTER_VERTICAL); | |||
| apertureControl.setTextAppearance(context, R.style.ResultExposureText); | |||
| @@ -74,8 +79,7 @@ class ExposureAdapterView extends LinearLayout { | |||
| // Shutter speed | |||
| TextView shutterControl = new TextView(context); | |||
| LinearLayout.LayoutParams shutterParams = new LinearLayout.LayoutParams(Math.round(0.35417f * width), | |||
| LayoutParams.WRAP_CONTENT, 0.2f); | |||
| LinearLayout.LayoutParams shutterParams = new LinearLayout.LayoutParams(Math.round(0.35417f * width), LayoutParams.WRAP_CONTENT, 0.2f); | |||
| shutterParams.setMargins(1, 1, 1, 1); | |||
| shutterControl.setGravity(Gravity.CENTER_HORIZONTAL | Gravity.CENTER_VERTICAL); | |||
| shutterControl.setTextAppearance(context, R.style.ResultExposureTextSpecial); | |||
| @@ -84,8 +88,7 @@ class ExposureAdapterView extends LinearLayout { | |||
| // EV Step | |||
| TextView evStepControl = new TextView(context); | |||
| LinearLayout.LayoutParams evStepParams = new LinearLayout.LayoutParams(Math.round(0.14583f * width), | |||
| LayoutParams.WRAP_CONTENT, 0.2f); | |||
| LinearLayout.LayoutParams evStepParams = new LinearLayout.LayoutParams(Math.round(0.14583f * width), LayoutParams.WRAP_CONTENT, 0.2f); | |||
| evStepParams.setMargins(1, 1, 1, 1); | |||
| evStepControl.setGravity(Gravity.CENTER_HORIZONTAL | Gravity.CENTER_VERTICAL); | |||
| evStepControl.setTextAppearance(context, R.style.ResultExposureText); | |||
| @@ -94,8 +97,7 @@ class ExposureAdapterView extends LinearLayout { | |||
| // Icon | |||
| ImageView expIconControl = new ImageView(context); | |||
| LinearLayout.LayoutParams expIconParams = new LinearLayout.LayoutParams(Math.round(0.14583f * width), | |||
| LayoutParams.WRAP_CONTENT, 0.2f); | |||
| LinearLayout.LayoutParams expIconParams = new LinearLayout.LayoutParams(Math.round(0.14583f * width), LayoutParams.WRAP_CONTENT, 0.2f); | |||
| expIconParams.setMargins(1, 1, 1, 1); | |||
| expIconControl.setImageBitmap(exposure.getEvStepBtmp()); | |||
| addView(expIconControl, expIconParams); | |||
| @@ -185,8 +187,7 @@ public class ExposureAdapter extends BaseAdapter { | |||
| // Nbr | |||
| TextView nbrControl = new TextView(context); | |||
| LinearLayout.LayoutParams nbrParams = new LinearLayout.LayoutParams(Math.round(0.14583f * width), | |||
| LayoutParams.WRAP_CONTENT, 0.2f); | |||
| LinearLayout.LayoutParams nbrParams = new LinearLayout.LayoutParams(Math.round(0.14583f * width), LayoutParams.WRAP_CONTENT, 0.2f); | |||
| nbrParams.setMargins(3, 1, 1, 1); | |||
| nbrControl.setGravity(Gravity.CENTER_HORIZONTAL | Gravity.CENTER_VERTICAL); | |||
| nbrControl.setTextSize(13f); | |||
| @@ -196,8 +197,7 @@ public class ExposureAdapter extends BaseAdapter { | |||
| // Aperture | |||
| TextView apertureControl = new TextView(context); | |||
| LinearLayout.LayoutParams apertureParams = new LinearLayout.LayoutParams(Math.round(0.20833f * width), | |||
| LayoutParams.WRAP_CONTENT, 0.2f); | |||
| LinearLayout.LayoutParams apertureParams = new LinearLayout.LayoutParams(Math.round(0.20833f * width), LayoutParams.WRAP_CONTENT, 0.2f); | |||
| apertureParams.setMargins(1, 1, 1, 1); | |||
| apertureControl.setGravity(Gravity.CENTER_HORIZONTAL | Gravity.CENTER_VERTICAL); | |||
| apertureControl.setTextSize(13f); | |||
| @@ -207,8 +207,7 @@ public class ExposureAdapter extends BaseAdapter { | |||
| // Shutter speed | |||
| TextView shutterControl = new TextView(context); | |||
| LinearLayout.LayoutParams shutterParams = new LinearLayout.LayoutParams(Math.round(0.35417f * width), | |||
| LayoutParams.WRAP_CONTENT, 0.2f); | |||
| LinearLayout.LayoutParams shutterParams = new LinearLayout.LayoutParams(Math.round(0.35417f * width), LayoutParams.WRAP_CONTENT, 0.2f); | |||
| shutterParams.setMargins(1, 1, 1, 1); | |||
| shutterControl.setGravity(Gravity.CENTER_HORIZONTAL | Gravity.CENTER_VERTICAL); | |||
| shutterControl.setTextSize(13f); | |||
| @@ -218,8 +217,7 @@ public class ExposureAdapter extends BaseAdapter { | |||
| // EV Step | |||
| TextView evStepControl = new TextView(context); | |||
| LinearLayout.LayoutParams evStepParams = new LinearLayout.LayoutParams(Math.round(0.14583f * width), | |||
| LayoutParams.WRAP_CONTENT, 0.2f); | |||
| LinearLayout.LayoutParams evStepParams = new LinearLayout.LayoutParams(Math.round(0.14583f * width), LayoutParams.WRAP_CONTENT, 0.2f); | |||
| evStepParams.setMargins(1, 1, 1, 1); | |||
| evStepControl.setGravity(Gravity.CENTER_HORIZONTAL | Gravity.CENTER_VERTICAL); | |||
| evStepControl.setTextSize(13f); | |||
| @@ -229,8 +227,7 @@ public class ExposureAdapter extends BaseAdapter { | |||
| // Icon | |||
| ImageView expIconControl = new ImageView(context); | |||
| LinearLayout.LayoutParams expIconParams = new LinearLayout.LayoutParams(Math.round(0.14583f * width), | |||
| LayoutParams.WRAP_CONTENT, 0.2f); | |||
| LinearLayout.LayoutParams expIconParams = new LinearLayout.LayoutParams(Math.round(0.14583f * width), LayoutParams.WRAP_CONTENT, 0.2f); | |||
| expIconParams.setMargins(1, 1, 1, 1); | |||
| headerLL.addView(expIconControl, expIconParams); | |||
| @@ -4,14 +4,14 @@ | |||
| * $LastChangedBy$ | |||
| * $LastChangedDate$ | |||
| * | |||
| * Copyright (c) 2005 syseca AG, Switzerland | |||
| * Copyright (c) 2011 spherIC, Switzerland | |||
| * All rights reserved. | |||
| * | |||
| * This software is the confidential and proprietary information | |||
| * of syseca AG. ("Confidential Information"). You shall not | |||
| * of spherIC. ("Confidential Information"). You shall not | |||
| * disclose such Confidential Information and shall use it only | |||
| * in accordance with the terms of the license agreement you | |||
| * entered into with syseca AG. | |||
| * entered into with spherIC. | |||
| */ | |||
| package ch.spherIC.resultlist; | |||
| @@ -4,27 +4,34 @@ | |||
| * $LastChangedBy$ | |||
| * $LastChangedDate$ | |||
| * | |||
| * Copyright (c) 2005 syseca AG, Switzerland | |||
| * Copyright (c) 2011 spherIC, Switzerland | |||
| * All rights reserved. | |||
| * | |||
| * This software is the confidential and proprietary information | |||
| * of syseca AG. ("Confidential Information"). You shall not | |||
| * of spherIC. ("Confidential Information"). You shall not | |||
| * disclose such Confidential Information and shall use it only | |||
| * in accordance with the terms of the license agreement you | |||
| * entered into with syseca AG. | |||
| * entered into with spherIC. | |||
| */ | |||
| package ch.spherIC.resultlist; | |||
| import android.content.Context; | |||
| import android.content.res.Resources; | |||
| import android.graphics.Bitmap; | |||
| import android.graphics.Bitmap.Config; | |||
| import android.graphics.BitmapFactory; | |||
| import android.graphics.Canvas; | |||
| import android.graphics.Paint; | |||
| import android.graphics.Paint.Style; | |||
| import android.graphics.PorterDuff; | |||
| import android.graphics.PorterDuffXfermode; | |||
| import android.graphics.Bitmap.Config; | |||
| import android.graphics.Paint.Style; | |||
| import ch.spherIC.R; | |||
| @@ -4,25 +4,30 @@ | |||
| * $LastChangedBy$ | |||
| * $LastChangedDate$ | |||
| * | |||
| * Copyright (c) 2005 syseca AG, Switzerland | |||
| * Copyright (c) 2011 spherIC, Switzerland | |||
| * All rights reserved. | |||
| * | |||
| * This software is the confidential and proprietary information | |||
| * of syseca AG. ("Confidential Information"). You shall not | |||
| * of spherIC. ("Confidential Information"). You shall not | |||
| * disclose such Confidential Information and shall use it only | |||
| * in accordance with the terms of the license agreement you | |||
| * entered into with syseca AG. | |||
| * entered into with spherIC. | |||
| */ | |||
| package ch.spherIC.settings; | |||
| import android.app.Dialog; | |||
| import android.content.Context; | |||
| import android.content.SharedPreferences; | |||
| import android.os.Bundle; | |||
| import android.view.View; | |||
| import android.widget.Button; | |||
| import android.widget.RadioButton; | |||
| import android.widget.Spinner; | |||
| import ch.spherIC.EasyBracketMain; | |||
| import ch.spherIC.R; | |||