Skip to content

Cards instead of grid + some updates to the ankh library #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions github-users-web-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,16 @@
<artifactId>dagger-gwt</artifactId>
</dependency>

<!-- guava -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava-gwt</artifactId>
</dependency>

<!-- RxJava, AutoRest, RxGwt -->
<dependency>
<groupId>com.intendia.gwt.autorest</groupId>
Expand All @@ -83,6 +93,18 @@
<groupId>com.intendia.gwt.rxgwt</groupId>
<artifactId>rxgwt</artifactId>
</dependency>

<!-- test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down Expand Up @@ -119,6 +141,23 @@
<artifactId>gwt-maven-plugin</artifactId>
<version>${gwt.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<!--
It seems that gwt-maven-plugin is switching off default surefire test pass.
I turned it on again, but it's hard to say what side consequences it might
have once we want to also have standard gwt tests here.
-->
<executions>
<execution>
<goals>
<goal>test</goal>
</goals>
<phase>test</phase>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@

<source path="" />

<inherits name="com.google.gwt.regexp.RegExp" />
<inherits name="com.google.common.base.Base" />
<inherits name="com.intendia.rxgwt.RxElemental2" />

</module>
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

package com.xemantic.ankh;
package com.xemantic.ankh.web;

import com.intendia.rxgwt.elemental2.RxElemental2;
import com.xemantic.githubusers.logic.event.Trigger;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
/*
* github-users-web - lists GitHub users. Minimal app demonstrating
* cross-platform app development (Web, Android, iOS) where core
* logic is shared and transpiled from Java to JavaScript and
* Objective-C. This project delivers Web version.
*
* Copyright (C) 2017 Kazimierz Pogoda
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

package com.xemantic.ankh.web;

import elemental2.dom.Image;
import rx.Single;

import java.util.Objects;

/**
* Image utilities.
*
* @author morisil
*/
public final class Images {

private Images() { /* util class, non-instantiable */ }

public static Single<Image> preload(String url) {
Objects.requireNonNull(url);
return Single.create(subscriber -> {
Image image = new Image();
image.src = url;
image.onload = p0 -> {
subscriber.onSuccess(image);
return null;
};
image.onerror = p0 -> {
subscriber.onError(new RuntimeException("Could not load image: " + url));
return null;
};
});
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

package com.xemantic.ankh;
package com.xemantic.ankh.web;

import elemental2.dom.DocumentFragment;
import elemental2.dom.DomGlobal;
Expand All @@ -47,10 +47,10 @@ public static <E extends Element> E create(Patcher patcher) {
return (E) fragment.firstChild;
}

@JsMethod(namespace = "com.xemantic.ankh.incrementaldom", name = "patch")
@JsMethod(namespace = "com.xemantic.ankh.web.incrementaldom", name = "patch")
public static native void patch(Node element, Patcher patcher);

@JsMethod(namespace = "com.xemantic.ankh.incrementaldom", name = "patchOuter")
@JsMethod(namespace = "com.xemantic.ankh.web.incrementaldom", name = "patchOuter")
public static native void patchOuter(Node element, Patcher patcher);

@JsFunction
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

package com.xemantic.githubusers.web.driver;
package com.xemantic.ankh.web.driver;

import com.xemantic.githubusers.logic.driver.UrlOpener;
import elemental2.dom.DomGlobal;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
/*
* github-users-web - lists GitHub users. Minimal app demonstrating
* cross-platform app development (Web, Android, iOS) where core
* logic is shared and transpiled from Java to JavaScript and
* Objective-C. This project delivers Web version.
*
* Copyright (C) 2017 Kazimierz Pogoda
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

package com.xemantic.ankh.web.mdc;

import com.google.common.base.Preconditions;
import com.google.gwt.regexp.shared.MatchResult;
import com.google.gwt.regexp.shared.RegExp;
import elemental2.dom.Element;

import java.util.Objects;

/**
* Controls {@code mdc-elevation} class.
*
* @author morisil
*/
public class MdcElevator {

private final static RegExp ELEVATION_CLASS_REG_EXP = RegExp.compile("^mdc-elevation--z([0-9][0-9]?)$");

private final Element element;

private final int initialLevel;

private int currentLevel;

public MdcElevator(Element element) {
this.element = Objects.requireNonNull(element);
initialLevel = getLevel(element);
currentLevel = initialLevel;
}

public static int getLevel(Element element) {
int level = 0;
for (int i = 0, length = element.classList.getLength(); i < length; i++) {
String klass = element.classList.getAt(i);
level += getLevel(klass);
if (level > 0) {
break;
}
}
return level;
}

public void liftTo(int level) {
Preconditions.checkArgument((level >= 0) && (level <= 24), "level range: 0..24");
if (currentLevel == level) {
return;
}
if (currentLevel > 0) {
element.classList.remove("mdc-elevation--z" + currentLevel);
}
if (level > 0) {
element.classList.add("mdc-elevation--z" + level);
}
currentLevel = level;
}

public void liftToInitialLevel() {
liftTo(initialLevel);
}

private static int getLevel(String klass) {
MatchResult result = ELEVATION_CLASS_REG_EXP.exec(klass);
return result != null
? Integer.parseInt(result.getGroup(1))
: 0;
}

public static OverBuilder whenOver(Element element) {
return new OverBuilder(element);
}

public static class OverBuilder {

private final Element element;

private OverBuilder(Element element) {
this.element = element;
}

public void liftTo(int level) {
MdcElevator elevator = new MdcElevator(element);
element.addEventListener("mouseenter", e -> elevator.liftTo(level));
element.addEventListener("mouseleave", e -> elevator.liftToInitialLevel());
}

}

}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<inherits name="mdc.Mdc" />

<inherits name="com.xemantic.ankh.Ankh" />
<inherits name="com.xemantic.ankh.web.Ankh" />

<inherits name="com.xemantic.githubusers.GitHubUsers" />

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import com.xemantic.githubusers.logic.event.UserSelectedEvent;
import com.xemantic.githubusers.logic.service.UserService;
import com.xemantic.githubusers.logic.view.*;
import com.xemantic.githubusers.web.driver.WebUrlOpener;
import com.xemantic.ankh.web.driver.WebUrlOpener;
import com.xemantic.githubusers.web.error.DefaultErrorAnalyzer;
import com.xemantic.githubusers.web.view.*;
import com.xemantic.githubusers.web.service.WebUserService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@

package com.xemantic.githubusers.web.view;

import com.xemantic.ankh.Elements;
import com.xemantic.ankh.IncrementalDom;
import com.xemantic.ankh.web.Elements;
import com.xemantic.ankh.web.IncrementalDom;
import com.xemantic.githubusers.logic.event.Trigger;
import com.xemantic.githubusers.logic.view.DrawerView;
import elemental2.dom.Element;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

package com.xemantic.githubusers.web.view;

import com.xemantic.ankh.IncrementalDom;
import com.xemantic.ankh.web.IncrementalDom;
import elemental2.dom.DomGlobal;
import elemental2.dom.Element;
import elemental2.dom.HTMLInputElement;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

package com.xemantic.githubusers.web.view;

import com.xemantic.ankh.IncrementalDom;
import com.xemantic.ankh.web.IncrementalDom;
import com.xemantic.githubusers.logic.view.SnackbarView;
import elemental2.dom.Element;
import mdc.snackbar.MDCSnackbar;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,14 @@

package com.xemantic.githubusers.web.view;

import com.xemantic.ankh.Elements;
import com.xemantic.ankh.IncrementalDom;
import com.xemantic.ankh.web.Elements;
import com.xemantic.ankh.web.IncrementalDom;
import com.xemantic.githubusers.logic.event.Trigger;
import com.xemantic.githubusers.logic.view.UserListView;
import com.xemantic.githubusers.logic.view.UserView;
import elemental2.dom.Element;
import elemental2.dom.HTMLButtonElement;
import elemental2.dom.HTMLElement;
import mdc.gridList.MDCGridList;
import rx.Observable;

import javax.inject.Inject;
Expand All @@ -54,8 +53,6 @@ public class WebUserListView implements UserListView, WebView {
public WebUserListView() {
element = IncrementalDom.create(Templates::userList);
Elements elements = new Elements(element);
/* it will center the grid and make it react to window resizing */
MDCGridList.attachTo(elements.get(".mdc-grid-list"));
userTiles = elements.get(".user-tiles");
loadMoreButton = elements.getButton(".load-more-action");
loadMore$ = Elements.observeClicksOf(loadMoreButton);
Expand Down
Loading