Skip to content

Commit 17843f7

Browse files
committed
Minor Fixes and Fixed Data Table - Pager is duplicated #47
1 parent ed1dbb2 commit 17843f7

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

src/main/java/gwt/material/design/demo/client/application/about/AboutView.ui.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<ui:with field='res' type='gwt.material.design.demo.client.resources.MaterialResources' />
2424

2525
<g:HTMLPanel addStyleNames="center-align">
26-
<m:MaterialRow>
26+
<m:MaterialRow marginTop="60">
2727
<m:MaterialImage resource="{res.ic_front}"/>
2828
<m:MaterialTitle title="What is Material Design?" description="Created and designed by Google, Material Design is a design language that combines the classic principles of successful design along with innovation and technology. Google's goal is to develop a system of design that allows for a unified user experience across all their products on any platform." />
2929
</m:MaterialRow>

src/main/java/gwt/material/design/demo/client/application/addins/datatable/table/PageTable.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ interface PageGridUiBinder extends UiBinder<HTMLPanel, PageTable> {
6161
@UiField
6262
MaterialDataTable<Person> table;
6363

64-
private MaterialDataPager pager;
64+
private MaterialDataPager pager = new MaterialDataPager();
65+
6566
private ListDataSource<Person> dataSource;
6667

6768
public PageTable() {
@@ -79,16 +80,17 @@ public PageTable() {
7980

8081
dataSource = new ListDataSource<>();
8182
dataSource.add(0, people);
83+
84+
pager.setTable(table);
85+
pager.setDataSource(dataSource);
86+
8287
}
8388

8489
@Override
8590
protected void onLoad() {
8691
super.onLoad();
8792

8893
table.setVisibleRange(1, 10);
89-
90-
pager = new MaterialDataPager<>(table, dataSource);
91-
pager.setLimitOptions(5, 10, 15, 20);
9294
table.add(pager);
9395

9496
// We will manually add this category otherwise categories

src/main/java/gwt/material/design/demo/client/application/animations/meaningful/MeaningfulAnimationsView.ui.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@
296296
<demo:PrettyPre addStyleNames="lang-java">
297297
MaterialAnimator.animate(Transition.FADE_IN_IMAGE, image, 0);
298298
</demo:PrettyPre>
299-
<m:MaterialImage addStyleNames="{style.block}" opacity="0" ui:field="image" resource="{res.image}" caption="I love Material Design"/>
299+
<m:MaterialImage addStyleNames="{style.block}" opacity="0" ui:field="image" url="http://www.topofandroid.com/wp-content/uploads/2015/05/Android-L-Material-Design-Wallpapers-5.png" caption="I love Material Design"/>
300300
</m:MaterialPanel>
301301
</g:HTMLPanel>
302302
</m:MaterialPanel>

src/main/java/gwt/material/design/demo/client/application/gettingstarted/GettingStartedView.ui.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
</m:MaterialPanel>
163163

164164
<m:MaterialPanel addStyleNames="code">
165-
<m:MaterialTitle title="Themes" description="We created another project for gwtmaterial themes .See below the link of the repo."/>
165+
<m:MaterialTitle title="Themes" description="We created another project for gwt material themes .See below the link of the repo."/>
166166
<m:MaterialLink href="https://github.com/GwtMaterialDesign/gwt-material-themes" text="Gwt Material Themes Github Repo" target="_blank" iconType="LINK" iconPosition="LEFT" textColor="BLUE"/>
167167
<m:MaterialTitle description="First: Make sure you are using GwtMaterialDesignBasic module (This will not load the materialize.css default file allowing you to customize your design.)" />
168168
<demo:PrettyPre addStyleNames="lang-xml-1">

0 commit comments

Comments
 (0)