From cecbf5067b623fa1991706125cff7cdc3d326c2e Mon Sep 17 00:00:00 2001
From: yang-chao <y.yangchao@gmail.com>
Date: Sat, 6 Jul 2013 14:45:09 +0800
Subject: [PATCH 1/7] GUI refactory for file view
---
 AndroidManifest.xml &#124; 3 +-
 res/layout/dropdown_item.xml &#124; 14 +-
 res/layout/file_browser_item.xml &#124; 16 +-
 res/layout/file_explorer_list.xml &#124; 140 ++++++++++--------
 res/values/styles.xml &#124; 6 +
 .../fileexplorer/FileExplorerTabActivity.java &#124; 10 +-
 .../micode/fileexplorer/FileViewActivity.java &#124; 4 +-
 .../fileexplorer/FileViewInteractionHub.java &#124; 49 +++---
 src/net/micode/fileexplorer/Util.java &#124; 4 +-
 9 files changed, 136 insertions(+), 110 deletions(-)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index c7240d8..4581ffb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -42,8 +42,7 @@
 <activity android:name=".FileExplorerTabActivity" android:configChanges="screenSize&#124;keyboardHidden" - android:screenOrientation="sensor" - android:uiOptions="splitActionBarWhenNarrow">
+ android:screenOrientation="portrait">
 <intent-filter>
 <action android:name="android.intent.action.MAIN" />
 <category android:name="android.intent.category.DEFAULT" />
diff --git a/res/layout/dropdown_item.xml b/res/layout/dropdown_item.xml
index 3feff00..b977668 100755
--- a/res/layout/dropdown_item.xml
+++ b/res/layout/dropdown_item.xml
@@ -11,26 +11,26 @@
 android:layout_width="fill_parent"
 android:layout_height="fill_parent"
 android:gravity="center_vertical"
- android:orientation="horizontal"
- android:layout_marginLeft="10dip">
+ android:orientation="vertical"
+ android:layout_margin="10dip">
 
 <imageview android:id="@+id/item_icon" - android:layout_ + android:layout_width="match_parent" android:layout_height="wrap_content" android:scaleType="fitCenter" android:gravity="center" android:layout_gravity="center_vertical" - android:layout_marginRight="5dip" />
+ android:layout_margin="2dip" />
 
 <textview android:id="@+id/path_name" android:layout_ - android:layout_height="88px" + android:layout_height="wrap_content" android:singleLine="true" - android:gravity="center_vertical" + android:gravity="center_horizontal" android:textAppearance="?android:attr/textAppearanceSmall" />
 
 </linearlayout>
 
-</linearlayout>
\ No newline at end of file
+</linearlayout>
diff --git a/res/layout/file_browser_item.xml b/res/layout/file_browser_item.xml
index e966756..ed53790 100755
--- a/res/layout/file_browser_item.xml
+++ b/res/layout/file_browser_item.xml
@@ -5,18 +5,19 @@
 android:layout_height="wrap_content"
 android:paddingTop="5dip"
 android:paddingBottom="5dip"
+ android:paddingLeft="3dip"
 android:orientation="horizontal"
 android:gravity="center_vertical">
 
 <framelayout android:layout_ - android:layout_height="fill_parent" + android:layout_height="50dp" android:layout_gravity="center" android:gravity="center">
 <imageview android:id="@+id/file_image_frame" - android:layout_ - android:layout_height="65px" + android:layout_width="60dp" + android:layout_height="60dp" android:scaleType="centerInside" android:gravity="center" android: @@ -24,9 +25,10 @@ android:visibility="gone" />
 <imageview android:id="@+id/file_image" - android:layout_ - android:layout_height="59px" - android:scaleType="centerInside" + android:layout_width="35dp" + android:layout_height="35dp" + android:layout_ + android:scaleType="fitXY" android:gravity="center" android:layout_gravity="center" />
 </framelayout>
@@ -76,7 +78,7 @@
 android:layout_width="wrap_content"
 android:layout_height="wrap_content"
 android:layout_gravity="left"
- android:layout_marginLeft="14px"
+ android:layout_marginLeft="14dip"
 android:gravity="left"
 android:textAppearance="?android:attr/textAppearanceSmall" />
 
diff --git a/res/layout/file_explorer_list.xml b/res/layout/file_explorer_list.xml
index 005b80b..fc0d200 100755
--- a/res/layout/file_explorer_list.xml
+++ b/res/layout/file_explorer_list.xml
@@ -9,6 +9,7 @@
 
 
 <linearlayout + android:visibility="gone" android:id="@+id/navigation_bar" android:layout_ android:layout_height="wrap_content" @@ -62,71 +63,82 @@ </linearlayout>
 
 
- <framelayout - android:layout_ - android:layout_height="0dip" - android:layout_weight="1">
- <listview - android:id="@+id/file_path_list" - android:layout_ - android:layout_height="wrap_content" - android:headerDividersEnabled="true" - android:footerDividersEnabled="true" android:fastScrollEnabled="true"/>
- <linearlayout - android:id="@+id/empty_view" - android:orientation="vertical" - android:layout_ - android:layout_height="fill_parent" - android:gravity="center" - android:visibility="gone">
- <imageview - android:src="@drawable/empty_icon" - android:layout_ - android:layout_height="wrap_content" />
- <textview - android:layout_ - android:layout_height="wrap_content" - android: - android:textSize="27px" - android:singleLine="true" />
- </linearlayout>
- <scrollview - android:id="@+id/dropdown_navigation" - android:overScrollMode="never" - android:layout_ - android:layout_height="wrap_content" - android: - android:visibility="gone">
- <linearlayout - android:id="@+id/dropdown_navigation_list" - android:orientation="vertical" - android:layout_ - android:layout_height="wrap_content">
- </linearlayout>
- </scrollview>
- <linearlayout - android:id="@+id/sd_not_available_page" - android:orientation="vertical" - android:layout_ - android:layout_height="fill_parent" - android:gravity="center" - android:visibility="gone">
- <imageview - android:src="@drawable/sd_not_available" - android:layout_ - android:layout_height="wrap_content" - android:layout_marginBottom="25px" />
-
- <textview - android: - android:layout_ - android:layout_width="wrap_content" - android:textSize="22px" - android:gravity="center" />
-
- </linearlayout>
- </framelayout>
+	<linearlayout + android:layout_ + android:layout_height="fill_parent" + android:orientation="horizontal" + android:baselineAligned="false">
 
+	 <scrollview + android:id="@+id/dropdown_navigation" + android:overScrollMode="never" + android:layout_ + android:layout_height="fill_parent" + android:layout_weight="1" + android:scrollbars="none" + android:>
+ 	 <linearlayout + android:id="@+id/dropdown_navigation_list" + android:orientation="vertical" + android:layout_ + android:layout_height="wrap_content">
+	 </linearlayout>
+	 </scrollview>
+	 
+	 <framelayout + android:layout_ + android:layout_height="fill_parent" + android:layout_weight="4">
+	 <listview + android:id="@+id/file_path_list" + android:layout_ + android:layout_height="wrap_content" + android:paddingLeft="5dip" + android:headerDividersEnabled="true" + android:footerDividersEnabled="true" + android:fastScrollEnabled="true"/>
+	 <linearlayout + android:id="@+id/empty_view" + android:orientation="vertical" + android:layout_ + android:layout_height="fill_parent" + android:gravity="center" + android:visibility="gone">
+	 <imageview + android:src="@drawable/empty_icon" + android:layout_ + android:layout_height="wrap_content" />
+	 <textview + android:layout_ + android:layout_height="wrap_content" + android: + android:textSize="27sp" + android:singleLine="true" />
+	 </linearlayout>
+	 <linearlayout + android:id="@+id/sd_not_available_page" + android:orientation="vertical" + android:layout_ + android:layout_height="fill_parent" + android:gravity="center" + android:visibility="gone">
+	 <imageview + android:src="@drawable/sd_not_available" + android:layout_ + android:layout_height="wrap_content" + android:layout_marginBottom="25dp" />
+	
+	 <textview + android: + android:layout_ + android:layout_width="wrap_content" + android:textSize="22sp" + android:gravity="center" />
+	
+	 </linearlayout>
+	 </framelayout>
+	</linearlayout>
+	
 <linearlayout android:id="@+id/moving_operation_bar" android:visibility="gone" diff --git a/res/values/styles.xml b/res/values/styles.xml index c559229..4a0e4a1 100755 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -1,5 +1,11 @@ <?xml version="1.0" encoding="utf-8"?>
 <resources>
+ 
+ 
+ 
 
 
 <style name="ShadowStyle">
diff --git a/src/net/micode/fileexplorer/main/FileExplorerTabActivity.java b/src/net/micode/fileexplorer/main/FileExplorerTabActivity.java
index 1a90e0a..7c4e1bf 100644
--- a/src/net/micode/fileexplorer/main/FileExplorerTabActivity.java
+++ b/src/net/micode/fileexplorer/main/FileExplorerTabActivity.java
@@ -32,14 +32,12 @@
 import android.support.v13.app.FragmentPagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.view.ActionMode;
+import android.view.Window;
 
 import java.util.ArrayList;
 
 import net.micode.fileexplorer.R;
 import net.micode.fileexplorer.Util;
-import net.micode.fileexplorer.R.id;
-import net.micode.fileexplorer.R.layout;
-import net.micode.fileexplorer.R.string;
 import net.micode.fileexplorer.categoryview.FileCategoryFragment;
 import net.micode.fileexplorer.fileview.FileViewFragment;
 
@@ -53,6 +51,8 @@ public class FileExplorerTabActivity extends Activity {
 @Override
 protected void onCreate(Bundle savedInstanceState) {
 super.onCreate(savedInstanceState);
+ 
+ getWindow().requestFeature(Window.FEATURE_ACTION_BAR);
 
 setContentView(R.layout.fragment_pager);
 mViewPager = (ViewPager) findViewById(R.id.pager);
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://github.com/MiCode/FileExplorer/compare/master...longrenle:FileExplorer:master.patch">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://github.com/MiCode/FileExplorer/compare/master...longrenle:FileExplorer:master.patch" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>