Skip to content

Commit

Permalink
Add a new widget: PagedView
Browse files Browse the repository at this point in the history
  • Loading branch information
Cyril Mottier committed Jun 2, 2011
1 parent 1fbbe49 commit e3dc5fd
Show file tree
Hide file tree
Showing 25 changed files with 1,454 additions and 0 deletions.
2 changes: 2 additions & 0 deletions GDCatalog/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@
<activity android:name=".AsyncImageViewListActivity" />

<activity android:name=".MapPinMapActivity" />
<activity android:name=".PagedScrollViewActivity" />
<activity android:name=".PagedViewActivity" />

</application>

Expand Down
60 changes: 60 additions & 0 deletions GDCatalog/res/layout/paged_view.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright (C) 2011 Cyril Mottier (http://www.cyrilmottier.com)
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->

<merge
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:greendroid="http://schemas.android.com/apk/res/com.cyrilmottier.android.gdcatalog">

<greendroid.widget.PagedView
android:id="@+id/paged_view"
android:layout_width="fill_parent"
android:layout_height="fill_parent" />

<greendroid.widget.PageIndicator
android:id="@+id/page_indicator_prev"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|left"
android:paddingBottom="10dp"
android:paddingRight="15dp"
android:paddingTop="25dp"
android:paddingLeft="15dp"
greendroid:dotType="multiple"
greendroid:gravity="left" />

<greendroid.widget.PageIndicator
android:id="@+id/page_indicator_next"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|right"
android:paddingBottom="10dp"
android:paddingRight="15dp"
android:paddingTop="25dp"
android:paddingLeft="15dp"
greendroid:dotType="multiple"
greendroid:gravity="right" />

<greendroid.widget.PageIndicator
android:id="@+id/page_indicator_other"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|center_horizontal"
android:paddingTop="10dp" />

</merge>
27 changes: 27 additions & 0 deletions GDCatalog/res/layout/paged_view_item.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright (C) 2011 Cyril Mottier (http://www.cyrilmottier.com)
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->

<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center"
android:textColor="@android:color/white"
android:textStyle="bold"
android:textSize="200dp" />
1 change: 1 addition & 0 deletions GDCatalog/res/values-en/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<string name="simple_async_image_view_label">Simple AsyncImageView</string>
<string name="async_image_view_list_view_label">AsyncImageView in ListView</string>
<string name="map_pin_drawable_label">MapPinDrawable</string>
<string name="paged_view_label">PagedView &amp; PageIndicator</string>

<string name="about">About</string>
<string name="license">License</string>
Expand Down
1 change: 1 addition & 0 deletions GDCatalog/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
<string name="simple_async_image_view_label">AsyncImageView simple</string>
<string name="async_image_view_list_view_label">AsyncImageView dans une ListView</string>
<string name="map_pin_drawable_label">MapPinDrawable</string>
<string name="paged_view_label">PagedView &amp; PageIndicator</string>

<string name="about">A propos</string>
<string name="license">Licence</string>
Expand Down
1 change: 1 addition & 0 deletions GDCatalog/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
<string name="simple_async_image_view_label">Simple AsyncImageView</string>
<string name="async_image_view_list_view_label">AsyncImageView in ListView</string>
<string name="map_pin_drawable_label">MapPinDrawable</string>
<string name="paged_view_label">PagedView &amp; PageIndicator</string>

<string name="about">About</string>
<string name="license">License</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ protected void onCreate(Bundle savedInstanceState) {
adapter.add(createTextItem(R.string.simple_async_image_view_label, SimpleAsyncImageViewActivity.class));
adapter.add(createTextItem(R.string.async_image_view_list_view_label, AsyncImageViewListActivity.class));
adapter.add(createTextItem(R.string.map_pin_drawable_label, MapPinMapActivity.class));
adapter.add(createTextItem(R.string.paged_view_label, PagedViewActivity.class));

setListAdapter(adapter);

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
/*
* Copyright (C) 2011 Cyril Mottier (http://www.cyrilmottier.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.cyrilmottier.android.gdcatalog;

import greendroid.app.GDActivity;
import greendroid.widget.PageIndicator;
import greendroid.widget.PagedAdapter;
import greendroid.widget.PagedView;
import greendroid.widget.PagedView.OnPagedViewChangeListener;
import android.os.Bundle;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.TextView;

public class PagedViewActivity extends GDActivity {

private static final int PAGE_COUNT = 7;
private static final int PAGE_MAX_INDEX = PAGE_COUNT - 1;

private PageIndicator mPageIndicatorNext;
private PageIndicator mPageIndicatorPrev;
private PageIndicator mPageIndicatorOther;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

setActionBarContentView(R.layout.paged_view);

final PagedView pagedView = (PagedView) findViewById(R.id.paged_view);
pagedView.setOnPageChangeListener(mOnPagedViewChangedListener);
pagedView.setAdapter(new PhotoSwipeAdapter());

mPageIndicatorNext = (PageIndicator) findViewById(R.id.page_indicator_next);
mPageIndicatorNext.setDotCount(PAGE_MAX_INDEX);
mPageIndicatorNext.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
pagedView.smoothScrollToNext();
}
});

mPageIndicatorPrev = (PageIndicator) findViewById(R.id.page_indicator_prev);
mPageIndicatorPrev.setDotCount(PAGE_MAX_INDEX);
mPageIndicatorPrev.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
pagedView.smoothScrollToPrevious();
}
});

mPageIndicatorOther = (PageIndicator) findViewById(R.id.page_indicator_other);
mPageIndicatorOther.setDotCount(PAGE_COUNT);

setActivePage(pagedView.getCurrentPage());
}

private void setActivePage(int page) {
mPageIndicatorOther.setActiveDot(page);
mPageIndicatorNext.setActiveDot(PAGE_MAX_INDEX - page);
mPageIndicatorPrev.setActiveDot(page);
}

private OnPagedViewChangeListener mOnPagedViewChangedListener = new OnPagedViewChangeListener() {

@Override
public void onStopTracking(PagedView pagedView) {
}

@Override
public void onStartTracking(PagedView pagedView) {
}

@Override
public void onPageChanged(PagedView pagedView, int previousPage, int newPage) {
setActivePage(newPage);
}
};

private class PhotoSwipeAdapter extends PagedAdapter {

@Override
public int getCount() {
return PAGE_COUNT;
}

@Override
public Object getItem(int position) {
return null;
}

@Override
public long getItemId(int position) {
return 0;
}

public View getView(int position, View convertView, ViewGroup parent) {
if (convertView == null) {
convertView = getLayoutInflater().inflate(R.layout.paged_view_item, parent, false);
}

((TextView) convertView).setText(Integer.toString(position));

return convertView;
}

}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 50 additions & 0 deletions GreenDroid/res/drawable/gd_page_indicator_dot.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
** Copyright (C) 2011 Cyril Mottier (http://www.cyrilmottier.com)
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->

<selector
xmlns:android="http://schemas.android.com/apk/res/android">

<item
android:state_selected="true"
android:state_pressed="true"
android:drawable="@drawable/gd_page_indicator_dot_selected_pressed" />

<item
android:state_selected="true"
android:state_focused="true"
android:drawable="@drawable/gd_page_indicator_dot_selected_focused" />

<item
android:state_selected="true"
android:drawable="@drawable/gd_page_indicator_dot_selected_normal" />

<item
android:state_selected="false"
android:state_pressed="true"
android:drawable="@drawable/gd_page_indicator_dot_normal_pressed" />

<item
android:state_selected="false"
android:state_focused="true"
android:drawable="@drawable/gd_page_indicator_dot_normal_focused" />

<item
android:drawable="@drawable/gd_page_indicator_dot_normal_normal" />

</selector>
23 changes: 23 additions & 0 deletions GreenDroid/res/values/gd_attrs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@
<attr name="gdQuickActionBarItemStyle" format="reference" />
<attr name="gdQuickActionGridStyle" format="reference" />
<attr name="gdQuickActionGridItemStyle" format="reference" />

<!-- PageIndicator related attributes -->
<attr name="gdPageIndicatorStyle" format="reference" />


<!-- -->
Expand Down Expand Up @@ -178,5 +181,25 @@
<enum name="xhdpi" value="320" />
</attr>
</declare-styleable>

<declare-styleable name="PageIndicator">
<attr name="dotCount" format="integer" />
<attr name="activeDot" format="integer" />
<attr name="dotDrawable" format="reference" />
<attr name="dotSpacing" format="dimension" />
<attr name="gravity">
<flag name="top" value="0x30" />
<flag name="bottom" value="0x50" />
<flag name="left" value="0x03" />
<flag name="right" value="0x05" />
<flag name="center_vertical" value="0x10" />
<flag name="center_horizontal" value="0x01" />
<flag name="center" value="0x11" />
</attr>
<attr name="dotType">
<enum name="single" value="0" />
<enum name="multiple" value="1" />
</attr>
</declare-styleable>

</resources>
4 changes: 4 additions & 0 deletions GreenDroid/res/values/gd_styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,10 @@
<item name="android:layout_width">fill_parent</item>
<item name="android:layout_height">65dp</item>
</style>

<style name="GreenDroid.Widget.PageIndicator">
<item name="dotDrawable">@drawable/gd_page_indicator_dot</item>
</style>

<!-- PopDownMenu -->
<style name="GreenDroid.Animation" />
Expand Down
1 change: 1 addition & 0 deletions GreenDroid/res/values/gd_themes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
<item name="gdQuickActionGridStyle">@style/GreenDroid.Widget.QuickAction.Grid</item>
<item name="gdQuickActionGridItemStyle">@style/GreenDroid.Widget.QuickAction.Grid.Item</item>

<item name="gdPageIndicatorStyle">@style/GreenDroid.Widget.PageIndicator</item>
</style>


Expand Down
Loading

0 comments on commit e3dc5fd

Please sign in to comment.