diff options
| author | Bananeweizen <bananeweizen@gmx.de> | 2012-04-22 09:43:21 +0200 |
|---|---|---|
| committer | Bananeweizen <bananeweizen@gmx.de> | 2012-04-22 09:43:21 +0200 |
| commit | b3e3e2c45e480b677d91bc509a3c73627a2b989b (patch) | |
| tree | 9df94f3607fe7b283c1accbb4cf18ea227b5312c /main/res | |
| parent | 3e5bb99f8f816796c56e217c4077c204968bdea0 (diff) | |
| download | cgeo-b3e3e2c45e480b677d91bc509a3c73627a2b989b.zip cgeo-b3e3e2c45e480b677d91bc509a3c73627a2b989b.tar.gz cgeo-b3e3e2c45e480b677d91bc509a3c73627a2b989b.tar.bz2 | |
make progress spinner style depend on selected skin
Diffstat (limited to 'main/res')
| -rw-r--r-- | main/res/layout/caches.xml | 26 | ||||
| -rw-r--r-- | main/res/layout/cacheview_description.xml | 9 | ||||
| -rw-r--r-- | main/res/values/attrs.xml | 2 | ||||
| -rw-r--r-- | main/res/values/themes.xml | 10 |
4 files changed, 29 insertions, 18 deletions
diff --git a/main/res/layout/caches.xml b/main/res/layout/caches.xml index 924651d..6e39fee 100644 --- a/main/res/layout/caches.xml +++ b/main/res/layout/caches.xml @@ -22,10 +22,23 @@ android:src="@drawable/actionbar_manual" android:onClick="goManual" /> </LinearLayout> + <include layout="@layout/filter_bar"/> + + <RelativeLayout android:id="@+id/loading" + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + <ProgressBar style="@android:style/Widget.ProgressBar.Large" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:gravity="center" + android:indeterminate="true" + android:indeterminateOnly="true" /> + </RelativeLayout> + <ListView android:id="@android:id/list" android:visibility="gone" - android:layout_above="@+id/counter" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_margin="0dip" @@ -33,15 +46,4 @@ android:dividerHeight="1dip" android:background="?background_color" android:cacheColorHint="?background_color" /> - <RelativeLayout android:id="@+id/loading" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:padding="5dip" > - <ProgressBar style="@android:style/Widget.ProgressBar.Large.Inverse" - android:layout_width="76dip" - android:layout_height="76dip" - android:layout_centerInParent="true" - android:gravity="center" - android:indeterminate="true" /> - </RelativeLayout> </LinearLayout>
\ No newline at end of file diff --git a/main/res/layout/cacheview_description.xml b/main/res/layout/cacheview_description.xml index 83d4e49..c985bfb 100644 --- a/main/res/layout/cacheview_description.xml +++ b/main/res/layout/cacheview_description.xml @@ -52,12 +52,13 @@ android:visibility="gone" >
<ProgressBar
- style="@android:style/Widget.ProgressBar.Large.Inverse"
- android:layout_width="76dip"
- android:layout_height="76dip"
+ style="?progressSpinnerLarge"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center"
- android:indeterminate="true" />
+ android:indeterminate="true"
+ android:indeterminateOnly="true" />
</RelativeLayout>
<!-- Hint and spoiler-images box -->
diff --git a/main/res/values/attrs.xml b/main/res/values/attrs.xml index 187d4cb..0f22ee4 100644 --- a/main/res/values/attrs.xml +++ b/main/res/values/attrs.xml @@ -31,4 +31,6 @@ <!-- others --> <attr name="compass" format="integer" /> + <attr name="progressSpinnerLarge" format="integer" /> + </resources> diff --git a/main/res/values/themes.xml b/main/res/values/themes.xml index ba07eb2..75986de 100644 --- a/main/res/values/themes.xml +++ b/main/res/values/themes.xml @@ -48,6 +48,8 @@ <item name="favourite_g">@drawable/favourite_background_green_dark</item> <item name="close">@drawable/map_close_dark</item> <item name="log_img_icon">@drawable/log_img_dark</item> + + <item name="progressSpinnerLarge">@android:style/Widget.ProgressBar.Large</item> <!-- own values: other --> <item name="compass">0</item> @@ -81,7 +83,9 @@ <item name="close">@drawable/map_close_light</item> <item name="log_img_icon">@drawable/log_img_light</item> - <!-- own values: other --> + <item name="progressSpinnerLarge">@android:style/Widget.ProgressBar.Large.Inverse</item> + + <!-- own values: other --> <item name="compass">1</item> </style> @@ -113,7 +117,9 @@ <item name="close">@drawable/map_close_dark</item> <item name="log_img_icon">@drawable/log_img_dark</item> - <!-- own values: other --> + <item name="progressSpinnerLarge">@android:style/Widget.ProgressBar.Large</item> + + <!-- own values: other --> <item name="compass">0</item> </style> </resources> |