Skip to content
Open

Yota2 #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
240 commits
Select commit Hold shift + click to select a range
5f095f0
Merge pull request #1 from geometer/yota2
karabaralex May 27, 2014
e89d549
fix canvas default density dpi
Jun 4, 2014
93f013b
gesture
Jun 5, 2014
a4cfc5b
start service from bs
Jun 11, 2014
3a28bb8
Merge pull request #2 from geometer/yota2
karabaralex Jun 20, 2014
54aeda7
fix comment
Jun 20, 2014
b967b6a
Merge branch 'yota2' of https://github.com/karabaralex/FBReaderJ into…
Jun 20, 2014
202dc0c
gradle support
Jun 23, 2014
3ff5197
run bs service without front UI
Jun 24, 2014
8ecf22e
Added gradle build support
Jul 7, 2014
a482e49
Fixed lint warnings not to use onMeasure instead of measuer
Jul 7, 2014
556356c
added Android Studio project files, renamed application into Yota Reader
Jul 7, 2014
17e2405
upgraded google anroid gradle plugin to 0.12 version
ybereza Jul 7, 2014
0717c84
fixed yotaphone sdk
ybereza Jul 7, 2014
a1e348b
moved from package yotadevices to yotadevices.yotaphone2
ybereza Jul 7, 2014
286734b
added actions for BS
ybereza Jul 7, 2014
f8c31b4
added action to toggle action/status bar on backscreen
Jul 8, 2014
f734a88
Added gauge progress view into statusbar popup
Jul 9, 2014
ee86376
added font settings popup but not finished yet
Jul 10, 2014
1607343
finished fonts settings layout, finished navigation status bar
ybereza Jul 10, 2014
3d978a3
fixed layout, added author and title in action bar
ybereza Jul 11, 2014
6497cd2
finished fonts popup
Jul 11, 2014
6cebf3c
Added bookmarks action
Jul 11, 2014
40bba81
moved action stack into service
Jul 15, 2014
d1a19dc
fixed native build
Jul 15, 2014
c8df98b
fixed jniLibs path in gradle build
Jul 16, 2014
c742f41
Fixed a bug. Action and Status bars didn't appears on the main screen…
Jul 16, 2014
cbf9a93
Temporary disabled long press on backscreen
Jul 17, 2014
a6ea885
Fixed crash when calling application from widget
Jul 17, 2014
8c6e57f
Fixed crash in FBReader on back to frontscreen
Jul 17, 2014
c370648
updated sdk, disable hiding navigation bar
Jul 17, 2014
dd96096
updated sdk. fullupdate on showing fonts. dithering enabled by default
Jul 18, 2014
a5c2331
fixed bug - action and status bar not appers when running application…
Jul 18, 2014
2e6b18c
fixed run from widget
Jul 18, 2014
c99012c
fixed crash when opening BS application from widget and frontscreen a…
Jul 22, 2014
0e5a297
added function for detecting position inside page
Aug 5, 2014
9585ec4
Merge remote-tracking branch 'upstream/yota2' into yota2
Aug 5, 2014
c689992
Launch Yota books collection from FBReader
Aug 6, 2014
f4414cb
fixed crash when user switches from backscreen to frontscreen
Aug 7, 2014
0f22637
Filechooser inside FBReader
Aug 11, 2014
6b77eea
fixed duplicate services in AndroidManifest.xml
Aug 12, 2014
38b30c0
fixed build. added filechooser
Aug 12, 2014
a5b4915
reverted default library
Aug 12, 2014
16c19e9
version up. working on book info activity
Aug 12, 2014
3e37af8
book info and add_to_collection layout done
ybereza Aug 12, 2014
cc5f84a
updated yotaphone sdk
ybereza Aug 12, 2014
c05d095
finished book info activity. working on deleting from library
Aug 13, 2014
e9f19d2
Launch Yota Reader Collection by default
Aug 14, 2014
9392a27
Perform fullupdate in reader on resume
Aug 14, 2014
fdca674
set theme with white action bar
Aug 15, 2014
2ddf144
Removed P2B action from actionbar, added p2b receiver #TA-464
Aug 19, 2014
4eed346
Fixed crash in FBReader #TA-4901
Aug 20, 2014
5a2a10a
Send widget update action after page turning #TA-292
Aug 21, 2014
1b27ce8
Fixed crash
Aug 21, 2014
5ec236d
Notify widget to update when page scrolled by finger sliding
Aug 22, 2014
23eb7c0
fixed crash in FBReader
Aug 25, 2014
109fc2d
version up!
Aug 25, 2014
6b9508c
Fixed reopening book if one was changed from widget settings
Aug 27, 2014
5b0dba1
starting work on selection popup
Aug 27, 2014
2527977
small changes
Aug 27, 2014
f1ba66e
added flowlayout for popup panel
ybereza Aug 27, 2014
b776925
Working on selection popup
Aug 28, 2014
0452851
updated sdk
Aug 28, 2014
ef25f5b
working on selection popup
Aug 28, 2014
46f1fef
working on selecting popup
Aug 29, 2014
8fc20f9
working on selection popup
ybereza Aug 31, 2014
3f465c5
working on selection popup
ybereza Aug 31, 2014
9abe3f9
Fixed selection popup position
Sep 1, 2014
072844e
continue working on selection popup
Sep 1, 2014
790777c
continue working on selection popup. fixed theme on fs/bs
Sep 2, 2014
99859a1
finished work on selection popup
Sep 3, 2014
6ec2a8d
Merge branch 'text_selection_popup' into yota2
Sep 3, 2014
b12e660
Added translation popup. Not finished yet
Sep 5, 2014
c88c3c9
reformated source with tabs instead of spaces
ybereza Sep 5, 2014
c4f067c
Implemented Translate/Define popup #TA-460 #TA-164
ybereza Sep 7, 2014
65f5511
Added Define into YotaReader #TA-460
Sep 8, 2014
cc426e8
Added error checking in Definition
Sep 8, 2014
9cacac1
Merge remote-tracking branch 'upstream/yota2' into yota2. Custom navi…
Sep 9, 2014
5afd06f
added russian strings
Sep 9, 2014
ea9fb92
fixed ugly selection cursor
Sep 9, 2014
c97ed98
customized actionbar, fixed missing clicks on epd
Sep 10, 2014
c35684f
Fixed book title updating onStart
Sep 10, 2014
1572121
Fixed font type names
Sep 11, 2014
98edbb0
Remove single full update from Yota Reader
Sep 11, 2014
3c9b1fe
Replaced font in navigation panel
Sep 11, 2014
764257f
Settings popup for ther front screen
Sep 11, 2014
285945f
Fixed id in resources
ybereza Sep 11, 2014
8ed8390
updated sdk, disabled dithering, disabled font antialiasing on backsc…
Sep 12, 2014
9ac6e2e
Enabled Settings popup in YotaReader
Sep 15, 2014
c4f24a8
Implemented "Chapter popup" #TA-668
Sep 15, 2014
ae36b6a
small ui fix
Sep 15, 2014
05a9121
Remove settings popup outside popup #TA-901
Sep 16, 2014
3ca4898
Network library available from external apps
Sep 17, 2014
7f753ef
Added book contents popup
Sep 18, 2014
5f52b39
Added TOC popup
Sep 19, 2014
2c353f2
updated project file
ybereza Sep 21, 2014
ebfa5cb
implemented bookmarks on frontscreen #TA-162
Sep 22, 2014
af8ae2c
added popup on backscreen but it's still problems with text highlighting
Sep 23, 2014
be9ddef
updateted iml file in third-party project
Sep 24, 2014
b13fee1
Changing network library to support yota design
Sep 24, 2014
da1f862
Working on network library
Sep 25, 2014
530ccd7
Merged with upstream/yota2
ybereza Sep 27, 2014
88c67a9
Merged with upstream/yota2 and fixed highlighting for yotaphone on epd
ybereza Sep 28, 2014
bc08e36
Merge branch 'networklibrary' into yota2
ybereza Sep 28, 2014
526b2ad
Started working on network bookinfo
ybereza Sep 28, 2014
823bf70
Merge branch 'yota2' of https://github.com/ybereza/FBReaderJ into yota2
ybereza Sep 28, 2014
8363046
Implemented NetworkBookInfo activity
ybereza Sep 29, 2014
c49a39b
Disabled ManageOPDSCatalogs item in NetworkLibrary
ybereza Sep 29, 2014
1e37e94
Save book cover to show on Yota Widget
Sep 29, 2014
de0572e
updated project file
Sep 29, 2014
19897c5
Fixed to open recent boook if book was changed
Sep 30, 2014
f5605b1
updated yota sdk, added share on bs
Sep 30, 2014
8dafdc9
Fixed bug in network library when no action available
Sep 30, 2014
fe8cbed
Fixed cover color in widget on backscreen
ybereza Oct 1, 2014
ec87622
Restored antialiasing in YotaReader, fixed widget update on navigatio…
Oct 2, 2014
2d05f4c
added localized resources
ybereza Oct 3, 2014
5603174
Fixed design and errors reporting in translation/define #TA-847
Oct 3, 2014
2315ccd
Decreased font size in selection panel
Oct 3, 2014
c8b8b3e
Show language tranlated from
Oct 3, 2014
a7457c5
Fixed navigation bar updating on backscreen #TA-1081
Oct 3, 2014
9a34b1d
Added bookmark toggle action on frontscreen. Show book info in yota d…
ybereza Oct 5, 2014
ae2aaaa
Added /sdcard/Download directory in default scan list #TA-882
ybereza Oct 5, 2014
bd65057
fixed work on not yotaphone devices
ybereza Oct 5, 2014
d7ac676
Fixed collection launch
Oct 6, 2014
1385308
Temporary disabled PDF/DJVU plugin in Reader
Oct 6, 2014
9078b4d
Working on settings popup position
Oct 6, 2014
a63eab0
Fixed settings and content popups in Reader #TA-1294 #TA-902
Oct 7, 2014
3bd4411
Fixed crash on backscreen when book has no authors
Oct 7, 2014
bef53f3
Fixed search issue in NetworkLibrary #TA-1314
Oct 7, 2014
9e7d72f
Fixed bugs with action bar
ybereza Oct 8, 2014
eaa31ee
Hide navigation bar
Oct 9, 2014
0006c0a
Added new icon
Oct 13, 2014
e629c61
A hack not to crash on FS
Oct 14, 2014
097f1b0
Removed bookmark action on actionbar, replaced search icon with bookm…
Oct 15, 2014
242b373
Changed font size in selection popup panel on back screen
Oct 15, 2014
c7b7f7e
updated string resources
Oct 15, 2014
e141367
renamed package to YD_YotaReader
Oct 17, 2014
94253cc
move arrow in font popup
Oct 20, 2014
113344a
Updated string resources
Oct 23, 2014
ccb764a
Merged with upstream
Oct 24, 2014
140915f
Fixed bug #TA-1456. Now there must be YotaReader shortcut after reboot
ybereza Oct 26, 2014
272a059
Fixed bug #TA-1379 Hyperlinks on bs works only for footnotes
ybereza Oct 26, 2014
71fbec4
Merge branch 'yota2' into qa
ybereza Oct 26, 2014
8837ea3
Now highlight renamed in Bookmark in popup panel #TA-1587
ybereza Oct 26, 2014
c3f17df
Added full update every 5th page update #TA-1533. Turn pages only by …
ybereza Oct 26, 2014
fbd859c
Reduced flick gesture size to swipe pages #TA-1400
ybereza Oct 26, 2014
719131b
Show reader collection at first start
ybereza Oct 26, 2014
4661e6f
Fixed rotation algorithm #TA-1684
ybereza Oct 26, 2014
5b9db01
Merge branch 'yota2' into qa
ybereza Oct 26, 2014
88b40d8
Decrease fullupdate count for white theme and increase for black theme
Oct 27, 2014
4d97771
Merge branch 'yota2' into qa
Oct 27, 2014
480ecca
Fixed crash in FBReader #TA-1781
Oct 27, 2014
d64c65f
updated yotaphone sdk
Oct 28, 2014
d986b84
updated yotaphone sdk
Oct 28, 2014
b330f87
updated ant build for building on server
Oct 28, 2014
38e4e71
added library dependency into manifest
Oct 28, 2014
060ec36
updated sdk
Oct 28, 2014
ccc3179
added build.properties
Oct 28, 2014
5a8bbe0
Fixed fbreader build with ant
Oct 29, 2014
248d292
Fixed build. Reopen last book when deliting current #TA-1842
Oct 29, 2014
c5c59d2
New strings for FBReaderJ
Nov 12, 2014
353d1c1
Sho panel by default. Fixed bug #TA-1928
ybereza Nov 19, 2014
81edeb9
Merge branch 'yota2' of https://github.com/ybereza/FBReaderJ into yota2
ybereza Nov 19, 2014
0599ef1
added strings
ybereza Nov 19, 2014
3dfb00c
fixed bug #TA-2320
ybereza Nov 19, 2014
f86a53e
New strings for FBReaderJ
Nov 20, 2014
10047cb
Fixed exception in Reader #TA-2154
ybereza Nov 20, 2014
50fbfe5
Merge branch 'yota2' of https://github.com/ybereza/FBReaderJ into yota2
ybereza Nov 20, 2014
a6c0f0f
Fixed native crash
ybereza Nov 20, 2014
b022593
New strings for FBReaderJ
Nov 21, 2014
f6529da
Replaced russian quick guide
ybereza Nov 21, 2014
e9a42e3
Fixed navigation panel layout, and arabic numbers #TA-2115
ybereza Nov 21, 2014
6c73d67
New strings for FBReaderJ
Nov 22, 2014
ec128bd
Fixed volume buttons scrolling if backscreen is locked #TA-2263
ybereza Nov 22, 2014
abd4ced
Merge branch 'yota2' of https://github.com/ybereza/FBReaderJ into yota2
ybereza Nov 22, 2014
e5d7d1d
Updated OPDS catalogs list. Removed all links except LitRes
ybereza Nov 22, 2014
1390dd4
Added xxxhdpi dollar icon for network library
ybereza Nov 23, 2014
bb92521
Updated SDK
ybereza Nov 23, 2014
4b658e5
Added files
ybereza Nov 23, 2014
6de822e
New strings for FBReaderJ
Nov 24, 2014
6ec3a09
Fixed reader collection launch when no book opened
ybereza Nov 24, 2014
c50509e
Merge branch 'yota2' of https://github.com/ybereza/FBReaderJ into yota2
ybereza Nov 24, 2014
3652779
Fixed links navigation on front and back screen
ybereza Nov 24, 2014
6c8d63b
Repalced About FBReader with QuickGuide
ybereza Nov 24, 2014
daf7797
Added new quickguides
ybereza Nov 25, 2014
965b91e
New strings for FBReaderJ
Nov 25, 2014
9f6bcc3
New strings for FBReaderJ
Nov 25, 2014
35e4818
Updated yotaphone sdk, added new method to api
ybereza Nov 25, 2014
e76a934
Merge branch 'yota2' of https://github.com/ybereza/FBReaderJ into yota2
ybereza Nov 25, 2014
f25e1a9
Disabled define button in selection popup panel
ybereza Nov 25, 2014
300c4e3
Changed default icons
ybereza Nov 25, 2014
8c80051
Renamed book library
ybereza Nov 26, 2014
950c019
Reverted SDK
ybereza Nov 26, 2014
281c651
Added new QuickGuides
ybereza Nov 26, 2014
c354e91
Changed first and second pages in YotaReader
ybereza Nov 26, 2014
8e113be
Sing in/sign out in network library
ybereza Nov 26, 2014
bd7f09b
Fixed hiding content popup in reader
ybereza Nov 26, 2014
69fde8e
Fixed popup on backscreen
ybereza Nov 26, 2014
bddc051
Fix in files scaning
ybereza Nov 26, 2014
20546f4
Removed one of intent filters to handle android.action.VIEW with cont…
ybereza Nov 27, 2014
01f4aaf
Added new strings
ybereza Nov 27, 2014
2d9b09e
Modified rules for building reader
ybereza Nov 27, 2014
79155af
fixed build
ybereza Nov 27, 2014
0a7f687
Fixed hardcoded strings on back screen
ybereza Dec 1, 2014
d50265a
Hide Tranlate menu from selection popup in chinese firmware
ybereza Dec 8, 2014
a9d22b2
Merge branch 'qa' into yota2
ybereza Dec 8, 2014
b80fae6
updated icons
Dec 18, 2014
81bba6f
New strings for FBReader
Dec 18, 2014
140762a
Updated sdk
Dec 19, 2014
059b1c4
added missed sdk files
Dec 19, 2014
7c10dcc
Changed QuickGuide title in russian translation
Dec 23, 2014
9a3185d
Updated sdk
Dec 24, 2014
1b8164c
Updated sdk once again
Dec 24, 2014
b9950a5
Fixed default font size if launched from p2b #TA-2626
Jan 12, 2015
5a1772f
Updated userguide for chinese firmware
Jan 15, 2015
1b87d82
Disabled p2b for YotaReader in Mirroring mode
Jan 20, 2015
7236e38
Fixed disabled p2b in mirroring #TA-3022
Jan 21, 2015
c230db3
Moved project to new sdk
Jan 27, 2015
c3e4695
Fixed build
Feb 2, 2015
bec5e26
Restored custom rules
Feb 2, 2015
24f8f45
Removed FBReader string from resources adding OPDS catalog
Feb 17, 2015
2d0b063
Enabled page flip by tap on 1/5 of screen width
Feb 27, 2015
c16242d
Combined network and local library in one screen
Mar 2, 2015
2e79e2f
Removed search item from catalogs list
Mar 3, 2015
c3c84b0
4 vertical tap zones instead of 5
Mar 4, 2015
75955d6
Working on UX for back button in navigation panel
Mar 4, 2015
900e32a
Changed actionbar back button and navigation popup backbutton ux
Mar 4, 2015
da2973c
Merge branch 'bug/TA-2721' into yota2
Mar 5, 2015
0eb9b9b
Hided font face option for epub books
Mar 5, 2015
fbbf31d
Merge branch 'bug/TA-3622' into yota2
Mar 5, 2015
5edb8c2
Trying to fix bug TA-3665
Mar 5, 2015
8495025
A test fix
Mar 6, 2015
2c65c87
Added seekbar on Backscreen to flip multiple pages at once
Mar 11, 2015
bdee82d
Merge branch 'bug/TA-3640' into yota2
Mar 11, 2015
9d00873
Merge branch 'bug/TA-3665' into yota2
Mar 11, 2015
4b32548
New strings for FBReader
Apr 8, 2015
df35d59
es-US fix
Apr 8, 2015
2fd1a48
New strings for FBReader
Jun 3, 2015
7e4899b
New strings for FBReader
Jun 29, 2015
18648b1
New strings for FBReader
Jul 6, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
default.properties
build.properties
local.properties
.gradle
.idea
bin/
build/
gen/
scripts/resources/*.diff
obj/
Expand Down
82 changes: 67 additions & 15 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="org.geometerplus.zlibrary.ui.android"
android:versionCode="2015120"
android:versionName="2.2 beta 1"
package="com.yotadevices.yotaphone2.yotareader"
android:versionCode="16506"
android:versionName="1.0.16506"
android:installLocation="auto"
>
<uses-sdk
android:minSdkVersion="11"
android:targetSdkVersion="14"
android:minSdkVersion="19"
android:maxSdkVersion="19"
android:targetSdkVersion="19"
/>
<supports-screens android:smallScreens="true" android:normalScreens="true" android:largeScreens="true" android:xlargeScreens="true" android:anyDensity="true"/>
<uses-permission android:name="android.permission.INTERNET"/>
Expand All @@ -20,18 +21,20 @@
<uses-permission android:name="fbreader.permission.CONFIG"/>
<uses-permission android:name="fbreader.permission.SYNC"/>
<uses-permission android:name="com.yotadevices.framework.permission.ACCESS_BACKSCREEN"/>
<uses-permission android:name="android.permission.VIBRATE" />
<permission android:name="fbreader.permission.LIBRARY" android:description="@string/permission_library_description" android:label="@string/permission_library_label"/>
<permission android:name="fbreader.permission.CONFIG" android:description="@string/permission_config_description" android:label="@string/permission_config_label"/>
<permission android:name="fbreader.permission.SYNC" android:description="@string/permission_sync_description" android:label="@string/permission_sync_label"/>
<application android:name="org.geometerplus.android.fbreader.FBReaderApplication" android:icon="@drawable/fbreader" android:logo="@drawable/fbreader_bw" android:label="FBReader">
<application android:name="org.geometerplus.android.fbreader.FBReaderApplication" android:icon="@drawable/yota_reader_icon" android:logo="@drawable/fbreader_bw" android:label="Yota Reader">
<uses-library android:name="com.yotadevices.yotaphone2.sdk.v2" android:required="true" />
<activity android:name="org.geometerplus.android.fbreader.error.BookReadingErrorActivity" android:theme="@style/FBReader.Dialog" android:process=":error" android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
<action android:name="android.fbreader.action.ERROR"/>
<category android:name="android.intent.category.DEFAULT"/>
<data android:scheme="BookReadingException"/>
</intent-filter>
</activity>
<activity android:name=".error.BugReportActivity" android:label="FBReader crash" android:theme="@style/FBReader.Activity" android:process=":crash" android:configChanges="orientation|keyboardHidden|screenSize"/>
<activity android:name=".error.BugReportActivity" android:label="Yota Reader crash" android:theme="@style/FBReader.Activity" android:process=":crash" android:configChanges="orientation|keyboardHidden|screenSize"/>
<activity android:name="org.geometerplus.android.fbreader.crash.FixBooksDirectoryActivity" android:theme="@style/FBReader.Dialog" android:process=":crash" android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
<action android:name="android.fbreader.action.CRASH"/>
Expand All @@ -57,10 +60,10 @@
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</service>
<activity android:name="org.geometerplus.android.fbreader.FBReader" android:launchMode="singleTask" android:icon="@drawable/fbreader" android:label="FBReader" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize">
<activity android:name="org.geometerplus.android.fbreader.FBReader" android:enabled="true" android:exported="true" android:launchMode="singleTask" android:icon="@drawable/yota_reader_icon" android:label="Yota Reader" android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
<intent-filter>
<action android:name="android.fbreader.action.VIEW"/>
Expand Down Expand Up @@ -105,12 +108,12 @@
<data android:pathPattern=".*\\.txt"/>
<data android:pathPattern=".*\\.rtf"/>
</intent-filter>
<!--intent-filter>
<!-- <intent-filter>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<data android:scheme="content" android:pathPattern=".*\\.fb2"/>
</intent-filter-->
</intent-filter> -->
<intent-filter>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
Expand All @@ -135,7 +138,38 @@
<action android:name="android.fbreader.action.PLUGIN_CRASH"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
<intent-filter>
<action android:name="android.fbreader.action.SHARE"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>

<!-- <activity-alias
android:launchMode="singleTask" android:icon="@drawable/fbreader" android:label="Yota Reader" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize"
android:name="org.geometerplus.android.fbreader.FBReaderLauncher"
android:targetActivity="org.geometerplus.android.fbreader.FBReader"
android:enabled="false"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity-alias>

<activity-alias
android:name="com.yotadevices.yotaphone2.fbreader.YotaReader"
android:label="Yota Reader"
android:icon="@drawable/yota_reader_icon"
android:logo="@null"
android:targetActivity="org.geometerplus.android.fbreader.FBReader"
android:enabled="true"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity-alias> -->

<activity android:name="org.geometerplus.android.fbreader.CancelActivity" android:theme="@style/FBReader.Dialog" android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
<action android:name="android.fbreader.action.CANCEL_MENU"/>
Expand Down Expand Up @@ -266,7 +300,7 @@
<meta-data android:name="android.app.searchable" android:resource="@xml/searchable"/>
</activity>
<activity android:name="org.geometerplus.android.fbreader.network.auth.WebAuthorisationScreen" android:process=":networkLibrary" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize" android:exported="false"/>
<activity android:name="org.geometerplus.android.fbreader.network.NetworkLibraryPrimaryActivity" android:process=":networkLibrary" android:launchMode="singleTask" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize">
<activity android:name="org.geometerplus.android.fbreader.network.NetworkLibraryPrimaryActivity" android:exported="true" android:process=":networkLibrary" android:launchMode="singleTask" android:theme="@style/FBReader.Activity" android:configChanges="orientation|keyboardHidden|screenSize">
<meta-data android:name="android.app.default_searchable" android:value="org.geometerplus.android.fbreader.network.NetworkSearchActivity"/>
<intent-filter>
<action android:name="android.fbreader.action.OPEN_NETWORK_CATALOG"/>
Expand Down Expand Up @@ -332,10 +366,28 @@
<activity android:name="org.geometerplus.android.util.FolderListDialogActivity" android:configChanges="orientation|screenSize|keyboard|keyboardHidden" android:theme="@style/FBReader.Dialog" android:exported="false"/>
<activity android:name="org.geometerplus.android.util.EditTagsDialogActivity" android:configChanges="orientation|screenSize|keyboard|keyboardHidden" android:theme="@style/FBReader.Dialog" android:exported="false"/>
<activity android:name="org.geometerplus.android.util.EditAuthorsDialogActivity" android:configChanges="orientation|screenSize|keyboard|keyboardHidden" android:theme="@style/FBReader.Dialog" android:exported="false"/>
<service android:name="com.yotadevices.fbreader.FBReaderYotaService" android:exported="false" android:launchMode="singleTask"/>
<activity android:name="com.yotadevices.yotaphone2.fbreader.FileChooseActivity" android:exported="true" android:configChanges="orientation|screenSize|keyboard|keyboardHidden" android:theme="@style/ActivityWithWhiteActionBar" android:logo="@drawable/yota_reader_icon"/>
<service android:name="com.yotadevices.yotaphone2.fbreader.FBReaderYotaService" android:exported="true" android:launchMode="singleTask"/>
<service android:name="com.yotadevices.yotaphone2.fbreader.ShareFlipActivity" android:exported="true" />
<activity android:name="org.geometerplus.android.fbreader.network.YotaNetworkBookInfoActivity" android:process=":networkLibrary" android:theme="@style/ActivityWithWhiteActionBar" android:configChanges="orientation|keyboardHidden|screenSize"/>
<activity android:name="com.yotadevices.yotaphone2.fbreader.YotaBookInfoActivity" android:theme="@style/ActivityWithWhiteActionBar" android:logo="@drawable/yota_reader_icon" android:configChanges="orientation|keyboardHidden|screenSize">
<intent-filter>
<action android:name="android.fbreader.action.BOOK_INFO"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</activity>
<receiver
android:name="com.yotadevices.yotaphone2.fbreader.P2BReceiver"
android:enabled="true"
android:exported="true">
<intent-filter>
<action android:name="yotaphone.intent.action.IS_BS_SUPPORTED" />
<action android:name="yotaphone.intent.action.P2B" />
</intent-filter>
</receiver>
<uses-library android:required="false" android:name="com.yotadevices.platinum"/>
<meta-data android:name="com.yotadevices.BS_ICON" android:resource="@drawable/fbreader_bs_icon"/>
<meta-data android:name="com.yotadevices.BS_TITLE" android:value="FBReader"/>
<meta-data android:name="com.yotadevices.BS_TITLE" android:value="Yota Reader"/>
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version"/>
</application>
</manifest>
96 changes: 96 additions & 0 deletions FBReaderJ.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":" />
</configuration>
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android 4.4.2 YotaPhone2 Add-On" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="open-dictionary-api-1.2.1" level="project" />
<orderEntry type="library" exported="" name="play-services-4.4.52" level="project" />
<orderEntry type="library" exported="" name="pdfparse" level="project" />
<orderEntry type="library" exported="" name="nanohttpd-2.0.5" level="project" />
<orderEntry type="library" exported="" name="support-v4-19.1.0" level="project" />
<orderEntry type="library" exported="" name="json-simple-1.1.1" level="project" />
<orderEntry type="library" exported="" name="httpmime-4.2.5" level="project" />
<orderEntry type="library" exported="" name="LingvoIntegration_2.5.2.12" level="project" />
<orderEntry type="module" module-name="library" exported="" />
<orderEntry type="module" module-name="AmbilWarna" exported="" />
<orderEntry type="module" module-name="code" exported="" />
</component>
</module>

Loading