Compare commits
No commits in common. "main" and "java-main-old" have entirely different histories.
main
...
java-main-
Binary file not shown.
|
Before Width: | Height: | Size: 120 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 124 KiB |
2
.gitignore
vendored
2
.gitignore
vendored
@ -12,8 +12,6 @@
|
|||||||
|
|
||||||
.idea/**
|
.idea/**
|
||||||
.idea/
|
.idea/
|
||||||
.idea/*
|
|
||||||
.idea/misc.xml
|
|
||||||
|
|
||||||
# Generated files
|
# Generated files
|
||||||
bin/
|
bin/
|
||||||
|
|||||||
3
.idea/.gitignore
vendored
Normal file
3
.idea/.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
# Default ignored files
|
||||||
|
/shelf/
|
||||||
|
/workspace.xml
|
||||||
1
.idea/.name
Normal file
1
.idea/.name
Normal file
@ -0,0 +1 @@
|
|||||||
|
Jarvis Client Android
|
||||||
6
.idea/compiler.xml
Normal file
6
.idea/compiler.xml
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="CompilerConfiguration">
|
||||||
|
<bytecodeTargetLevel target="11" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
@ -1,5 +1,24 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
|
<component name="DesignSurface">
|
||||||
|
<option name="filePathToZoomLevelMap">
|
||||||
|
<map>
|
||||||
|
<entry key="../../../../../layout/custom_preview.xml" value="0.5354166666666667" />
|
||||||
|
<entry key="app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.36614583333333334" />
|
||||||
|
<entry key="app/src/main/res/drawable/circle.xml" value="0.346875" />
|
||||||
|
<entry key="app/src/main/res/drawable/ic_launcher_background.xml" value="0.36614583333333334" />
|
||||||
|
<entry key="app/src/main/res/drawable/mic.xml" value="0.346875" />
|
||||||
|
<entry key="app/src/main/res/drawable/microphone.xml" value="0.346875" />
|
||||||
|
<entry key="app/src/main/res/drawable/round_button.xml" value="0.346875" />
|
||||||
|
<entry key="app/src/main/res/drawable/rounded_white_on_top.xml" value="0.36614583333333334" />
|
||||||
|
<entry key="app/src/main/res/layout/activity_listening.xml" value="0.16315431679129844" />
|
||||||
|
<entry key="app/src/main/res/layout/activity_main.xml" value="0.35" />
|
||||||
|
<entry key="app/src/main/res/layout/dialog_listening.xml" value="0.3333333333333333" />
|
||||||
|
<entry key="app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.36614583333333334" />
|
||||||
|
<entry key="app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml" value="0.2607638888888889" />
|
||||||
|
</map>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
|
||||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||||
@ -7,4 +26,11 @@
|
|||||||
<component name="ProjectType">
|
<component name="ProjectType">
|
||||||
<option name="id" value="Android" />
|
<option name="id" value="Android" />
|
||||||
</component>
|
</component>
|
||||||
|
<component name="VisualizationToolProject">
|
||||||
|
<option name="state">
|
||||||
|
<ProjectState>
|
||||||
|
<option name="scale" value="0.16315431679129844" />
|
||||||
|
</ProjectState>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
</project>
|
</project>
|
||||||
674
LICENSE
Normal file
674
LICENSE
Normal file
@ -0,0 +1,674 @@
|
|||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users. We, the Free Software Foundation, use the
|
||||||
|
GNU General Public License for most of our software; it applies also to
|
||||||
|
any other work released this way by its authors. You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the manufacturer
|
||||||
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
|
protecting users' freedom to change the software. The systematic
|
||||||
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
|
products. If such problems arise substantially in other domains, we
|
||||||
|
stand ready to extend this provision to those domains in future versions
|
||||||
|
of the GPL, as needed to protect the freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
|
avoid the special danger that patents applied to a free program could
|
||||||
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If the program does terminal interaction, make it output a short
|
||||||
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
|
<program> Copyright (C) <year> <name of author>
|
||||||
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, your program's commands
|
||||||
|
might be different; for a GUI interface, you would use an "about box".
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU GPL, see
|
||||||
|
<https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
The GNU General Public License does not permit incorporating your program
|
||||||
|
into proprietary programs. If your program is a subroutine library, you
|
||||||
|
may consider it more useful to permit linking proprietary applications with
|
||||||
|
the library. If this is what you want to do, use the GNU Lesser General
|
||||||
|
Public License instead of this License. But first, please read
|
||||||
|
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||||
@ -1,9 +1,4 @@
|
|||||||
# Jarvis Client for Android 10+
|
# jarvis-client-android
|
||||||
Android Client for Jarvis
|
Android Client for Jarvis
|
||||||
|
|
||||||
This client is absolutely not ready to use but is under heavy development. (WIP)
|
This client is absolutely not ready to use. (WIP)
|
||||||
|
|
||||||
<p float="left">
|
|
||||||
<img src=".github-images/demo_white.png" width="300" />
|
|
||||||
<img src=".github-images/demo_black.png" width="300" />
|
|
||||||
</p>
|
|
||||||
|
|||||||
@ -1,23 +1,18 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'com.android.application'
|
id 'com.android.application'
|
||||||
id 'org.jetbrains.kotlin.android'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
namespace 'ch.broillet.jarvis.android'
|
compileSdk 31
|
||||||
compileSdk 33
|
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "ch.broillet.jarvis.android"
|
applicationId "ch.mathieubroillet.jarvis.android"
|
||||||
minSdk 32
|
minSdk 27
|
||||||
targetSdk 33
|
targetSdk 31
|
||||||
versionCode 1
|
versionCode 1
|
||||||
versionName "1.0"
|
versionName "1.0"
|
||||||
|
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
vectorDrawables {
|
|
||||||
useSupportLibrary true
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
@ -30,48 +25,17 @@ android {
|
|||||||
sourceCompatibility JavaVersion.VERSION_1_8
|
sourceCompatibility JavaVersion.VERSION_1_8
|
||||||
targetCompatibility JavaVersion.VERSION_1_8
|
targetCompatibility JavaVersion.VERSION_1_8
|
||||||
}
|
}
|
||||||
kotlinOptions {
|
|
||||||
jvmTarget = '1.8'
|
|
||||||
}
|
|
||||||
buildFeatures {
|
|
||||||
compose true
|
|
||||||
}
|
|
||||||
composeOptions {
|
|
||||||
kotlinCompilerExtensionVersion '1.4.0'
|
|
||||||
}
|
|
||||||
packagingOptions {
|
|
||||||
resources {
|
|
||||||
excludes += '/META-INF/{AL2.0,LGPL2.1}'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
||||||
implementation 'androidx.core:core-ktx:1.9.0'
|
implementation 'androidx.appcompat:appcompat:1.4.0'
|
||||||
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
|
implementation 'com.google.android.material:material:1.4.0'
|
||||||
implementation 'androidx.activity:activity-compose:1.7.0'
|
|
||||||
implementation "androidx.compose.ui:ui:$compose_version"
|
|
||||||
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
|
|
||||||
implementation 'androidx.compose.material3:material3:1.1.0-beta01'
|
|
||||||
implementation 'com.google.android.material:material:1.8.0'
|
|
||||||
testImplementation 'junit:junit:4.13.2'
|
|
||||||
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
|
|
||||||
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
|
|
||||||
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
|
|
||||||
debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
|
|
||||||
debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
|
|
||||||
|
|
||||||
implementation "androidx.navigation:navigation-compose:2.6.0-alpha08"
|
implementation 'com.agrawalsuneet.androidlibs:dotsloader:1.4'
|
||||||
implementation 'com.google.accompanist:accompanist-permissions:0.23.1'
|
|
||||||
implementation 'com.google.accompanist:accompanist-insets:0.23.1'
|
|
||||||
|
|
||||||
implementation "com.google.accompanist:accompanist-systemuicontroller:0.23.1"
|
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
|
||||||
|
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
|
||||||
|
|
||||||
implementation 'com.github.squti:Android-Wave-Recorder:1.7.0'
|
implementation 'ai.picovoice:porcupine-android:2.0.1'
|
||||||
implementation("com.squareup.okhttp3:okhttp:4.9.3")
|
|
||||||
implementation 'com.google.code.gson:gson:2.8.9'
|
|
||||||
implementation ('io.socket:socket.io-client:2.0.0') {
|
|
||||||
exclude group: 'org.json', module: 'json'
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@ -1,24 +0,0 @@
|
|||||||
package ch.broillet.jarvis.android
|
|
||||||
|
|
||||||
import androidx.test.platform.app.InstrumentationRegistry
|
|
||||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
|
||||||
|
|
||||||
import org.junit.Test
|
|
||||||
import org.junit.runner.RunWith
|
|
||||||
|
|
||||||
import org.junit.Assert.*
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Instrumented test, which will execute on an Android device.
|
|
||||||
*
|
|
||||||
* See [testing documentation](http://d.android.com/tools/testing).
|
|
||||||
*/
|
|
||||||
@RunWith(AndroidJUnit4::class)
|
|
||||||
class ExampleInstrumentedTest {
|
|
||||||
@Test
|
|
||||||
fun useAppContext() {
|
|
||||||
// Context of the app under test.
|
|
||||||
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
|
|
||||||
assertEquals("ch.broillet.jarvis.android", appContext.packageName)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -0,0 +1,26 @@
|
|||||||
|
package ch.mathieubroillet.jarvis.android;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
import androidx.test.platform.app.InstrumentationRegistry;
|
||||||
|
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Instrumented test, which will execute on an Android device.
|
||||||
|
*
|
||||||
|
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
|
||||||
|
*/
|
||||||
|
@RunWith(AndroidJUnit4.class)
|
||||||
|
public class ExampleInstrumentedTest {
|
||||||
|
@Test
|
||||||
|
public void useAppContext() {
|
||||||
|
// Context of the app under test.
|
||||||
|
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
|
||||||
|
assertEquals("ch.mathieubroillet.jarvis.android", appContext.getPackageName());
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,30 +1,41 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:tools="http://schemas.android.com/tools">
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
package="ch.mathieubroillet.jarvis.android">
|
||||||
|
|
||||||
|
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
|
||||||
|
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
|
||||||
<uses-permission android:name="android.permission.RECORD_AUDIO" />
|
<uses-permission android:name="android.permission.RECORD_AUDIO" />
|
||||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
|
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
|
||||||
|
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||||
|
<uses-permission
|
||||||
|
android:name="android.permission.QUERY_ALL_PACKAGES"
|
||||||
|
tools:ignore="QueryAllPackagesPermission" />
|
||||||
|
|
||||||
<application
|
<application
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
android:dataExtractionRules="@xml/data_extraction_rules"
|
android:fullBackupContent="true"
|
||||||
android:fullBackupContent="@xml/backup_rules"
|
|
||||||
android:icon="@mipmap/ic_launcher"
|
android:icon="@mipmap/ic_launcher"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:roundIcon="@mipmap/ic_launcher"
|
android:roundIcon="@mipmap/ic_launcher_round"
|
||||||
|
android:showOnLockScreen="true"
|
||||||
android:supportsRtl="true"
|
android:supportsRtl="true"
|
||||||
android:theme="@style/Theme.Jarvisclientapp"
|
android:theme="@style/Theme.JarvisClientAndroid">
|
||||||
android:usesCleartextTraffic="true"
|
|
||||||
tools:targetApi="33">
|
|
||||||
|
<activity
|
||||||
|
android:name=".ListeningActivity"
|
||||||
|
android:excludeFromRecents="true"
|
||||||
|
android:theme="@style/Theme.Transparent" />
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".MainActivity"
|
android:name=".MainActivity"
|
||||||
android:exported="true"
|
android:label="@string/app_name"
|
||||||
android:screenOrientation="portrait"
|
android:exported="true">
|
||||||
android:theme="@style/Theme.Jarvisclientapp">
|
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
|
|
||||||
<category android:name="android.intent.category.LAUNCHER" />
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
|
|
||||||
@ -34,9 +45,9 @@
|
|||||||
</intent-filter>
|
</intent-filter>
|
||||||
|
|
||||||
<meta-data
|
<meta-data
|
||||||
android:name="android.app.lib_name"
|
android:name="com.android.systemui.action_assist_icon"
|
||||||
android:value="" />
|
android:resource="@mipmap/ic_launcher" />
|
||||||
</activity>
|
</activity>
|
||||||
</application>
|
|
||||||
|
|
||||||
|
</application>
|
||||||
</manifest>
|
</manifest>
|
||||||
@ -1,67 +0,0 @@
|
|||||||
package ch.broillet.jarvis.android
|
|
||||||
|
|
||||||
import android.os.Bundle
|
|
||||||
import android.view.WindowManager
|
|
||||||
import androidx.activity.ComponentActivity
|
|
||||||
import androidx.activity.compose.setContent
|
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
|
||||||
import androidx.compose.material3.MaterialTheme
|
|
||||||
import androidx.compose.material3.Surface
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.core.view.WindowCompat
|
|
||||||
import ch.broillet.jarvis.android.chat.ConversationUiState
|
|
||||||
import ch.broillet.jarvis.android.chat.Message
|
|
||||||
import ch.broillet.jarvis.android.nav.Navigation
|
|
||||||
import ch.broillet.jarvis.android.ui.theme.JarvisclientappTheme
|
|
||||||
import ch.broillet.jarvis.android.utils.SocketHandler
|
|
||||||
import ch.broillet.jarvis.android.utils.getDeviceId
|
|
||||||
|
|
||||||
|
|
||||||
class MainActivity : ComponentActivity() {
|
|
||||||
|
|
||||||
|
|
||||||
// Default uiState with welcome message only
|
|
||||||
var uiState = ConversationUiState(listOf())
|
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
|
||||||
uiState = ConversationUiState(
|
|
||||||
listOf(
|
|
||||||
Message(
|
|
||||||
true,
|
|
||||||
resources.getString(R.string.demo_message_1)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
// The following lines connects the Android app to the server.
|
|
||||||
SocketHandler.setSocket()
|
|
||||||
SocketHandler.establishConnection()
|
|
||||||
SocketHandler.joinRoom(getDeviceId(this))
|
|
||||||
|
|
||||||
SocketHandler.getSocket()
|
|
||||||
.on("message_from_jarvis") { SocketHandler.messageFromJarvis(it, uiState) }
|
|
||||||
SocketHandler.getSocket()
|
|
||||||
.on("message_from_user") { SocketHandler.messageFromUser(it, uiState) }
|
|
||||||
|
|
||||||
super.onCreate(savedInstanceState)
|
|
||||||
|
|
||||||
setContent {
|
|
||||||
JarvisclientappTheme {
|
|
||||||
|
|
||||||
// Fullscreen
|
|
||||||
WindowCompat.setDecorFitsSystemWindows(window, false)
|
|
||||||
window.setFlags(
|
|
||||||
WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS,
|
|
||||||
WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
|
|
||||||
)
|
|
||||||
|
|
||||||
// A surface container using the 'background' color from the theme
|
|
||||||
Surface(
|
|
||||||
modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background
|
|
||||||
) {
|
|
||||||
Navigation(uiState)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,33 +0,0 @@
|
|||||||
package ch.broillet.jarvis.android.audio
|
|
||||||
|
|
||||||
import android.content.Context
|
|
||||||
import com.github.squti.androidwaverecorder.WaveRecorder
|
|
||||||
import java.io.File
|
|
||||||
|
|
||||||
|
|
||||||
class AudioRecorder(
|
|
||||||
private var audioTempFileOutput: String = "",
|
|
||||||
var waveRecorder: WaveRecorder
|
|
||||||
) {
|
|
||||||
|
|
||||||
fun startRecording() {
|
|
||||||
waveRecorder.startRecording()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun stopRecording() {
|
|
||||||
waveRecorder.stopRecording()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getOutputFile(): File {
|
|
||||||
return File(audioTempFileOutput)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getAudioRecorder(context: Context): AudioRecorder {
|
|
||||||
val outputFile = context.filesDir.absolutePath + "/temp_recording.wav"
|
|
||||||
|
|
||||||
val waveRecorder = WaveRecorder(outputFile)
|
|
||||||
waveRecorder.noiseSuppressorActive = true
|
|
||||||
|
|
||||||
return AudioRecorder(audioTempFileOutput = outputFile, waveRecorder = waveRecorder)
|
|
||||||
}
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
package ch.broillet.jarvis.android.chat
|
|
||||||
|
|
||||||
import androidx.compose.runtime.Immutable
|
|
||||||
import androidx.compose.runtime.mutableStateListOf
|
|
||||||
import androidx.compose.ui.res.stringResource
|
|
||||||
import ch.broillet.jarvis.android.R
|
|
||||||
|
|
||||||
class ConversationUiState(
|
|
||||||
initialMessages: List<Message>
|
|
||||||
) {
|
|
||||||
private val _messages: MutableList<Message> =
|
|
||||||
mutableStateListOf(*initialMessages.toTypedArray())
|
|
||||||
val messages: List<Message> = _messages
|
|
||||||
|
|
||||||
fun addMessage(msg: Message) {
|
|
||||||
_messages.add(0, msg) // Add to the beginning of the list
|
|
||||||
}
|
|
||||||
|
|
||||||
fun clearMessage(){
|
|
||||||
_messages.clear()
|
|
||||||
addMessage(Message(true, "Hello, I'm Jarvis!"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Immutable
|
|
||||||
data class Message(
|
|
||||||
val isJarvis: Boolean,
|
|
||||||
val content: String,
|
|
||||||
)
|
|
||||||
@ -1,141 +0,0 @@
|
|||||||
package ch.broillet.jarvis.android.chat
|
|
||||||
|
|
||||||
import androidx.compose.foundation.Image
|
|
||||||
import androidx.compose.foundation.background
|
|
||||||
import androidx.compose.foundation.isSystemInDarkTheme
|
|
||||||
import androidx.compose.foundation.layout.*
|
|
||||||
import androidx.compose.foundation.lazy.LazyColumn
|
|
||||||
import androidx.compose.foundation.lazy.rememberLazyListState
|
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
|
||||||
import androidx.compose.material3.MaterialTheme
|
|
||||||
import androidx.compose.material3.Text
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.runtime.LaunchedEffect
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.draw.clip
|
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
import androidx.compose.ui.res.painterResource
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import ch.broillet.jarvis.android.R
|
|
||||||
import ch.broillet.jarvis.android.ui.theme.productSansFont
|
|
||||||
import kotlinx.coroutines.delay
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun Messages(
|
|
||||||
messages: List<Message>,
|
|
||||||
modifier: Modifier = Modifier
|
|
||||||
) {
|
|
||||||
Box(modifier = modifier) {
|
|
||||||
val scrollState = rememberLazyListState()
|
|
||||||
|
|
||||||
LaunchedEffect(messages.size) {
|
|
||||||
delay(50)
|
|
||||||
scrollState.animateScrollToItem(messages.size)
|
|
||||||
}
|
|
||||||
LazyColumn(
|
|
||||||
modifier = Modifier.fillMaxSize(),
|
|
||||||
state = scrollState
|
|
||||||
) {
|
|
||||||
val reverse: List<Message> = messages.reversed()
|
|
||||||
|
|
||||||
for (message in reverse) {
|
|
||||||
item {
|
|
||||||
if (message.isJarvis) {
|
|
||||||
MessageFromJarvis(text = message.content)
|
|
||||||
} else {
|
|
||||||
MessageFromUser(text = message.content)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun MessageFromJarvis(
|
|
||||||
text: String,
|
|
||||||
anotherMessageFollows: Boolean = false,
|
|
||||||
showProfileIcon: Boolean = true
|
|
||||||
) {
|
|
||||||
//We create a row to contain the message and the robot image (to look like an sms)
|
|
||||||
Row(
|
|
||||||
Modifier.padding(
|
|
||||||
bottom = if (anotherMessageFollows) 5.dp else 20.dp,
|
|
||||||
start = if (!showProfileIcon) 50.dp else 0.dp
|
|
||||||
)
|
|
||||||
) {
|
|
||||||
|
|
||||||
// Adding the robot image as the sender
|
|
||||||
if (showProfileIcon) {
|
|
||||||
Image(
|
|
||||||
painter = painterResource(id = R.drawable.robot256),
|
|
||||||
contentDescription = "robot",
|
|
||||||
Modifier
|
|
||||||
.size(50.dp)
|
|
||||||
.padding(end = 10.dp)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Adding the message box with the text given in the params
|
|
||||||
Box(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth(fraction = 0.9F)
|
|
||||||
.clip(RoundedCornerShape(15.dp))
|
|
||||||
.background(color = MaterialTheme.colorScheme.secondaryContainer)
|
|
||||||
.padding(horizontal = 10.dp, vertical = 10.dp)
|
|
||||||
) {
|
|
||||||
Text(text = text, fontFamily = productSansFont)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun MessageFromJarvis(texts: List<String>) {
|
|
||||||
//Automated function to send multiples messages at the same time but only showing the profile pic in the first one and reducing the padding between them.
|
|
||||||
var i = texts.size
|
|
||||||
for (text in texts) {
|
|
||||||
when (i) {
|
|
||||||
texts.size -> MessageFromJarvis(
|
|
||||||
text = text,
|
|
||||||
anotherMessageFollows = true,
|
|
||||||
showProfileIcon = true
|
|
||||||
)
|
|
||||||
1 -> MessageFromJarvis(
|
|
||||||
text = text,
|
|
||||||
anotherMessageFollows = false,
|
|
||||||
showProfileIcon = false
|
|
||||||
)
|
|
||||||
else -> MessageFromJarvis(
|
|
||||||
text = text,
|
|
||||||
anotherMessageFollows = true,
|
|
||||||
showProfileIcon = false
|
|
||||||
)
|
|
||||||
}
|
|
||||||
i--
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun MessageFromUser(text: String) {
|
|
||||||
//We create a row to contain the user message and we align the row to the right side (to look like a conversation between two people)
|
|
||||||
Row(
|
|
||||||
Modifier
|
|
||||||
.padding(bottom = 25.dp)
|
|
||||||
.fillMaxWidth(), horizontalArrangement = Arrangement.End
|
|
||||||
) {
|
|
||||||
// The message box with the text
|
|
||||||
Box(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth(fraction = 0.8F)
|
|
||||||
.clip(RoundedCornerShape(15.dp))
|
|
||||||
.background(color = MaterialTheme.colorScheme.secondary)
|
|
||||||
.padding(horizontal = 10.dp, vertical = 10.dp)
|
|
||||||
) {
|
|
||||||
Text(
|
|
||||||
text = text,
|
|
||||||
fontFamily = productSansFont,
|
|
||||||
color = if (!isSystemInDarkTheme()) Color.White else Color(15, 15, 15, 255)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,63 +0,0 @@
|
|||||||
package ch.broillet.jarvis.android.nav
|
|
||||||
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.ui.platform.LocalContext
|
|
||||||
import androidx.navigation.NavController
|
|
||||||
import androidx.navigation.compose.NavHost
|
|
||||||
import androidx.navigation.compose.composable
|
|
||||||
import androidx.navigation.compose.rememberNavController
|
|
||||||
import ch.broillet.jarvis.android.audio.getAudioRecorder
|
|
||||||
import ch.broillet.jarvis.android.chat.ConversationUiState
|
|
||||||
import ch.broillet.jarvis.android.pages.DisplayMainPage
|
|
||||||
import ch.broillet.jarvis.android.pages.DisplayPermissionsPage
|
|
||||||
import ch.broillet.jarvis.android.pages.DisplaySettingsPage
|
|
||||||
import com.google.accompanist.permissions.ExperimentalPermissionsApi
|
|
||||||
import com.google.accompanist.permissions.rememberMultiplePermissionsState
|
|
||||||
|
|
||||||
@OptIn(ExperimentalPermissionsApi::class)
|
|
||||||
@Composable
|
|
||||||
fun Navigation(uiState: ConversationUiState) {
|
|
||||||
val navController = rememberNavController()
|
|
||||||
|
|
||||||
val permissions = listOf(
|
|
||||||
android.Manifest.permission.RECORD_AUDIO,
|
|
||||||
)
|
|
||||||
val permissionState = rememberMultiplePermissionsState(permissions)
|
|
||||||
|
|
||||||
|
|
||||||
NavHost(
|
|
||||||
navController = navController,
|
|
||||||
startDestination = if (permissionState.allPermissionsGranted) Screen.MainScreen.route else Screen.PermissionsScreen.route
|
|
||||||
) {
|
|
||||||
composable(route = Screen.MainScreen.route) {
|
|
||||||
MainScreen(navController = navController, uiState)
|
|
||||||
}
|
|
||||||
composable(route = Screen.SettingsScreen.route) {
|
|
||||||
SettingsScreen(navController = navController)
|
|
||||||
}
|
|
||||||
composable(route = Screen.PermissionsScreen.route) {
|
|
||||||
PermissionsScreen(navController = navController)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun MainScreen(navController: NavController, uiState: ConversationUiState) {
|
|
||||||
//TODO: change so that it doesn't reset when going to settings menu
|
|
||||||
DisplayMainPage(
|
|
||||||
navController,
|
|
||||||
uiState,
|
|
||||||
getAudioRecorder(LocalContext.current)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun SettingsScreen(navController: NavController) {
|
|
||||||
DisplaySettingsPage(navController)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun PermissionsScreen(navController: NavController) {
|
|
||||||
DisplayPermissionsPage(navController)
|
|
||||||
}
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
package ch.broillet.jarvis.android.nav
|
|
||||||
|
|
||||||
sealed class Screen(val route: String) {
|
|
||||||
object MainScreen : Screen("main_screen")
|
|
||||||
object SettingsScreen : Screen("settings_screen")
|
|
||||||
object PermissionsScreen : Screen("permissions_screen")
|
|
||||||
}
|
|
||||||
@ -1,237 +0,0 @@
|
|||||||
package ch.broillet.jarvis.android.pages
|
|
||||||
|
|
||||||
import android.provider.Settings.Secure
|
|
||||||
import androidx.compose.foundation.layout.*
|
|
||||||
import androidx.compose.material.icons.Icons
|
|
||||||
import androidx.compose.material.icons.outlined.Edit
|
|
||||||
import androidx.compose.material.icons.outlined.Settings
|
|
||||||
import androidx.compose.material.icons.outlined.Share
|
|
||||||
import androidx.compose.material3.*
|
|
||||||
import androidx.compose.runtime.*
|
|
||||||
import androidx.compose.ui.Alignment
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.res.painterResource
|
|
||||||
import androidx.compose.ui.res.stringResource
|
|
||||||
import androidx.compose.ui.tooling.preview.Preview
|
|
||||||
import androidx.compose.ui.unit.DpOffset
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import androidx.compose.ui.unit.sp
|
|
||||||
import androidx.navigation.NavController
|
|
||||||
import androidx.navigation.compose.rememberNavController
|
|
||||||
import ch.broillet.jarvis.android.R
|
|
||||||
import ch.broillet.jarvis.android.audio.AudioRecorder
|
|
||||||
import ch.broillet.jarvis.android.chat.ConversationUiState
|
|
||||||
import ch.broillet.jarvis.android.chat.Message
|
|
||||||
import ch.broillet.jarvis.android.chat.Messages
|
|
||||||
import ch.broillet.jarvis.android.nav.Screen
|
|
||||||
import ch.broillet.jarvis.android.ui.theme.JarvisclientappTheme
|
|
||||||
import ch.broillet.jarvis.android.ui.theme.productSansFont
|
|
||||||
import ch.broillet.jarvis.android.utils.*
|
|
||||||
import com.github.squti.androidwaverecorder.RecorderState
|
|
||||||
import com.github.squti.androidwaverecorder.WaveRecorder
|
|
||||||
import org.json.JSONObject
|
|
||||||
import java.io.File
|
|
||||||
import java.io.IOException
|
|
||||||
import kotlin.concurrent.thread
|
|
||||||
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun DisplayMainPage(
|
|
||||||
navController: NavController,
|
|
||||||
uiState: ConversationUiState,
|
|
||||||
audioRecorder: AudioRecorder
|
|
||||||
) {
|
|
||||||
|
|
||||||
//We create a main box with basic padding to avoid having stuff too close to every side.
|
|
||||||
DefaultBox {
|
|
||||||
|
|
||||||
// This column regroup the base and all the conversations (everything except the footer)
|
|
||||||
Column(Modifier.padding(bottom = 80.dp)) {
|
|
||||||
|
|
||||||
MainBase(navController, uiState)
|
|
||||||
|
|
||||||
Messages(
|
|
||||||
messages = uiState.messages,
|
|
||||||
modifier = Modifier.weight(1f)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Finally we add the footer to the bottom center of the main box
|
|
||||||
Column(
|
|
||||||
Modifier
|
|
||||||
.align(Alignment.BottomCenter)
|
|
||||||
.padding(bottom = 40.dp)
|
|
||||||
) {
|
|
||||||
|
|
||||||
RecordingFooterButton(
|
|
||||||
audioRecorder = audioRecorder,
|
|
||||||
navController = navController,
|
|
||||||
uiState = uiState
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//Draws the base of the main activity, that includes the 3-dots menu and the "hi text".
|
|
||||||
@Composable
|
|
||||||
fun MainBase(navController: NavController, uiState: ConversationUiState) {
|
|
||||||
|
|
||||||
Column(
|
|
||||||
Modifier
|
|
||||||
.padding(bottom = 25.dp)
|
|
||||||
.fillMaxWidth()
|
|
||||||
) {
|
|
||||||
Row(Modifier.align(Alignment.End)) {
|
|
||||||
DropDownSettingsMenu(navController, uiState)
|
|
||||||
}
|
|
||||||
|
|
||||||
Text(
|
|
||||||
text = stringResource(id = R.string.main_page_how_may_i_help_you),
|
|
||||||
fontFamily = productSansFont,
|
|
||||||
fontSize = 30.sp,
|
|
||||||
modifier = Modifier.padding(top = 30.dp)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun DropDownSettingsMenu(navController: NavController, uiState: ConversationUiState) {
|
|
||||||
var expanded by remember { mutableStateOf(false) }
|
|
||||||
|
|
||||||
IconButton(onClick = { expanded = true }) {
|
|
||||||
Icon(
|
|
||||||
painter = painterResource(id = R.drawable.ic_baseline_more_vert_24),
|
|
||||||
contentDescription = "3 dots button"
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
DropdownMenu(
|
|
||||||
expanded = expanded,
|
|
||||||
onDismissRequest = { expanded = false },
|
|
||||||
offset = DpOffset((-500).dp, 0.dp)
|
|
||||||
) {
|
|
||||||
DropdownMenuItem(
|
|
||||||
text = { Text(stringResource(id = R.string.main_page_delete_conversation)) },
|
|
||||||
onClick = { SocketHandler.clearMessages(uiState, getDeviceId(navController.context)) },
|
|
||||||
leadingIcon = {
|
|
||||||
Icon(
|
|
||||||
Icons.Outlined.Edit,
|
|
||||||
contentDescription = null
|
|
||||||
)
|
|
||||||
})
|
|
||||||
DropdownMenuItem(
|
|
||||||
text = { Text(stringResource(id = R.string.settings)) },
|
|
||||||
onClick = { navController.navigate(Screen.SettingsScreen.route) },
|
|
||||||
leadingIcon = {
|
|
||||||
Icon(
|
|
||||||
Icons.Outlined.Settings,
|
|
||||||
contentDescription = null
|
|
||||||
)
|
|
||||||
})
|
|
||||||
DropdownMenuItem(
|
|
||||||
text = { Text(stringResource(id = R.string.report_an_issue)) },
|
|
||||||
onClick = { /* Handle send feedback! */ },
|
|
||||||
leadingIcon = {
|
|
||||||
Icon(
|
|
||||||
Icons.Outlined.Share,
|
|
||||||
contentDescription = null
|
|
||||||
)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun RecordingFooterButton(
|
|
||||||
audioRecorder: AudioRecorder,
|
|
||||||
navController: NavController,
|
|
||||||
uiState: ConversationUiState
|
|
||||||
) {
|
|
||||||
|
|
||||||
var isListening: Boolean by remember { mutableStateOf(false) }
|
|
||||||
var isProcessing: Boolean by remember { mutableStateOf(false) }
|
|
||||||
var isError: Boolean by remember { mutableStateOf(false) }
|
|
||||||
|
|
||||||
// Add a listener for the waveRecorder to record when isListening is true and then process the audio when done listening
|
|
||||||
audioRecorder.waveRecorder.onStateChangeListener = {
|
|
||||||
when (it) {
|
|
||||||
RecorderState.RECORDING -> isListening = true
|
|
||||||
RecorderState.STOP -> {
|
|
||||||
thread {
|
|
||||||
isListening = false
|
|
||||||
isProcessing = true
|
|
||||||
isError = false
|
|
||||||
|
|
||||||
try {
|
|
||||||
processMessage(
|
|
||||||
processAudio(audioRecorder.getOutputFile()),
|
|
||||||
navController,
|
|
||||||
uiState
|
|
||||||
)
|
|
||||||
} catch (e: IOException) {
|
|
||||||
isError = true
|
|
||||||
e.printStackTrace()
|
|
||||||
}
|
|
||||||
|
|
||||||
isProcessing = false
|
|
||||||
audioRecorder.getOutputFile().delete()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else -> {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//We create a row that we align to the bottom center of the parent box
|
|
||||||
Row(
|
|
||||||
Modifier
|
|
||||||
.fillMaxWidth(),
|
|
||||||
verticalAlignment = Alignment.Bottom,
|
|
||||||
horizontalArrangement = Arrangement.Center
|
|
||||||
) {
|
|
||||||
|
|
||||||
//Microphone floating button to manually start/stop listening
|
|
||||||
FloatingActionButton(
|
|
||||||
onClick = { if (isListening) audioRecorder.stopRecording() else audioRecorder.startRecording() },
|
|
||||||
modifier = Modifier.size(70.dp)
|
|
||||||
) {
|
|
||||||
if (isListening) {
|
|
||||||
DotsTyping(7.dp, 3, 300, MaterialTheme.colorScheme.secondary, 2.dp)
|
|
||||||
} else {
|
|
||||||
if (isProcessing) {
|
|
||||||
DotsFlashing(7.dp, 3, 300, MaterialTheme.colorScheme.secondary, 2.dp)
|
|
||||||
} else {
|
|
||||||
Icon(
|
|
||||||
painter = painterResource(id = (if (isError) R.drawable.ic_baseline_error_24 else R.drawable.ic_baseline_mic_24)),
|
|
||||||
contentDescription = "microphone"
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun processAudio(audioFile: File): String {
|
|
||||||
val json = JSONObject(getTextFromAudio(audioFile))
|
|
||||||
|
|
||||||
return json.getString("data")
|
|
||||||
}
|
|
||||||
|
|
||||||
fun processMessage(text: String, navController: NavController, uiState: ConversationUiState) {
|
|
||||||
uiState.addMessage(Message(false, text))
|
|
||||||
|
|
||||||
navController.context.mainExecutor.execute {
|
|
||||||
SocketHandler.processMessage(text, getDeviceId(navController.context))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Preview(showBackground = true)
|
|
||||||
@Composable
|
|
||||||
fun MainPagePreview() {
|
|
||||||
JarvisclientappTheme {
|
|
||||||
DisplayMainPage(
|
|
||||||
rememberNavController(), ConversationUiState(
|
|
||||||
listOf(Message(true, stringResource(id = R.string.demo_message_1)))
|
|
||||||
), audioRecorder = AudioRecorder("", WaveRecorder(""))
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,157 +0,0 @@
|
|||||||
package ch.broillet.jarvis.android.pages
|
|
||||||
|
|
||||||
import android.Manifest
|
|
||||||
import androidx.compose.foundation.layout.*
|
|
||||||
import androidx.compose.material3.*
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.ui.Alignment
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.platform.LocalContext
|
|
||||||
import androidx.compose.ui.platform.LocalInspectionMode
|
|
||||||
import androidx.compose.ui.res.painterResource
|
|
||||||
import androidx.compose.ui.res.stringResource
|
|
||||||
import androidx.compose.ui.tooling.preview.Preview
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import androidx.compose.ui.unit.sp
|
|
||||||
import androidx.navigation.NavController
|
|
||||||
import androidx.navigation.compose.rememberNavController
|
|
||||||
import ch.broillet.jarvis.android.R
|
|
||||||
import ch.broillet.jarvis.android.ui.theme.JarvisclientappTheme
|
|
||||||
import ch.broillet.jarvis.android.ui.theme.productSansFont
|
|
||||||
import ch.broillet.jarvis.android.utils.DefaultBox
|
|
||||||
import ch.broillet.jarvis.android.utils.openAppSettings
|
|
||||||
import com.google.accompanist.permissions.ExperimentalPermissionsApi
|
|
||||||
import com.google.accompanist.permissions.PermissionRequired
|
|
||||||
import com.google.accompanist.permissions.rememberPermissionState
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun DisplayPermissionsPage(navController: NavController) {
|
|
||||||
DefaultBox {
|
|
||||||
PermissionsBase()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun PermissionsBase() {
|
|
||||||
Column(
|
|
||||||
Modifier
|
|
||||||
.padding(bottom = 25.dp)
|
|
||||||
.fillMaxWidth()
|
|
||||||
) {
|
|
||||||
Row {
|
|
||||||
Icon(
|
|
||||||
painter = painterResource(id = R.drawable.ic_baseline_shield_24),
|
|
||||||
contentDescription = "shield icon",
|
|
||||||
modifier = Modifier.size(50.dp)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
Text(
|
|
||||||
text = stringResource(id = R.string.permissions_page_permissions_page_before_starting),
|
|
||||||
fontFamily = productSansFont,
|
|
||||||
fontSize = 30.sp,
|
|
||||||
modifier = Modifier.padding(top = 15.dp)
|
|
||||||
)
|
|
||||||
Text(
|
|
||||||
text = stringResource(id = R.string.permissions_page_this_app_need_the_following_permissions),
|
|
||||||
fontFamily = productSansFont,
|
|
||||||
fontSize = 20.sp,
|
|
||||||
modifier = Modifier.padding(top = 10.dp)
|
|
||||||
)
|
|
||||||
|
|
||||||
// List of required permissions to display
|
|
||||||
PermissionRow(
|
|
||||||
R.drawable.ic_baseline_mic_24,
|
|
||||||
stringResource(id = R.string.permission_microphone),
|
|
||||||
stringResource(id = R.string.permission_microphone_description),
|
|
||||||
Manifest.permission.RECORD_AUDIO
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun PermissionRow(
|
|
||||||
icon: Int = R.drawable.ic_baseline_error_24,
|
|
||||||
title: String = "Name",
|
|
||||||
description: String = "Description of the permission",
|
|
||||||
permission: String
|
|
||||||
) {
|
|
||||||
Row(
|
|
||||||
Modifier
|
|
||||||
.padding(top = 20.dp)
|
|
||||||
.fillMaxWidth(),
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
|
||||||
horizontalArrangement = Arrangement.SpaceBetween
|
|
||||||
) {
|
|
||||||
Row(modifier = Modifier.fillMaxWidth(0.75F)) {
|
|
||||||
Icon(
|
|
||||||
painter = painterResource(id = icon),
|
|
||||||
contentDescription = "permission icon",
|
|
||||||
modifier = Modifier
|
|
||||||
.size(40.dp)
|
|
||||||
.padding(end = 10.dp)
|
|
||||||
)
|
|
||||||
Column {
|
|
||||||
Text(
|
|
||||||
text = title,
|
|
||||||
fontFamily = productSansFont,
|
|
||||||
fontSize = 18.sp
|
|
||||||
)
|
|
||||||
Text(
|
|
||||||
text = description,
|
|
||||||
fontFamily = productSansFont,
|
|
||||||
fontSize = 14.sp,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Remove preview error (only in IDE, has no impact on app)
|
|
||||||
if (!LocalInspectionMode.current) {
|
|
||||||
PermissionRequestButton(permission = permission)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@OptIn(ExperimentalPermissionsApi::class)
|
|
||||||
@Composable
|
|
||||||
fun PermissionRequestButton(permission: String) {
|
|
||||||
val permissionState = rememberPermissionState(permission = permission)
|
|
||||||
val context = LocalContext.current
|
|
||||||
|
|
||||||
PermissionRequired(
|
|
||||||
permissionState = permissionState,
|
|
||||||
permissionNotGrantedContent = {
|
|
||||||
Button(onClick = {
|
|
||||||
permissionState.launchPermissionRequest()
|
|
||||||
}) {
|
|
||||||
Text(text = stringResource(id = R.string.permissions_page_grant_permission))
|
|
||||||
}
|
|
||||||
|
|
||||||
},
|
|
||||||
permissionNotAvailableContent = {
|
|
||||||
Button(
|
|
||||||
onClick = { openAppSettings(context) },
|
|
||||||
colors = ButtonDefaults.buttonColors(contentColor = MaterialTheme.colorScheme.error)
|
|
||||||
) {
|
|
||||||
Text(text = stringResource(id = R.string.permissions_page_permission_denied))
|
|
||||||
Icon(
|
|
||||||
painter = painterResource(id = R.drawable.ic_outline_settings_24),
|
|
||||||
contentDescription = "app settings icon"
|
|
||||||
)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
content = {
|
|
||||||
Button(onClick = {}, enabled = false) {
|
|
||||||
Text(text = stringResource(id = R.string.permission_granted))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Preview(showBackground = true)
|
|
||||||
@Composable
|
|
||||||
fun PermissionsPagePreview() {
|
|
||||||
JarvisclientappTheme {
|
|
||||||
DisplayPermissionsPage(rememberNavController())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,58 +0,0 @@
|
|||||||
package ch.broillet.jarvis.android.pages
|
|
||||||
|
|
||||||
import androidx.compose.foundation.layout.Column
|
|
||||||
import androidx.compose.foundation.layout.Row
|
|
||||||
import androidx.compose.foundation.layout.padding
|
|
||||||
import androidx.compose.material3.Icon
|
|
||||||
import androidx.compose.material3.IconButton
|
|
||||||
import androidx.compose.material3.Text
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.res.painterResource
|
|
||||||
import androidx.compose.ui.res.stringResource
|
|
||||||
import androidx.compose.ui.tooling.preview.Preview
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import androidx.compose.ui.unit.sp
|
|
||||||
import androidx.navigation.NavController
|
|
||||||
import androidx.navigation.compose.rememberNavController
|
|
||||||
import ch.broillet.jarvis.android.R
|
|
||||||
import ch.broillet.jarvis.android.nav.Screen
|
|
||||||
import ch.broillet.jarvis.android.ui.theme.JarvisclientappTheme
|
|
||||||
import ch.broillet.jarvis.android.ui.theme.productSansFont
|
|
||||||
import ch.broillet.jarvis.android.utils.DefaultBox
|
|
||||||
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun DisplaySettingsPage(navController: NavController) {
|
|
||||||
DefaultBox {
|
|
||||||
SettingsBase(navController)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun SettingsBase(navController: NavController) {
|
|
||||||
Column(Modifier.padding(bottom = 25.dp)) {
|
|
||||||
Row {
|
|
||||||
IconButton(onClick = { navController.navigate(Screen.MainScreen.route) }) {
|
|
||||||
Icon(
|
|
||||||
painter = painterResource(id = R.drawable.ic_baseline_arrow_back_24),
|
|
||||||
contentDescription = "back button"
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Text(
|
|
||||||
text = stringResource(id = R.string.settings),
|
|
||||||
fontFamily = productSansFont,
|
|
||||||
fontSize = 30.sp,
|
|
||||||
modifier = Modifier.padding(top = 30.dp)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Preview(showBackground = true)
|
|
||||||
@Composable
|
|
||||||
fun SettingsPagePreview() {
|
|
||||||
JarvisclientappTheme {
|
|
||||||
DisplaySettingsPage(rememberNavController())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,69 +0,0 @@
|
|||||||
package ch.broillet.jarvis.android.ui.theme
|
|
||||||
|
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
|
|
||||||
|
|
||||||
val md_theme_light_primary = Color(0xFF006D3E)
|
|
||||||
val md_theme_light_onPrimary = Color(0xFFFFFFFF)
|
|
||||||
val md_theme_light_primaryContainer = Color(0xFF96F7B8)
|
|
||||||
val md_theme_light_onPrimaryContainer = Color(0xFF00210F)
|
|
||||||
val md_theme_light_secondary = Color(0xFF4F6354)
|
|
||||||
val md_theme_light_onSecondary = Color(0xFFFFFFFF)
|
|
||||||
val md_theme_light_secondaryContainer = Color(0xFFD1E8D5)
|
|
||||||
val md_theme_light_onSecondaryContainer = Color(0xFF0C1F13)
|
|
||||||
val md_theme_light_tertiary = Color(0xFF3B6470)
|
|
||||||
val md_theme_light_onTertiary = Color(0xFFFFFFFF)
|
|
||||||
val md_theme_light_tertiaryContainer = Color(0xFFBEEAF7)
|
|
||||||
val md_theme_light_onTertiaryContainer = Color(0xFF001F26)
|
|
||||||
val md_theme_light_error = Color(0xFFBA1A1A)
|
|
||||||
val md_theme_light_errorContainer = Color(0xFFFFDAD6)
|
|
||||||
val md_theme_light_onError = Color(0xFFFFFFFF)
|
|
||||||
val md_theme_light_onErrorContainer = Color(0xFF410002)
|
|
||||||
val md_theme_light_background = Color(0xFFFBFDF8)
|
|
||||||
val md_theme_light_onBackground = Color(0xFF191C1A)
|
|
||||||
val md_theme_light_surface = Color(0xFFFBFDF8)
|
|
||||||
val md_theme_light_onSurface = Color(0xFF191C1A)
|
|
||||||
val md_theme_light_surfaceVariant = Color(0xFFDCE5DB)
|
|
||||||
val md_theme_light_onSurfaceVariant = Color(0xFF414942)
|
|
||||||
val md_theme_light_outline = Color(0xFF717971)
|
|
||||||
val md_theme_light_inverseOnSurface = Color(0xFFF0F1EC)
|
|
||||||
val md_theme_light_inverseSurface = Color(0xFF2E312E)
|
|
||||||
val md_theme_light_inversePrimary = Color(0xFF7ADA9E)
|
|
||||||
val md_theme_light_shadow = Color(0xFF000000)
|
|
||||||
val md_theme_light_surfaceTint = Color(0xFF006D3E)
|
|
||||||
val md_theme_light_outlineVariant = Color(0xFFC0C9C0)
|
|
||||||
val md_theme_light_scrim = Color(0xFF000000)
|
|
||||||
|
|
||||||
val md_theme_dark_primary = Color(0xFF7ADA9E)
|
|
||||||
val md_theme_dark_onPrimary = Color(0xFF00391E)
|
|
||||||
val md_theme_dark_primaryContainer = Color(0xFF00522E)
|
|
||||||
val md_theme_dark_onPrimaryContainer = Color(0xFF96F7B8)
|
|
||||||
val md_theme_dark_secondary = Color(0xFFB6CCB9)
|
|
||||||
val md_theme_dark_onSecondary = Color(0xFF213527)
|
|
||||||
val md_theme_dark_secondaryContainer = Color(0xFF374B3D)
|
|
||||||
val md_theme_dark_onSecondaryContainer = Color(0xFFD1E8D5)
|
|
||||||
val md_theme_dark_tertiary = Color(0xFFA3CDDB)
|
|
||||||
val md_theme_dark_onTertiary = Color(0xFF023640)
|
|
||||||
val md_theme_dark_tertiaryContainer = Color(0xFF214C57)
|
|
||||||
val md_theme_dark_onTertiaryContainer = Color(0xFFBEEAF7)
|
|
||||||
val md_theme_dark_error = Color(0xFFFFB4AB)
|
|
||||||
val md_theme_dark_errorContainer = Color(0xFF93000A)
|
|
||||||
val md_theme_dark_onError = Color(0xFF690005)
|
|
||||||
val md_theme_dark_onErrorContainer = Color(0xFFFFDAD6)
|
|
||||||
val md_theme_dark_background = Color(0xFF191C1A)
|
|
||||||
val md_theme_dark_onBackground = Color(0xFFE1E3DE)
|
|
||||||
val md_theme_dark_surface = Color(0xFF191C1A)
|
|
||||||
val md_theme_dark_onSurface = Color(0xFFE1E3DE)
|
|
||||||
val md_theme_dark_surfaceVariant = Color(0xFF414942)
|
|
||||||
val md_theme_dark_onSurfaceVariant = Color(0xFFC0C9C0)
|
|
||||||
val md_theme_dark_outline = Color(0xFF8A938B)
|
|
||||||
val md_theme_dark_inverseOnSurface = Color(0xFF191C1A)
|
|
||||||
val md_theme_dark_inverseSurface = Color(0xFFE1E3DE)
|
|
||||||
val md_theme_dark_inversePrimary = Color(0xFF006D3E)
|
|
||||||
val md_theme_dark_shadow = Color(0xFF000000)
|
|
||||||
val md_theme_dark_surfaceTint = Color(0xFF7ADA9E)
|
|
||||||
val md_theme_dark_outlineVariant = Color(0xFF414942)
|
|
||||||
val md_theme_dark_scrim = Color(0xFF000000)
|
|
||||||
|
|
||||||
|
|
||||||
val seed = Color(0xFF056D3F)
|
|
||||||
@ -1,105 +0,0 @@
|
|||||||
package ch.broillet.jarvis.android.ui.theme
|
|
||||||
|
|
||||||
import android.app.Activity
|
|
||||||
import android.os.Build
|
|
||||||
import androidx.compose.foundation.isSystemInDarkTheme
|
|
||||||
import androidx.compose.material3.*
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.runtime.SideEffect
|
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
import androidx.compose.ui.platform.LocalContext
|
|
||||||
import androidx.compose.ui.platform.LocalView
|
|
||||||
import androidx.core.view.WindowCompat
|
|
||||||
|
|
||||||
private val DarkColorScheme = darkColorScheme(
|
|
||||||
primary = md_theme_dark_primary,
|
|
||||||
onPrimary = md_theme_dark_onPrimary,
|
|
||||||
primaryContainer = md_theme_dark_primaryContainer,
|
|
||||||
onPrimaryContainer = md_theme_dark_onPrimaryContainer,
|
|
||||||
secondary = md_theme_dark_secondary,
|
|
||||||
onSecondary = md_theme_dark_onSecondary,
|
|
||||||
secondaryContainer = md_theme_dark_secondaryContainer,
|
|
||||||
onSecondaryContainer = md_theme_dark_onSecondaryContainer,
|
|
||||||
tertiary = md_theme_dark_tertiary,
|
|
||||||
onTertiary = md_theme_dark_onTertiary,
|
|
||||||
tertiaryContainer = md_theme_dark_tertiaryContainer,
|
|
||||||
onTertiaryContainer = md_theme_dark_onTertiaryContainer,
|
|
||||||
error = md_theme_dark_error,
|
|
||||||
errorContainer = md_theme_dark_errorContainer,
|
|
||||||
onError = md_theme_dark_onError,
|
|
||||||
onErrorContainer = md_theme_dark_onErrorContainer,
|
|
||||||
background = md_theme_dark_background,
|
|
||||||
onBackground = md_theme_dark_onBackground,
|
|
||||||
surface = md_theme_dark_surface,
|
|
||||||
onSurface = md_theme_dark_onSurface,
|
|
||||||
surfaceVariant = md_theme_dark_surfaceVariant,
|
|
||||||
onSurfaceVariant = md_theme_dark_onSurfaceVariant,
|
|
||||||
outline = md_theme_dark_outline,
|
|
||||||
inverseOnSurface = md_theme_dark_inverseOnSurface,
|
|
||||||
inverseSurface = md_theme_dark_inverseSurface,
|
|
||||||
inversePrimary = md_theme_dark_inversePrimary
|
|
||||||
)
|
|
||||||
|
|
||||||
private val LightColorScheme = lightColorScheme(
|
|
||||||
primary = md_theme_light_primary,
|
|
||||||
onPrimary = md_theme_light_onPrimary,
|
|
||||||
primaryContainer = md_theme_light_primaryContainer,
|
|
||||||
onPrimaryContainer = md_theme_light_onPrimaryContainer,
|
|
||||||
secondary = md_theme_light_secondary,
|
|
||||||
onSecondary = md_theme_light_onSecondary,
|
|
||||||
secondaryContainer = md_theme_light_secondaryContainer,
|
|
||||||
onSecondaryContainer = md_theme_light_onSecondaryContainer,
|
|
||||||
tertiary = md_theme_light_tertiary,
|
|
||||||
onTertiary = md_theme_light_onTertiary,
|
|
||||||
tertiaryContainer = md_theme_light_tertiaryContainer,
|
|
||||||
onTertiaryContainer = md_theme_light_onTertiaryContainer,
|
|
||||||
error = md_theme_light_error,
|
|
||||||
errorContainer = md_theme_light_errorContainer,
|
|
||||||
onError = md_theme_light_onError,
|
|
||||||
onErrorContainer = md_theme_light_onErrorContainer,
|
|
||||||
background = md_theme_light_background,
|
|
||||||
onBackground = md_theme_light_onBackground,
|
|
||||||
surface = md_theme_light_surface,
|
|
||||||
onSurface = md_theme_light_onSurface,
|
|
||||||
surfaceVariant = md_theme_light_surfaceVariant,
|
|
||||||
onSurfaceVariant = md_theme_light_onSurfaceVariant,
|
|
||||||
outline = md_theme_light_outline,
|
|
||||||
inverseOnSurface = md_theme_light_inverseOnSurface,
|
|
||||||
inverseSurface = md_theme_light_inverseSurface,
|
|
||||||
inversePrimary = md_theme_light_inversePrimary
|
|
||||||
)
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun JarvisclientappTheme(
|
|
||||||
darkTheme: Boolean = isSystemInDarkTheme(),
|
|
||||||
// Dynamic color is available on Android 12+
|
|
||||||
dynamicColor: Boolean = true,
|
|
||||||
content: @Composable () -> Unit
|
|
||||||
) {
|
|
||||||
|
|
||||||
val colorScheme = when {
|
|
||||||
dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
|
|
||||||
val context = LocalContext.current
|
|
||||||
if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
|
|
||||||
}
|
|
||||||
darkTheme -> DarkColorScheme
|
|
||||||
else -> LightColorScheme
|
|
||||||
}
|
|
||||||
|
|
||||||
val view = LocalView.current
|
|
||||||
if (!view.isInEditMode) {
|
|
||||||
SideEffect {
|
|
||||||
(view.context as Activity).window.statusBarColor = Color.Transparent.hashCode()
|
|
||||||
WindowCompat.getInsetsController(
|
|
||||||
(view.context as Activity).window,
|
|
||||||
view
|
|
||||||
).isAppearanceLightStatusBars = !darkTheme
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
MaterialTheme(
|
|
||||||
colorScheme = colorScheme,
|
|
||||||
typography = Typography,
|
|
||||||
content = content
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@ -1,53 +0,0 @@
|
|||||||
package ch.broillet.jarvis.android.ui.theme
|
|
||||||
|
|
||||||
import androidx.compose.material3.Typography
|
|
||||||
import androidx.compose.ui.text.TextStyle
|
|
||||||
import androidx.compose.ui.text.font.Font
|
|
||||||
import androidx.compose.ui.text.font.FontFamily
|
|
||||||
import androidx.compose.ui.text.font.FontStyle
|
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
|
||||||
import androidx.compose.ui.unit.sp
|
|
||||||
import ch.broillet.jarvis.android.R
|
|
||||||
|
|
||||||
// Adding the Product Sans fonts
|
|
||||||
val productSansFont = FontFamily(
|
|
||||||
Font(R.font.google_regular),
|
|
||||||
Font(R.font.google_thin, weight = FontWeight.Thin),
|
|
||||||
Font(R.font.google_thin_italic, weight = FontWeight.Thin, style = FontStyle.Italic),
|
|
||||||
Font(R.font.google_light, weight = FontWeight.Light),
|
|
||||||
Font(R.font.google_light_italic, weight = FontWeight.Light, style = FontStyle.Italic),
|
|
||||||
Font(R.font.google_medium, weight = FontWeight.Medium),
|
|
||||||
Font(R.font.google_medium_italic, weight = FontWeight.Medium, style = FontStyle.Italic),
|
|
||||||
Font(R.font.google_bold, weight = FontWeight.Bold),
|
|
||||||
Font(R.font.google_bold_italic, weight = FontWeight.Bold, style = FontStyle.Italic),
|
|
||||||
Font(R.font.google_black, weight = FontWeight.Black),
|
|
||||||
Font(R.font.google_black_italic, weight = FontWeight.Black, style = FontStyle.Italic)
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
// Set of Material typography styles to start with
|
|
||||||
val Typography = Typography(
|
|
||||||
bodyLarge = TextStyle(
|
|
||||||
fontFamily = productSansFont,
|
|
||||||
fontWeight = FontWeight.Normal,
|
|
||||||
fontSize = 16.sp,
|
|
||||||
lineHeight = 24.sp,
|
|
||||||
letterSpacing = 0.5.sp
|
|
||||||
)
|
|
||||||
/* Other default text styles to override
|
|
||||||
titleLarge = TextStyle(
|
|
||||||
fontFamily = FontFamily.Default,
|
|
||||||
fontWeight = FontWeight.Normal,
|
|
||||||
fontSize = 22.sp,
|
|
||||||
lineHeight = 28.sp,
|
|
||||||
letterSpacing = 0.sp
|
|
||||||
),
|
|
||||||
labelSmall = TextStyle(
|
|
||||||
fontFamily = FontFamily.Default,
|
|
||||||
fontWeight = FontWeight.Medium,
|
|
||||||
fontSize = 11.sp,
|
|
||||||
lineHeight = 16.sp,
|
|
||||||
letterSpacing = 0.5.sp
|
|
||||||
)
|
|
||||||
*/
|
|
||||||
)
|
|
||||||
@ -1,258 +0,0 @@
|
|||||||
// Thanks to EugeneTheDev : https://gist.github.com/EugeneTheDev/a27664cb7e7899f964348b05883cbccd
|
|
||||||
|
|
||||||
package ch.broillet.jarvis.android.utils
|
|
||||||
|
|
||||||
import androidx.compose.animation.core.*
|
|
||||||
import androidx.compose.foundation.background
|
|
||||||
import androidx.compose.foundation.layout.*
|
|
||||||
import androidx.compose.foundation.shape.CircleShape
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.runtime.State
|
|
||||||
import androidx.compose.runtime.getValue
|
|
||||||
import androidx.compose.ui.Alignment
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.draw.alpha
|
|
||||||
import androidx.compose.ui.draw.scale
|
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
import androidx.compose.ui.unit.Dp
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun DotsPulsing(dotSize: Dp, numberOfDots: Int, delayUnit: Int, dotColor: Color, spaceBetween: Dp) {
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun Dot(scale: Float) {
|
|
||||||
Spacer(
|
|
||||||
Modifier
|
|
||||||
.size(dotSize)
|
|
||||||
.scale(scale)
|
|
||||||
.background(
|
|
||||||
color = dotColor, shape = CircleShape
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
val infiniteTransition = rememberInfiniteTransition()
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun animateScaleWithDelay(delay: Int) = infiniteTransition.animateFloat(
|
|
||||||
initialValue = 0f,
|
|
||||||
targetValue = 0f,
|
|
||||||
animationSpec = infiniteRepeatable(animation = keyframes {
|
|
||||||
durationMillis = delayUnit * numberOfDots
|
|
||||||
0f at delay with LinearEasing
|
|
||||||
1f at delay + delayUnit with LinearEasing
|
|
||||||
0f at delay + numberOfDots * delayUnit
|
|
||||||
})
|
|
||||||
)
|
|
||||||
|
|
||||||
val scales = arrayListOf<State<Float>>()
|
|
||||||
for (i in 0 until numberOfDots) {
|
|
||||||
scales.add(animateScaleWithDelay(delay = i * delayUnit))
|
|
||||||
}
|
|
||||||
|
|
||||||
Row(
|
|
||||||
verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Center
|
|
||||||
) {
|
|
||||||
scales.forEach {
|
|
||||||
Dot(it.value)
|
|
||||||
Spacer(Modifier.width(spaceBetween))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun DotsElastic(dotSize: Dp, numberOfDots: Int, delayUnit: Int, dotColor: Color, spaceBetween: Dp) {
|
|
||||||
val minScale = 0.6f
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun Dot(scale: Float) {
|
|
||||||
Spacer(
|
|
||||||
Modifier
|
|
||||||
.size(dotSize)
|
|
||||||
.scale(scaleX = minScale, scaleY = scale)
|
|
||||||
.background(
|
|
||||||
color = dotColor, shape = CircleShape
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
val infiniteTransition = rememberInfiniteTransition()
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun animateScaleWithDelay(delay: Int) = infiniteTransition.animateFloat(
|
|
||||||
initialValue = minScale,
|
|
||||||
targetValue = minScale,
|
|
||||||
animationSpec = infiniteRepeatable(animation = keyframes {
|
|
||||||
durationMillis = numberOfDots * delayUnit
|
|
||||||
minScale at delay with LinearEasing
|
|
||||||
1f at delay + delayUnit with LinearEasing
|
|
||||||
minScale at delay + numberOfDots * delayUnit
|
|
||||||
})
|
|
||||||
)
|
|
||||||
|
|
||||||
val scales = arrayListOf<State<Float>>()
|
|
||||||
for (i in 0 until numberOfDots) {
|
|
||||||
scales.add(animateScaleWithDelay(delay = i * delayUnit))
|
|
||||||
}
|
|
||||||
|
|
||||||
Row(
|
|
||||||
verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Center
|
|
||||||
) {
|
|
||||||
scales.forEach {
|
|
||||||
Dot(it.value)
|
|
||||||
Spacer(Modifier.width(spaceBetween))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun DotsFlashing(
|
|
||||||
dotSize: Dp, numberOfDots: Int, delayUnit: Int, dotColor: Color, spaceBetween: Dp
|
|
||||||
) {
|
|
||||||
val minAlpha = 0.1f
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun Dot(alpha: Float) = Spacer(
|
|
||||||
Modifier
|
|
||||||
.size(dotSize)
|
|
||||||
.alpha(alpha)
|
|
||||||
.background(
|
|
||||||
color = dotColor, shape = CircleShape
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
val infiniteTransition = rememberInfiniteTransition()
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun animateAlphaWithDelay(delay: Int) = infiniteTransition.animateFloat(
|
|
||||||
initialValue = minAlpha,
|
|
||||||
targetValue = minAlpha,
|
|
||||||
animationSpec = infiniteRepeatable(animation = keyframes {
|
|
||||||
durationMillis = numberOfDots * delayUnit
|
|
||||||
minAlpha at delay with LinearEasing
|
|
||||||
1f at delay + delayUnit with LinearEasing
|
|
||||||
minAlpha at delay + numberOfDots * delayUnit
|
|
||||||
})
|
|
||||||
)
|
|
||||||
|
|
||||||
val alphas = arrayListOf<State<Float>>()
|
|
||||||
for (i in 0 until numberOfDots) {
|
|
||||||
alphas.add(animateAlphaWithDelay(delay = i * delayUnit))
|
|
||||||
}
|
|
||||||
|
|
||||||
Row(
|
|
||||||
verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Center
|
|
||||||
) {
|
|
||||||
alphas.forEach {
|
|
||||||
Dot(it.value)
|
|
||||||
Spacer(Modifier.width(spaceBetween))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun DotsTyping(dotSize: Dp, numberOfDots: Int, delayUnit: Int, dotColor: Color, spaceBetween: Dp) {
|
|
||||||
val maxOffset = (numberOfDots * 2).toFloat()
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun Dot(offset: Float) {
|
|
||||||
Spacer(
|
|
||||||
Modifier
|
|
||||||
.size(dotSize)
|
|
||||||
.offset(y = -offset.dp)
|
|
||||||
.background(
|
|
||||||
color = dotColor, shape = CircleShape
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
val infiniteTransition = rememberInfiniteTransition()
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun animateOffsetWithDelay(delay: Int) = infiniteTransition.animateFloat(
|
|
||||||
initialValue = 0f,
|
|
||||||
targetValue = 0f,
|
|
||||||
animationSpec = infiniteRepeatable(animation = keyframes {
|
|
||||||
durationMillis = numberOfDots * delayUnit
|
|
||||||
0f at delay with LinearEasing
|
|
||||||
maxOffset at delay + delayUnit with LinearEasing
|
|
||||||
0f at delay + (numberOfDots * delayUnit / 2)
|
|
||||||
})
|
|
||||||
)
|
|
||||||
|
|
||||||
val offsets = arrayListOf<State<Float>>()
|
|
||||||
for (i in 0 until numberOfDots) {
|
|
||||||
offsets.add(animateOffsetWithDelay(delay = i * delayUnit))
|
|
||||||
}
|
|
||||||
|
|
||||||
Row(
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
|
||||||
horizontalArrangement = Arrangement.Center,
|
|
||||||
modifier = Modifier.padding(top = maxOffset.dp)
|
|
||||||
) {
|
|
||||||
offsets.forEach {
|
|
||||||
Dot(it.value)
|
|
||||||
Spacer(Modifier.width(spaceBetween))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun DotsCollision(
|
|
||||||
dotSize: Dp, numberOfDots: Int, delayUnit: Int, dotColor: Color, spaceBetween: Dp
|
|
||||||
) {
|
|
||||||
val maxOffset = 30f
|
|
||||||
val delayUnit = 500
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun Dot(offset: Float) {
|
|
||||||
Spacer(
|
|
||||||
Modifier
|
|
||||||
.size(dotSize)
|
|
||||||
.offset(x = offset.dp)
|
|
||||||
.background(
|
|
||||||
color = dotColor, shape = CircleShape
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
val infiniteTransition = rememberInfiniteTransition()
|
|
||||||
|
|
||||||
val offsetLeft by infiniteTransition.animateFloat(
|
|
||||||
initialValue = 0f,
|
|
||||||
targetValue = 0f,
|
|
||||||
animationSpec = infiniteRepeatable(animation = keyframes {
|
|
||||||
durationMillis = delayUnit * 3
|
|
||||||
0f at 0 with LinearEasing
|
|
||||||
-maxOffset at delayUnit / 2 with LinearEasing
|
|
||||||
0f at delayUnit
|
|
||||||
})
|
|
||||||
)
|
|
||||||
val offsetRight by infiniteTransition.animateFloat(
|
|
||||||
initialValue = 0f,
|
|
||||||
targetValue = 0f,
|
|
||||||
animationSpec = infiniteRepeatable(animation = keyframes {
|
|
||||||
durationMillis = delayUnit * 3
|
|
||||||
0f at delayUnit with LinearEasing
|
|
||||||
maxOffset at delayUnit + delayUnit / 2 with LinearEasing
|
|
||||||
0f at delayUnit * 2
|
|
||||||
})
|
|
||||||
)
|
|
||||||
|
|
||||||
Row(
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
|
||||||
horizontalArrangement = Arrangement.Center,
|
|
||||||
modifier = Modifier.padding(horizontal = maxOffset.dp)
|
|
||||||
) {
|
|
||||||
Dot(offsetLeft)
|
|
||||||
Spacer(Modifier.width(spaceBetween))
|
|
||||||
for (i in 0 until numberOfDots - 2) {
|
|
||||||
Dot(0f)
|
|
||||||
Spacer(Modifier.width(spaceBetween))
|
|
||||||
}
|
|
||||||
Dot(offsetRight)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,49 +0,0 @@
|
|||||||
package ch.broillet.jarvis.android.utils
|
|
||||||
|
|
||||||
import okhttp3.MediaType.Companion.toMediaType
|
|
||||||
import okhttp3.OkHttpClient
|
|
||||||
import okhttp3.Request
|
|
||||||
import okhttp3.RequestBody.Companion.asRequestBody
|
|
||||||
import java.io.File
|
|
||||||
import java.io.IOException
|
|
||||||
|
|
||||||
|
|
||||||
fun getTextFromAudio(file: File): String {
|
|
||||||
val client = OkHttpClient()
|
|
||||||
|
|
||||||
val request = Request.Builder()
|
|
||||||
.url("https://jarvis-server.broillet.ch/get_text_from_audio")
|
|
||||||
.post(file.asRequestBody("audio/x-wav; charset=utf-8".toMediaType()))
|
|
||||||
.build()
|
|
||||||
|
|
||||||
|
|
||||||
client.newCall(request).execute().use { response ->
|
|
||||||
if (!response.isSuccessful) throw IOException("Unexpected code $response")
|
|
||||||
return response.body!!.string()
|
|
||||||
}
|
|
||||||
|
|
||||||
/* # SEND STT REQUEST DIRECTLY TO WHISPER ASR WITHOUT JARVIS SERVER API
|
|
||||||
val okHttpClient = OkHttpClient()
|
|
||||||
.newBuilder()
|
|
||||||
.connectTimeout(60, TimeUnit.SECONDS)
|
|
||||||
.build()
|
|
||||||
|
|
||||||
val fileBody: RequestBody = RequestBody.create("audio/x-wav".toMediaTypeOrNull(), file.readBytes())
|
|
||||||
|
|
||||||
val multipartBody: MultipartBody = MultipartBody.Builder()
|
|
||||||
.setType(MultipartBody.FORM) // Header to show we are sending a Multipart Form Data
|
|
||||||
.addFormDataPart("audio_file", file.name, fileBody) // file param
|
|
||||||
.build()
|
|
||||||
|
|
||||||
val request = Request.Builder()
|
|
||||||
.addHeader("Accept", "application/json")
|
|
||||||
.addHeader("Content-Type", "multipart/form-data")
|
|
||||||
.url("http://192.168.1.208:9000/asr?task=transcribe&language=fr&output=json")
|
|
||||||
.post(multipartBody)
|
|
||||||
.build()
|
|
||||||
|
|
||||||
okHttpClient.newCall(request).execute().use { response ->
|
|
||||||
if (!response.isSuccessful) throw IOException("Unexpected code $response")
|
|
||||||
return response.body!!.string()
|
|
||||||
}*/
|
|
||||||
}
|
|
||||||
@ -1,84 +0,0 @@
|
|||||||
package ch.broillet.jarvis.android.utils
|
|
||||||
|
|
||||||
import ch.broillet.jarvis.android.chat.ConversationUiState
|
|
||||||
import ch.broillet.jarvis.android.chat.Message
|
|
||||||
import io.socket.client.IO
|
|
||||||
import io.socket.client.Socket
|
|
||||||
import io.socket.engineio.client.transports.WebSocket
|
|
||||||
import org.json.JSONObject
|
|
||||||
import java.net.URISyntaxException
|
|
||||||
|
|
||||||
object SocketHandler {
|
|
||||||
|
|
||||||
lateinit var mSocket: Socket
|
|
||||||
|
|
||||||
@Synchronized
|
|
||||||
fun setSocket() {
|
|
||||||
try {
|
|
||||||
val options = IO.Options()
|
|
||||||
options.transports = arrayOf(WebSocket.NAME)
|
|
||||||
|
|
||||||
mSocket = IO.socket("https://jarvis-server.broillet.ch", options)
|
|
||||||
} catch (_: URISyntaxException) {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Synchronized
|
|
||||||
fun getSocket(): Socket {
|
|
||||||
return mSocket
|
|
||||||
}
|
|
||||||
|
|
||||||
@Synchronized
|
|
||||||
fun establishConnection() {
|
|
||||||
mSocket.connect()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Synchronized
|
|
||||||
fun closeConnection() {
|
|
||||||
mSocket.disconnect()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Synchronized
|
|
||||||
fun processMessage(message: String, uuid: String) {
|
|
||||||
val body = JSONObject()
|
|
||||||
body.put("data", message)
|
|
||||||
body.put("uuid", uuid)
|
|
||||||
getSocket().emit("process_message", body.toString())
|
|
||||||
}
|
|
||||||
|
|
||||||
@Synchronized
|
|
||||||
fun joinRoom(uuid: String) {
|
|
||||||
val body = JSONObject()
|
|
||||||
body.put("uuid", uuid)
|
|
||||||
getSocket().emit("join", body.toString())
|
|
||||||
}
|
|
||||||
|
|
||||||
@Synchronized
|
|
||||||
fun clearMessages(uiState: ConversationUiState, uuid: String) {
|
|
||||||
val body = JSONObject()
|
|
||||||
body.put("uuid", uuid)
|
|
||||||
|
|
||||||
getSocket().emit("clear_chat", body.toString())
|
|
||||||
uiState.clearMessage()
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
fun messageFromJarvis(data: Array<Any>, uiState: ConversationUiState) {
|
|
||||||
if (data[0].toString().contains("data")) {
|
|
||||||
val result: JSONObject = data[0] as JSONObject
|
|
||||||
if (result.getString("data") != "") {
|
|
||||||
uiState.addMessage(Message(true, result.getString("data")))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
fun messageFromUser(data: Array<Any>, uiState: ConversationUiState) {
|
|
||||||
if (data[0].toString().contains("data")) {
|
|
||||||
val result: JSONObject = data[0] as JSONObject
|
|
||||||
if (result.getString("data") != "") {
|
|
||||||
uiState.addMessage(Message(false, result.getString("data")))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
package ch.broillet.jarvis.android.utils
|
|
||||||
|
|
||||||
import android.content.Context
|
|
||||||
import android.content.Intent
|
|
||||||
import android.net.Uri
|
|
||||||
import android.provider.Settings
|
|
||||||
import androidx.compose.foundation.layout.*
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun DefaultBox(
|
|
||||||
content: @Composable() (BoxScope.() -> Unit)
|
|
||||||
) {
|
|
||||||
Box(
|
|
||||||
Modifier
|
|
||||||
.fillMaxHeight()
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(horizontal = 15.dp)
|
|
||||||
.padding(top = 45.dp, bottom = 10.dp)
|
|
||||||
) {
|
|
||||||
content()
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
// Open the application in the system's settings to (i.e) manually give permission
|
|
||||||
fun openAppSettings(context: Context) {
|
|
||||||
context.startActivity(
|
|
||||||
Intent(
|
|
||||||
Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
|
|
||||||
Uri
|
|
||||||
.fromParts("package", context.applicationInfo.packageName, null)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getDeviceId(context: Context): String {
|
|
||||||
return Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID)
|
|
||||||
}
|
|
||||||
@ -0,0 +1,135 @@
|
|||||||
|
package ch.mathieubroillet.jarvis.android;
|
||||||
|
|
||||||
|
import android.app.KeyguardManager;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.media.MediaRecorder;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.os.Handler;
|
||||||
|
import android.os.ParcelFileDescriptor;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.WindowManager;
|
||||||
|
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
|
||||||
|
import java.io.ByteArrayOutputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
|
||||||
|
public class ListeningActivity extends AppCompatActivity {
|
||||||
|
private static final String audioFile = null;
|
||||||
|
private MediaRecorder mediaRecorder;
|
||||||
|
private RecordAudio recordTask;
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
|
// used for turning on the screen and show the activity
|
||||||
|
setShowWhenLocked(true);
|
||||||
|
setTurnScreenOn(true);
|
||||||
|
|
||||||
|
KeyguardManager keyguardManager = (KeyguardManager) getSystemService(Context.KEYGUARD_SERVICE);
|
||||||
|
if (keyguardManager != null)
|
||||||
|
keyguardManager.requestDismissKeyguard(this, null);
|
||||||
|
|
||||||
|
|
||||||
|
// full screen
|
||||||
|
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
|
||||||
|
WindowManager.LayoutParams.FLAG_FULLSCREEN);
|
||||||
|
|
||||||
|
setContentView(R.layout.dialog_listening);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onDestroy() {
|
||||||
|
super.onDestroy();
|
||||||
|
stopRecording();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void quit(View view) {
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void recordAudio(int seconds) {
|
||||||
|
try {
|
||||||
|
// Byte array for audio record
|
||||||
|
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
|
||||||
|
|
||||||
|
ParcelFileDescriptor[] descriptors = ParcelFileDescriptor.createPipe();
|
||||||
|
ParcelFileDescriptor parcelRead = new ParcelFileDescriptor(descriptors[0]);
|
||||||
|
ParcelFileDescriptor parcelWrite = new ParcelFileDescriptor(descriptors[1]);
|
||||||
|
|
||||||
|
InputStream inputStream = new ParcelFileDescriptor.AutoCloseInputStream(parcelRead);
|
||||||
|
|
||||||
|
mediaRecorder = new MediaRecorder();
|
||||||
|
mediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);
|
||||||
|
mediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.AMR_NB);
|
||||||
|
mediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);
|
||||||
|
mediaRecorder.setOutputFile(parcelWrite.getFileDescriptor());
|
||||||
|
mediaRecorder.setMaxDuration(seconds * 1000);
|
||||||
|
mediaRecorder.prepare();
|
||||||
|
|
||||||
|
mediaRecorder.start();
|
||||||
|
|
||||||
|
|
||||||
|
int read;
|
||||||
|
byte[] data = new byte[16384];
|
||||||
|
|
||||||
|
while ((read = inputStream.read(data, 0, data.length)) != -1) {
|
||||||
|
byteArrayOutputStream.write(data, 0, read);
|
||||||
|
}
|
||||||
|
|
||||||
|
byteArrayOutputStream.flush();
|
||||||
|
} catch (IOException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void startRecording() {
|
||||||
|
Handler handler = new Handler();
|
||||||
|
handler.postDelayed(() -> {
|
||||||
|
recordTask = new RecordAudio();
|
||||||
|
recordTask.start();
|
||||||
|
recordTask.execute();
|
||||||
|
}, 250);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void stopRecording() {
|
||||||
|
/*
|
||||||
|
mediaRecorder.stop();
|
||||||
|
mediaRecorder.reset();
|
||||||
|
mediaRecorder.release();*/
|
||||||
|
|
||||||
|
recordTask.stop();
|
||||||
|
recordTask.cancel(true);
|
||||||
|
|
||||||
|
//byteArrayOutputStream.toByteArray();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void onClickMicrophone(View view) {
|
||||||
|
view.setVisibility(View.INVISIBLE);
|
||||||
|
|
||||||
|
View dots = findViewById(R.id.dots);
|
||||||
|
dots.setVisibility(View.VISIBLE);
|
||||||
|
|
||||||
|
//recordAudio(5);
|
||||||
|
|
||||||
|
startRecording();
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void onClickRecordingDots(View view) {
|
||||||
|
view.setVisibility(View.INVISIBLE);
|
||||||
|
|
||||||
|
View dots = findViewById(R.id.microphone);
|
||||||
|
dots.setVisibility(View.VISIBLE);
|
||||||
|
|
||||||
|
stopRecording();
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,52 @@
|
|||||||
|
package ch.mathieubroillet.jarvis.android;
|
||||||
|
|
||||||
|
import android.Manifest;
|
||||||
|
import android.app.NotificationManager;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.content.pm.PackageManager;
|
||||||
|
import android.os.Build;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import androidx.annotation.RequiresApi;
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
import androidx.core.app.ActivityCompat;
|
||||||
|
import androidx.core.content.ContextCompat;
|
||||||
|
|
||||||
|
public class MainActivity extends AppCompatActivity {
|
||||||
|
private boolean hasPermissions() {
|
||||||
|
return ActivityCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void requestPermissions() {
|
||||||
|
ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.RECORD_AUDIO, Manifest.permission.SYSTEM_ALERT_WINDOW}, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void startService() {
|
||||||
|
Intent serviceIntent = new Intent(this, PorcupineService.class);
|
||||||
|
ContextCompat.startForegroundService(this, serviceIntent);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void stopService() {
|
||||||
|
Intent serviceIntent = new Intent(this, PorcupineService.class);
|
||||||
|
stopService(serviceIntent);
|
||||||
|
}
|
||||||
|
|
||||||
|
@RequiresApi(api = Build.VERSION_CODES.M)
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
|
Notifications.createNotificationChannel(getSystemService(NotificationManager.class));
|
||||||
|
|
||||||
|
setContentView(R.layout.activity_main);
|
||||||
|
|
||||||
|
if (!hasPermissions()) {
|
||||||
|
Toast.makeText(this, "Missing permissions, accept all permissions and restart app.", Toast.LENGTH_SHORT).show();
|
||||||
|
|
||||||
|
requestPermissions();
|
||||||
|
}
|
||||||
|
|
||||||
|
startService();
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,19 @@
|
|||||||
|
package ch.mathieubroillet.jarvis.android;
|
||||||
|
|
||||||
|
|
||||||
|
import android.app.NotificationChannel;
|
||||||
|
import android.app.NotificationManager;
|
||||||
|
|
||||||
|
public class Notifications {
|
||||||
|
|
||||||
|
public static final String CHANNEL_ID = "JarvisChannel";
|
||||||
|
|
||||||
|
public static void createNotificationChannel(NotificationManager manager) {
|
||||||
|
NotificationChannel notificationChannel = new NotificationChannel(
|
||||||
|
CHANNEL_ID,
|
||||||
|
"Jarvis",
|
||||||
|
NotificationManager.IMPORTANCE_HIGH);
|
||||||
|
|
||||||
|
manager.createNotificationChannel(notificationChannel);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,71 @@
|
|||||||
|
package ch.mathieubroillet.jarvis.android;
|
||||||
|
|
||||||
|
|
||||||
|
import android.app.Notification;
|
||||||
|
import android.app.Service;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.os.IBinder;
|
||||||
|
import android.util.Log;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import androidx.annotation.Nullable;
|
||||||
|
import androidx.core.app.NotificationCompat;
|
||||||
|
|
||||||
|
import ai.picovoice.porcupine.Porcupine;
|
||||||
|
import ai.picovoice.porcupine.PorcupineException;
|
||||||
|
import ai.picovoice.porcupine.PorcupineManager;
|
||||||
|
|
||||||
|
public class PorcupineService extends Service {
|
||||||
|
|
||||||
|
private PorcupineManager porcupineManager;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int onStartCommand(Intent intent, int flags, int startId) {
|
||||||
|
Notification notification = new NotificationCompat.Builder(this, Notifications.CHANNEL_ID)
|
||||||
|
.setContentTitle("Jarvis")
|
||||||
|
.setContentText("Say 'Jarvis' and ask me anything.")
|
||||||
|
.setSmallIcon(R.drawable.ic_launcher_foreground)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
startForeground(4002, notification);
|
||||||
|
|
||||||
|
try {
|
||||||
|
porcupineManager = new PorcupineManager.Builder()
|
||||||
|
.setKeyword(Porcupine.BuiltInKeyword.JARVIS)
|
||||||
|
.setSensitivity(0.7f).build(
|
||||||
|
getApplicationContext(),
|
||||||
|
(keywordIndex) -> {
|
||||||
|
|
||||||
|
Intent dialogIntent = new Intent(getApplicationContext(), ListeningActivity.class);
|
||||||
|
dialogIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
|
||||||
|
dialogIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||||
|
startActivity(dialogIntent);
|
||||||
|
|
||||||
|
Toast.makeText(this, "Wake-word detected!", Toast.LENGTH_SHORT).show();
|
||||||
|
});
|
||||||
|
porcupineManager.start();
|
||||||
|
} catch (PorcupineException e) {
|
||||||
|
Log.e("JARVIS", e.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
return super.onStartCommand(intent, flags, startId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
@Override
|
||||||
|
public IBinder onBind(Intent intent) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onDestroy() {
|
||||||
|
try {
|
||||||
|
porcupineManager.stop();
|
||||||
|
porcupineManager.delete();
|
||||||
|
} catch (PorcupineException e) {
|
||||||
|
Log.e("JARVIS", e.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
super.onDestroy();
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,263 @@
|
|||||||
|
package ch.mathieubroillet.jarvis.android;
|
||||||
|
|
||||||
|
import android.annotation.SuppressLint;
|
||||||
|
import android.media.AudioFormat;
|
||||||
|
import android.media.AudioRecord;
|
||||||
|
import android.media.MediaRecorder;
|
||||||
|
import android.os.AsyncTask;
|
||||||
|
import android.os.Environment;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileInputStream;
|
||||||
|
import java.io.FileNotFoundException;
|
||||||
|
import java.io.FileOutputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
public class RecordAudio extends AsyncTask<Void, Double, Void> {
|
||||||
|
|
||||||
|
private static final String TAG = MainActivity.class.getSimpleName();
|
||||||
|
|
||||||
|
private static final int RECORDER_BPP = 16;
|
||||||
|
private static final String AUDIO_RECORDER_FILE_EXT_WAV = ".wav";
|
||||||
|
private static final String AUDIO_RECORDER_FOLDER = "AudioRecorder";
|
||||||
|
private static final String AUDIO_RECORDER_TEMP_FILE = "record_temp.raw";
|
||||||
|
private boolean started = false;
|
||||||
|
|
||||||
|
private int bufferSize;
|
||||||
|
private final int frequency = 44100;;
|
||||||
|
|
||||||
|
private FileOutputStream os = null;
|
||||||
|
|
||||||
|
public void start(){
|
||||||
|
started = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void stop(){
|
||||||
|
started = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected Void doInBackground(Void... voids) {
|
||||||
|
Log.w(TAG, "doInBackground");
|
||||||
|
try {
|
||||||
|
|
||||||
|
String filename = getTempFilename();
|
||||||
|
|
||||||
|
try {
|
||||||
|
os = new FileOutputStream(filename);
|
||||||
|
} catch (FileNotFoundException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int channelConfiguration = AudioFormat.CHANNEL_IN_MONO;
|
||||||
|
int audioEncoding = AudioFormat.ENCODING_PCM_16BIT;
|
||||||
|
bufferSize = AudioRecord.getMinBufferSize(frequency, channelConfiguration, audioEncoding);
|
||||||
|
|
||||||
|
@SuppressLint("MissingPermission")
|
||||||
|
AudioRecord audioRecord = new AudioRecord(MediaRecorder.AudioSource.MIC, frequency, channelConfiguration, audioEncoding, bufferSize);
|
||||||
|
|
||||||
|
short[] buffer = new short[bufferSize];
|
||||||
|
|
||||||
|
audioRecord.startRecording();
|
||||||
|
|
||||||
|
while (started) {
|
||||||
|
int bufferReadResult = audioRecord.read(buffer, 0, bufferSize);
|
||||||
|
if (AudioRecord.ERROR_INVALID_OPERATION != bufferReadResult) {
|
||||||
|
//check signal
|
||||||
|
//put a threshold
|
||||||
|
short threshold = 15000;
|
||||||
|
int foundPeak = searchThreshold(buffer, threshold);
|
||||||
|
if (foundPeak > -1) { //found signal
|
||||||
|
//record signal
|
||||||
|
byte[] byteBuffer = shortToByte(buffer, bufferReadResult);
|
||||||
|
try {
|
||||||
|
os.write(byteBuffer);
|
||||||
|
} catch (IOException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
} else {//count the time
|
||||||
|
//don't save signal
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//show results
|
||||||
|
//here, with publichProgress function, if you calculate the total saved samples,
|
||||||
|
//you can optionally show the recorded file length in seconds: publishProgress(elsapsedTime,0);
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
audioRecord.stop();
|
||||||
|
|
||||||
|
//close file
|
||||||
|
try {
|
||||||
|
os.close();
|
||||||
|
} catch (IOException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
|
copyWaveFile(getTempFilename(), getFilename());
|
||||||
|
deleteTempFile();
|
||||||
|
|
||||||
|
|
||||||
|
} catch (Throwable t) {
|
||||||
|
t.printStackTrace();
|
||||||
|
Log.e("AudioRecord", "Recording Failed");
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
byte[] shortToByte(short[] input, int elements) {
|
||||||
|
int short_index, byte_index;
|
||||||
|
byte[] buffer = new byte[elements * 2];
|
||||||
|
|
||||||
|
short_index = byte_index = 0;
|
||||||
|
|
||||||
|
while (short_index != elements) {
|
||||||
|
buffer[byte_index] = (byte) (input[short_index] & 0x00FF);
|
||||||
|
buffer[byte_index + 1] = (byte) ((input[short_index] & 0xFF00) >> 8);
|
||||||
|
|
||||||
|
++short_index;
|
||||||
|
byte_index += 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
return buffer;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int searchThreshold(short[] arr, short thr) {
|
||||||
|
int peakIndex;
|
||||||
|
int arrLen = arr.length;
|
||||||
|
for (peakIndex = 0; peakIndex < arrLen; peakIndex++) {
|
||||||
|
if ((arr[peakIndex] >= thr) || (arr[peakIndex] <= -thr)) {
|
||||||
|
return peakIndex;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getFilename() {
|
||||||
|
String filepath = Environment.getExternalStorageDirectory().getPath();
|
||||||
|
File file = new File(filepath, AUDIO_RECORDER_FOLDER);
|
||||||
|
|
||||||
|
if (!file.exists()) {
|
||||||
|
file.mkdirs();
|
||||||
|
}
|
||||||
|
|
||||||
|
return (file.getAbsolutePath() + "/" + System.currentTimeMillis() + AUDIO_RECORDER_FILE_EXT_WAV);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private String getTempFilename() {
|
||||||
|
String filepath = Environment.getExternalStorageDirectory().getPath();
|
||||||
|
File file = new File(filepath, AUDIO_RECORDER_FOLDER);
|
||||||
|
|
||||||
|
if (!file.exists()) {
|
||||||
|
file.mkdirs();
|
||||||
|
}
|
||||||
|
|
||||||
|
File tempFile = new File(filepath, AUDIO_RECORDER_TEMP_FILE);
|
||||||
|
|
||||||
|
if (tempFile.exists())
|
||||||
|
tempFile.delete();
|
||||||
|
|
||||||
|
return (file.getAbsolutePath() + "/" + AUDIO_RECORDER_TEMP_FILE);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private void deleteTempFile() {
|
||||||
|
File file = new File(getTempFilename());
|
||||||
|
|
||||||
|
file.delete();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void copyWaveFile(String inFilename, String outFilename) {
|
||||||
|
FileInputStream in;
|
||||||
|
FileOutputStream out;
|
||||||
|
long totalAudioLen;
|
||||||
|
long totalDataLen;
|
||||||
|
long longSampleRate = frequency;
|
||||||
|
int channels = 1;
|
||||||
|
long byteRate = (long) RECORDER_BPP * frequency * channels / 8;
|
||||||
|
|
||||||
|
byte[] data = new byte[bufferSize];
|
||||||
|
|
||||||
|
try {
|
||||||
|
in = new FileInputStream(inFilename);
|
||||||
|
out = new FileOutputStream(outFilename);
|
||||||
|
totalAudioLen = in.getChannel().size();
|
||||||
|
totalDataLen = totalAudioLen + 36;
|
||||||
|
|
||||||
|
|
||||||
|
writeWaveFileHeader(out, totalAudioLen, totalDataLen, longSampleRate, channels, byteRate);
|
||||||
|
|
||||||
|
while (in.read(data) != -1) {
|
||||||
|
out.write(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
in.close();
|
||||||
|
out.close();
|
||||||
|
} catch (IOException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void writeWaveFileHeader(
|
||||||
|
FileOutputStream out, long totalAudioLen,
|
||||||
|
long totalDataLen, long longSampleRate, int channels,
|
||||||
|
long byteRate) throws IOException {
|
||||||
|
|
||||||
|
byte[] header = new byte[44];
|
||||||
|
|
||||||
|
header[0] = 'R'; // RIFF/WAVE header
|
||||||
|
header[1] = 'I';
|
||||||
|
header[2] = 'F';
|
||||||
|
header[3] = 'F';
|
||||||
|
header[4] = (byte) (totalDataLen & 0xff);
|
||||||
|
header[5] = (byte) ((totalDataLen >> 8) & 0xff);
|
||||||
|
header[6] = (byte) ((totalDataLen >> 16) & 0xff);
|
||||||
|
header[7] = (byte) ((totalDataLen >> 24) & 0xff);
|
||||||
|
header[8] = 'W';
|
||||||
|
header[9] = 'A';
|
||||||
|
header[10] = 'V';
|
||||||
|
header[11] = 'E';
|
||||||
|
header[12] = 'f'; // 'fmt ' chunk
|
||||||
|
header[13] = 'm';
|
||||||
|
header[14] = 't';
|
||||||
|
header[15] = ' ';
|
||||||
|
header[16] = 16; // 4 bytes: size of 'fmt ' chunk
|
||||||
|
header[17] = 0;
|
||||||
|
header[18] = 0;
|
||||||
|
header[19] = 0;
|
||||||
|
header[20] = 1; // format = 1
|
||||||
|
header[21] = 0;
|
||||||
|
header[22] = (byte) channels;
|
||||||
|
header[23] = 0;
|
||||||
|
header[24] = (byte) (longSampleRate & 0xff);
|
||||||
|
header[25] = (byte) ((longSampleRate >> 8) & 0xff);
|
||||||
|
header[26] = (byte) ((longSampleRate >> 16) & 0xff);
|
||||||
|
header[27] = (byte) ((longSampleRate >> 24) & 0xff);
|
||||||
|
header[28] = (byte) (byteRate & 0xff);
|
||||||
|
header[29] = (byte) ((byteRate >> 8) & 0xff);
|
||||||
|
header[30] = (byte) ((byteRate >> 16) & 0xff);
|
||||||
|
header[31] = (byte) ((byteRate >> 24) & 0xff);
|
||||||
|
header[32] = (byte) (channels * 16 / 8); // block align
|
||||||
|
header[33] = 0;
|
||||||
|
header[34] = RECORDER_BPP; // bits per sample
|
||||||
|
header[35] = 0;
|
||||||
|
header[36] = 'd';
|
||||||
|
header[37] = 'a';
|
||||||
|
header[38] = 't';
|
||||||
|
header[39] = 'a';
|
||||||
|
header[40] = (byte) (totalAudioLen & 0xff);
|
||||||
|
header[41] = (byte) ((totalAudioLen >> 8) & 0xff);
|
||||||
|
header[42] = (byte) ((totalAudioLen >> 16) & 0xff);
|
||||||
|
header[43] = (byte) ((totalAudioLen >> 24) & 0xff);
|
||||||
|
|
||||||
|
out.write(header, 0, 44);
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,11 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24"
|
|
||||||
android:tint="?attr/colorControlNormal"
|
|
||||||
android:autoMirrored="true">
|
|
||||||
<path
|
|
||||||
android:fillColor="@android:color/white"
|
|
||||||
android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
|
|
||||||
</vector>
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24"
|
|
||||||
android:tint="?attr/colorControlNormal">
|
|
||||||
<path
|
|
||||||
android:fillColor="@android:color/white"
|
|
||||||
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z"/>
|
|
||||||
</vector>
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24"
|
|
||||||
android:tint="?attr/colorControlNormal">
|
|
||||||
<path
|
|
||||||
android:fillColor="@android:color/white"
|
|
||||||
android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM20,18L4,18L4,8h16v10z"/>
|
|
||||||
</vector>
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24"
|
|
||||||
android:tint="?attr/colorControlNormal">
|
|
||||||
<path
|
|
||||||
android:fillColor="@android:color/white"
|
|
||||||
android:pathData="M20,5L4,5c-1.1,0 -1.99,0.9 -1.99,2L2,17c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,7c0,-1.1 -0.9,-2 -2,-2zM11,8h2v2h-2L11,8zM11,11h2v2h-2v-2zM8,8h2v2L8,10L8,8zM8,11h2v2L8,13v-2zM7,13L5,13v-2h2v2zM7,10L5,10L5,8h2v2zM16,17L8,17v-2h8v2zM16,13h-2v-2h2v2zM16,10h-2L14,8h2v2zM19,13h-2v-2h2v2zM19,10h-2L17,8h2v2z"/>
|
|
||||||
</vector>
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:height="24dp"
|
|
||||||
android:width="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24"
|
|
||||||
android:tint="?attr/colorControlNormal">
|
|
||||||
|
|
||||||
<path android:fillColor="@android:color/white" android:pathData="M17.3,11C17.3,14 14.76,16.1 12,16.1C9.24,16.1 6.7,14 6.7,11H5C5,14.41 7.72,17.23 11,17.72V21H13V17.72C16.28,17.23 19,14.41 19,11M10.8,4.9C10.8,4.24 11.34,3.7 12,3.7C12.66,3.7 13.2,4.24 13.2,4.9L13.19,11.1C13.19,11.76 12.66,12.3 12,12.3C11.34,12.3 10.8,11.76 10.8,11.1M12,14A3,3 0 0,0 15,11V5A3,3 0 0,0 12,2A3,3 0 0,0 9,5V11A3,3 0 0,0 12,14Z" />
|
|
||||||
</vector>
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:tint="?attr/colorControlNormal"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24">
|
|
||||||
|
|
||||||
<path
|
|
||||||
android:fillColor="@android:color/white"
|
|
||||||
android:pathData="M10,17L6,13L7.41,11.59L10,14.17L16.59,7.58L18,9M12,1L3,5V11C3,16.55 6.84,21.74 12,23C17.16,21.74 21,16.55 21,11V5L12,1Z" />
|
|
||||||
</vector>
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:aapt="http://schemas.android.com/aapt"
|
|
||||||
android:width="108dp"
|
|
||||||
android:height="108dp"
|
|
||||||
android:viewportWidth="108"
|
|
||||||
android:viewportHeight="108">
|
|
||||||
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
|
|
||||||
<aapt:attr name="android:fillColor">
|
|
||||||
<gradient
|
|
||||||
android:endX="85.84757"
|
|
||||||
android:endY="92.4963"
|
|
||||||
android:startX="42.9492"
|
|
||||||
android:startY="49.59793"
|
|
||||||
android:type="linear">
|
|
||||||
<item
|
|
||||||
android:color="#44000000"
|
|
||||||
android:offset="0.0" />
|
|
||||||
<item
|
|
||||||
android:color="#00000000"
|
|
||||||
android:offset="1.0" />
|
|
||||||
</gradient>
|
|
||||||
</aapt:attr>
|
|
||||||
</path>
|
|
||||||
<path
|
|
||||||
android:fillColor="#FFFFFF"
|
|
||||||
android:fillType="nonZero"
|
|
||||||
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
|
|
||||||
android:strokeWidth="1"
|
|
||||||
android:strokeColor="#00000000" />
|
|
||||||
</vector>
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:width="24dp"
|
|
||||||
android:height="24dp"
|
|
||||||
android:viewportWidth="24"
|
|
||||||
android:viewportHeight="24"
|
|
||||||
android:tint="?attr/colorControlNormal">
|
|
||||||
<path
|
|
||||||
android:fillColor="@android:color/white"
|
|
||||||
android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98 0,-0.34 -0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.09,-0.16 -0.26,-0.25 -0.44,-0.25 -0.06,0 -0.12,0.01 -0.17,0.03l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.06,-0.02 -0.12,-0.03 -0.18,-0.03 -0.17,0 -0.34,0.09 -0.43,0.25l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98 0,0.33 0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.09,0.16 0.26,0.25 0.44,0.25 0.06,0 0.12,-0.01 0.17,-0.03l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.06,0.02 0.12,0.03 0.18,0.03 0.17,0 0.34,-0.09 0.43,-0.25l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM17.45,11.27c0.04,0.31 0.05,0.52 0.05,0.73 0,0.21 -0.02,0.43 -0.05,0.73l-0.14,1.13 0.89,0.7 1.08,0.84 -0.7,1.21 -1.27,-0.51 -1.04,-0.42 -0.9,0.68c-0.43,0.32 -0.84,0.56 -1.25,0.73l-1.06,0.43 -0.16,1.13 -0.2,1.35h-1.4l-0.19,-1.35 -0.16,-1.13 -1.06,-0.43c-0.43,-0.18 -0.83,-0.41 -1.23,-0.71l-0.91,-0.7 -1.06,0.43 -1.27,0.51 -0.7,-1.21 1.08,-0.84 0.89,-0.7 -0.14,-1.13c-0.03,-0.31 -0.05,-0.54 -0.05,-0.74s0.02,-0.43 0.05,-0.73l0.14,-1.13 -0.89,-0.7 -1.08,-0.84 0.7,-1.21 1.27,0.51 1.04,0.42 0.9,-0.68c0.43,-0.32 0.84,-0.56 1.25,-0.73l1.06,-0.43 0.16,-1.13 0.2,-1.35h1.39l0.19,1.35 0.16,1.13 1.06,0.43c0.43,0.18 0.83,0.41 1.23,0.71l0.91,0.7 1.06,-0.43 1.27,-0.51 0.7,1.21 -1.07,0.85 -0.89,0.7 0.14,1.13zM12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
|
|
||||||
</vector>
|
|
||||||
BIN
app/src/main/res/drawable/logo.png
Normal file
BIN
app/src/main/res/drawable/logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 24 KiB |
File diff suppressed because it is too large
Load Diff
@ -6,5 +6,5 @@
|
|||||||
android:tint="?attr/colorControlNormal">
|
android:tint="?attr/colorControlNormal">
|
||||||
<path
|
<path
|
||||||
android:fillColor="@android:color/white"
|
android:fillColor="@android:color/white"
|
||||||
android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
|
android:pathData="M12,14c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM17.3,11c0,3 -2.54,5.1 -5.3,5.1S6.7,14 6.7,11L5,11c0,3.41 2.72,6.23 6,6.72L11,21h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z"/>
|
||||||
</vector>
|
</vector>
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB |
11
app/src/main/res/drawable/rounded_white_on_top.xml
Normal file
11
app/src/main/res/drawable/rounded_white_on_top.xml
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
|
||||||
|
<!-- we define background color -->
|
||||||
|
<solid android:color="#ffffff" />
|
||||||
|
|
||||||
|
<!-- we define corner radius, note that radius can be different for each corner -->
|
||||||
|
<corners android:topLeftRadius="27dp"
|
||||||
|
android:topRightRadius="27dp"/>
|
||||||
|
|
||||||
|
</shape>
|
||||||
6
app/src/main/res/layout/activity_main.xml
Normal file
6
app/src/main/res/layout/activity_main.xml
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
tools:context=".MainActivity"/>
|
||||||
116
app/src/main/res/layout/dialog_listening.xml
Normal file
116
app/src/main/res/layout/dialog_listening.xml
Normal file
@ -0,0 +1,116 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
|
||||||
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:id="@+id/RelativeLayout"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
|
||||||
|
android:background="#66000000"
|
||||||
|
tools:context="ch.mathieubroillet.jarvis.android.ListeningActivity">
|
||||||
|
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/button_quit"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_marginBottom="300dp"
|
||||||
|
android:alpha="0"
|
||||||
|
android:fontFamily="@font/google_bold"
|
||||||
|
android:onClick="quit"
|
||||||
|
android:text="" />
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="300dp"
|
||||||
|
android:layout_alignParentStart="false"
|
||||||
|
android:layout_alignParentBottom="true"
|
||||||
|
android:background="@drawable/rounded_white_on_top">
|
||||||
|
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/jarvis_logo"
|
||||||
|
android:layout_width="40dp"
|
||||||
|
android:layout_height="40dp"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
|
android:layout_marginTop="15dp"
|
||||||
|
android:contentDescription="logo"
|
||||||
|
app:srcCompat="@drawable/logo" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/imjarvis_text"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentTop="true"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
|
android:layout_marginTop="70dp"
|
||||||
|
android:fontFamily="@font/google_medium"
|
||||||
|
android:text="@string/imjarvis"
|
||||||
|
android:textSize="25sp" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/howcanihelp_text"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentTop="true"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
|
android:layout_marginTop="105dp"
|
||||||
|
android:fontFamily="@font/google_light"
|
||||||
|
android:text="@string/howcanihelp"
|
||||||
|
android:textSize="20sp" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/listening_text"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentTop="true"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
|
android:layout_marginTop="150dp"
|
||||||
|
android:fontFamily="@font/google_medium"
|
||||||
|
android:text="@string/listening"
|
||||||
|
android:textSize="20sp" />
|
||||||
|
|
||||||
|
|
||||||
|
<com.agrawalsuneet.dotsloader.loaders.LinearDotsLoader
|
||||||
|
android:id="@+id/dots"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
|
android:layout_marginTop="223dp"
|
||||||
|
android:onClick="onClickRecordingDots"
|
||||||
|
android:visibility="invisible"
|
||||||
|
app:loader_animDur="250"
|
||||||
|
app:loader_circleRadius="10dp"
|
||||||
|
app:loader_defaultColor="#f5b273"
|
||||||
|
app:loader_dotsDist="10dp"
|
||||||
|
app:loader_expandOnSelect="false"
|
||||||
|
app:loader_isSingleDir="false"
|
||||||
|
app:loader_noOfDots="4"
|
||||||
|
app:loader_selectedColor="#6a5767"
|
||||||
|
app:loader_selectedRadius="10dp"
|
||||||
|
app:loader_showRunningShadow="true" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/microphone"
|
||||||
|
android:layout_width="50dp"
|
||||||
|
android:layout_height="50dp"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
|
android:layout_marginTop="205dp"
|
||||||
|
android:contentDescription="microphone"
|
||||||
|
android:onClick="onClickMicrophone"
|
||||||
|
app:srcCompat="@drawable/microphone"
|
||||||
|
tools:ignore="OnClick" />
|
||||||
|
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
|
|
||||||
|
</RelativeLayout>
|
||||||
|
|
||||||
BIN
app/src/main/res/mipmap-hdpi/ic_launcher.png
Normal file
BIN
app/src/main/res/mipmap-hdpi/ic_launcher.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.9 KiB |
BIN
app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Normal file
BIN
app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.3 KiB |
BIN
app/src/main/res/mipmap-mdpi/ic_launcher.png
Normal file
BIN
app/src/main/res/mipmap-mdpi/ic_launcher.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.1 KiB |
BIN
app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Normal file
BIN
app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.3 KiB |
BIN
app/src/main/res/mipmap-xhdpi/ic_launcher.png
Normal file
BIN
app/src/main/res/mipmap-xhdpi/ic_launcher.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.5 KiB |
BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Normal file
BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.7 KiB |
BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Normal file
BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 11 KiB |
BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Normal file
BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Normal file
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
Normal file
BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
@ -1,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
|
||||||
<background android:drawable="@mipmap/ic_launcher_adaptive_back"/>
|
|
||||||
<foreground android:drawable="@mipmap/ic_launcher_adaptive_fore"/>
|
|
||||||
<monochrome android:drawable="@drawable/logo_transparent"/>
|
|
||||||
</adaptive-icon>
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB |
@ -1,23 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
<string name="permissions_page_grant_permission">Autoriser</string>
|
|
||||||
<string name="permissions_page_permission_denied">Refusée</string>
|
|
||||||
<string name="permission_granted">Autorisé</string>
|
|
||||||
<string name="permissions_page_permissions_page_before_starting">Avant de commencer</string>
|
|
||||||
<string name="main_page_dialog_ask_me_anything">Demandez-moi quelque chose</string>
|
|
||||||
<string name="main_page_dialog_type_a_sentence">Entrez une phrase</string>
|
|
||||||
<string name="main_page_delete_conversation">Effacer la conversation</string>
|
|
||||||
<string name="main_page_how_may_i_help_you">Bonjour, comment puis-je vous aider ?</string>
|
|
||||||
<string name="settings">Paramètres</string>
|
|
||||||
<string name="report_an_issue">Signaler un problème</string>
|
|
||||||
<string name="demo_message_1">Salut, je suis Jarvis! \nPose moi une question et je ferais de mon mieux pour te renseigner.</string>
|
|
||||||
<string name="demo_message_2">Quel temps fait-il à Paris en ce moment ?</string>
|
|
||||||
<string name="demo_message_3">A Paris, il fait actuellement 10 degrés et le ciel est nuageux.</string>
|
|
||||||
<string name="permissions_page_this_app_need_the_following_permissions">Cette application a besoin des autorisations suivantes pour fonctionner:</string>
|
|
||||||
<string name="permission_microphone">Microphone</string>
|
|
||||||
<string name="permission_microphone_description">Nécessaire pour vous entendre</string>
|
|
||||||
<string name="cancel">Annuler</string>
|
|
||||||
<string name="ok">OK</string>
|
|
||||||
<string name="permission_files">Fichiers</string>
|
|
||||||
<string name="permission_files_description">Nécessaire pour stocker temporairement les enregistrements audios</string>
|
|
||||||
</resources>
|
|
||||||
16
app/src/main/res/values-night/themes.xml
Normal file
16
app/src/main/res/values-night/themes.xml
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||||
|
<!-- Base application theme. -->
|
||||||
|
<style name="Theme.JarvisClientAndroid" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
|
||||||
|
<!-- Primary brand color. -->
|
||||||
|
<item name="colorPrimary">@color/purple_200</item>
|
||||||
|
<item name="colorPrimaryVariant">@color/purple_700</item>
|
||||||
|
<item name="colorOnPrimary">@color/black</item>
|
||||||
|
<!-- Secondary brand color. -->
|
||||||
|
<item name="colorSecondary">@color/teal_200</item>
|
||||||
|
<item name="colorSecondaryVariant">@color/teal_200</item>
|
||||||
|
<item name="colorOnSecondary">@color/black</item>
|
||||||
|
<!-- Status bar color. -->
|
||||||
|
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
|
||||||
|
<!-- Customize your theme here. -->
|
||||||
|
</style>
|
||||||
|
</resources>
|
||||||
@ -1,24 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
<resources>
|
||||||
<string name="app_name" translatable="false">Jarvis</string>
|
<string name="app_name">Jarvis</string>
|
||||||
<string name="permissions_page_grant_permission">Grant</string>
|
<string name="listening">J\'écoute…</string>
|
||||||
<string name="permissions_page_permission_denied">Denied</string>
|
<string name="imjarvis">Salut, je suis Jarvis.</string>
|
||||||
<string name="permission_granted">Granted</string>
|
<string name="howcanihelp">Dis moi comment je peux t\'aider.</string>
|
||||||
<string name="permissions_page_permissions_page_before_starting">Before you begin</string>
|
|
||||||
<string name="main_page_dialog_ask_me_anything">Ask me anything</string>
|
|
||||||
<string name="main_page_dialog_type_a_sentence">Type something here</string>
|
|
||||||
<string name="main_page_how_may_i_help_you">Hi, how can I help ?</string>
|
|
||||||
<string name="main_page_delete_conversation">Delete conversation</string>
|
|
||||||
<string name="settings">Settings</string>
|
|
||||||
<string name="report_an_issue">Report an issue</string>
|
|
||||||
<string name="demo_message_1">Hi, I\'m Jarvis! \nAsk me anything and I\'ll do my best to help you.</string>
|
|
||||||
<string name="demo_message_2">What\'s the weather like in Paris ?</string>
|
|
||||||
<string name="demo_message_3">In Paris it\'s cloudy and the temperature is 10 degrees celsuis</string>
|
|
||||||
<string name="permissions_page_this_app_need_the_following_permissions">The following permissions are required for this application to run:</string>
|
|
||||||
<string name="permission_microphone">Microphone</string>
|
|
||||||
<string name="permission_microphone_description">Necessary to hear you</string>
|
|
||||||
<string name="cancel">Cancel</string>
|
|
||||||
<string name="ok">OK</string>
|
|
||||||
<string name="permission_files">Files</string>
|
|
||||||
<string name="permission_files_description">Necessary to temporarily save audio recordings</string>
|
|
||||||
</resources>
|
</resources>
|
||||||
12
app/src/main/res/values/styles.xml
Normal file
12
app/src/main/res/values/styles.xml
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<resources>
|
||||||
|
|
||||||
|
<style name="Theme.Transparent" parent="Theme.AppCompat.Light.NoActionBar">
|
||||||
|
<item name="android:windowIsTranslucent">true</item>
|
||||||
|
<item name="android:windowBackground">@android:color/transparent</item>
|
||||||
|
<item name="android:windowContentOverlay">@null</item>
|
||||||
|
<item name="android:windowNoTitle">true</item>
|
||||||
|
<item name="android:backgroundDimEnabled">true</item>
|
||||||
|
<item name="colorPrimaryDark">@android:color/transparent</item>
|
||||||
|
</style>
|
||||||
|
</resources>
|
||||||
@ -1,5 +1,16 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||||
<resources>
|
<!-- Base application theme. -->
|
||||||
|
<style name="Theme.JarvisClientAndroid" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
|
||||||
<style name="Theme.Jarvisclientapp" parent="android:Theme.Material.Light.NoActionBar" />
|
<!-- Primary brand color. -->
|
||||||
|
<item name="colorPrimary">@color/purple_500</item>
|
||||||
|
<item name="colorPrimaryVariant">@color/purple_700</item>
|
||||||
|
<item name="colorOnPrimary">@color/white</item>
|
||||||
|
<!-- Secondary brand color. -->
|
||||||
|
<item name="colorSecondary">@color/teal_200</item>
|
||||||
|
<item name="colorSecondaryVariant">@color/teal_700</item>
|
||||||
|
<item name="colorOnSecondary">@color/black</item>
|
||||||
|
<!-- Status bar color. -->
|
||||||
|
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
|
||||||
|
<!-- Customize your theme here. -->
|
||||||
|
</style>
|
||||||
</resources>
|
</resources>
|
||||||
@ -1,13 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?><!--
|
|
||||||
Sample backup rules file; uncomment and customize as necessary.
|
|
||||||
See https://developer.android.com/guide/topics/data/autobackup
|
|
||||||
for details.
|
|
||||||
Note: This file is ignored for devices older that API 31
|
|
||||||
See https://developer.android.com/about/versions/12/backup-restore
|
|
||||||
-->
|
|
||||||
<full-backup-content>
|
|
||||||
<!--
|
|
||||||
<include domain="sharedpref" path="."/>
|
|
||||||
<exclude domain="sharedpref" path="device.xml"/>
|
|
||||||
-->
|
|
||||||
</full-backup-content>
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?><!--
|
|
||||||
Sample data extraction rules file; uncomment and customize as necessary.
|
|
||||||
See https://developer.android.com/about/versions/12/backup-restore#xml-changes
|
|
||||||
for details.
|
|
||||||
-->
|
|
||||||
<data-extraction-rules>
|
|
||||||
<cloud-backup>
|
|
||||||
<!-- TODO: Use <include> and <exclude> to control what is backed up.
|
|
||||||
<include .../>
|
|
||||||
<exclude .../>
|
|
||||||
-->
|
|
||||||
</cloud-backup>
|
|
||||||
<!--
|
|
||||||
<device-transfer>
|
|
||||||
<include .../>
|
|
||||||
<exclude .../>
|
|
||||||
</device-transfer>
|
|
||||||
-->
|
|
||||||
</data-extraction-rules>
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
package ch.broillet.jarvis.android
|
|
||||||
|
|
||||||
import org.junit.Test
|
|
||||||
|
|
||||||
import org.junit.Assert.*
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Example local unit test, which will execute on the development machine (host).
|
|
||||||
*
|
|
||||||
* See [testing documentation](http://d.android.com/tools/testing).
|
|
||||||
*/
|
|
||||||
class ExampleUnitTest {
|
|
||||||
@Test
|
|
||||||
fun addition_isCorrect() {
|
|
||||||
assertEquals(4, 2 + 2)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -0,0 +1,17 @@
|
|||||||
|
package ch.mathieubroillet.jarvis.android;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import static org.junit.Assert.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Example local unit test, which will execute on the development machine (host).
|
||||||
|
*
|
||||||
|
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
|
||||||
|
*/
|
||||||
|
public class ExampleUnitTest {
|
||||||
|
@Test
|
||||||
|
public void addition_isCorrect() {
|
||||||
|
assertEquals(4, 2 + 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
20
build.gradle
20
build.gradle
@ -1,11 +1,17 @@
|
|||||||
|
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||||
buildscript {
|
buildscript {
|
||||||
ext {
|
repositories {
|
||||||
compose_version = '1.4.0'
|
google()
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
dependencies {
|
||||||
|
classpath "com.android.tools.build:gradle:7.0.3"
|
||||||
|
|
||||||
|
// NOTE: Do not place your application dependencies here; they belong
|
||||||
|
// in the individual module build.gradle files
|
||||||
}
|
}
|
||||||
}// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
|
||||||
plugins {
|
|
||||||
id 'com.android.application' version '7.4.2' apply false
|
|
||||||
id 'com.android.library' version '7.4.2' apply false
|
|
||||||
id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
task clean(type: Delete) {
|
||||||
|
delete rootProject.buildDir
|
||||||
|
}
|
||||||
@ -12,12 +12,8 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
|
|||||||
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
||||||
# org.gradle.parallel=true
|
# org.gradle.parallel=true
|
||||||
# AndroidX package structure to make it clearer which packages are bundled with the
|
# AndroidX package structure to make it clearer which packages are bundled with the
|
||||||
# Android operating system, and which are packaged with your app's APK
|
# Android operating system, and which are packaged with your app"s APK
|
||||||
# https://developer.android.com/topic/libraries/support-library/androidx-rn
|
# https://developer.android.com/topic/libraries/support-library/androidx-rn
|
||||||
android.useAndroidX=true
|
android.useAndroidX=true
|
||||||
# Kotlin code style for this project: "official" or "obsolete":
|
# Automatically convert third-party libraries to use AndroidX
|
||||||
kotlin.code.style=official
|
android.enableJetifier=true
|
||||||
# Enables namespacing of each library's R class so that its R class includes only the
|
|
||||||
# resources declared in the library itself and none from the library's dependencies,
|
|
||||||
# thereby reducing the size of the R class for that library
|
|
||||||
android.nonTransitiveRClass=true
|
|
||||||
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +1,6 @@
|
|||||||
#Tue Nov 29 18:41:19 CET 2022
|
#Fri Aug 13 21:34:17 CEST 2021
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|||||||
@ -1,17 +1,10 @@
|
|||||||
pluginManagement {
|
|
||||||
repositories {
|
|
||||||
gradlePluginPortal()
|
|
||||||
google()
|
|
||||||
mavenCentral()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
dependencyResolutionManagement {
|
dependencyResolutionManagement {
|
||||||
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
|
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
|
||||||
repositories {
|
repositories {
|
||||||
google()
|
google()
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven { url "https://jitpack.io" }
|
jcenter() // Warning: this repository is going to shut down soon
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
rootProject.name = "jarvis-client-app"
|
rootProject.name = "Jarvis Client Android"
|
||||||
include ':app'
|
include ':app'
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user