| @@ -118,7 +118,7 @@ | |||
| android:layout_width="fill_parent" | |||
| android:background="@drawable/gradient_view" /> | |||
| <TextView | |||
| android:id="@+id/Title_DarkPoint" | |||
| android:id="@+id/Title_BrightPoint" | |||
| android:textColor="@color/black" | |||
| android:textStyle="bold" | |||
| android:layout_marginLeft="3dip" | |||
| @@ -137,7 +137,7 @@ | |||
| android:id="@+id/Row_BP_Shutter"> | |||
| <TextView | |||
| android:id="@+id/Label_DP_Shutter" | |||
| android:id="@+id/Label_BP_Shutter" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_gravity="right|center_vertical" | |||
| @@ -174,7 +174,7 @@ | |||
| android:id="@+id/Row_BP_Aperture"> | |||
| <TextView | |||
| android:id="@+id/Label_DP_Aperture" | |||
| android:id="@+id/Label_BP_Aperture" | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:layout_gravity="right|center_vertical" | |||
| @@ -299,7 +299,7 @@ | |||
| <TableRow | |||
| android:layout_width="wrap_content" | |||
| android:layout_height="wrap_content" | |||
| android:id="@+id/Row_calcP_Aperture" | |||
| android:id="@+id/Row_calcP_Aperture2" | |||
| android:paddingTop="2dip"> | |||
| <TextView | |||
| @@ -101,9 +101,11 @@ public class ExposureFactory { | |||
| if ((v1 <= shutter && shutter <= v2) || (v2 <= shutter && shutter <= v1)) { | |||
| if (Math.abs(shutter - v1) <= Math.abs(shutter - v2)) { | |||
| shutterSpeed = (v1 < 1) ? "1/" + evDF.format((1 / v1)) : "" + EasyBracketMain.DF.format(v1) + "''"; | |||
| shutterSpeed = (v1 < 1) ? "1/" + evDF.format((1 / v1)) | |||
| : "" + EasyBracketMain.DF.format(v1) + "''"; | |||
| } else { | |||
| shutterSpeed = (v2 < 1) ? "1/" + evDF.format((1 / v2)) : "" + EasyBracketMain.DF.format(v2) + "''"; | |||
| shutterSpeed = (v2 < 1) ? "1/" + evDF.format((1 / v2)) | |||
| : "" + EasyBracketMain.DF.format(v2) + "''"; | |||
| } | |||
| found = true; | |||
| break; | |||
| @@ -111,7 +113,8 @@ public class ExposureFactory { | |||
| } | |||
| if (!found) { | |||
| shutterSpeed = (shutter < 1) ? "1/" + Math.round(1 / shutter) : "" + EasyBracketMain.DF.format(shutter) + "''"; | |||
| shutterSpeed = (shutter < 1) ? "1/" + Math.round(1 / shutter) | |||
| : "" + EasyBracketMain.DF.format(shutter) + "''"; | |||
| } | |||
| exp = new Exposure(i + 1, "f/" + EasyBracketMain.DF.format(calcPrmAperture), shutterSpeed, evStep, deltaEV, | |||
| @@ -176,8 +179,8 @@ public class ExposureFactory { | |||
| break; | |||
| default: | |||
| iSize = 72; | |||
| iSize_r = 68; | |||
| iSize = 96; | |||
| iSize_r = 92; | |||
| iStart = 2; | |||
| break; | |||
| } | |||
| @@ -59,7 +59,7 @@ public class ExposureIconFactory { | |||
| final Resources res = context.getResources(); | |||
| // The background | |||
| mIconBG = Bitmap.createBitmap(36, 36, Config.ARGB_8888); | |||
| mIconBG = Bitmap.createBitmap(32, 32, Config.ARGB_8888); | |||
| mIconBG.eraseColor(0x00000000); | |||
| canvas = new Canvas(mIconBG); | |||
| mPaint.setStyle(Style.FILL); | |||