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.

Sign up for GitHub

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
morisil wants to merge 4 commits into
base:master
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bbecb91
guava, junit and mockito dependencies added to the project
morisil Aug 14, 2017
388774a
ankh library update with Image preloaded and MdcElevator
morisil Nov 28, 2017
6990715
code adjusted for new package structure of ankh library
morisil Nov 28, 2017
101d864
new layout with cards instead of tiles
morisil Nov 28, 2017
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
View file
Open in desktop
Original file line numberDiff line numberDiff 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 DownExpand 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
2 changes: 2 additions & 0 deletions .../main/java/com/xemantic/ankh/Ankh.gwt.xml → ...n/java/com/xemantic/ankh/web/Ankh.gwt.xml
View file
Open in desktop
Original file line numberDiff line numberDiff 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>
2 changes: 1 addition & 1 deletion ...main/java/com/xemantic/ankh/Elements.java → .../java/com/xemantic/ankh/web/Elements.java
View file
Open in desktop
Original file line numberDiff line numberDiff 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
55 changes: 55 additions & 0 deletions github-users-web-client/src/main/java/com/xemantic/ankh/web/Images.java
View file
Open in desktop
Original file line numberDiff line numberDiff 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;
};
});
}

}
6 changes: 3 additions & 3 deletions ...ava/com/xemantic/ankh/IncrementalDom.java → ...com/xemantic/ankh/web/IncrementalDom.java
View file
Open in desktop
Original file line numberDiff line numberDiff 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
2 changes: 1 addition & 1 deletion .../githubusers/web/driver/WebUrlOpener.java → ...emantic/ankh/web/driver/WebUrlOpener.java
View file
Open in desktop
Original file line numberDiff line numberDiff 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
110 changes: 110 additions & 0 deletions github-users-web-client/src/main/java/com/xemantic/ankh/web/mdc/MdcElevator.java
View file
Open in desktop
Original file line numberDiff line numberDiff 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());
}

}

}
2 changes: 1 addition & 1 deletion github-users-web-client/src/main/java/com/xemantic/githubusers/GitHubUsersWeb.gwt.xml
View file
Open in desktop
Original file line numberDiff line numberDiff 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
2 changes: 1 addition & 1 deletion github-users-web-client/src/main/java/com/xemantic/githubusers/web/GitHubUsersModule.java
View file
Open in desktop
Original file line numberDiff line numberDiff 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
4 changes: 2 additions & 2 deletions github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebDrawerView.java
View file
Open in desktop
Original file line numberDiff line numberDiff 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
2 changes: 1 addition & 1 deletion github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebScreen.java
View file
Open in desktop
Original file line numberDiff line numberDiff 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
2 changes: 1 addition & 1 deletion github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebSnackbarView.java
View file
Open in desktop
Original file line numberDiff line numberDiff 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
7 changes: 2 additions & 5 deletions github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebUserListView.java
View file
Open in desktop
Original file line numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

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.

 Sign up for GitHub

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

morisil
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Cards instead of grid + some updates to the ankh library
#10
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
bbecb91

guava, junit and mockito dependencies added to the project


morisil Aug 14, 2017
388774a

ankh library update with Image preloaded and MdcElevator


morisil Nov 28, 2017
6990715

code adjusted for new package structure of ankh library


morisil Nov 28, 2017
101d864

new layout with cards instead of tiles


morisil Nov 28, 2017

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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

2 changes: 2 additions & 0 deletions
.../main/java/com/xemantic/ankh/Ankh.gwt.xml → ...n/java/com/xemantic/ankh/web/Ankh.gwt.xml

View file


Open in desktop

Original file line numberDiff line numberDiff 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>

2 changes: 1 addition & 1 deletion
...main/java/com/xemantic/ankh/Elements.java → .../java/com/xemantic/ankh/web/Elements.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

55 changes: 55 additions & 0 deletions
github-users-web-client/src/main/java/com/xemantic/ankh/web/Images.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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;
 };
 });
 }

}

6 changes: 3 additions & 3 deletions
...ava/com/xemantic/ankh/IncrementalDom.java → ...com/xemantic/ankh/web/IncrementalDom.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
.../githubusers/web/driver/WebUrlOpener.java → ...emantic/ankh/web/driver/WebUrlOpener.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

110 changes: 110 additions & 0 deletions
github-users-web-client/src/main/java/com/xemantic/ankh/web/mdc/MdcElevator.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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());
 }

 }

}

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/GitHubUsersWeb.gwt.xml

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/web/GitHubUsersModule.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

4 changes: 2 additions & 2 deletions
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebDrawerView.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebScreen.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebSnackbarView.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

7 changes: 2 additions & 5 deletions
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebUserListView.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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.

 Sign up for GitHub

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

morisil
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Cards instead of grid + some updates to the ankh library
#10
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
bbecb91

guava, junit and mockito dependencies added to the project


morisil Aug 14, 2017
388774a

ankh library update with Image preloaded and MdcElevator


morisil Nov 28, 2017
6990715

code adjusted for new package structure of ankh library


morisil Nov 28, 2017
101d864

new layout with cards instead of tiles


morisil Nov 28, 2017

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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

2 changes: 2 additions & 0 deletions
.../main/java/com/xemantic/ankh/Ankh.gwt.xml → ...n/java/com/xemantic/ankh/web/Ankh.gwt.xml

View file


Open in desktop

Original file line numberDiff line numberDiff 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>

2 changes: 1 addition & 1 deletion
...main/java/com/xemantic/ankh/Elements.java → .../java/com/xemantic/ankh/web/Elements.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

55 changes: 55 additions & 0 deletions
github-users-web-client/src/main/java/com/xemantic/ankh/web/Images.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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;
 };
 });
 }

}

6 changes: 3 additions & 3 deletions
...ava/com/xemantic/ankh/IncrementalDom.java → ...com/xemantic/ankh/web/IncrementalDom.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
.../githubusers/web/driver/WebUrlOpener.java → ...emantic/ankh/web/driver/WebUrlOpener.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

110 changes: 110 additions & 0 deletions
github-users-web-client/src/main/java/com/xemantic/ankh/web/mdc/MdcElevator.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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());
 }

 }

}

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/GitHubUsersWeb.gwt.xml

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/web/GitHubUsersModule.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

4 changes: 2 additions & 2 deletions
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebDrawerView.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebScreen.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebSnackbarView.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

7 changes: 2 additions & 5 deletions
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebUserListView.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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.

 Sign up for GitHub

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

morisil
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Cards instead of grid + some updates to the ankh library
#10
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
bbecb91

guava, junit and mockito dependencies added to the project


morisil Aug 14, 2017
388774a

ankh library update with Image preloaded and MdcElevator


morisil Nov 28, 2017
6990715

code adjusted for new package structure of ankh library


morisil Nov 28, 2017
101d864

new layout with cards instead of tiles


morisil Nov 28, 2017

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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

2 changes: 2 additions & 0 deletions
.../main/java/com/xemantic/ankh/Ankh.gwt.xml → ...n/java/com/xemantic/ankh/web/Ankh.gwt.xml

View file


Open in desktop

Original file line numberDiff line numberDiff 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>

2 changes: 1 addition & 1 deletion
...main/java/com/xemantic/ankh/Elements.java → .../java/com/xemantic/ankh/web/Elements.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

55 changes: 55 additions & 0 deletions
github-users-web-client/src/main/java/com/xemantic/ankh/web/Images.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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;
 };
 });
 }

}

6 changes: 3 additions & 3 deletions
...ava/com/xemantic/ankh/IncrementalDom.java → ...com/xemantic/ankh/web/IncrementalDom.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
.../githubusers/web/driver/WebUrlOpener.java → ...emantic/ankh/web/driver/WebUrlOpener.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

110 changes: 110 additions & 0 deletions
github-users-web-client/src/main/java/com/xemantic/ankh/web/mdc/MdcElevator.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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());
 }

 }

}

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/GitHubUsersWeb.gwt.xml

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/web/GitHubUsersModule.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

4 changes: 2 additions & 2 deletions
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebDrawerView.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebScreen.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebSnackbarView.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

7 changes: 2 additions & 5 deletions
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebUserListView.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

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.

 Sign up for GitHub

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

morisil
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Cards instead of grid + some updates to the ankh library
#10
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
bbecb91

guava, junit and mockito dependencies added to the project


morisil Aug 14, 2017
388774a

ankh library update with Image preloaded and MdcElevator


morisil Nov 28, 2017
6990715

code adjusted for new package structure of ankh library


morisil Nov 28, 2017
101d864

new layout with cards instead of tiles


morisil Nov 28, 2017

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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

2 changes: 2 additions & 0 deletions
.../main/java/com/xemantic/ankh/Ankh.gwt.xml → ...n/java/com/xemantic/ankh/web/Ankh.gwt.xml

View file


Open in desktop

Original file line numberDiff line numberDiff 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>

2 changes: 1 addition & 1 deletion
...main/java/com/xemantic/ankh/Elements.java → .../java/com/xemantic/ankh/web/Elements.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

55 changes: 55 additions & 0 deletions
github-users-web-client/src/main/java/com/xemantic/ankh/web/Images.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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;
 };
 });
 }

}

6 changes: 3 additions & 3 deletions
...ava/com/xemantic/ankh/IncrementalDom.java → ...com/xemantic/ankh/web/IncrementalDom.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
.../githubusers/web/driver/WebUrlOpener.java → ...emantic/ankh/web/driver/WebUrlOpener.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

110 changes: 110 additions & 0 deletions
github-users-web-client/src/main/java/com/xemantic/ankh/web/mdc/MdcElevator.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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());
 }

 }

}

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/GitHubUsersWeb.gwt.xml

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/web/GitHubUsersModule.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

4 changes: 2 additions & 2 deletions
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebDrawerView.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebScreen.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebSnackbarView.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

7 changes: 2 additions & 5 deletions
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebUserListView.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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.

 Sign up for GitHub

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

morisil
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Cards instead of grid + some updates to the ankh library
#10
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
bbecb91

guava, junit and mockito dependencies added to the project


morisil Aug 14, 2017
388774a

ankh library update with Image preloaded and MdcElevator


morisil Nov 28, 2017
6990715

code adjusted for new package structure of ankh library


morisil Nov 28, 2017
101d864

new layout with cards instead of tiles


morisil Nov 28, 2017

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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

2 changes: 2 additions & 0 deletions
.../main/java/com/xemantic/ankh/Ankh.gwt.xml → ...n/java/com/xemantic/ankh/web/Ankh.gwt.xml

View file


Open in desktop

Original file line numberDiff line numberDiff 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>

2 changes: 1 addition & 1 deletion
...main/java/com/xemantic/ankh/Elements.java → .../java/com/xemantic/ankh/web/Elements.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

55 changes: 55 additions & 0 deletions
github-users-web-client/src/main/java/com/xemantic/ankh/web/Images.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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;
 };
 });
 }

}

6 changes: 3 additions & 3 deletions
...ava/com/xemantic/ankh/IncrementalDom.java → ...com/xemantic/ankh/web/IncrementalDom.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
.../githubusers/web/driver/WebUrlOpener.java → ...emantic/ankh/web/driver/WebUrlOpener.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

110 changes: 110 additions & 0 deletions
github-users-web-client/src/main/java/com/xemantic/ankh/web/mdc/MdcElevator.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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());
 }

 }

}

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/GitHubUsersWeb.gwt.xml

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/web/GitHubUsersModule.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

4 changes: 2 additions & 2 deletions
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebDrawerView.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebScreen.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebSnackbarView.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

7 changes: 2 additions & 5 deletions
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebUserListView.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

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.

 Sign up for GitHub

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

morisil
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Cards instead of grid + some updates to the ankh library
#10
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
bbecb91

guava, junit and mockito dependencies added to the project


morisil Aug 14, 2017
388774a

ankh library update with Image preloaded and MdcElevator


morisil Nov 28, 2017
6990715

code adjusted for new package structure of ankh library


morisil Nov 28, 2017
101d864

new layout with cards instead of tiles


morisil Nov 28, 2017

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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

2 changes: 2 additions & 0 deletions
.../main/java/com/xemantic/ankh/Ankh.gwt.xml → ...n/java/com/xemantic/ankh/web/Ankh.gwt.xml

View file


Open in desktop

Original file line numberDiff line numberDiff 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>

2 changes: 1 addition & 1 deletion
...main/java/com/xemantic/ankh/Elements.java → .../java/com/xemantic/ankh/web/Elements.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

55 changes: 55 additions & 0 deletions
github-users-web-client/src/main/java/com/xemantic/ankh/web/Images.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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;
 };
 });
 }

}

6 changes: 3 additions & 3 deletions
...ava/com/xemantic/ankh/IncrementalDom.java → ...com/xemantic/ankh/web/IncrementalDom.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
.../githubusers/web/driver/WebUrlOpener.java → ...emantic/ankh/web/driver/WebUrlOpener.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

110 changes: 110 additions & 0 deletions
github-users-web-client/src/main/java/com/xemantic/ankh/web/mdc/MdcElevator.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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());
 }

 }

}

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/GitHubUsersWeb.gwt.xml

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/web/GitHubUsersModule.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

4 changes: 2 additions & 2 deletions
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebDrawerView.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebScreen.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebSnackbarView.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

7 changes: 2 additions & 5 deletions
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebUserListView.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

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.

 Sign up for GitHub

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

morisil
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Cards instead of grid + some updates to the ankh library
#10
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
bbecb91

guava, junit and mockito dependencies added to the project


morisil Aug 14, 2017
388774a

ankh library update with Image preloaded and MdcElevator


morisil Nov 28, 2017
6990715

code adjusted for new package structure of ankh library


morisil Nov 28, 2017
101d864

new layout with cards instead of tiles


morisil Nov 28, 2017

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

View file


Open in desktop

Original file line numberDiff line numberDiff 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 DownExpand 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

2 changes: 2 additions & 0 deletions
.../main/java/com/xemantic/ankh/Ankh.gwt.xml → ...n/java/com/xemantic/ankh/web/Ankh.gwt.xml

View file


Open in desktop

Original file line numberDiff line numberDiff 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>

2 changes: 1 addition & 1 deletion
...main/java/com/xemantic/ankh/Elements.java → .../java/com/xemantic/ankh/web/Elements.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

55 changes: 55 additions & 0 deletions
github-users-web-client/src/main/java/com/xemantic/ankh/web/Images.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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;
 };
 });
 }

}

6 changes: 3 additions & 3 deletions
...ava/com/xemantic/ankh/IncrementalDom.java → ...com/xemantic/ankh/web/IncrementalDom.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
.../githubusers/web/driver/WebUrlOpener.java → ...emantic/ankh/web/driver/WebUrlOpener.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

110 changes: 110 additions & 0 deletions
github-users-web-client/src/main/java/com/xemantic/ankh/web/mdc/MdcElevator.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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());
 }

 }

}

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/GitHubUsersWeb.gwt.xml

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/web/GitHubUsersModule.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

4 changes: 2 additions & 2 deletions
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebDrawerView.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebScreen.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

2 changes: 1 addition & 1 deletion
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebSnackbarView.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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

7 changes: 2 additions & 5 deletions
github-users-web-client/src/main/java/com/xemantic/githubusers/web/view/WebUserListView.java

View file


Open in desktop

Original file line numberDiff line numberDiff 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