Skip to content

Commit 8f68713

Browse files
committed
New interface for portrait orientation
1 parent 8fa7a75 commit 8f68713

File tree

3 files changed

+62
-15
lines changed

3 files changed

+62
-15
lines changed

res/layout-land/manager.xml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:layout_width="fill_parent"
4+
android:layout_height="wrap_content">
5+
6+
<LinearLayout
7+
android:id="@+id/manager_land"
8+
android:layout_width="fill_parent"
9+
android:layout_height="wrap_content"
10+
android:orientation="vertical" >
11+
12+
</LinearLayout>
13+
14+
</ScrollView>

res/layout/manager.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
android:layout_height="wrap_content">
55

66
<LinearLayout
7-
android:id="@+id/general"
7+
android:id="@+id/manager_port"
88
android:layout_width="fill_parent"
99
android:layout_height="wrap_content"
1010
android:orientation="vertical" >

src/ru/pmmlabs/stylish/StyleManager.java

+47-14
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public void onCreate(Bundle savedInstanceState) {
4141
setTheme(android.R.style.Theme_Holo);
4242
setContentView(R.layout.manager);
4343
setTitle(getString(R.string.managestyles));
44-
final LinearLayout general = (LinearLayout) findViewById(R.id.general);
45-
44+
boolean landscape_mode = findViewById(R.id.manager_land) != null;
45+
final LinearLayout general = (LinearLayout) (landscape_mode ? findViewById(R.id.manager_land) : findViewById(R.id.manager_port));
4646
final StylishAddonService StylishAddon = StylishAddonService.getInstance();
4747
Map<String, Integer> rTypes = StylishAddon.rulesTypes;
4848
SQLiteDatabase db = StylishAddon.sbHelper.getReadableDatabase();
@@ -68,7 +68,7 @@ public void onCreate(Bundle savedInstanceState) {
6868
final TextView title = new TextView(this);
6969
title.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
7070
title.setText(name);
71-
title.setTextAppearance(this, android.R.style.TextAppearance_Large);
71+
title.setTextAppearance(this, (landscape_mode ? android.R.style.TextAppearance_DeviceDefault_Large : android.R.style.TextAppearance_DeviceDefault_Medium));
7272
if (!enabled) title.setTextColor(android.graphics.Color.GRAY);
7373

7474
TextView description = new TextView(this);
@@ -91,7 +91,7 @@ public void onCreate(Bundle savedInstanceState) {
9191

9292
@Override
9393
public void onClick(View v) {
94-
if (homepage != "")
94+
if (!homepage.equals(""))
9595
try {
9696
StylishAddon.browser.tabs.create(homepage, false);
9797
} catch (RemoteException e) {
@@ -110,7 +110,12 @@ public void onClick(View v) {
110110

111111
Button btnEdit = new Button(this);
112112
btnEdit.setLayoutParams(buttonParams);
113-
btnEdit.setText(getString(R.string.edit));
113+
if (landscape_mode)
114+
btnEdit.setText(getString(R.string.edit));
115+
else {
116+
btnEdit.setText("");
117+
btnEdit.setCompoundDrawablesWithIntrinsicBounds(android.R.drawable.ic_menu_edit, 0, 0, 0);
118+
}
114119
btnEdit.setOnClickListener(new OnClickListener() { // edit style
115120

116121
@Override
@@ -126,7 +131,12 @@ public void onClick(View v) {
126131

127132
Button btnUpdate = new Button(this);
128133
btnUpdate.setLayoutParams(buttonParams);
129-
btnUpdate.setText(getString(R.string.update));
134+
if (landscape_mode)
135+
btnUpdate.setText(getString(R.string.update));
136+
else {
137+
btnUpdate.setText("");
138+
btnUpdate.setCompoundDrawablesWithIntrinsicBounds(android.R.drawable.ic_popup_sync, 0, 0, 0);
139+
}
130140
btnUpdate.setOnClickListener(new OnClickListener() { // update style
131141

132142
@Override
@@ -140,8 +150,10 @@ public void onClick(View v) {
140150

141151
ToggleButton btnOnOff = new ToggleButton(this);
142152
btnOnOff.setLayoutParams(buttonParams);
143-
btnOnOff.setTextOff(getString(R.string.enable));
144-
btnOnOff.setTextOn(getString(R.string.disable));
153+
btnOnOff.setTextOff((landscape_mode ? getString(R.string.enable) : ""));
154+
btnOnOff.setTextOn((landscape_mode ? getString(R.string.disable) : ""));
155+
if (!landscape_mode)
156+
btnOnOff.setCompoundDrawablesWithIntrinsicBounds(android.R.drawable.ic_lock_power_off, 0, 0, 0);
145157
btnOnOff.setChecked(enabled);
146158
btnOnOff.setOnClickListener(new OnClickListener() { // enable or disable style
147159

@@ -158,18 +170,39 @@ public void onClick(View v) {
158170

159171
Button btnDelete = new Button(this);
160172
btnDelete.setLayoutParams(buttonParams);
161-
btnDelete.setText(getString(R.string.delete));
173+
if (landscape_mode)
174+
btnDelete.setText(getString(R.string.delete));
175+
else {
176+
btnDelete.setText("");
177+
btnDelete.setCompoundDrawablesWithIntrinsicBounds(android.R.drawable.ic_menu_delete, 0, 0, 0);
178+
}
162179

163-
164180
final LinearLayout L = new LinearLayout(this);
165181
//experimental//final RelativeLayout L = new RelativeLayout(this);
166182
L.setOrientation(LinearLayout.HORIZONTAL);
167183
L.setLayoutParams(new LinearLayout.LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
168184
L.addView(titleAndDesc);
169-
L.addView(btnEdit);
170-
L.addView(btnUpdate);
171-
L.addView(btnOnOff);
172-
L.addView(btnDelete);
185+
if (landscape_mode) {
186+
L.addView(btnEdit);
187+
L.addView(btnUpdate);
188+
L.addView(btnOnOff);
189+
L.addView(btnDelete);
190+
} else {
191+
LinearLayout Column1 = new LinearLayout(this);
192+
Column1.setOrientation(LinearLayout.VERTICAL);
193+
LinearLayout.LayoutParams ColParams = new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
194+
Column1.setLayoutParams(ColParams);
195+
Column1.addView(btnEdit);
196+
Column1.addView(btnUpdate);
197+
198+
LinearLayout Column2 = new LinearLayout(this);
199+
Column2.setOrientation(LinearLayout.VERTICAL);
200+
Column2.setLayoutParams(ColParams);
201+
Column2.addView(btnOnOff);
202+
Column2.addView(btnDelete);
203+
L.addView(Column1);
204+
L.addView(Column2);
205+
}
173206
general.addView(L);
174207
btnDelete.setOnClickListener(new OnClickListener() { //delete style
175208

0 commit comments

Comments
 (0)