Skip to content

Commit

Permalink
- update icons and logo - fix #48
Browse files Browse the repository at this point in the history
- Home: Add "my account" button, when user is log in
- Home: change "report issue" layout
- Add favicon - fix #25
- prepare release 0.1.19
  • Loading branch information
blavenie committed Jun 22, 2016
1 parent aa84e8d commit 76a8888
Show file tree
Hide file tree
Showing 34 changed files with 245 additions and 27 deletions.
10 changes: 4 additions & 6 deletions config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
xmlns="http://www.w3.org/ns/widgets"
xmlns:cdv="http://cordova.apache.org/ns/1.0"
id="fr.duniter.cesium"
version="0.1.18"
android-versionCode="6"
version="0.1.19"
android-versionCode="7"
>
<name>Cesium</name>
<description>
Expand All @@ -15,16 +15,13 @@
</author>
<content src="index.html" />
<access origin="*" />
<!-- icon requirement for Ubuntu click packages -->
<icon src="www/img/logo.png" />
<preference name="webviewbounce" value="false" />
<preference name="UIWebViewBounce" value="false" />
<preference name="DisallowOverscroll" value="true" />
<preference name="android-minSdkVersion" value="16" />
<preference name="BackupWebStorage" value="none" />
<preference name="SplashScreen" value="screen" />
<preference name="SplashScreenDelay" value="3000" />
<preference name="CrosswalkAnimatable" value="true" />
<preference name="SplashScreenDelay" value="4000" />
<allow-navigation href="*" />
<feature name="StatusBar">
<param name="ios-package" onload="true" value="CDVStatusBar" />
Expand All @@ -50,6 +47,7 @@
<splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" />
</platform>
<platform name="ios">
<preference name="BackupWebStorage" value="local" />
<icon height="57" src="resources/ios/icon/icon.png" width="57" />
<icon height="114" src="resources/ios/icon/icon@2x.png" width="114" />
<icon height="40" src="resources/ios/icon/icon-40.png" width="40" />
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cesium",
"version": "0.1.18",
"version": "0.1.19",
"description": "A webapp client for Duniter network",
"dependencies": {
"delete-empty": "^0.1.3",
Expand Down
Binary file modified resources/android/icon/drawable-hdpi-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/icon/drawable-ldpi-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/icon/drawable-mdpi-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/icon/drawable-xhdpi-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/icon/drawable-xxhdpi-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/icon/drawable-xxxhdpi-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed resources/android/icon/lesou-120px.png
Binary file not shown.
Binary file modified resources/android/splash/drawable-land-hdpi-screen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/splash/drawable-land-ldpi-screen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/splash/drawable-land-mdpi-screen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/splash/drawable-land-xhdpi-screen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/splash/drawable-land-xxhdpi-screen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/splash/drawable-land-xxxhdpi-screen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/splash/drawable-port-hdpi-screen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/splash/drawable-port-ldpi-screen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/splash/drawable-port-mdpi-screen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/splash/drawable-port-xhdpi-screen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/splash/drawable-port-xxhdpi-screen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/android/splash/drawable-port-xxxhdpi-screen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions www/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,18 @@
}
*/

#menu img.logo {
margin-top: 3px;
margin-left: 42px;
height: 37px;
}

#home img.logo {
margin-top: 15px;
height: 200px;
width: 200px;
}

#home h1 {
padding-top: 15px;
text-align: center;
Expand Down
1 change: 1 addition & 0 deletions www/i18n/locale-en.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"BTN_MARKET": "Market place",
"BTN_CURRENCIES": "Explore currencies",
"BTN_CURRENCY": "Explore currency",
"BTN_ACCOUNT": "My Account",
"DEV_WARNING": "Warning",
"DEV_WARNING_MESSAGE": "This application is still in active development.<br/>Please report us all issues !",
"DEV_WARNING_MESSAGE_SHORT": "This App is still unstable (still under development).",
Expand Down
1 change: 1 addition & 0 deletions www/i18n/locale-fr-FR.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"BTN_MARKET": "Offres/demandes",
"BTN_CURRENCIES": "Explorer les monnaies",
"BTN_CURRENCY": "Explorer la monnaie",
"BTN_ACCOUNT": "Mon compte",
"DEV_WARNING": "Avertissement",
"DEV_WARNING_MESSAGE": "Cette application n'est pas encore stabilisée (développement en cours).<br/>N'hésitez pas à nous remonter les anomalies rencontrées !",
"DEV_WARNING_MESSAGE_SHORT": "Cette App n'est pas encore stabilisée (développement en cours).",
Expand Down
59 changes: 59 additions & 0 deletions www/img/logo-cs.large.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
57 changes: 57 additions & 0 deletions www/img/logo-cs.small.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
57 changes: 57 additions & 0 deletions www/img/logo.large.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified www/img/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions www/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
<title>Cesium</title>

<link rel="icon" href="img/favicon.ico">

<!-- build:css dist_css/cesium.css -->
<link href="css/ionic.app.css" rel="stylesheet">
<link href="css/style.css" rel="stylesheet">
Expand Down
4 changes: 3 additions & 1 deletion www/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,9 @@ angular.module('cesium', ['ionic', 'ionic-material', 'ngMessages', 'ngAnimate',

.config(function($ionicConfigProvider) {
'ngInject';
$ionicConfigProvider.scrolling.jsScrolling(false);
// JS scrolling need for iOs (see http://blog.ionic.io/native-scrolling-in-ionic-a-tale-in-rhyme/)
var enableJsScrolling = ionic.Platform.isIOS();
$ionicConfigProvider.scrolling.jsScrolling(enableJsScrolling);
$ionicConfigProvider.views.maxCache(5);
})

Expand Down
4 changes: 2 additions & 2 deletions www/js/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ angular.module("cesium.config", [])
"NEW_ISSUE_LINK": "https://github.com/duniter/cesium/issues/new?labels=bug",
"TIMEOUT": 4000,
"DEBUG": false,
"VERSION": "0.1.18",
"BUILD_DATE": "2016-06-14T07:08:40.077Z"
"VERSION": "0.1.19",
"BUILD_DATE": "2016-06-22T13:02:21.415Z"
})

;
45 changes: 34 additions & 11 deletions www/templates/home/home.html
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
<ion-view id="home">
<ion-nav-title>
<!--span class="visible-xs visible-sm" translate>HOME.TITLE</span>-->

</ion-nav-title>

<ion-content class="has-header center padding-xs positive-900-bg">

<h2 class="hidden-xs" translate>HOME.WELCOME</h2>
<img class="logo" src="img/logo.large.svg"/>
<h4 class="hidden-xs" translate>HOME.MESSAGE</h4>
<h4 class="visible-xs" translate>HOME.MESSAGE_SHORT</h4>

<div class="row no-padding">
<div class="col-25 hidden-xs hidden-sm">&nbsp;</div>
<div class="col">
<div class="col col-25 hidden-xs hidden-sm">&nbsp;</div>

<div class="col">
<!-- CURRENCY -->
<button type="button"
class="button button-block button-stable button-raised icon icon-left ion-ios-world-outline ink-dark"
Expand All @@ -33,12 +34,32 @@ <h4 class="visible-xs" translate>HOME.MESSAGE_SHORT</h4>
<button type="button"
class="button button-block button-light ink button-clear"
ng-click="newAccount()" ng-show="!isLogged()" translate>COMMON.BTN_ADD_ACCOUNT</button>
<button type="button"
class="button button-block button-positive button-raised icon icon-left ion-card ink-dark"
ui-sref="app.view_wallet" ng-show="isLogged()" translate>HOME.BTN_ACCOUNT</button>

</div>

<div class="col col-25 hidden-xs hidden-sm">&nbsp;</div>
</div>

<!-- spacer -->
<span class="hidden-xs">
<br/>
<br/>
</span>
<span class="hidden-xs hidden-sm">
<br/>
</span>

<!-- warning still dev -->
<div class="row no-padding">

<!-- warning still dev -->
<br class="hidden-xs"/>
<br class="hidden-xs"/>
<br class="hidden-xs hidden-sm"/>
<div class="card stable-bg no-padding no-margin hidden-xs">
<div class="col col-25 hidden-xs hidden-sm">&nbsp;</div>
<div class="col col-10 hidden-xs">&nbsp;</div>

<div class="col">
<div class="card stable-bg no-padding no-margin hidden-xs hidden-sm">
<div class="item item-divider">
<i class="icon ion-alert-circled assertive"></i>
{{'HOME.DEV_WARNING'|translate}}
Expand All @@ -52,13 +73,13 @@ <h4 class="visible-xs" translate>HOME.MESSAGE_SHORT</h4>
</div>
</div>

<div class="card stable-bg no-padding no-margin visible-xs">
<div class="card stable-bg no-padding no-margin visible-xs visible-sm">
<p class="item item-text-wrap">
<span class="gray">
<i class="icon ion-alert-circled assertive"></i>
<b>{{'HOME.DEV_WARNING'|translate}}</b>
</span><br/>
<span translate>HOME.DEV_WARNING_MESSAGE_SHORT</span>
<span translate>HOME.DEV_WARNING_MESSAGE_SHORT</span>
<span>
<a href="{{config.NEW_ISSUE_LINK}}"
target="_blank"
Expand All @@ -67,7 +88,9 @@ <h4 class="visible-xs" translate>HOME.MESSAGE_SHORT</h4>
</p>
</div>
</div>
<div class="col-25 hidden-xs hidden-sm">&nbsp;</div>

<div class="col col-10 hidden-xs">&nbsp;</div>
<div class="col col-25 hidden-xs hidden-sm">&nbsp;</div>
</div>

<!-- fork me on github -->
Expand Down
14 changes: 10 additions & 4 deletions www/templates/menu.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@
expose-aside-when="large"
enable-menu-with-back-views="false"
width="225">
<ion-header-bar class="bar">
<h1 class="title" translate>
<ion-header-bar class="bar bar-header">
<img class="logo" src="img/logo-cs.small.svg"/>
<h1 class="title royal" translate>
MENU.TITLE
</h1>
</ion-header-bar>
Expand Down Expand Up @@ -81,14 +82,18 @@ <h1 class="title" translate>
<!-- scan QR code -->
<ion-item menu-close class="item item-button-right" ng-if="isDeviceEnable()">
<span translate>Scan</span>
<button class="button button-energized-900" ng-click="scanQrCodeAndGo()">
<button class="button button-stable" ng-click="scanQrCodeAndGo()">
<i class="icon ion-qr-scanner"></i>
</button>
</ion-item>
<span class="hidden-xs hidden-sm">
<br/>
<br/>
</span>
<!-- log out -->
<ion-item menu-close class="item item-button-right" ng-if="isLogged()">
<span translate>COMMON.BTN_LOGOUT</span>
<button class="button button-energized-900" ng-click="logout()">
<button class="button button-stable" ng-click="logout()">
<i class="icon ion-log-out"></i>
</button>
</ion-item>
Expand All @@ -101,6 +106,7 @@ <h1 class="title">
<span translate="COMMON.APP_VERSION" translate-values="{version: config.VERSION}"></span>
<span class="buildDate" translate="COMMON.APP_BUILD_DATE" translate-values="{buildDate: config.BUILD_DATE}"></span>
</h1>

</ion-footer-bar>
</ion-side-menu>

Expand Down
4 changes: 2 additions & 2 deletions www/templates/wallet/view_wallet.html
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ <h2>
<i class="icon ion-key"></i>
{{::tx.pubkey | formatPubkey}}
</span>
<span class="energized" ng-if="tx.isUD">
<span class="dark" ng-if="tx.isUD">
<i class="icon ion-arrow-up-c"></i>
{{'COMMON.UNIVERSAL_DIVIDEND' | translate}}
</span>
Expand All @@ -143,7 +143,7 @@ <h3 class="dark">
</span>
</h3>
<div class="badge item-note"
ng-class="{'badge-balanced': tx.amount > 0 && !tx.isUD, 'badge-energized': tx.isUD}">
ng-class="{'badge-balanced': tx.amount > 0}">
<span ng-if="!walletData.settings.useRelative">{{tx.amount | formatInteger}}</span>
<span ng-if="walletData.settings.useRelative">{{tx.amount/walletData.currentUD | formatDecimal}}</span>
</div >
Expand Down

0 comments on commit 76a8888

Please sign in to comment.