Skip to content

A
abook_check
Commit 59b38cf3 by Kang Donghun
Options

#67472 【android15検証 @Form】画面の上と下にあるボタンが、端末のボタンに覆われ操作できない　コード整理

parent fee105b2
Showing with 38 additions and 41 deletions
ABVJE_UI_Android/res/layout/ac_setting_main.xml
...@@ -6,35 +6,41 @@ ...@@ -6,35 +6,41 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/setting_bg" android:background="@drawable/setting_bg"
android:orientation="vertical" android:orientation="vertical"
android:padding="20dp" > android:fitsSystemWindows="true" >
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:gravity="center_vertical" android:orientation="vertical"
android:paddingBottom="10dp" > android:padding="20dp">
<ImageButton <LinearLayout
android:id="@+id/app_icon" android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/icon" android:gravity="center_vertical"
android:src="@null" /> android:paddingBottom="10dp" >
<TextView <ImageButton
android:id="@+id/textView1" android:id="@+id/app_icon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="20dp" android:background="@drawable/icon"
android:text="@string/setting" android:src="@null" />
android:textAppearance="?android:attr/textAppearanceLarge" />
</LinearLayout>
<fragment <TextView
android:id="@+id/pref_fragment" android:id="@+id/textView1"
android:name="jp.agentec.abook.abv.ui.home.activity.ABookSettingFragment" android:layout_width="wrap_content"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:layout_height="match_parent" android:paddingLeft="20dp"
tools:layout="@layout/setting_fragment" /> android:text="@string/setting"
android:textAppearance="?android:attr/textAppearanceLarge" />
</LinearLayout>
<fragment
android:id="@+id/pref_fragment"
android:name="jp.agentec.abook.abv.ui.home.activity.ABookSettingFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:layout="@layout/setting_fragment" />
</LinearLayout>
</LinearLayout> </LinearLayout>
\ No newline at end of file
ABVJE_UI_Android/res/values/dimens.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="opeartion_title_text_size" />
<dimen name="report_status_height_1">48dp</dimen>
<dimen name="report_status_height_2">32dp</dimen>
<dimen name="report_status_height_3">24dp</dimen>
<dimen name="report_status_width_1">80dp</dimen>
<dimen name="report_status_width_2">36dp</dimen>
</resources>
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/common/util/DisplayUtil.java
...@@ -30,7 +30,7 @@ public class DisplayUtil { ...@@ -30,7 +30,7 @@ public class DisplayUtil {
WindowInsets windowInsets = metrics.getWindowInsets(); WindowInsets windowInsets = metrics.getWindowInsets();
android.graphics.Insets insets = windowInsets.getInsets( android.graphics.Insets insets = windowInsets.getInsets(
WindowInsets.Type.systemBars() | WindowInsets.Type.displayCutout() WindowInsets.Type.navigationBars() | WindowInsets.Type.displayCutout()
); );
displayWidth = bounds.width() - (insets.left + insets.right); displayWidth = bounds.width() - (insets.left + insets.right);
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/activity/ContentViewActivity.java
...@@ -613,11 +613,11 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -613,11 +613,11 @@ public class ContentViewActivity extends ABVContentViewActivity {
// SurfaceViewをLayoutにaddViewするタイミングで起きるが、大きさ0のSurfaceViewをここでセットすることで避けられる。 // SurfaceViewをLayoutにaddViewするタイミングで起きるが、大きさ0のSurfaceViewをここでセットすることで避けられる。
mMainLayout.addView(new SurfaceView(this), new ViewGroup.LayoutParams(0, 0)); mMainLayout.addView(new SurfaceView(this), new ViewGroup.LayoutParams(0, 0));
mMainLayout.setFitsSystemWindows(true); mMainLayout.setFitsSystemWindows(true);
mContentWrapLayout = new RelativeLayout(this); mContentWrapLayout = new RelativeLayout(this);
mPageScrollView = new PageScrollView(this); mPageScrollView = new PageScrollView(this);
mPageScrollView.setHorizontalScrollBarEnabled(false); // ScrollBarを非表示 mPageScrollView.setHorizontalScrollBarEnabled(false); // ScrollBarを非表示
mPageScrollView.addView(mContentWrapLayout, new ViewGroup.LayoutParams(mAllPageCount * mDisplaySize.width, FP)); mPageScrollView.addView(mContentWrapLayout, new ViewGroup.LayoutParams(mAllPageCount * mDisplaySize.width, FP));
RelativeLayout.LayoutParams param0 = createParam(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT); RelativeLayout.LayoutParams param0 = createParam(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
param0.addRule(RelativeLayout.CENTER_IN_PARENT); param0.addRule(RelativeLayout.CENTER_IN_PARENT);
...@@ -630,8 +630,8 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -630,8 +630,8 @@ public class ContentViewActivity extends ABVContentViewActivity {
if (hasMultiPages) { // サムネイルバーとページ番号表示 if (hasMultiPages) { // サムネイルバーとページ番号表示
mPageNumberLayout = (RelativeLayout)getLayoutInflater().inflate(R.layout.page_number, null); mPageNumberLayout = (RelativeLayout)getLayoutInflater().inflate(R.layout.page_number, null);
int height = (int) ((isNormalSize()? ThumbnailSeekBarLayout.NORMAL_HEIGHT: ThumbnailSeekBarLayout.LARGE_HEIGHT) * getResources().getDisplayMetrics().density); // サムネイルバーの高さ int height = (int) ((isNormalSize()? ThumbnailSeekBarLayout.NORMAL_HEIGHT: ThumbnailSeekBarLayout.LARGE_HEIGHT) * getResources().getDisplayMetrics().density); // サムネイルバーの高さ
mLThumViewSize = (int) (200 * (float)height / ThumbnailSeekBarLayout.LARGE_HEIGHT); // 大サムネイル表示領域の設定 mLThumViewSize = (int) (200 * (float)height / ThumbnailSeekBarLayout.LARGE_HEIGHT); // 大サムネイル表示領域の設定
mSeekBarLayout = new ThumbnailSeekBarLayout(this, mFoxitPdfCore, getContentId(), mAllPageCount, isLandscapeView, mDisplaySize.width, mDisplaySize.height, isNormalSize(), mPageNumberLayout); mSeekBarLayout = new ThumbnailSeekBarLayout(this, mFoxitPdfCore, getContentId(), mAllPageCount, isLandscapeView, mDisplaySize.width, mDisplaySize.height, isNormalSize(), mPageNumberLayout);
mSeekBarLayout.setId(id.seekbar_layout_id); // 番号は適当 mSeekBarLayout.setId(id.seekbar_layout_id); // 番号は適当
mSeekBarLayout.setVisibility(View.INVISIBLE); mSeekBarLayout.setVisibility(View.INVISIBLE);
...@@ -642,7 +642,7 @@ public class ContentViewActivity extends ABVContentViewActivity { ...@@ -642,7 +642,7 @@ public class ContentViewActivity extends ABVContentViewActivity {
mMainLayout.setFitsSystemWindows(true); mMainLayout.setFitsSystemWindows(true);
mPageNumberLayout.setVisibility(View.INVISIBLE); mPageNumberLayout.setVisibility(View.INVISIBLE);
RelativeLayout.LayoutParams param = createParam(ViewGroup.LayoutParams.MATCH_PARENT, (int)(convertDensitySize(50) + 0.5f)); RelativeLayout.LayoutParams param = createParam(ViewGroup.LayoutParams.MATCH_PARENT, (int)(convertDensitySize(50) + 0.5f));
param.setMargins(0, 0, 0, 10); param.setMargins(0, 0, 0, 10);
param.addRule(RelativeLayout.ABOVE, mSeekBarLayout.getId()); param.addRule(RelativeLayout.ABOVE, mSeekBarLayout.getId());
mMainLayout.addView(mPageNumberLayout, param); mMainLayout.addView(mPageNumberLayout, param);
......
ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/viewer/view/ThumbnailSeekBarLayout.java
...@@ -254,6 +254,7 @@ public class ThumbnailSeekBarLayout extends LinearLayout { ...@@ -254,6 +254,7 @@ public class ThumbnailSeekBarLayout extends LinearLayout {
float x = ev.getRawX() - insetLeft; float x = ev.getRawX() - insetLeft;
float y = ev.getRawY() - insetTop; float y = ev.getRawY() - insetTop;
Logger.d(TAG, "[onTouch]:page:" + page + " action=" + str(ev.getAction()) + ", count=" + ev.getPointerCount()+ " x=" + x + " y=" + y); Logger.d(TAG, "[onTouch]:page:" + page + " action=" + str(ev.getAction()) + ", count=" + ev.getPointerCount()+ " x=" + x + " y=" + y);
switch (ev.getAction() & MotionEvent.ACTION_MASK) { switch (ev.getAction() & MotionEvent.ACTION_MASK) {
case MotionEvent.ACTION_DOWN: case MotionEvent.ACTION_DOWN:
// 中サイズのサムネイル表示 // 中サイズのサムネイル表示
......
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