Skip to content

Commit

Permalink
- Multicolumn output (not finished yet)
Browse files Browse the repository at this point in the history 
- Misc. fixes

Signed-off-by: Igor Dulevich <gamba69@gmail.com>
  • Loading branch information
@gamba69
gamba69 committed Dec 9, 2011
1 parent f62d5ff commit 241b627
Show file tree
Hide file tree
Showing 16 changed files with 2,132 additions and 1,401 deletions.
6 changes: 3 additions & 3 deletions res/layout/flist_layout.xml
View file
Expand Up @@ -2,8 +2,8 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="fill_parent" android:background="@color/normal_bg" android:paddingTop="2dp" android:paddingBottom="2dp">
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:background="@color/normal_bg" android:paddingTop="2dp" android:paddingBottom="2dp" android:layout_gravity="top|left">
<ImageView android:src="@drawable/dir_ok" android:background="@color/normal_bg" android:layout_width="wrap_content" android:id="@+id/fl_icon" android:layout_height="wrap_content" android:layout_marginLeft="4dp" android:layout_gravity="top|left"></ImageView>
<LinearLayout
Expand All @@ -12,7 +12,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:background="@color/normal_bg"
android:orientation="vertical" android:layout_gravity="top|left">
android:orientation="vertical" android:layout_gravity="top|left" android:layout_marginRight="4dp">

<TextView
android:id="@+id/fl_text"
Expand Down
253 changes: 174 additions & 79 deletions res/layout/main.xml
View file
@@ -1,79 +1,174 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:padding="8dp" android:background="@color/normal_bg">
<LinearLayout
android:id="@+id/linearLayout1"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:minHeight="32dp" >

<ImageButton android:layout_weight="1" android:layout_width="0dp" android:src="@android:drawable/ic_menu_compass" android:id="@+id/home_btn" android:layout_height="fill_parent" android:layout_gravity="center"></ImageButton>
<ImageButton android:layout_weight="1" android:layout_width="0dp" android:src="@android:drawable/ic_menu_myplaces" android:id="@+id/lru_btn" android:layout_height="fill_parent" android:layout_gravity="center" android:layout_marginLeft="4dp"></ImageButton>
<ImageButton android:layout_width="0dp" android:id="@+id/favor_btn" android:layout_weight="1" android:src="@android:drawable/btn_star" android:layout_height="fill_parent" android:layout_gravity="center" android:layout_marginLeft="4dp"></ImageButton>
<ImageButton android:src="@android:drawable/ic_menu_search" android:layout_weight="1" android:layout_width="0dp" android:id="@+id/search_btn" android:layout_height="fill_parent" android:layout_gravity="center" android:layout_marginLeft="4dp"></ImageButton>
<ImageButton android:src="@android:drawable/ic_menu_preferences" android:layout_weight="1" android:layout_width="0dp" android:id="@+id/settings_btn" android:layout_gravity="center" android:layout_height="fill_parent" android:layout_marginLeft="4dp"></ImageButton>
<!--
<ImageButton
android:id="@+id/about_btn"
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_weight="1"
android:src="@android:drawable/ic_menu_info_details" android:layout_marginLeft="4dp"/>
-->
</LinearLayout>
<EditText android:text="TITLE" android:id="@+id/title_txt" android:textColor="@color/normal_fg" android:background="@color/normal_bg_gray" android:textAppearance="?android:attr/textAppearanceMedium" android:layout_width="fill_parent" android:inputType="textMultiLine" android:focusable="false" android:editable="false" android:layout_height="wrap_content" android:layout_gravity="center" android:gravity="center" android:textStyle="bold" android:layout_marginTop="4dp" android:padding="2dp">
<requestFocus></requestFocus>
</EditText>
<LinearLayout android:layout_width="fill_parent" android:id="@+id/linearLayout2" android:layout_height="56dp" android:layout_marginTop="4dp">
<Button
android:id="@+id/goup_btn"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_weight="0.6"
android:drawableLeft="@drawable/arrow_up"
android:drawableRight="@drawable/arrow_up" android:text="@string/main_launcher_nb_layout_go_one_level_up">
</Button>
<Button
android:id="@+id/upscroll_btn"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_weight="1"
android:drawableLeft="@drawable/arrow_up"
android:text="0%" android:layout_marginLeft="4dp">
</Button>

<Button
android:id="@+id/downscroll_btn"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_weight="1"
android:drawableLeft="@drawable/arrow_down"
android:text="0%" android:layout_marginLeft="4dp">
</Button>

<ImageButton
android:id="@+id/advanced_btn"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_weight="1"
android:src="@drawable/su" android:layout_marginLeft="4dp">
</ImageButton>


</LinearLayout>
<LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_weight="1" android:id="@+id/fl_layout" android:layout_marginTop="4dp" android:background="@color/normal_bg">

<ListView
android:id="@+id/fl_list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1"
android:fadeScrollbars="false" android:divider="@color/normal_transparent">
</ListView>

</LinearLayout>
</LinearLayout>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@color/normal_bg"
android:orientation="vertical"
android:padding="8dp" >

<LinearLayout
android:id="@+id/linearLayout1"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:minHeight="32dp" >

<ImageButton
android:id="@+id/home_btn"
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_gravity="center"
android:layout_weight="1"
android:src="@android:drawable/ic_menu_compass" >
</ImageButton>

<ImageButton
android:id="@+id/lru_btn"
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_gravity="center"
android:layout_marginLeft="4dp"
android:layout_weight="1"
android:src="@android:drawable/ic_menu_myplaces" >
</ImageButton>

<ImageButton
android:id="@+id/favor_btn"
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_gravity="center"
android:layout_marginLeft="4dp"
android:layout_weight="1"
android:src="@android:drawable/btn_star" >
</ImageButton>

<ImageButton
android:id="@+id/search_btn"
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_gravity="center"
android:layout_marginLeft="4dp"
android:layout_weight="1"
android:src="@android:drawable/ic_menu_search" >
</ImageButton>

<ImageButton
android:id="@+id/settings_btn"
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_gravity="center"
android:layout_marginLeft="4dp"
android:layout_weight="1"
android:src="@android:drawable/ic_menu_preferences" >
</ImageButton>
<!--
<ImageButton
android:id="@+id/about_btn"
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_weight="1"
android:src="@android:drawable/ic_menu_info_details" android:layout_marginLeft="4dp"/>
-->
</LinearLayout>

<EditText
android:id="@+id/title_txt"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="8dp"
android:background="@color/normal_bg_gray"
android:focusable="false"
android:gravity="center"
android:inputType="textMultiLine"
android:padding="2dp"
android:text="TITLE"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/normal_fg"
android:textStyle="bold" >

<requestFocus >
</requestFocus>
</EditText>

<LinearLayout
android:id="@+id/linearLayout2"
android:layout_width="fill_parent"
android:layout_height="56dp"
android:layout_marginTop="8dp" >

<Button
android:id="@+id/goup_btn"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_weight="0.6"
android:drawableLeft="@drawable/arrow_up"
android:drawableRight="@drawable/arrow_up"
android:text="@string/main_launcher_nb_layout_go_one_level_up" >
</Button>

<Button
android:id="@+id/upscroll_btn"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_marginLeft="4dp"
android:layout_weight="1"
android:drawableLeft="@drawable/arrow_up"
android:text="0%" >
</Button>

<Button
android:id="@+id/downscroll_btn"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_marginLeft="4dp"
android:layout_weight="1"
android:drawableLeft="@drawable/arrow_down"
android:text="0%" >
</Button>

<ImageButton
android:id="@+id/advanced_btn"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_marginLeft="4dp"
android:layout_weight="1"
android:src="@drawable/su" >
</ImageButton>
</LinearLayout>
<!--
<LinearLayout
android:id="@+id/fl_layout"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_marginTop="4dp"
android:layout_weight="1"
android:background="@color/normal_bg" >
<ListView
android:id="@+id/fl_list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1"
android:divider="@color/normal_transparent"
android:fadeScrollbars="false" >
</ListView>
</LinearLayout> -->

<LinearLayout
android:id="@+id/gl_layout"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_marginTop="8dp"
android:layout_weight="1" >

<GridView
android:id="@+id/gl_list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1"
android:numColumns="3" android:duplicateParentState="true">
</GridView>
</LinearLayout>

</LinearLayout>
Expand Down

0 comments on commit 241b627

Please sign in to comment.