yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 17:59:33 +02:00
Code Issues Releases Wiki Activity

widget configuration activity theme => dialog

Browse source
This commit is contained in:
Nikolay Pultsin 2015-08-12 22:11:17 +02:00
parent b4f1ed3552
commit 47c827c547
6 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
AndroidManifest.xml
View file

@ -382,7 +382,7 @@
</intent-filter> </intent-filter>
<meta-data android:name="android.appwidget.provider" android:resource="@xml/widget_simple"/> <meta-data android:name="android.appwidget.provider" android:resource="@xml/widget_simple"/>
</receiver> </receiver>
<activity android:name="org.geometerplus.android.fbreader.widget.simple.ConfigurationActivity" android:configChanges="orientation|screenSize|keyboard|keyboardHidden" android:theme="@style/FBReader.Activity" android:exported="false"> <activity android:name="org.geometerplus.android.fbreader.widget.simple.ConfigurationActivity" android:configChanges="orientation|screenSize|keyboard|keyboardHidden" android:theme="@style/FBReader.Dialog.NoTitle" android:exported="false">
<intent-filter> <intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/> <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
</intent-filter> </intent-filter>

2
AndroidManifest.xml.pattern
View file

@ -382,7 +382,7 @@
</intent-filter> </intent-filter>
<meta-data android:name="android.appwidget.provider" android:resource="@xml/widget_simple"/> <meta-data android:name="android.appwidget.provider" android:resource="@xml/widget_simple"/>
</receiver> </receiver>
<activity android:name="org.geometerplus.android.fbreader.widget.simple.ConfigurationActivity" android:configChanges="orientation|screenSize|keyboard|keyboardHidden" android:theme="@style/FBReader.Activity" android:exported="false"> <activity android:name="org.geometerplus.android.fbreader.widget.simple.ConfigurationActivity" android:configChanges="orientation|screenSize|keyboard|keyboardHidden" android:theme="@style/FBReader.Dialog.NoTitle" android:exported="false">
<intent-filter> <intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/> <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
</intent-filter> </intent-filter>

2
assets/resources/application/en.xml
View file

@ -1207,7 +1207,7 @@
<node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?"/> <node name="conflict" value="Both FBReader and FBReader Premium appear to be installed. Which one would you like to run?"/>
</node> </node>
<node name="widget"> <node name="widget">
<node name="simple" value="FBReader widget setup"> <node name="simple">
<node name="selectIcon" value="Select widget icon"/> <node name="selectIcon" value="Select widget icon"/>
<node name="selectAction" value="Select action"/> <node name="selectAction" value="Select action"/>
<node name="book" value="Read book"/> <node name="book" value="Read book"/>

10
res/layout/widget_simple_config.xml
View file

@ -4,16 +4,16 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:padding="7dp" android:padding="15dp"
> >
<TextView <TextView
android:id="@+id/widget_simple_config_icon_label" android:id="@+id/widget_simple_config_icon_label"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
/> />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
> >
@ -36,7 +36,7 @@
</LinearLayout> </LinearLayout>
<TextView <TextView
android:id="@+id/widget_simple_config_action_label" android:id="@+id/widget_simple_config_action_label"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:paddingTop="12dp" android:paddingTop="12dp"
@ -45,7 +45,7 @@
android:id="@+id/widget_simple_config_actions" android:id="@+id/widget_simple_config_actions"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:spinnerMode="dialog" android:spinnerMode="dropdown"
/> />
<include <include
layout="@layout/ok_cancel_buttons" layout="@layout/ok_cancel_buttons"

3
res/values/styles.xml
View file

@ -5,6 +5,9 @@
</style> </style>
<style name="FBReader.Dialog" parent="android:Theme.Dialog"> <style name="FBReader.Dialog" parent="android:Theme.Dialog">
</style> </style>
<style name="FBReader.Dialog.NoTitle" parent="FBReader.Dialog">
<item name="android:windowNoTitle">true</item>
</style>
<style name="FBReader.Transparent" parent="android:Theme.Translucent.NoTitleBar"> <style name="FBReader.Transparent" parent="android:Theme.Translucent.NoTitleBar">
<item name="android:windowBackground">@android:color/transparent</item> <item name="android:windowBackground">@android:color/transparent</item>
</style> </style>

1
src/org/geometerplus/android/fbreader/widget/simple/ConfigurationActivity.java
View file

@ -66,7 +66,6 @@ public class ConfigurationActivity extends Activity {
setContentView(R.layout.widget_simple_config); setContentView(R.layout.widget_simple_config);
final ZLResource widgetResource = ZLResource.resource("widget").getResource("simple"); final ZLResource widgetResource = ZLResource.resource("widget").getResource("simple");
setTitle(widgetResource.getValue());
myWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID; myWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID;
final Bundle extras = getIntent().getExtras(); final Bundle extras = getIntent().getExtras();