summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/drawable-hdpi/dialog_bottom_holo_dark.9.pngbin3303 -> 0 bytes
-rw-r--r--res/drawable-hdpi/dialog_top_holo_dark.9.pngbin4633 -> 0 bytes
-rw-r--r--res/drawable-mdpi/dialog_bottom_holo_dark.9.pngbin3303 -> 0 bytes
-rw-r--r--res/drawable-mdpi/dialog_top_holo_dark.9.pngbin4633 -> 0 bytes
-rw-r--r--res/layout/basic_setting_popup.xml7
-rw-r--r--res/layout/effect_setting_popup.xml7
-rw-r--r--res/layout/in_line_setting_switch.xml2
-rw-r--r--res/layout/other_setting_popup.xml8
-rw-r--r--res/values-w1024dp/dimens.xml6
-rw-r--r--res/values-w1024dp/styles.xml1
-rw-r--r--res/values-w1280dp/dimens.xml4
-rw-r--r--res/values/colors.xml2
-rw-r--r--res/values/dimens.xml11
-rw-r--r--res/values/styles.xml12
14 files changed, 38 insertions, 22 deletions
diff --git a/res/drawable-hdpi/dialog_bottom_holo_dark.9.png b/res/drawable-hdpi/dialog_bottom_holo_dark.9.png
deleted file mode 100644
index 1ada4d3..0000000
--- a/res/drawable-hdpi/dialog_bottom_holo_dark.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/dialog_top_holo_dark.9.png b/res/drawable-hdpi/dialog_top_holo_dark.9.png
deleted file mode 100644
index 3cd7eb8..0000000
--- a/res/drawable-hdpi/dialog_top_holo_dark.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/dialog_bottom_holo_dark.9.png b/res/drawable-mdpi/dialog_bottom_holo_dark.9.png
deleted file mode 100644
index 1ada4d3..0000000
--- a/res/drawable-mdpi/dialog_bottom_holo_dark.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/dialog_top_holo_dark.9.png b/res/drawable-mdpi/dialog_top_holo_dark.9.png
deleted file mode 100644
index 3cd7eb8..0000000
--- a/res/drawable-mdpi/dialog_top_holo_dark.9.png
+++ /dev/null
Binary files differ
diff --git a/res/layout/basic_setting_popup.xml b/res/layout/basic_setting_popup.xml
index c51ff31..d101878 100644
--- a/res/layout/basic_setting_popup.xml
+++ b/res/layout/basic_setting_popup.xml
@@ -20,21 +20,22 @@
style="@style/SettingPopupWindow">
<LinearLayout android:orientation="vertical"
+ android:background="@color/popup_background"
android:layout_height="wrap_content"
android:layout_width="@dimen/setting_popup_window_width">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/dialog_top_holo_dark"
android:minHeight="@dimen/popup_title_frame_min_height">
<TextView android:id="@+id/title"
style="@style/PopupTitleText" />
</FrameLayout>
+ <View style="@style/PopupTitleSeperator" />
+
<FrameLayout android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/dialog_bottom_holo_dark">
+ android:layout_height="wrap_content">
<ListView android:id="@+id/settingList"
style="@style/SettingItemList"
android:choiceMode="singleChoice" />
diff --git a/res/layout/effect_setting_popup.xml b/res/layout/effect_setting_popup.xml
index 590c3e3..ad22d9f 100644
--- a/res/layout/effect_setting_popup.xml
+++ b/res/layout/effect_setting_popup.xml
@@ -17,21 +17,22 @@
style="@style/SettingPopupWindow">
<LinearLayout android:orientation="vertical"
+ android:background="@color/popup_background"
android:layout_height="wrap_content"
android:layout_width="@dimen/big_setting_popup_window_width">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/dialog_top_holo_dark"
android:minHeight="@dimen/popup_title_frame_min_height">
<TextView android:id="@+id/title"
style="@style/PopupTitleText" />
</FrameLayout>
+ <View style="@style/PopupTitleSeperator" />
+
<FrameLayout android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/dialog_bottom_holo_dark">
+ android:layout_height="wrap_content">
<GridView android:id="@+id/settingList"
style="@style/EffectSettingGrid"
android:choiceMode="singleChoice" />
diff --git a/res/layout/in_line_setting_switch.xml b/res/layout/in_line_setting_switch.xml
index c884ece..d5c3df6 100644
--- a/res/layout/in_line_setting_switch.xml
+++ b/res/layout/in_line_setting_switch.xml
@@ -22,7 +22,7 @@
<!-- The Switch widget always aligns to the right, so we have to wrap it in a frame layout. -->
<FrameLayout android:layout_weight="1"
- android:layout_width="fill_parent"
+ android:layout_width="0dp"
android:layout_height="match_parent">
<Switch android:id="@+id/setting_switch"
android:layout_gravity="center"
diff --git a/res/layout/other_setting_popup.xml b/res/layout/other_setting_popup.xml
index b207e2f..acb7953 100644
--- a/res/layout/other_setting_popup.xml
+++ b/res/layout/other_setting_popup.xml
@@ -22,22 +22,24 @@
style="@style/SettingPopupWindow">
<LinearLayout android:orientation="vertical"
+ android:background="@color/popup_background"
android:layout_width="@dimen/big_setting_popup_window_width"
android:layout_height="wrap_content">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@drawable/dialog_top_holo_dark">
+ android:minHeight="@dimen/popup_title_frame_min_height">
<TextView android:id="@+id/title"
android:text="@string/pref_camera_settings_category"
style="@style/PopupTitleText" />
</FrameLayout>
+ <View style="@style/PopupTitleSeperator" />
+
<FrameLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/dialog_bottom_holo_dark">
+ android:layout_height="wrap_content">
<ListView android:id="@+id/settingList"
style="@style/SettingItemList" />
</FrameLayout>
diff --git a/res/values-w1024dp/dimens.xml b/res/values-w1024dp/dimens.xml
index a3c909d..4859607 100644
--- a/res/values-w1024dp/dimens.xml
+++ b/res/values-w1024dp/dimens.xml
@@ -35,14 +35,14 @@
<dimen name="pano_capture_too_fast_text_height">160dp</dimen>
<dimen name="pano_indication_width">300dp</dimen>
<dimen name="pano_indication_height">150dp</dimen>
- <dimen name="setting_row_height">48dp</dimen>
+ <dimen name="setting_row_height">50dp</dimen>
<dimen name="setting_item_text_size">21dp</dimen>
- <dimen name="setting_knob_width">72dp</dimen>
+ <dimen name="setting_knob_width">50dp</dimen>
<dimen name="setting_item_text_width">130dp</dimen>
<dimen name="setting_popup_window_width">410dp</dimen>
<dimen name="setting_item_list_margin">16dp</dimen>
<dimen name="popup_title_text_size">22dp</dimen>
- <dimen name="popup_title_frame_min_height">48dp</dimen>
+ <dimen name="popup_title_frame_min_height">60dp</dimen>
<dimen name="big_setting_popup_window_width">590dp</dimen>
<dimen name="setting_item_icon_width">35dp</dimen>
<dimen name="effect_setting_item_icon_width">54dp</dimen>
diff --git a/res/values-w1024dp/styles.xml b/res/values-w1024dp/styles.xml
index 5588ae5..a0fd9bd 100644
--- a/res/values-w1024dp/styles.xml
+++ b/res/values-w1024dp/styles.xml
@@ -54,6 +54,7 @@
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_centerVertical">true</item>
<item name="android:layout_alignParentRight">true</item>
+ <item name="android:layout_marginRight">@dimen/setting_popup_right_margin</item>
<item name="android:visibility">gone</item>
</style>
<style name="PanoCustomDialogText">
diff --git a/res/values-w1280dp/dimens.xml b/res/values-w1280dp/dimens.xml
index 6bde0a5..b08a935 100644
--- a/res/values-w1280dp/dimens.xml
+++ b/res/values-w1280dp/dimens.xml
@@ -25,14 +25,14 @@
<dimen name="mode_switcher_inner_padding">15dp</dimen>
<dimen name="camera_switcher_margin_right">30dp</dimen>
<dimen name="camera_switcher_margin_bottom">56dp</dimen>
- <dimen name="setting_row_height">48dp</dimen>
+ <dimen name="setting_row_height">54dp</dimen>
<dimen name="setting_item_text_size">21dp</dimen>
<dimen name="setting_knob_width">72dp</dimen>
<dimen name="setting_item_text_width">130dp</dimen>
<dimen name="setting_popup_window_width">410dp</dimen>
<dimen name="setting_item_list_margin">16dp</dimen>
<dimen name="popup_title_text_size">22dp</dimen>
- <dimen name="popup_title_frame_min_height">48dp</dimen>
+ <dimen name="popup_title_frame_min_height">64dp</dimen>
<dimen name="big_setting_popup_window_width">590dp</dimen>
<dimen name="setting_item_icon_width">35dp</dimen>
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index e5e08c2..517efa2 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -28,6 +28,8 @@
<color name="share_popup_background">#B0000000</color>
<color name="share_icon_background">#40000000</color>
<color name="indicator_background">#40000000</color>
+ <color name="popup_title_color">#ff33b5e5</color>
+ <color name="popup_background">#ff282828</color>
<color name="pano_custom_dialog_background">#FF666666</color>
<color name="pano_progress_empty">#FF2E2E2E</color>
<color name="pano_progress_done">#FF33525E</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index fe1f2d7..74842b2 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -31,15 +31,16 @@
<dimen name="pano_capture_too_fast_text_height">70dp</dimen>
<dimen name="pano_indication_width">150dp</dimen>
<dimen name="pano_indication_height">75dp</dimen>
- <dimen name="setting_row_height">42dp</dimen>
- <dimen name="setting_item_text_size">16dp</dimen>
- <dimen name="setting_knob_width">36dp</dimen>
+ <dimen name="setting_popup_right_margin">5dp</dimen>
+ <dimen name="setting_row_height">50dp</dimen>
+ <dimen name="setting_item_text_size">18sp</dimen>
+ <dimen name="setting_knob_width">20dp</dimen>
<dimen name="setting_knob_text_size">20dp</dimen>
<dimen name="setting_item_text_width">81dp</dimen>
<dimen name="setting_popup_window_width">240dp</dimen>
<dimen name="setting_item_list_margin">6dp</dimen>
- <dimen name="popup_title_text_size">18dp</dimen>
- <dimen name="popup_title_frame_min_height">32dp</dimen>
+ <dimen name="popup_title_text_size">22dp</dimen>
+ <dimen name="popup_title_frame_min_height">60dp</dimen>
<dimen name="big_setting_popup_window_width">320dp</dimen>
<dimen name="setting_item_icon_width">28dp</dimen>
<dimen name="effect_setting_item_icon_width">40dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 91426c8..7a5db3f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -69,6 +69,7 @@
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_centerVertical">true</item>
<item name="android:layout_toLeftOf">@+id/indicator_control</item>
+ <item name="android:layout_marginRight">@dimen/setting_popup_right_margin</item>
<item name="android:visibility">gone</item>
</style>
<style name="PopupTitleText">
@@ -77,10 +78,17 @@
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:singleLine">true</item>
- <item name="android:textColor">@android:color/white</item>
+ <item name="android:textColor">@color/popup_title_color</item>
<item name="android:layout_marginLeft">10dp</item>
<item name="android:paddingLeft">16dp</item>
</style>
+ <style name="PopupTitleSeperator">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">2dp</item>
+ <item name="android:layout_marginLeft">@dimen/setting_item_list_margin</item>
+ <item name="android:layout_marginRight">@dimen/setting_item_list_margin</item>
+ <item name="android:background">@color/popup_title_color</item>
+ </style>
<style name="SettingItemList">
<item name="android:orientation">vertical</item>
<item name="android:layout_marginLeft">@dimen/setting_item_list_margin</item>
@@ -96,7 +104,7 @@
<item name="android:textColor">@android:color/white</item>
<item name="android:singleLine">true</item>
<item name="android:layout_weight">1</item>
- <item name="android:layout_width">fill_parent</item>
+ <item name="android:layout_width">0dp</item>
<item name="android:layout_height">match_parent</item>
</style>
<style name="SettingItemText">
generated by cgit v1.1 at 2025-02-04 03:41:15 +0000