Skip to content
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

Add a link in the info page to rate the application in the AppStore/Google Play store #138

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+176 −3
Open

Add a link in the info page to rate the application in the AppStore/Google Play store #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3bae44
review button
itayB Jan 10, 2013
9ff934f
Add a link in the info page
itayB Jan 10, 2013
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
2 changes: 2 additions & 0 deletions src/android/www/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
<script src="javascripts/controllers/ProtocolSectionController.js" type="text/javascript"></script>
<script src="javascripts/controllers/VoteDetailsController.js" type="text/javascript"></script>
<script src="javascripts/controllers/InfoController.js" type="text/javascript"></script>
<script src="javascripts/controllers/MarketReviewController.js" type="text/javascript"></script>
<script src="javascripts/controllers/DisclaimerController.js" type="text/javascript"></script>
<script src="javascripts/controllers/CreditsController.js" type="text/javascript"></script>
<script src="javascripts/controllers/navigation.js" type="text/javascript"></script>
Expand Down Expand Up @@ -104,6 +105,7 @@
<script type="text/javascript" src="javascripts/views/ProtocolSectionView.js"></script>
<script type="text/javascript" src="javascripts/views/VoteDetailsView.js"></script>
<script type="text/javascript" src="javascripts/views/InfoView.js"></script>
<script type="text/javascript" src="javascripts/views/MarketReviewView.js"></script>
<script type="text/javascript" src="javascripts/views/DisclaimerView.js"></script>
<script type="text/javascript" src="javascripts/views/CreditsView.js"></script>
<script type="text/javascript" src="javascripts/views/AgendaListView.js"></script>
Expand Down
2 changes: 2 additions & 0 deletions src/ios/www/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
<script src="javascripts/controllers/ProtocolSectionController.js" type="text/javascript"></script>
<script src="javascripts/controllers/VoteDetailsController.js" type="text/javascript"></script>
<script src="javascripts/controllers/InfoController.js" type="text/javascript"></script>
<script src="javascripts/controllers/MarketReviewController.js" type="text/javascript"></script>
<script src="javascripts/controllers/DisclaimerController.js" type="text/javascript"></script>
<script src="javascripts/controllers/CreditsController.js" type="text/javascript"></script>
<script src="javascripts/controllers/navigation.js" type="text/javascript"></script>
Expand Down Expand Up @@ -96,6 +97,7 @@
<script type="text/javascript" src="javascripts/views/ProtocolSectionView.js"></script>
<script type="text/javascript" src="javascripts/views/VoteDetailsView.js"></script>
<script type="text/javascript" src="javascripts/views/InfoView.js"></script>
<script type="text/javascript" src="javascripts/views/MarketReviewView.js"></script>
<script type="text/javascript" src="javascripts/views/DisclaimerView.js"></script>
<script type="text/javascript" src="javascripts/views/CreditsView.js"></script>
<script type="text/javascript" src="javascripts/views/AgendaListView.js"></script>
Expand Down
2 changes: 2 additions & 0 deletions src/web/www/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
<script src="javascripts/controllers/ProtocolSectionController.js" type="text/javascript"></script>
<script src="javascripts/controllers/VoteDetailsController.js" type="text/javascript"></script>
<script src="javascripts/controllers/InfoController.js" type="text/javascript"></script>
<script src="javascripts/controllers/MarketReviewController.js" type="text/javascript"></script>
<script src="javascripts/controllers/DisclaimerController.js" type="text/javascript"></script>
<script src="javascripts/controllers/CreditsController.js" type="text/javascript"></script>
<script src="javascripts/controllers/navigation.js" type="text/javascript"></script>
Expand Down Expand Up @@ -91,6 +92,7 @@
<script type="text/javascript" src="javascripts/views/ProtocolSectionView.js"></script>
<script type="text/javascript" src="javascripts/views/VoteDetailsView.js"></script>
<script type="text/javascript" src="javascripts/views/InfoView.js"></script>
<script type="text/javascript" src="javascripts/views/MarketReviewView.js"></script>
<script type="text/javascript" src="javascripts/views/DisclaimerView.js"></script>
<script type="text/javascript" src="javascripts/views/CreditsView.js"></script>
<script type="text/javascript" src="javascripts/views/AgendaListView.js"></script>
Expand Down
25 changes: 24 additions & 1 deletion src/web/www/javascripts/controllers/InfoController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ Ext.regController('Info', {
this.sendEmail(this.emailSubject);
}, this);

this.view.dockedItems.getAt(1).items.getByKey('marketReview').setHandler(function(){
this.openMarket();
}, this);

this.view.dockedItems.getAt(1).items.getByKey('displayDisclaimerBtn').setHandler(function(){
OKnesset.app.controllers.navigation.dispatchBack();
OKnesset.app.controllers.navigation.dispatchDialog('Disclaimer/Index');
Expand Down Expand Up @@ -71,5 +75,24 @@ Ext.regController('Info', {
}
}
// TODO - for web, implement a "send email" link
}
},

openMarket : function() {
OKnesset.log("Open market for review");
if (isPhoneGap()) {
// TODO: add GATrackEvent
if (isiOS()) {
// TODO: open app store
} else if (isAndroid()) {
window.plugins.webintent.startActivity({
action : WebIntent.ACTION_VIEW,
url: 'market://details?id=org.oknesset',
}, function() {
// success callback
}, function() {
OKnesset.log("Failed to open market for review");
});
}
}
}
});
60 changes: 60 additions & 0 deletions src/web/www/javascripts/controllers/MarketReviewController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
Ext.regController('MarketReview', {

// index action
Index: function(options)
{
if ( ! this.view)
{
this.view = this.render({
xtype: 'MarketReviewView',
});

this.view.dockedItems.getAt(1).items.getByKey('letsGoBtn').setHandler(function(){
OKnesset.app.controllers.navigation.dispatchBack();
this.openMarket();
}, this);

this.view.dockedItems.getAt(1).items.getByKey('notNowBtn').setHandler(function(){
OKnesset.app.controllers.navigation.dispatchBack();
}, this);

this.view.dockedItems.getAt(1).items.getByKey('dontShowAgainBtn').setHandler(function(){
localStorage.setItem("marketReviewCounter", -1);
OKnesset.app.controllers.navigation.dispatchBack();
});
}

var infoTitle = OKnesset.strings.infoDialog.MarketReviewView.title;
var infoText = OKnesset.strings.infoDialog.MarketReviewView.text;

// don't track if the panal was reached by pressing 'back'
if (options.pushed){
// TODO: support GATrackPage for MarketReview
//GATrackPage('InfoView', this.emailSubject);
}

this.view.dockedItems.getAt(0).setTitle(infoTitle);
this.view.items.getByKey('pageDescription').update({text:infoText});
this.view.show(options.animation);

},

openMarket : function() {
OKnesset.log("Open market for review");
if (isPhoneGap()) {
// TODO: add GATrackEvent
if (isiOS()) {
// TODO: open app store
} else if (isAndroid()) {
window.plugins.webintent.startActivity({
action : WebIntent.ACTION_VIEW,
url: 'market://details?id=org.oknesset',
}, function() {
// success callback
}, function() {
OKnesset.log("Failed to open market for review");
});
}
}
}
});
12 changes: 12 additions & 0 deletions src/web/www/javascripts/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,17 @@ function secondaryLaunch() {
OKnesset.app.controllers.navigation.dispatchDialog('Disclaimer/Index');
}

var marketReviewCounter = parseInt(localStorage.getItem("marketReviewCounter"));

if (marketReviewCounter != -1) // -1 stand for don't show it again
{
if (marketReviewCounter == 1) // show on second use
OKnesset.app.controllers.navigation.dispatchDialog('MarketReview/Index');

marketReviewCounter = (marketReviewCounter + 1) % 5;
localStorage.setItem("marketReviewCounter", marketReviewCounter);
}

googleAnalytics();

if (isAndroid()) {
Expand Down Expand Up @@ -181,6 +192,7 @@ function appUpdate(){
localStorage.removeItem('PartyData');
localStorage.removeItem('PartyDataDate');
localStorage.setItem("disclaimerDismissed", false);
localStorage.setItem("marketReviewCounter", 0);
} else {
// new installation
}
Expand Down
10 changes: 9 additions & 1 deletion src/web/www/javascripts/models/strings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ OKnesset.strings = {
ministerIndicator : "שר",
knessetChairman : "יושב ראש הכנסת",
emailButtonLabel : "שלחו לנו משוב",
marketReviewButtonLabel : "דרגו אותנו",
emailBody : "\n\n\nנשלח מאפליקציית כנסת פתוחה",
feedbackEmailAddress : 'oknesset.mobile@gmail.com',
errorAndroidEmail : 'כשלון בשליחת מייל',
Expand Down Expand Up @@ -112,6 +113,9 @@ OKnesset.strings = {
GotoPartyManifest : "למצע המפלגה",
GotoPartyPanel : "למסך המפלגה בכנסת פתוחה",
ManifestNA : "מצע אינו זמין ברשת",
letsGoButtonLabel : "דרג עכשיו!",
notNowButtonLabel : "פעם אחרת",
dontShowAgainButtonLabel : "אל תציג שוב",
infoDialog: {
Default: {
title:"אופס...",
Expand Down Expand Up @@ -201,6 +205,10 @@ OKnesset.strings = {
CandidatePartyView: {
title: "רשימה מועמדת לכנסת",
text: "המסך מציג את האות המייצגת, ורשימת המועמדים, מסודרים לפי מיקומם וכפי שאושרו על ידי ועדת הבחירות המרכזית. עבור רשימות שיש להן אתר בית ומצע יש קישור.<br/>ייתכן וחלק מהקישורים אינם נכונים - נשמח אם תעירו לנו על ידי שליחת משוב בכפתור למטה."
},
},
MarketReviewView: {
title: "דרגו אותנו",
text: "נשמח אם תקדישו לנו מספר רגעים ותדרגו אותנו בחנות האפליקציות."
},
}
};
3 changes: 2 additions & 1 deletion src/web/www/javascripts/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ GApageMapping = {
InfoView : "/app/info/",
DisclaimerView : "/app/disclaimer/",
CreditsView : "/app/disclaimer/credits",
ElectionView : "/app/elections/"
ElectionView : "/app/elections/",
MarketReviewView : "/app/marketview/"
};

function GATrackPage(page, extra) {
Expand Down
7 changes: 7 additions & 0 deletions src/web/www/javascripts/views/InfoView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@ OKnesset.app.views.InfoView = new Ext.extend(Ext.Panel, {
margin : "0 10 10 10",
text: OKnesset.strings.emailButtonLabel,
},
{
xtype: 'button',
id: 'marketReview',
width : "90%",
margin : "0 10 10 10",
text: OKnesset.strings.marketReviewButtonLabel,
},
{
xtype : 'button',
id : 'cancelInfoBtn',
Expand Down
56 changes: 56 additions & 0 deletions src/web/www/javascripts/views/MarketReviewView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
OKnesset.app.views.MarketReviewView = new Ext.extend(Ext.Panel, {
id : 'MarketReviewView',
layout : 'vbox',
width : '90%',
height : '60%',
floating : true,
centered : true,
items : [{
scroll : 'vertical',
id : 'pageDescription',
tpl : '{text}',
height : "100%",
margin : "10 10 0 10",
}],
dockedItems : [{
dock : 'top',
xtype : 'toolbar',
}, {
dock : 'bottom',
ui : 'light',
items : [{
xtype : 'button',
id : 'letsGoBtn',
width : "90%",
margin : "0 10 10 10",
text : OKnesset.strings.letsGoButtonLabel
}, {
xtype : 'button',
id : 'notNowBtn',
width : "90%",
margin : "0 10 10 10",
text : OKnesset.strings.notNowButtonLabel,
}, {
xtype : 'button',
id : 'dontShowAgainBtn',
width : "90%",
margin : "0 10 10 10",
text : OKnesset.strings.dontShowAgainButtonLabel,
}]
}],
listeners : {
// layout the pageDescription height, because it varies
afterlayout : {
fn : function(that, layout) {
var textHeight = that.getHeight();
for (var i = 0; i < that.dockedItems.items.length; i++) {
textHeight -= that.dockedItems.items[i].getHeight();
};
that.items.getAt(0).setHeight(textHeight - 10);
}
}

}
});

Ext.reg('MarketReviewView', OKnesset.app.views.MarketReviewView);