Skip to content

C
core
Kaydet (Commit) 3b631e41 authored tarafından Artur Dryomov's avatar Artur Dryomov
Dosyalara gözat
Seçenekler

Rename some resources, fix action bar tab selectors as well. 

Change-Id: I48b4f69bd85b9aa0b034f6a7210311598662c163
üst 041452c6
Hide whitespace changes
Inline Side-by-side
Showing with 74 additions and 38 deletions
android/sdremote/res/drawable/action_bar_tab.xml deleted 100644 → 0
Dosyayı görüntüle @ 041452c6
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_focused="false"
android:state_selected="false"
android:state_pressed="false"
android:drawable="@drawable/action_bar_tab_unselected"/>
<item
android:state_focused="false"
android:state_selected="true"
android:state_pressed="false"
android:drawable="@drawable/action_bar_tab_selected"/>
<item
android:state_selected="false"
android:state_pressed="true"
android:drawable="@drawable/action_bar_tab_selected_pressed"/>
<item
android:state_selected="true"
android:state_pressed="true"
android:drawable="@drawable/action_bar_tab_selected_pressed"/>
</selector>
\ No newline at end of file
android/sdremote/res/drawable/bg_action_bar_tab.xml 0 → 100644
Dosyayı görüntüle @ 3b631e41
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Non focused states -->
<item
android:state_focused="false"
android:state_selected="false"
android:state_pressed="false"
android:drawable="@android:color/transparent"/>
<item
android:state_focused="false"
android:state_selected="true"
android:state_pressed="false"
android:drawable="@drawable/bg_action_bar_tab_selected"/>
<!-- Focused states -->
<item
android:state_focused="true"
android:state_selected="false"
android:state_pressed="false"
android:drawable="@drawable/bg_action_bar_tab_unselected_focused"/>
<item
android:state_focused="true"
android:state_selected="true"
android:state_pressed="false"
android:drawable="@drawable/bg_action_bar_tab_selected_focused"/>
<!-- Pressed -->
<!-- Non focused states -->
<item
android:state_focused="false"
android:state_selected="false"
android:state_pressed="true"
android:drawable="@drawable/bg_action_bar_tab_unselected_pressed"/>
<item
android:state_focused="false"
android:state_selected="true"
android:state_pressed="true"
android:drawable="@drawable/bg_action_bar_tab_selected_pressed"/>
<!-- Focused states -->
<item
android:state_focused="true"
android:state_selected="false"
android:state_pressed="true"
android:drawable="@drawable/bg_action_bar_tab_unselected_pressed"/>
<item
android:state_focused="true"
android:state_selected="true"
android:state_pressed="true"
android:drawable="@drawable/bg_action_bar_tab_selected_pressed"/>
</selector>
\ No newline at end of file
android/sdremote/res/drawable/underline_header.xml
Dosyayı görüntüle @ 3b631e41
......@@ -3,7 +3,7 @@
android:shape="rectangle">
<size
android:width="10000dp"
android:width="100000dp"
android:height="1dp"/>
<solid
......
android/sdremote/res/layout/view_grid_slide.xml
Dosyayı görüntüle @ 3b631e41
......@@ -7,7 +7,7 @@
<ImageView
android:id="@+id/image_slide_preview"
android:adjustViewBounds="true"
android:background="@drawable/background_grid_slide"
android:background="@drawable/bg_grid_slide"
android:contentDescription="@string/description_grid_slide"
android:layout_alignParentTop="true"
android:layout_width="wrap_content"
......
android/sdremote/res/menu/menu_action_bar_computers.xml
Dosyayı görüntüle @ 3b631e41
......@@ -9,7 +9,7 @@
<item
android:id="@+id/menu_settings"
android:title="@string/title_settings"
android:title="@string/menu_settings"
android:showAsAction="never"/>
<item
......
android/sdremote/res/values/colors.xml
Dosyayı görüntüle @ 3b631e41
......@@ -2,6 +2,7 @@
<resources>
<color name="background_action_bar">#e46f1f</color>
<color name="background_action_bar_tab_indicator">#e6821c</color>
<color name="background_action_bar_divider">#55ffffff</color>
<color name="background_header">@color/background_action_bar</color>
<color name="background_slide_index">#7f000000</color>
......
android/sdremote/res/values/themes.xml
Dosyayı görüntüle @ 3b631e41
......@@ -10,16 +10,16 @@
</style>
<style name="Theme.ImpressRemote.ActionBar" parent="Widget.Sherlock.Light.ActionBar.Solid.Inverse">
<item name="android:background">@drawable/action_bar_background</item>
<item name="background">@drawable/action_bar_background</item>
<item name="android:background">@drawable/bg_action_bar</item>
<item name="background">@drawable/bg_action_bar</item>
<item name="android:displayOptions">showTitle|showHome|homeAsUp|useLogo</item>
<item name="displayOptions">showTitle|showHome|homeAsUp|useLogo</item>
</style>
<style name="Theme.ImpressRemote.ActionBar.Tab" parent="Widget.Sherlock.Light.ActionBar.TabView.Inverse">
<item name="android:background">@drawable/action_bar_tab</item>
<item name="background">@drawable/action_bar_tab</item>
<item name="android:background">@drawable/bg_action_bar_tab</item>
<item name="background">@drawable/bg_action_bar_tab</item>
</style>
<style name="Theme.ImpressRemote.Computers" parent="Theme.ImpressRemote">
......
android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesGridAdapter.java
Dosyayı görüntüle @ 3b631e41
......@@ -28,7 +28,7 @@ public class SlidesGridAdapter extends BaseAdapter {
public SlidesGridAdapter(Context aContext, SlideShow aSlideShow) {
mLayoutInflater = LayoutInflater.from(aContext);
mImageLoader = new ImageLoader(aContext.getResources(), R.drawable.slide_unknown);
mImageLoader = new ImageLoader(aContext.getResources(), R.drawable.bg_slide_unknown);
mSlideShow = aSlideShow;
}
......@@ -105,7 +105,7 @@ public class SlidesGridAdapter extends BaseAdapter {
}
private void setUpUnknownSlidePreview(ViewHolder aSlideViewHolder) {
aSlideViewHolder.mSlidePreview.setImageResource(R.drawable.slide_unknown);
aSlideViewHolder.mSlidePreview.setImageResource(R.drawable.bg_slide_unknown);
}
private String buildSlideIndex(int aPosition) {
......
android/sdremote/src/org/libreoffice/impressremote/adapter/SlidesPagerAdapter.java
Dosyayı görüntüle @ 3b631e41
......@@ -29,7 +29,7 @@ public class SlidesPagerAdapter extends PagerAdapter {
public SlidesPagerAdapter(Context aContext, SlideShow aSlideShow, View.OnClickListener aSlideClickListener) {
mLayoutInflater = LayoutInflater.from(aContext);
mImageLoader = new ImageLoader(aContext.getResources(), R.drawable.slide_unknown);
mImageLoader = new ImageLoader(aContext.getResources(), R.drawable.bg_slide_unknown);
mSlideShow = aSlideShow;
......@@ -76,7 +76,7 @@ public class SlidesPagerAdapter extends PagerAdapter {
}
private void setUpUnknownSlidePreview(ImageView aSlideView) {
aSlideView.setImageResource(R.drawable.slide_unknown);
aSlideView.setImageResource(R.drawable.bg_slide_unknown);
}
@Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment