Skip to content

Commit

Permalink
Android release v0.10.85
Browse files Browse the repository at this point in the history
  • Loading branch information
@laurent22
laurent22 committed Feb 5, 2018
1 parent 8ad8b73 commit bc26098
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 9 deletions.
9 changes: 8 additions & 1 deletion ElectronClient/app/ElectronAppWrapper.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const { shim } = require('lib/shim');
const url = require('url')
const path = require('path')
const urlUtils = require('lib/urlUtils.js');
const { dirname } = require('lib/path-utils');

class ElectronAppWrapper {

Expand Down Expand Up @@ -114,9 +115,15 @@ class ElectronAppWrapper {
return !!this.tray_;
}

buildDir() {
let dir = __dirname;
if (dir.indexOf('.asar') >= 0) dir = dirname(dir);
return dir + '/build';
}

// Note: this must be called only after the "ready" event of the app has been dispatched
createTray(contextMenu) {
this.tray_ = new Tray(__dirname + '/build/icons/16x16.png')
this.tray_ = new Tray(this.buildDir() + '/icons/16x16.png')
this.tray_.setToolTip(this.electronApp_.getName())
this.tray_.setContextMenu(contextMenu)

Expand Down
1 change: 1 addition & 0 deletions ElectronClient/app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
},
"build": {
"appId": "net.cozic.joplin-desktop",
"extraResources": ["build/icons/*"],
"win": {
"icon": "../../Assets/Joplin.ico"
},
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Linux | <a href='https://github.com/laurent22/joplin/releases/download/

Operating System | Download | Alt. Download
-----------------|----------|----------------
Android | <a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeAndroid.png'/></a> | or [Download APK File](https://github.com/laurent22/joplin/releases/download/android-v0.10.83/joplin-v0.10.83.apk)
Android | <a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeAndroid.png'/></a> | or [Download APK File](https://github.com/laurent22/joplin/releases/download/android-v0.10.85/joplin-v0.10.85.apk)
iOS | <a href='https://itunes.apple.com/us/app/joplin/id1315599797'><img alt='Get it on the App Store' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeIOS.png'/></a> | -

## Terminal application
Expand Down
4 changes: 2 additions & 2 deletions ReactNativeClient/android/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ android {
applicationId "net.cozic.joplin"
minSdkVersion 16
targetSdkVersion 22
versionCode 2097261
versionName "0.10.83"
versionCode 2097263
versionName "0.10.85"
ndk {
abiFilters "armeabi-v7a", "x86"
}
Expand Down
10 changes: 5 additions & 5 deletions docs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ <h2 id="mobile-applications">Mobile applications</h2>
<tr>
<td>Android</td>
<td><a href='https://play.google.com/store/apps/details?id=net.cozic.joplin&utm_source=GitHub&utm_campaign=README&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img alt='Get it on Google Play' height="40px" src='https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/BadgeAndroid.png'/></a></td>
<td>or <a href="https://github.com/laurent22/joplin/releases/download/android-v0.10.83/joplin-v0.10.83.apk">Download APK File</a></td>
<td>or <a href="https://github.com/laurent22/joplin/releases/download/android-v0.10.85/joplin-v0.10.85.apk">Download APK File</a></td>
</tr>
<tr>
<td>iOS</td>
Expand Down Expand Up @@ -355,14 +355,14 @@ <h1 id="localisation">Localisation</h1>
<td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/hr.png" alt=""></td>
<td>Croatian</td>
<td>hr_HR</td>
<td>Hrvoje Mandić <a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#111;&#58;&#116;&#x72;&#x62;&#117;&#x68;&#111;&#x6d;&#64;&#x6e;&#x65;&#x74;&#46;&#104;&#x72;">&#116;&#x72;&#x62;&#117;&#x68;&#111;&#x6d;&#64;&#x6e;&#x65;&#x74;&#46;&#104;&#x72;</a></td>
<td>Hrvoje Mandić <a href="&#109;&#97;&#x69;&#108;&#116;&#111;&#58;&#x74;&#x72;&#x62;&#117;&#x68;&#111;&#109;&#x40;&#110;&#101;&#116;&#46;&#104;&#114;">&#x74;&#x72;&#x62;&#117;&#x68;&#111;&#109;&#x40;&#110;&#101;&#116;&#46;&#104;&#114;</a></td>
<td>72%</td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/de.png" alt=""></td>
<td>Deutsch</td>
<td>de_DE</td>
<td>Tobias Strobel <a href="&#109;&#x61;&#x69;&#108;&#x74;&#x6f;&#x3a;&#x67;&#x69;&#x74;&#x40;&#115;&#116;&#114;&#x6f;&#98;&#101;&#108;&#x74;&#111;&#x62;&#105;&#x61;&#x73;&#46;&#x64;&#101;">&#x67;&#x69;&#x74;&#x40;&#115;&#116;&#114;&#x6f;&#98;&#101;&#108;&#x74;&#111;&#x62;&#105;&#x61;&#x73;&#46;&#x64;&#101;</a></td>
<td>Tobias Strobel <a href="&#109;&#x61;&#105;&#108;&#116;&#x6f;&#x3a;&#x67;&#x69;&#x74;&#x40;&#115;&#x74;&#114;&#x6f;&#98;&#x65;&#108;&#116;&#111;&#98;&#x69;&#x61;&#115;&#x2e;&#100;&#x65;">&#x67;&#x69;&#x74;&#x40;&#115;&#x74;&#114;&#x6f;&#98;&#x65;&#108;&#116;&#111;&#98;&#x69;&#x61;&#115;&#x2e;&#100;&#x65;</a></td>
<td>92%</td>
</tr>
<tr>
Expand Down Expand Up @@ -418,14 +418,14 @@ <h1 id="localisation">Localisation</h1>
<td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/ru.png" alt=""></td>
<td>Русский</td>
<td>ru_RU</td>
<td>Artyom Karlov <a href="&#109;&#97;&#105;&#108;&#116;&#111;&#58;&#x61;&#114;&#x74;&#121;&#111;&#x6d;&#46;&#x6b;&#97;&#x72;&#x6c;&#x6f;&#118;&#x40;&#x67;&#x6d;&#x61;&#105;&#x6c;&#46;&#99;&#111;&#109;">&#x61;&#114;&#x74;&#121;&#111;&#x6d;&#46;&#x6b;&#97;&#x72;&#x6c;&#x6f;&#118;&#x40;&#x67;&#x6d;&#x61;&#105;&#x6c;&#46;&#99;&#111;&#109;</a></td>
<td>Artyom Karlov <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#111;&#x3a;&#97;&#114;&#116;&#x79;&#x6f;&#x6d;&#x2e;&#x6b;&#x61;&#x72;&#x6c;&#111;&#118;&#x40;&#x67;&#109;&#x61;&#105;&#108;&#x2e;&#99;&#x6f;&#x6d;">&#97;&#114;&#116;&#x79;&#x6f;&#x6d;&#x2e;&#x6b;&#x61;&#x72;&#x6c;&#111;&#118;&#x40;&#x67;&#109;&#x61;&#105;&#108;&#x2e;&#99;&#x6f;&#x6d;</a></td>
<td>96%</td>
</tr>
<tr>
<td><img src="https://raw.githubusercontent.com/stevenrskelton/flag-icon/master/png/16/country-4x3/cn.png" alt=""></td>
<td>中文 (简体)</td>
<td>zh_CN</td>
<td>RCJacH <a href="&#109;&#97;&#105;&#108;&#116;&#x6f;&#x3a;&#x52;&#x43;&#x4a;&#97;&#99;&#72;&#64;&#111;&#117;&#116;&#108;&#x6f;&#x6f;&#107;&#46;&#x63;&#x6f;&#x6d;">&#x52;&#x43;&#x4a;&#97;&#99;&#72;&#64;&#111;&#117;&#116;&#108;&#x6f;&#x6f;&#107;&#46;&#x63;&#x6f;&#x6d;</a></td>
<td>RCJacH <a href="&#109;&#x61;&#x69;&#x6c;&#116;&#x6f;&#x3a;&#x52;&#67;&#x4a;&#97;&#x63;&#x48;&#64;&#111;&#117;&#116;&#108;&#x6f;&#x6f;&#x6b;&#46;&#x63;&#x6f;&#109;">&#x52;&#67;&#x4a;&#97;&#x63;&#x48;&#64;&#111;&#117;&#116;&#108;&#x6f;&#x6f;&#x6b;&#46;&#x63;&#x6f;&#109;</a></td>
<td>76%</td>
</tr>
<tr>
Expand Down

0 comments on commit bc26098

Please sign in to comment.