Skip to content

Commit

Permalink
Adding changs from last few months mostly look/feel
Browse files Browse the repository at this point in the history
  • Loading branch information
@vkoser
vkoser committed Apr 1, 2010
1 parent 616495c commit 8672a4d
Show file tree
Hide file tree
Showing 20 changed files with 640 additions and 270 deletions.
9 changes: 6 additions & 3 deletions Resources/accounts.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,8 @@ function editAccounts() {
props.setInt('accountMode',0);
Titanium.UI.createWindow({
url:'newaccount.html',
barColor:'#423721',
//barColor:'#423721',
barColor:'#000000',
}).open();
});

Expand All @@ -179,15 +180,17 @@ function editAccounts() {
props.setInt('accountMode',0);
Titanium.UI.createWindow({
url:'newaccount.html',
barColor:'#423721',
//barColor:'#423721',
barColor:'#000000',
}).open();
}
else {
props.setInt('accountMode',1);
props.setString('accName',$(this).children(".label").text());
Titanium.UI.createWindow({
url:'newaccount.html',
barColor:'#423721',
//barColor:'#423721',
barColor:'#000000',
}).open();
}
});
Expand Down
Binary file modified Resources/images/bg_all.png
View file
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/images/bg_loading.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/images/entry-even-bg.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/images/entry-odd-bg.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/images/entry-selected-bg.png
View file
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/iphone/Default.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/iphone/oDefault.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 8 additions & 4 deletions Resources/message.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,8 @@ window.onload = function() {
// User detail view
Titanium.UI.createWindow({
url:'user.html',
barColor:'#423721',
//barColor:'#423721',
barColor:'#000000',
}).open();
return false;
});
Expand Down Expand Up @@ -133,7 +134,8 @@ window.onload = function() {
props.setInt('postMode',0);
Titanium.UI.createWindow({
url:'post.html',
barColor:'#423721',
//barColor:'#423721',
barColor:'#000000',
title:props.getString('username'),
}).open();
});
Expand All @@ -147,7 +149,8 @@ window.onload = function() {
props.setString('sendTo',id);
Titanium.UI.createWindow({
url:'post.html',
barColor:'#423721',
//barColor:'#423721',
barColor:'#000000',
title:props.getString('username'),
}).open();
});
Expand All @@ -160,7 +163,8 @@ window.onload = function() {
props.setInt('postMode',0);
Titanium.UI.createWindow({
url:'post.html',
barColor:'#423721',
//barColor:'#423721',
barColor:'#000000',
title:props.getString('username'),
}).open();
});
Expand Down
68 changes: 50 additions & 18 deletions Resources/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,29 +44,56 @@ img.centeredimg {
}

.status {
height:88px;
width:320px;
//height:88px;
height:99px;
width:320px;
background-repeat:repeat-x;
}

.odd {
background-color: #FFFFEE;
border-top-color: #000000;
background-image: url('images/entry-odd-bg.png');
background-repeat: repeat-x;
border:1px solid #000;
}
.even {
background-color: #EEEEFF;
border-top-color: #000000;
background-image: url('images/entry-even-bg.png');
background-repeat: repeat-x;
border:1px solid #000;
}
/*
.even {
background-image:url('images/bg_dark_sliver.png');
}
.odd {
background-image:url('images/bg_light_sliver.png');
}

*/
.self {
background-image:url('images/bg_red_sliver.png');
}
background-color: #00FFFF;
border-top-color: #000000;
background-image: url('images/entry-selected-bg.png');
background-repeat: repeat-x;
border:1px solid #000;

}
.reply{
background-color: #EEEEAA;
background-image: none;
}
.usrimg {
margin-top:19px;
margin-left:10px;
height:48px;
width:48px;
border:1px solid #fff;
border:3px double #999999;
background-color:#FFFFFF;
//border:1px solid #000;
float:left;
overflow:hidden;
}
Expand All @@ -77,7 +104,7 @@ img.centeredimg {
height:20px;
width:130px;
float:left;
color:#ffd200;
color:#2F2F64;
font-size:16px;
font-weight:bold;
overflow:hidden;
Expand All @@ -89,7 +116,7 @@ img.centeredimg {
height:14px;
width:50px;
float:right;
color:#d9bc86;
color:#FF9966;
font-size:13px;
font-style:italic;
text-align:right;
Expand All @@ -100,7 +127,7 @@ img.centeredimg {
height:48px;
width:235px;
float:left;
color:#fff;
color:#000;
font-size:13px;
overflow:hidden;
text-overflow:ellipsis;
Expand All @@ -111,7 +138,7 @@ img.centeredimg {
height:48px;
width:235px;
float:left;
color:#fff;
color:#000;
font-size:13px;
overflow:hidden;
text-overflow:ellipsis;
Expand All @@ -122,7 +149,7 @@ img.centeredimg {
height:64px;
width:235px;
float:left;
color:#fff;
color:#000;
font-size:13px;
overflow:hidden;
text-overflow:ellipsis;
Expand All @@ -133,8 +160,9 @@ img.centeredimg {
margin-left:27px;
height:14px;
width:235px;
color:#d9bc86;
float:left;
//color:#d9bc86;
color: #666666;
float:left;
font-size:12px;
font-style:italic;
overflow:hidden;
Expand Down Expand Up @@ -170,7 +198,7 @@ heavy {
height:48px;
width:110px;
float:left;
color:#fff;
color:#000;
font-size:13px;
font-weight:bold;
}
Expand All @@ -196,11 +224,12 @@ hilite {
}

lnk {
color:#ffd200;
color:#666666;

}

usr {
color:#ffd200;
color:#333399;
}


Expand Down Expand Up @@ -371,8 +400,11 @@ ctext {
left:0;
height:118px;
width:320px;
background-image:url('images/BG_dark_large.png');
background-repeat:repeat-x;
//background-image:url('images/BG_dark_large.png');
//background-repeat:repeat-x;
background-image: url('images/entry-odd-bg.png');
background-repeat: repeat-x;

}

.smallbutton_container {
Expand Down
25 changes: 18 additions & 7 deletions Resources/timeline-all.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,14 @@ function getTimelineAll() {
"' timestamp='" +
tweet.created_at +
"' class='status ";

//
//Titanium.API.debug(tweet.text + ' ' + props.getString('username'));
//var Pos = tweet.text.indexOf(props.getString('username'));
//Titanium.API.debug('position is ' + Pos);

if (props.getBool('loggedIn') == true && props.getString('username') == tweet.user.screen_name) {text += "self";}
else if (props.getBool('loggedIn') == true && tweet.text.indexOf(props.getString('username')) > 0) {text += "reply";}
else if ((timelineCount-thisCount) % 2 == 0) {text += "even";}
else if ((timelineCount-thisCount) % 2 == 1) {text += "odd";}
text += "'><img src='" +
Expand Down Expand Up @@ -98,7 +105,8 @@ function getTimelineAll() {
//User detail view
Titanium.UI.createWindow({
url:'user.html',
barColor:'#423721',
//barColor:'#423721',
barColor:'#000000',
}).open();
});
//Message detail
Expand All @@ -108,7 +116,8 @@ function getTimelineAll() {
//Message detail view
Titanium.UI.createWindow({
url:'message.html',
barColor:'#423721',
//barColor:'#423721',
barColor:'#000000',
}).open();
});
//Links
Expand All @@ -125,7 +134,8 @@ function getTimelineAll() {
//User detail view
Titanium.UI.createWindow({
url:'user.html',
barColor:'#423721',
//barColor:'#423721',
barColor:'#000000',
}).open();
return false;
});
Expand Down Expand Up @@ -154,11 +164,12 @@ window.onload = function() {
Titanium.UI.currentWindow.setRightNavButton(refreshbutton);

//Shake refresh event
Titanium.Gesture.addEventListener('shake',function(){
getTimelineAll();
});
// Titanium.Gesture.addEventListener('shake',function(){
// getTimelineAll();
// });

setInterval("getTimelineAll()",60000);
// hrm, don't autorefresh this is a mobile app
//setInterval("getTimelineAll()",60000);

Titanium.UI.currentWindow.addEventListener('focused',function(){
if (props.getBool('accountChangeAll') == true) {
Expand Down
15 changes: 10 additions & 5 deletions Resources/timeline.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ window.onload = function() {
// Stack accounts screen on top of timeline window
Titanium.UI.createWindow({
url:'accounts.html',
barColor:'#423721',
//barColor:'#423721',
barColor:'#000000',
}).open({animated:false});

// Stack splash screen on top of accounts window (initial window)
Expand All @@ -101,7 +102,8 @@ window.onload = function() {
// Stack accounts screen on top of timeline window
Titanium.UI.createWindow({
url:'accounts.html',
barColor:'#423721',
//barColor:'#423721',
barColor:'#000000',
}).open({animated:false});
}
else if (initialState == 2) {
Expand All @@ -124,7 +126,8 @@ window.onload = function() {
accountbutton.addEventListener('click', function(e) {
Titanium.UI.createWindow({
url:'accounts.html',
barColor:'#423721',
//barColor:'#423721',
barColor:'#000000',
}).open();
});
Titanium.UI.currentWindow.setLeftNavButton(accountbutton);
Expand All @@ -134,7 +137,8 @@ window.onload = function() {
var tabbar = Titanium.UI.createTabbedBar({
index:props.getInt('inboxMode'),
labels:['All','Replies','DM\'s'],
backgroundColor:'#423721'
//backgroundColor:'#423721'
backgroundColor:'#000000'
});
tabbar.addEventListener('click',function(e){
props.setInt('inboxMode',e.index);
Expand All @@ -152,7 +156,8 @@ window.onload = function() {
props.setString('postMode',0);
Titanium.UI.createWindow({
url:'post.html',
barColor:'#423721',
//barColor:'#423721',
barColor:'#000000',
title:props.getString('username'),
}).open();
});
Expand Down
14 changes: 9 additions & 5 deletions Resources/user.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,8 @@ window.onload = function() {
props.setInt('postMode',0);
Titanium.UI.createWindow({
url:'post.html',
barColor:'#423721',
//barColor:'#423721',
barColor:'#000000',
title:name,
}).open();
});
Expand All @@ -195,7 +196,8 @@ window.onload = function() {
props.setString('sendTo',id);
Titanium.UI.createWindow({
url:'post.html',
barColor:'#423721',
//barColor:'#423721',
barColor:'#000000',
title:props.getString('username'),
}).open();
});
Expand All @@ -208,7 +210,8 @@ window.onload = function() {
props.setInt('resultsMode',1);
Titanium.UI.createWindow({
url:'results.html',
barColor:'#423721',
//barColor:'#423721',
barColor:'#000000',
}).open();
});

Expand All @@ -219,8 +222,9 @@ window.onload = function() {
props.setInt('resultsMode',0);
Titanium.UI.createWindow({
url:'results.html',
barColor:'#423721',
}).open();
//barColor:'#423721',
barColor:'#000000',
}).open();
});

};
Loading

0 comments on commit 8672a4d

Please sign in to comment.