Launcher design: merge two tabs into one page, remove tabs at all
This commit is contained in:
parent
6de85e2184
commit
08212b5175
|
@ -16,7 +16,6 @@
|
||||||
android:orientation="horizontal"
|
android:orientation="horizontal"
|
||||||
android:layout_marginRight="5dp"
|
android:layout_marginRight="5dp"
|
||||||
android:layout_marginTop="20dp"
|
android:layout_marginTop="20dp"
|
||||||
android:layout_marginBottom="1dp"
|
|
||||||
android:layout_marginLeft="5dp"
|
android:layout_marginLeft="5dp"
|
||||||
android:background="#555555" >
|
android:background="#555555" >
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -44,171 +43,95 @@
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:gravity="center_vertical" />
|
android:gravity="center_vertical" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
<TabHost
|
<LinearLayout
|
||||||
android:id="@+id/tabhost"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
|
android:background="#555555"
|
||||||
|
android:orientation="vertical"
|
||||||
android:layout_weight="1.20"
|
android:layout_weight="1.20"
|
||||||
android:paddingBottom="10dp"
|
android:layout_marginBottom="5dp"
|
||||||
android:paddingLeft="3dp"
|
android:layout_marginLeft="5dp"
|
||||||
android:paddingRight="3dp"
|
android:layout_marginRight="5dp"
|
||||||
android:paddingTop="8dp">
|
android:layout_marginTop="10dp">
|
||||||
<LinearLayout
|
<ScrollView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="#555555"
|
android:id="@+id/scrollView2">
|
||||||
android:orientation="vertical">
|
<LinearLayout
|
||||||
<TabWidget
|
|
||||||
android:id="@android:id/tabs"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:showDividers="middle" />
|
|
||||||
<ScrollView
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:id="@+id/scrollView2">
|
android:layout_marginBottom="10dp"
|
||||||
<FrameLayout
|
android:layout_marginLeft="10dp"
|
||||||
android:id="@android:id/tabcontent"
|
android:layout_marginRight="10dp"
|
||||||
|
android:layout_marginTop="10dp"
|
||||||
|
android:background="#444444"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:weightSum="1">
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textView_args"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginBottom="1dp"
|
||||||
|
android:layout_marginLeft="10dp"
|
||||||
|
android:layout_marginRight="10dp"
|
||||||
|
android:layout_marginTop="10dp"
|
||||||
|
android:text="@string/cmd_args_text"
|
||||||
|
android:textAppearance="?android:attr/textAppearanceMedium" />
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/textView_args"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginBottom="1dp"
|
||||||
|
android:layout_marginLeft="10dp"
|
||||||
|
android:layout_marginRight="10dp"
|
||||||
|
android:layout_marginTop="1dp"
|
||||||
|
android:text="@string/cmd_args_text2"
|
||||||
|
android:textAppearance="?android:attr/textAppearanceSmall" />
|
||||||
|
<EditText
|
||||||
|
android:id="@+id/cmdArgs"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="wrap_content"
|
||||||
<LinearLayout
|
android:layout_marginBottom="10dp"
|
||||||
android:id="@+id/tab1"
|
android:layout_marginLeft="10dp"
|
||||||
android:layout_width="match_parent"
|
android:layout_marginRight="10dp"
|
||||||
android:layout_height="wrap_content"
|
android:layout_marginTop="1dp"
|
||||||
android:layout_marginLeft="10dp"
|
android:hint="@string/defCmdArgs"/>
|
||||||
android:layout_marginRight="10dp"
|
<ToggleButton
|
||||||
android:layout_marginTop="15dp"
|
android:id="@+id/use_zbot"
|
||||||
android:layout_marginBottom="25dp"
|
android:layout_width="match_parent"
|
||||||
android:background="#333333"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical"
|
android:layout_margin="10dp"
|
||||||
android:text="@string/text_tab1"
|
android:layout_marginLeft="10dp"
|
||||||
android:weightSum="0.6">
|
android:layout_marginRight="10dp"
|
||||||
<TextView
|
android:layout_marginTop="10dp"
|
||||||
android:id="@+id/textView_path1"
|
android:text="nothing"
|
||||||
android:layout_width="fill_parent"
|
android:textOff="@string/zbot_off"
|
||||||
android:layout_height="40dp"
|
android:textOn="@string/zbot_on" />
|
||||||
android:layout_marginBottom="2dp"
|
<ToggleButton
|
||||||
android:layout_marginLeft="10dp"
|
android:id="@+id/use_yapb"
|
||||||
android:background="#444444"
|
android:layout_width="match_parent"
|
||||||
android:layout_marginRight="10dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="10dp"
|
android:layout_margin="10dp"
|
||||||
android:text="@string/text_res_tittle2"
|
android:layout_marginLeft="10dp"
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
android:layout_marginRight="10dp"
|
||||||
android:textSize="20sp"
|
android:layout_marginTop="10dp"
|
||||||
android:gravity="center_vertical|center_horizontal" />
|
android:text="nothing"
|
||||||
<LinearLayout
|
android:textOff="@string/yapb_off"
|
||||||
android:layout_width="match_parent"
|
android:textOn="@string/yapb_on" />
|
||||||
android:layout_height="match_parent"
|
<ToggleButton
|
||||||
android:layout_marginBottom="10dp"
|
android:id="@+id/enableczero"
|
||||||
android:layout_marginLeft="10dp"
|
android:layout_width="match_parent"
|
||||||
android:layout_marginRight="10dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="10dp"
|
android:layout_margin="10dp"
|
||||||
android:background="#444444"
|
android:layout_marginLeft="10dp"
|
||||||
android:orientation="vertical"
|
android:layout_marginRight="10dp"
|
||||||
android:weightSum="1">
|
android:layout_marginTop="10dp"
|
||||||
<ToggleButton
|
android:text="nothing"
|
||||||
android:id="@+id/use_zbot"
|
android:textOff="@string/czero_off"
|
||||||
android:layout_width="match_parent"
|
android:textOn="@string/czero_on" />
|
||||||
android:layout_height="wrap_content"
|
</LinearLayout>
|
||||||
android:layout_margin="10dp"
|
</ScrollView>
|
||||||
android:layout_marginLeft="10dp"
|
</LinearLayout>
|
||||||
android:layout_marginRight="10dp"
|
|
||||||
android:layout_marginTop="10dp"
|
|
||||||
android:text="nothing"
|
|
||||||
android:textOff="@string/zbot_off"
|
|
||||||
android:textOn="@string/zbot_on" />
|
|
||||||
<ToggleButton
|
|
||||||
android:id="@+id/use_yapb"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_margin="10dp"
|
|
||||||
android:layout_marginLeft="10dp"
|
|
||||||
android:layout_marginRight="10dp"
|
|
||||||
android:layout_marginTop="10dp"
|
|
||||||
android:text="nothing"
|
|
||||||
android:textOff="@string/yapb_off"
|
|
||||||
android:textOn="@string/yapb_on" />
|
|
||||||
<ToggleButton
|
|
||||||
android:id="@+id/enableczero"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_margin="10dp"
|
|
||||||
android:layout_marginLeft="10dp"
|
|
||||||
android:layout_marginRight="10dp"
|
|
||||||
android:layout_marginTop="10dp"
|
|
||||||
android:text="nothing"
|
|
||||||
android:textOff="@string/czero_off"
|
|
||||||
android:textOn="@string/czero_on" />
|
|
||||||
</LinearLayout>
|
|
||||||
</LinearLayout>
|
|
||||||
<LinearLayout
|
|
||||||
android:id="@+id/tab2"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:layout_marginLeft="10dp"
|
|
||||||
android:layout_marginRight="10dp"
|
|
||||||
android:layout_marginTop="15dp"
|
|
||||||
android:background="#333333"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:text="@string/text_tab2">
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/textView_path2"
|
|
||||||
android:layout_width="fill_parent"
|
|
||||||
android:layout_height="40dp"
|
|
||||||
android:layout_marginBottom="2dp"
|
|
||||||
android:layout_marginLeft="10dp"
|
|
||||||
android:background="#444444"
|
|
||||||
android:layout_marginRight="10dp"
|
|
||||||
android:layout_marginTop="13dp"
|
|
||||||
android:text="@string/text_res_tittle3"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
|
||||||
android:textSize="20sp"
|
|
||||||
android:gravity="center_vertical|center_horizontal" />
|
|
||||||
<LinearLayout
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="match_parent"
|
|
||||||
android:layout_marginBottom="10dp"
|
|
||||||
android:layout_marginLeft="10dp"
|
|
||||||
android:layout_marginRight="10dp"
|
|
||||||
android:layout_marginTop="10dp"
|
|
||||||
android:background="#444444"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:weightSum="1">
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/textView_args"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginBottom="10dp"
|
|
||||||
android:layout_marginLeft="10dp"
|
|
||||||
android:layout_marginRight="10dp"
|
|
||||||
android:layout_marginTop="20dp"
|
|
||||||
android:text="@string/cmd_args_text"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceMedium" />
|
|
||||||
<TextView
|
|
||||||
android:id="@+id/textView_args"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginBottom="10dp"
|
|
||||||
android:layout_marginLeft="10dp"
|
|
||||||
android:layout_marginRight="10dp"
|
|
||||||
android:layout_marginTop="20dp"
|
|
||||||
android:text="@string/cmd_args_text2"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceSmall" />
|
|
||||||
<EditText
|
|
||||||
android:id="@+id/cmdArgs"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginBottom="10dp"
|
|
||||||
android:layout_marginLeft="10dp"
|
|
||||||
android:layout_marginRight="10dp"
|
|
||||||
android:layout_marginTop="3dp"
|
|
||||||
android:hint="@string/defCmdArgs"/>
|
|
||||||
</LinearLayout>
|
|
||||||
</LinearLayout>
|
|
||||||
</FrameLayout>
|
|
||||||
</ScrollView>
|
|
||||||
</LinearLayout>
|
|
||||||
</TabHost>
|
|
||||||
<com.google.android.gms.ads.AdView
|
<com.google.android.gms.ads.AdView
|
||||||
android:id="@+id/adView"
|
android:id="@+id/adView"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
|
|
|
@ -92,21 +92,6 @@ public class LauncherActivity extends Activity {
|
||||||
|
|
||||||
setContentView(R.layout.activity_launcher);
|
setContentView(R.layout.activity_launcher);
|
||||||
|
|
||||||
TabHost tabHost = (TabHost) findViewById(R.id.tabhost);
|
|
||||||
tabHost.setup();
|
|
||||||
|
|
||||||
TabHost.TabSpec tabSpec;
|
|
||||||
tabSpec = tabHost.newTabSpec("tabtag1");
|
|
||||||
tabSpec.setIndicator(getString(R.string.text_tab1));
|
|
||||||
tabSpec.setContent(R.id.tab1);
|
|
||||||
tabHost.addTab(tabSpec);
|
|
||||||
|
|
||||||
tabSpec = tabHost.newTabSpec("tabtag2");
|
|
||||||
tabSpec.setIndicator(getString(R.string.text_tab2));
|
|
||||||
tabSpec.setContent(R.id.tab2);
|
|
||||||
tabHost.addTab(tabSpec);
|
|
||||||
|
|
||||||
|
|
||||||
// get preferences
|
// get preferences
|
||||||
mPref = getSharedPreferences("mod", 0);
|
mPref = getSharedPreferences("mod", 0);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue