Skip to content
This repository has been archived by the owner on Nov 2, 2019. It is now read-only.

Commit

Permalink
UI changes, splash update
Browse files Browse the repository at this point in the history
  • Loading branch information
feruzm committed Mar 14, 2018
1 parent 57a33b2 commit c926f97
Show file tree
Hide file tree
Showing 30 changed files with 59 additions and 15 deletions.
13 changes: 13 additions & 0 deletions config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,19 @@
<preference name="KeyboardDisplayRequiresUserAction" value="false" />
<platform name="ios">
<preference name="StatusBarOverlaysWebView" value="true" />
<splash height="1136" src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" />
<splash height="1334" src="resources/ios/splash/Default-667h.png" width="750" />
<splash height="2208" src="resources/ios/splash/Default-736h.png" width="1242" />
<splash height="1242" src="resources/ios/splash/Default-Landscape-736h.png" width="2208" />
<splash height="1536" src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" />
<splash height="2048" src="resources/ios/splash/Default-Landscape@~ipadpro.png" width="2732" />
<splash height="768" src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" />
<splash height="2048" src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" />
<splash height="2732" src="resources/ios/splash/Default-Portrait@~ipadpro.png" width="2048" />
<splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768" />
<splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640" />
<splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
<splash height="2732" src="resources/ios/splash/Default@2x~universal~anyany.png" width="2732" />
</platform>
<platform name="android">
<icon density="ldpi" src="resources/android/icon/drawable-ldpi-icon.png" />
Expand Down
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.
Binary file modified resources/ios/splash/Default-568h@2x~iphone.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/ios/splash/Default-667h.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/ios/splash/Default-736h.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/ios/splash/Default-Landscape-736h.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/ios/splash/Default-Landscape@2x~ipad.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/ios/splash/Default-Landscape@~ipadpro.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/ios/splash/Default-Landscape~ipad.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/ios/splash/Default-Portrait@2x~ipad.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/ios/splash/Default-Portrait@~ipadpro.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/ios/splash/Default-Portrait~ipad.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/ios/splash/Default@2x~iphone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified resources/ios/splash/Default~iphone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/posts/controllers.js
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ app.controller('AppCtrl', function($scope, $ionicModal, $timeout, $rootScope, $s
angular.merge($rootScope.$storage.user, dd);
$rootScope.user = $rootScope.$storage.user;

$scope.mcss = ($rootScope.user.json_metadata && $rootScope.user.json_metadata.profile && $rootScope.user.json_metadata.profile.cover_image) ? {'background': 'url('+$rootScope.user.json_metadata.profile.cover_image+')', 'background-size': 'cover', 'background-position':'fixed', 'color': 'white', 'box-shadow':'inset 0 0 0 2000px rgba(255,0,150,0.3)'} : {'background-color': 'rgba(31,83,152,1)', 'color': 'white'};
$scope.mcss = ($rootScope.user.json_metadata && $rootScope.user.json_metadata.profile && $rootScope.user.json_metadata.profile.cover_image) ? {'background': 'url('+$rootScope.user.json_metadata.profile.cover_image+')', 'background-size': 'cover', 'background-position':'fixed', 'color': 'white', 'box-shadow':'inset 0 0 0 2000px rgba(33,34,35,0.7)'} : {'background-color': 'rgba(31,83,152,1)', 'color': 'white'};

$scope.$applyAsync();

Expand Down Expand Up @@ -4268,7 +4268,7 @@ app.controller('ProfileCtrl', function($scope, $stateParams, $rootScope, $ionicA
//console.log($scope.user.json_metadata.profile.cover_image);

if ($rootScope.user) {
$scope.css = ($rootScope.user.username === $scope.user.username && $rootScope.user.json_metadata.profile.cover_image) ? {'background': 'url('+$rootScope.user.json_metadata.profile.cover_image+')', 'background-size': 'cover', 'background-position':'fixed', 'box-shadow':'inset 0 0 0 2000px rgba(255,0,150,0.3)' } : ($rootScope.user.username !== $scope.user.username && ($scope.user.json_metadata && $scope.user.json_metadata.profile && $scope.user.json_metadata.profile.cover_image)) ? {'background': 'url('+$scope.user.json_metadata.profile.cover_image+')', 'background-size': 'cover', 'background-position':'fixed', 'box-shadow':'inset 0 0 0 2000px rgba(0,0,0,0.5)'} : null;
$scope.css = ($rootScope.user.username === $scope.user.username && $rootScope.user.json_metadata.profile.cover_image) ? {'background': 'url('+$rootScope.user.json_metadata.profile.cover_image+')', 'background-size': 'cover', 'background-position':'fixed', 'box-shadow':'inset 0 0 0 2000px rgba(33,34,35,0.7)' } : ($rootScope.user.username !== $scope.user.username && ($scope.user.json_metadata && $scope.user.json_metadata.profile && $scope.user.json_metadata.profile.cover_image)) ? {'background': 'url('+$scope.user.json_metadata.profile.cover_image+')', 'background-size': 'cover', 'background-position':'fixed', 'box-shadow':'inset 0 0 0 2000px rgba(0,0,0,0.5)'} : null;
} else {
$scope.css = null;
}
Expand Down
21 changes: 13 additions & 8 deletions src/posts/templates/posts.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<ion-nav-title on-tap="showFilter()">
<div class="page-title">{{$root.$storage.filterName}} {{$root.$storage.tag}} &emsp; <i class="icon ion-arrow-down-b"></i></div>
</ion-nav-title>
<ion-nav-buttons side="right">
<ion-nav-buttons side="right" class="headerIcon">
<button class="button button-icon ion-ios-bell" ng-if="$root.user&&!$root.voiceOver" on-tap="showStats($root.user.username)"></button>
<button class="button button-icon ion-ios-search-strong" ng-if="!$root.voiceOver" on-tap="openSmodal()"></button>
</ion-nav-buttons>
Expand Down Expand Up @@ -58,16 +58,21 @@
</div>
<!--track by ds.id | limitTo : 10 : data.length-10-->
<div ng-if="$root.$storage.view=='card' && data.length>0" class="masonry-layout">
<div ng-repeat="ds in data | regex:'category':'bm.*' track by ds.id " class="masonry-layout__panel">
<div ng-repeat="ds in data track by ds.id " class="masonry-layout__panel">
<div class="list card masonry-layout__panel-content" ng-if="ds" ng-class="{'theme-dark':$root.$storage.theme == 'night'}">

<div class="item" on-tap="open(ds)" ng-class="{'theme-dark':$root.$storage.theme == 'night'}">
<span ng-if="ds.reblogged_by.length>0"><i class="icon ion-arrow-return-right"></i> {{::translations.resteem}} {{::ds.reblogged_by}}</span>
<h2 class=""><i class="fa fa-money positive" ng-if="ds.promoted.split(' ')[0] !== '0.000'"></i> <i class="fa fa-fire positive" ng-if="ds.percent_steem_dollars === 0"></i> {{::ds.title}}</h2>
<div class="row postdetails"><div class="col"><i class="icon ion-ios-time-outline"></i> {{ds.created|timeago}}&nbsp;{{::translations.by}}&nbsp;<b>{{::ds.author}}</b>&nbsp;<div class="reputation">{{::ds.author_reputation|reputation|number:0}}</div><p><i class="icon ion-ios-book-outline"></i> {{ds.body|readingtime}} {{translations.min}} <i class="icon ion-ios-grid-view-outline"></i> {{::ds.category|detransliterate:false}}</p></div></div>
<div class="item item-avatar" ng-class="{'theme-dark':$root.$storage.theme == 'night'}">
<img class="round-avatar-title" ng-src="https://steemitimages.com/u/{{ds.author}}/avatar/small" onerror="this.src=\'img/user_profile.png\'" onabort="this.src=\'img/user_profile.png\'" />
<div class="row postdetails">
<div class="col"><b><a href="#/app/profile/{{ds.author}}">{{ds.author}}</b></a>&nbsp;<div class="reputation">{{::ds.author_reputation|reputation|number:0}}</div>&nbsp;&middot;&nbsp;{{ds.created|timeago}}&nbsp;<p>{{ds.body|readingtime}} {{translations.min}}&nbsp;&middot;&nbsp;<a href on-tap="openTag(ds.category, 5)"><i class="icon ion-ios-grid-view-outline"></i> {{::ds.category|detransliterate:false}}</a></p></div></div>
<span ng-if="ds.reblogged_by.length>0">
<i class="icon ion-arrow-return-right"></i> {{::translations.resteem}} {{::ds.reblogged_by}}
</span>
</div>
<div class="item-body ibody"><!--ds.json_metadata.image[0]-->
<center><img class="full-image" check-image ng-src="{{ds|catchimage}}" on-tap="open(ds)" ng-if="ds.json_metadata.indexOf('nsfw')==-1" />
<h2 class="postTitle" on-tap="open(ds)">
<i class="fa fa-money positive" ng-if="ds.promoted.split(' ')[0] !== '0.000'"></i> <i class="fa fa-fire positive" ng-if="ds.percent_steem_dollars === 0"></i> {{::ds.title}}</h2>
<div class="item-body ibody" on-tap="open(ds)"><!--ds.json_metadata.image[0]-->
<center><img class="full-image" check-image ng-src="{{ds|catchimage}}" ng-if="ds.json_metadata.indexOf('nsfw')==-1" />
<img class="full-image" ng-src="img/nsfwimage.png" on-tap="open(ds)" ng-if="$root.$storage.nsfw && ds.json_metadata.indexOf('nsfw')>-1" /></center>
<div class="row">
<div class="col">
Expand Down
28 changes: 27 additions & 1 deletion www/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,14 @@ img.round-avatar {
-webkit-box-shadow: 0 0 8px rgba(0, 0, 0, .8);
-moz-box-shadow: 0 0 8px rgba(0, 0, 0, .8);
}

img.round-avatar-title {
width: 40px;
height: 40px;
border-radius: 50%;
margin: 0px 10px 0px 0px;
-webkit-border-radius: 50%;
-moz-border-radius: 50%;
}
.col img {
float: left;
}
Expand Down Expand Up @@ -1781,6 +1788,25 @@ img {
-webkit-box-shadow: 0 0 8px rgba(255, 255, 255, .3);
-moz-box-shadow: 0 0 8px rgba(255, 255, 255, .3);
}

.postTitle {
padding-left: 10px;
font-size: 12pt;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}

.bar .button.button-icon:before {
font-size: 20px;
}
.bar .button.button-icon .icon:before {
font-size: 20px;
}
.bar .button.back-button .icon:before {
font-size: 20px;
}

/*
.platform-ios ion-nav > .ion-page > .toolbar.statusbar-padding:first-child,
.platform-ios ion-nav > .ion-page > ion-header > .toolbar.statusbar-padding:first-child,
Expand Down
Loading

0 comments on commit c926f97

Please sign in to comment.