浏览代码

Version 1.0.1

ExposureIcon Helligkeiten gedreht / Layouting
master
gitsvn 12 年前
父节点
当前提交
95415e6c31

+ 5
- 3
EasyBracketing/EasyBracketing/EasyBracketing/AndroidManifest.xml 查看文件

@@ -3,15 +3,17 @@
xmlns:android="http://schemas.android.com/apk/res/android"
package="ch.spherIC"
android:versionCode="1"
android:versionName="1.0.0">
<uses-sdk android:minSdkVersion="10" />
android:versionName="1.0.1">
<uses-sdk android:minSdkVersion="10"
android:targetSdkVersion="10" />
<application
android:icon="@drawable/icon"
android:label="@string/app_name"
android:theme="@style/GlassTheme">
<activity
android:name=".EasyBracketMain"
android:label="@string/app_name">
android:label="@string/app_name"
android:screenOrientation="portrait">
<intent-filter>
<action
android:name="android.intent.action.MAIN" />

+ 104
- 73
EasyBracketing/EasyBracketing/EasyBracketing/res/layout/main.xml 查看文件

@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<TableLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
xmlns:android="http://schemas.android.com/apk/res/android"
android:background="@drawable/bg"
android:orientation="vertical"
android:id="@+id/TableLayout"
xmlns:spherIC="http://schemas.android.com/apk/res/ch.spherIC">
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:spherIC="http://schemas.android.com/apk/res/ch.spherIC"
android:id="@+id/TableLayout"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_gravity="fill"
android:background="@drawable/bg"
android:orientation="vertical" >

<ch.spherIC.components.XTextView
android:autoText="false"
android:text="@string/dynamic_range"
@@ -42,16 +43,19 @@
<TableRow
android:layout_width="wrap_content"
android:id="@+id/Row_DP_Shutter">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:text="@string/shutter_speed"
android:id="@+id/Label_DP_Shutter"
android:layout_gravity="center_vertical"
android:textSize="13dip"
android:layout_marginLeft="10dip"
android:layout_marginRight="10dip"></TextView>
android:id="@+id/Label_DP_Shutter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|center_vertical"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:text="@string/shutter_speed"
android:textColor="@color/black"
android:textSize="13dip" >

</TextView>
<ch.spherIC.components.ShutterSpeedSpinner
android:layout_width="wrap_content"
android:id="@+id/Spinner_DP_Shutter"
@@ -75,15 +79,19 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/Row_DP_Aperture">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:layout_marginLeft="10dip"
android:id="@+id/Label_DP_Aperture"
android:text="@string/aperture"
android:layout_gravity="center_vertical"
android:textSize="13dip"></TextView>
android:id="@+id/Label_DP_Aperture"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|center_vertical"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:text="@string/aperture"
android:textColor="@color/black"
android:textSize="13dip" >

</TextView>
<ch.spherIC.components.ApertureSpinner
android:layout_width="wrap_content"
android:layout_weight="2"
@@ -127,15 +135,19 @@
<TableRow
android:layout_width="wrap_content"
android:id="@+id/Row_BP_Shutter">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:text="@string/shutter_speed"
android:layout_marginLeft="10dip"
android:id="@+id/Label_DP_Shutter"
android:layout_gravity="center_vertical"
android:textSize="13dip"></TextView>
android:id="@+id/Label_DP_Shutter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|center_vertical"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:text="@string/shutter_speed"
android:textColor="@color/black"
android:textSize="13dip" >

</TextView>
<ch.spherIC.components.ShutterSpeedSpinner
android:layout_width="wrap_content"
android:layout_gravity="center_vertical"
@@ -160,15 +172,19 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/Row_BP_Aperture">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:layout_marginLeft="10dip"
android:id="@+id/Label_DP_Aperture"
android:text="@string/aperture"
android:layout_gravity="center_vertical"
android:textSize="13dip"></TextView>
android:id="@+id/Label_DP_Aperture"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|center_vertical"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:text="@string/aperture"
android:textColor="@color/black"
android:textSize="13dip" >

</TextView>
<ch.spherIC.components.ApertureSpinner
android:layout_width="wrap_content"
android:layout_weight="2"
@@ -216,14 +232,19 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/Row_DeltaEV">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:text="@string/delta_EV"
android:layout_marginLeft="10dip"
android:id="@+id/label_deltaEV"
android:textSize="13dip"></TextView>
android:id="@+id/label_deltaEV"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|center_vertical"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:text="@string/delta_EV"
android:textColor="@color/black"
android:textSize="13dip" >

</TextView>
<TextView
android:background="@color/yellow"
android:text="16"
@@ -242,15 +263,19 @@
android:layout_height="wrap_content"
android:id="@+id/Row_calcP_Aperture"
android:paddingTop="2dip">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:layout_marginLeft="10dip"
android:id="@+id/label_calcP_Aperture"
android:text="@string/aperture"
android:layout_gravity="center_vertical"
android:textSize="13dip"></TextView>
android:id="@+id/label_calcP_Aperture"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|center_vertical"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:text="@string/aperture"
android:textColor="@color/black"
android:textSize="13dip" >

</TextView>
<ch.spherIC.components.ApertureSpinner
android:layout_width="wrap_content"
android:layout_weight="2"
@@ -276,15 +301,19 @@
android:layout_height="wrap_content"
android:id="@+id/Row_calcP_Aperture"
android:paddingTop="2dip">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:layout_marginLeft="10dip"
android:layout_gravity="center_vertical"
android:id="@+id/label_calcP_ExpStep"
android:text="@string/expEVStep"
android:textSize="13dip"></TextView>
android:id="@+id/label_calcP_ExpStep"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|center_vertical"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:text="@string/expEVStep"
android:textColor="@color/black"
android:textSize="13dip" >

</TextView>
<ch.spherIC.components.XSpinner
android:layout_width="wrap_content"
android:layout_weight="2"
@@ -340,15 +369,17 @@
android:layout_marginTop="2dip"
android:background="@color/black"
android:id="@+id/View_ResHeader_Understroke" />

<ListView
android:layout_width="wrap_content"
android:divider="@drawable/gradient_view"
android:dividerHeight="1dip"
android:layout_weight="1"
android:layout_height="wrap_content"
android:hapticFeedbackEnabled="true"
android:id="@+id/ListView_ExpResults"
android:focusable="true"
android:clickable="true">
android:id="@+id/ListView_ExpResults"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:clickable="true"
android:divider="@drawable/gradient_view"
android:dividerHeight="1dip"
android:focusable="true"
android:hapticFeedbackEnabled="true" >

</ListView>
</TableLayout>

+ 7
- 1
EasyBracketing/EasyBracketing/EasyBracketing/src/ch/spherIC/resultlist/ExposureFactory.java 查看文件

@@ -169,6 +169,12 @@ public class ExposureFactory {
iStart = 2;
break;
case DisplayMetrics.DENSITY_XHIGH:
iSize = 48;
iSize_r = 44;
iStart = 2;
break;
default:
iSize = 72;
iSize_r = 68;
@@ -178,7 +184,7 @@ public class ExposureFactory {
if (expNbr > 1 || nbrExposures > 1) {
deltaRGB = twentyPercentGray / (nbrExposures - 1) * (expNbr - 1);
deltaRGB = twentyPercentGray - (twentyPercentGray / (nbrExposures - 1) * (expNbr - 1));
}
// The background

+ 1
- 1
EasyBracketing/EasyBracketing/EasyBracketing/src/ch/spherIC/settings/SettingsDlg.java 查看文件

@@ -66,7 +66,7 @@ public class SettingsDlg extends Dialog {
saveSettings();
SettingsDlg.this.dismiss();
((EasyBracketMain) SettingsDlg.this.prnt).loadSettings();
((EasyBracketMain) SettingsDlg.this.prnt).setDefaults();
// ((EasyBracketMain) SettingsDlg.this.prnt).setDefaults();
}
});

正在加载...
取消
保存