Skip to content

A
abook_check
Commit 19ae8790 by Kim Jinsung
Options

設定画面の文字サイス調整

parent b5b73a59
Showing with 109 additions and 13 deletions
ABVJE_UI_Android/res/drawable/selector_custom_checkbox.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:state_checked="true"
android:drawable="@drawable/btn_check_on_holo_light" />
<item android:state_checked="false"
android:drawable="@drawable/btn_check_off_holo_light" />
<item android:drawable="@drawable/btn_check_off_holo_light" />
</selector>
\ No newline at end of file
ABVJE_UI_Android/res/layout/custom_preference_category.xml
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:padding="5dp" android:padding="5dp"
android:textColor="@android:color/darker_gray" android:textColor="@android:color/darker_gray"
android:textSize="14sp" android:textSize="16sp"
android:textStyle="bold" android:textStyle="bold"
android:background="@android:color/black"/> android:background="@android:color/black"/>
</LinearLayout> </LinearLayout>
\ No newline at end of file
ABVJE_UI_Android/res/layout/custom_preference_checkbox.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false"
android:gravity="right|center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingRight="?android:attr/scrollbarSize">
<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+android:id/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:button="@drawable/selector_custom_checkbox"
android:clickable="false"
android:focusable="false"
android:gravity="left" />
</LinearLayout>
\ No newline at end of file
ABVJE_UI_Android/res/layout/custom_preference_screen.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingRight="?android:attr/scrollbarSize"
android:baselineAligned="false" >
<RelativeLayout
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_marginBottom="6dip"
android:layout_marginLeft="15dip"
android:layout_marginRight="6dip"
android:layout_marginTop="6dip"
android:layout_weight="1" >
<TextView
android:id="@+android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:singleLine="true"
android:textColor="@android:color/white"
android:textAppearance="?android:attr/textAppearanceLarge"/>
<TextView
android:id="@+android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@android:id/title"
android:layout_below="@android:id/title"
android:maxLines="4"
android:textColor="@android:color/darker_gray"
android:textAppearance="?android:attr/textAppearanceSmall" />
</RelativeLayout>
<LinearLayout
android:id="@+android:id/widget_frame"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:minWidth="80dip"
android:gravity="center_vertical"
android:orientation="vertical" >
</LinearLayout>
</LinearLayout>
\ No newline at end of file
ABVJE_UI_Android/res/xml/pref.xml
...@@ -8,52 +8,64 @@ ...@@ -8,52 +8,64 @@
<PreferenceScreen <PreferenceScreen
android:key="accountPath" android:key="accountPath"
android:summary="--" android:summary="--"
android:title="@string/contractor"></PreferenceScreen> android:title="@string/contractor"
android:layout="@layout/custom_preference_screen"></PreferenceScreen>
<PreferenceScreen <PreferenceScreen
android:key="loginid" android:key="loginid"
android:summary="--" android:summary="--"
android:title="@string/logid"></PreferenceScreen> android:title="@string/logid"
android:layout="@layout/custom_preference_screen"></PreferenceScreen>
<PreferenceScreen <PreferenceScreen
android:key="lastLogin" android:key="lastLogin"
android:summary="--" android:summary="--"
android:title="@string/last_login"></PreferenceScreen> android:title="@string/last_login"
android:layout="@layout/custom_preference_screen"></PreferenceScreen>
<PreferenceScreen <PreferenceScreen
android:key="passwordChange" android:key="passwordChange"
android:summary="@string/password_change_summary" android:summary="@string/password_change_summary"
android:title="@string/pwd_change"></PreferenceScreen> android:title="@string/pwd_change"
android:layout="@layout/custom_preference_screen"></PreferenceScreen>
<PreferenceScreen <PreferenceScreen
android:key="logout" android:key="logout"
android:summary="@string/logout_summary" android:summary="@string/logout_summary"
android:title="@string/logout"></PreferenceScreen> android:title="@string/logout"
android:layout="@layout/custom_preference_screen"></PreferenceScreen>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/log_info" android:key="log_info" android:layout="@layout/custom_preference_category"> <PreferenceCategory android:title="@string/log_info" android:key="log_info" android:layout="@layout/custom_preference_category">
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="true" android:defaultValue="true"
android:key="errorSendEnable" android:key="errorSendEnable"
android:summary="@string/send_error" android:summary="@string/send_error"
android:title="@string/send_error_title" /> android:title="@string/send_error_title"
android:layout="@layout/custom_preference_screen"
android:widgetLayout="@layout/custom_preference_checkbox"/>
<PreferenceScreen <PreferenceScreen
android:key="export" android:key="export"
android:summary="@string/export" android:summary="@string/export"
android:title="@string/export_title" > android:title="@string/export_title"
android:layout="@layout/custom_preference_screen">
</PreferenceScreen> </PreferenceScreen>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/app_info" android:key="app_info" android:layout="@layout/custom_preference_category"> <PreferenceCategory android:title="@string/app_info" android:key="app_info" android:layout="@layout/custom_preference_category">
<PreferenceScreen <PreferenceScreen
android:key="aboutABook" android:key="aboutABook"
android:title="@string/about_app" > android:title="@string/about_app"
android:layout="@layout/custom_preference_screen">
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen <PreferenceScreen
android:key="licenseInfo" android:key="licenseInfo"
android:title="@string/licence_info" > android:title="@string/licence_info"
android:layout="@layout/custom_preference_screen">
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen <PreferenceScreen
android:key="checkAppUpdate" android:key="checkAppUpdate"
android:title="@string/check_app_update" > android:title="@string/check_app_update"
android:layout="@layout/custom_preference_screen">
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen <PreferenceScreen
android:key="abookCheckManual" android:key="abookCheckManual"
android:title="@string/operation_manual" > android:title="@string/operation_manual"
android:layout="@layout/custom_preference_screen">
</PreferenceScreen> </PreferenceScreen>
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>
\ No newline at end of file
ABVJE_UI_Android/src/jp/agentec/abook/abv/cl/helper/ABVUncaughtExceptionHandler.java
...@@ -179,7 +179,11 @@ public class ABVUncaughtExceptionHandler implements UncaughtExceptionHandler { ...@@ -179,7 +179,11 @@ public class ABVUncaughtExceptionHandler implements UncaughtExceptionHandler {
if (!bugFile.exists()) { //バグレポートがなければ以降の処理を行わない if (!bugFile.exists()) { //バグレポートがなければ以降の処理を行わない
return; return;
} }
// 設定で送信ONになっていない場合はファイルを削除する。⇒しない。Exportに含めるように変更。
if (!PreferenceUtil.get(act, DefPrefKey.ERROR_SEND_ENABLE, true)) {
// bugFile.delete();
return;
}
//AlertDialogを表示 //AlertDialogを表示
ABookAlertDialog alert = AlertDialogUtil.createAlertDialog(act, R.string.bug_report); ABookAlertDialog alert = AlertDialogUtil.createAlertDialog(act, R.string.bug_report);
alert.setMessage(R.string.BUG_REPORT); alert.setMessage(R.string.BUG_REPORT);
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/appinfo/AppDefType.java
...@@ -25,6 +25,7 @@ public interface AppDefType { ...@@ -25,6 +25,7 @@ public interface AppDefType {
String CURSOR_ENABLE = "cursorEnable"; String CURSOR_ENABLE = "cursorEnable";
String DISPLAY_MARKING = "displayMarking"; String DISPLAY_MARKING = "displayMarking";
String APP_VERSIONUP_PROCESSING = "appVersionProcessingFlag"; String APP_VERSIONUP_PROCESSING = "appVersionProcessingFlag";
String ERROR_SEND_ENABLE = "errorSendEnable";
} }
interface UserPrefKey { interface UserPrefKey {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment