build off newer kde runtime

This reverts commit 5d274f3946.

CMakeLists.txt

@@ -1,6 +1,6 @@
+cmake_minimum_required(VERSION 3.5.0)
 project(vehiclevoyage)
 
-cmake_minimum_required(VERSION 2.8.12)
 set(KF5_MIN_VERSION "5.70.0")
 set(QT_MIN_VERSION "5.14.0")
 
@@ -28,7 +28,7 @@ include(KDECompilerSettings NO_POLICY_SCOPE)
 
 ################# Find dependencies #################
 
-find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Sql Svg QuickControls2 Widgets)
+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Concurrent Quick Test Gui Sql Svg QuickControls2 Widgets)
 find_package(KF5Kirigami2 ${KF5_MIN_VERSION} REQUIRED)
 find_package(KF5CoreAddons ${KF5_MIN_VERSION} REQUIRED)
 
@@ -40,7 +40,7 @@ set(CMAKE_CXX_STANDARD 11)
 add_subdirectory(src)
 
 install(PROGRAMS packaging/org.eyecreate.vehiclevoyage.desktop DESTINATION ${KDE_INSTALL_APPDIR})
-install(FILES packaging/org.eyecreate.vehiclevoyage.svg DESTINATION ${KDE_INSTALL_ICONDIR})
+install(FILES packaging/org.eyecreate.vehiclevoyage.svg DESTINATION ${KDE_INSTALL_ICONDIR}/hicolor/scalable/apps)
 install(FILES packaging/org.eyecreate.vehiclevoyage.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://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.
+
+    Vehicle Voyage
+    Copyright (C) 2020  Kevin Whitaker
+
+    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 <http://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:
+
+    Vehicle Voyage  Copyright (C) 2020  Kevin Whitaker
+    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
+<http://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
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

packaging/android/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest package="org.eyecreate.vehiclevoyage" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
-    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/>
+<manifest package="org.eyecreate.vehiclevoyage" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.1" android:versionCode="2" android:installLocation="auto">
 
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
          Remove the comment if you do not require these default permissions. -->

packaging/org.eyecreate.vehiclevoyage.appdata.xml

@@ -1,24 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright [2024] [Kevin Whitaker] -->
 <component type="desktop-application">
   <id>org.eyecreate.vehiclevoyage</id>
   <name>Vehicle Voyage</name>
-  <summary>Track vehicle service history.</summary>
+  <summary>Track vehicle service history</summary>
   <metadata_license>FSFAP</metadata_license>
   <project_license>GPL-3.0-or-later</project_license>
   <content_rating type="oars-1.1" />
   <url type="homepage">https://git.eyecreate.org/eyecreate/vehicle-voyage</url>
   <url type="contact">https://www.eyecreate.org</url>
-  <developer_name>eyecreate</developer_name>
+  <url type="donation">https://liberapay.com/eyecreate/donate</url>
+  <launchable type="desktop-id">org.eyecreate.vehiclevoyage.desktop</launchable>
+  <developer id="org.eyecreate">
+    <name>eyecreate</name>
+  </developer>
   <description>
     <p>Track vehicle service history.</p>
   </description>
   <screenshots>
       <screenshot type="default">
-          <image type="source">https://git.eyecreate.org/eyecreate/vehicle-voyage/raw/v1.0/packaging/main_window.png</image>
-          <image type="source">https://git.eyecreate.org/eyecreate/vehicle-voyage/raw/v1.0/packaging/mobile_window.png</image>
+          <image >https://git.eyecreate.org/eyecreate/vehicle-voyage/raw/v1.0/packaging/main_window.png</image>
+      </screenshot>
+      <screenshot>
+          <image >https://git.eyecreate.org/eyecreate/vehicle-voyage/raw/v1.0/packaging/mobile_window.png</image>
       </screenshot>
   </screenshots>
   <releases>
+      <release version="1.1" date="2020-8-22" type="stable">
+        <description>
+            <ul>
+                <li>Add edit screen for service entries.</li>
+                <li>Add settings screen for app configuration.</li>
+                <li>Add service warnings for vehicle starting with oil change.</li>
+            </ul>
+          </description>
+      </release>
       <release version="1.0" date="2020-7-19" type="stable"/>
   </releases>
 </component>

packaging/org.eyecreate.vehiclevoyage.desktop

@@ -8,3 +8,4 @@ Icon=org.eyecreate.vehiclevoyage
 Type=Application
 Terminal=false
 Categories=Utility;Qt;KDE;
+X-Purism-FormFactor=Workstation;Mobile;

packaging/org.eyecreate.vehiclevoyage.json

@@ -10,7 +10,7 @@
     "--socket=x11",
     "--socket=wayland",
     "--device=dri",
-    "--filesystem=home",
+    "--filesystem=xdg-data",
     "--talk-name=org.freedesktop.Notifications"
   ],
   "separate-locales": false,
@@ -26,7 +26,7 @@
         {
           "type": "git",
           "url": "https://git.eyecreate.org/eyecreate/vehicle-voyage.git",
-          "commit": "42a2ce9ce3a958e95b8ce2a24e7cf547117da245"
+          "commit": "5d274f3946a9955dc67d8627becc0c45fd7af304"
         }
       ]
     }

packaging/snap/snapcraft.yaml

@@ -0,0 +1,88 @@
+name: vehicle-voyage # you probably want to 'snapcraft register <name>'
+base: core20 # the base snap is the execution environment for this snap
+version: '1.1' # just for humans, typically '1.2+git' or '1.3.2'
+summary: Track vehicle service history. # 79 char long summary
+description: |
+  Track vehicle service history.
+
+grade: devel # must be 'stable' to release into candidate/stable channels
+confinement: strict # use 'strict' once you have the right plugs and slots
+adopt-info: vehicle-voyage
+
+apps:
+  vehicle-voyage:
+    common-id: org.eyecreate.vehiclevoyage
+    command: usr/bin/vehiclevoyage
+    extensions:
+      - kde-neon
+    environment:
+      QML2_IMPORT_PATH: "$SNAP/usr/lib/x86_64-linux-gnu/qml"
+      QT_QPA_PLATFORMTHEME: flatpak
+      QT_QPA_FLATPAK_PLATFORMTHEME: kde
+
+slots:
+  session-dbus-interface:
+    interface: dbus
+    name: org.eyecreate.vehiclevoyage
+    bus: session
+
+parts:
+  ecm:
+    source: https://invent.kde.org/frameworks/extra-cmake-modules.git
+    source-tag: v5.81.0
+    source-depth: 0
+    plugin: cmake
+    cmake-parameters:
+      - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DBUILD_TESTING=OFF
+  kirigami:
+    after:
+      - ecm
+    build-packages:
+      - libgl-dev
+    source: https://invent.kde.org/frameworks/kirigami.git
+    source-tag: v5.81.0
+    source-depth: 0
+    plugin: cmake
+    cmake-parameters:
+      - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DBUILD_TESTING=OFF
+    prime:
+      - -*
+  kcoreaddons:
+    after:
+      - ecm
+    source: https://invent.kde.org/frameworks/kcoreaddons.git
+    source-tag: v5.81.0
+    source-depth: 0
+    plugin: cmake
+    cmake-parameters:
+      - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DBUILD_TESTING=OFF
+  qqc2:
+    after:
+      - kirigami
+    source: https://invent.kde.org/frameworks/qqc2-desktop-style.git
+    source-tag: v5.81.0
+    source-depth: 0
+    plugin: cmake
+    cmake-parameters:
+      - -DCMAKE_INSTALL_PREFIX=/usr
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DBUILD_TESTING=OFF
+  vehicle-voyage:
+    after:
+      - kirigami
+      - kcoreaddons
+    parse-info: 
+      - usr/share/metainfo/org.eyecreate.vehiclevoyage.appdata.xml
+    plugin: cmake
+    source: https://git.eyecreate.org/eyecreate/vehicle-voyage.git
+    source-type: git
+    source-commit: 53c23bff890b97ddf010f778ebd53154b67d74e6
+    cmake-parameters:
+      - -DCMAKE_BUILD_TYPE=Release
+      - -DCMAKE_INSTALL_PREFIX=/usr

src/CMakeLists.txt

@@ -1,6 +1,7 @@
 set(vehiclevoyage_SRCS
     db/sqlvehicle.cpp
     db/sqlservicerecord.cpp
+    db/recordanalytics.cpp
     jsonio.cpp
     main.cpp
     )
@@ -11,5 +12,5 @@ target_link_libraries(vehiclevoyage Qt5::Core Qt5::Qml Qt5::Quick Qt5::QuickCont
 install(TARGETS vehiclevoyage ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Android")
-    kirigami_package_breeze_icons(ICONS list-add application-javascript help-about edit-find edit-delete window-close mail-sent globe)
+    kirigami_package_breeze_icons(ICONS list-add application-javascript help-about edit-find edit-delete window-close mail-sent globe preferences-system edit-symbolic dialog-information)
 endif()

src/contents/ui/AddRecord.qml

@@ -0,0 +1,138 @@
+import QtQuick 2.14
+import org.kde.kirigami 2.12 as Kirigami
+import QtQuick.Controls 2.14 as Controls
+import QtQuick.Layouts 1.14 as Layouts
+import QtQuick.Controls 1.4 as Old
+import QtQuick.Dialogs 1.3 as Dialogs
+
+Kirigami.PageRoute {
+    name: "addrecord"
+    Component {
+        Kirigami.Page {
+            id: recordAddPage
+            title: qsTr("Add Service Record")
+            Layouts.ColumnLayout {
+                anchors.fill: parent
+                Kirigami.InlineMessage {
+                    Layouts.Layout.fillWidth: true
+                    Layouts.Layout.leftMargin: 10
+                    Layouts.Layout.rightMargin: 10
+                    z: 9997
+                    type: Kirigami.MessageType.Error
+                    showCloseButton: true
+                    id: formError
+                }
+                Kirigami.FormLayout {
+                    Layouts.Layout.alignment: Qt.AlignHCenter
+                    Layouts.Layout.fillWidth: true
+                    width: recordAddPage.width
+                    
+                    Item {
+                        Kirigami.FormData.isSection: true
+                        Kirigami.FormData.label: "Service Information"
+                    }
+                    
+                    Controls.TextField {
+                        id: providerField
+                        selectByMouse: true
+                        Kirigami.FormData.label: qsTr("Service Provider")+":"
+                    }
+                    
+                    Controls.ComboBox {
+                        id: typeField
+                        model: serviceTypeModel
+                        textRole: "text"
+                        valueRole: "value"
+                        onActivated: {
+                            if(currentValue == -1) {
+                                customTypeField.visible = true;
+                            } else {
+                                customTypeField.visible = false;
+                            }
+                        }
+                        Kirigami.FormData.label: qsTr("Service Type")+":"
+                    }
+                    
+                    Controls.TextField {
+                        id: customTypeField
+                        visible: false
+                        Kirigami.FormData.label: qsTr("Custom Service Type")+":"
+                    }
+                    
+                    Layouts.RowLayout {
+                        Kirigami.FormData.label: qsTr("Date")+":"
+                        Controls.TextField {
+                            id: dateField
+                            text: new Date().toLocaleDateString(Qt.locale())
+                            readOnly: true
+                        }
+                        Controls.Button {
+                            icon.name: "office-calendar"
+                            text: qsTr("Select Date")
+                            display: Controls.AbstractButton.IconOnly
+                            onClicked: {
+                                calendarPopup.open();
+                            }
+                        }
+                    }
+                    
+                    Controls.TextField {
+                        id: milesField
+                        selectByMouse: true
+                        Kirigami.FormData.label: qsTr("Miles")+":"
+                        inputMethodHints: Qt.ImhDigitsOnly
+                        validator: IntValidator {
+                            bottom: 0
+                            top: 500000
+                        }
+                    }
+                    
+                    Controls.TextArea {
+                        id: notesField
+                        placeholderText: qsTr("Notes about service")
+                        selectByMouse: true
+                        Kirigami.FormData.label: qsTr("Notes")+":"
+                    }
+                    
+                    Layouts.RowLayout {
+                    
+                        Controls.Button {
+                            text: qsTr("Add")
+                            highlighted: true
+                            onClicked: {
+                                var dateObj = Date.fromLocaleDateString(Qt.locale(), dateField.text);
+                                var typeText = typeField.currentText;
+                                if(typeField.currentValue == -1) {
+                                    typeText = customTypeField.text;
+                                }
+                                if(milesField.acceptableInput) {
+                                    recordModel.addNewRecord(providerField.text, typeField.currentValue, typeText, dateObj.toISOString(), parseInt(milesField.text), notesField.text);
+                                    router.popRoute();
+                                } else {
+                                    formError.text = qsTr("Invalid number of miles.");
+                                    formError.visible = true;
+                                }
+                            }
+                        }
+                        Controls.Button {
+                            text: qsTr("Cancel")
+                            onClicked: {
+                                router.popRoute();
+                            }
+                        }
+                    }
+                }
+            }
+            
+            Kirigami.OverlaySheet {
+                id: calendarPopup
+                Old.Calendar {
+                    selectedDate: Date.fromLocaleDateString(Qt.locale(), dateField.text)
+                    onClicked: {
+                        dateField.text = date.toLocaleDateString(Qt.locale());
+                    }
+                }
+            }
+        }
+    }
+}

src/contents/ui/AddVehicle.qml

@@ -0,0 +1,95 @@
+import QtQuick 2.14
+import org.kde.kirigami 2.12 as Kirigami
+import QtQuick.Controls 2.14 as Controls
+import QtQuick.Layouts 1.14 as Layouts
+
+Kirigami.PageRoute {
+    name: "addvehicle"
+    Component {
+        Kirigami.Page {
+            id: vehicleAddPage
+            title: qsTr("Add Vehicle")
+            Layouts.ColumnLayout {
+                anchors.fill: parent
+                Kirigami.InlineMessage {
+                    Layouts.Layout.fillWidth: true
+                    Layouts.Layout.leftMargin: 10
+                    Layouts.Layout.rightMargin: 10
+                    z: 9997
+                    type: Kirigami.MessageType.Error
+                    showCloseButton: true
+                    id: formError
+                }
+                Kirigami.FormLayout {
+                    Layouts.Layout.alignment: Qt.AlignHCenter
+                    Layouts.Layout.fillWidth: true
+                    width: vehicleAddPage.width
+                    
+                    Item {
+                        Kirigami.FormData.isSection: true
+                        Kirigami.FormData.label: "Vehicle Information"
+                    }
+                    
+                    Controls.TextField {
+                        id: nameField
+                        selectByMouse: true
+                        Kirigami.FormData.label: qsTr("Vehicle Name")+":"
+                    }
+                    
+                    Controls.TextField {
+                        id: makeField
+                        selectByMouse: true
+                        Kirigami.FormData.label: qsTr("Make")+":"
+                    }
+                    
+                    Controls.TextField {
+                        id: modelField
+                        selectByMouse: true
+                        Kirigami.FormData.label: qsTr("Model")+":"
+                    }
+                    
+                    Controls.TextField {
+                        id: yearField
+                        selectByMouse: true
+                        Kirigami.FormData.label: qsTr("Year")+":"
+                        inputMethodHints: Qt.ImhDigitsOnly
+                        validator: IntValidator {
+                            bottom: 1900
+                            top: 4000
+                        }
+                    }
+                    
+                    Controls.TextField {
+                        id: vinField
+                        selectByMouse: true
+                        Kirigami.FormData.label: qsTr("VIN")+":"
+                    }
+                    
+                    Layouts.RowLayout {
+                        
+                        Controls.Button {
+                            text: qsTr("Add")
+                            highlighted: true
+                            onClicked: {
+                                if(yearField.acceptableInput) {
+                                    vehicleModel.addNewVehicle(nameField.text, makeField.text, modelField.text, parseInt(yearField.text), "", vinField.text);
+                                    router.popRoute();
+                                } else {
+                                    formError.text = qsTr("Year is invalid!");
+                                    formError.visible = true;
+                                }
+                            }
+                        }
+                        
+                        Controls.Button {
+                            text: qsTr("Cancel")
+                            onClicked: {
+                                router.popRoute();
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

src/contents/ui/EditRecord.qml

@@ -0,0 +1,125 @@
+import QtQuick 2.14
+import org.kde.kirigami 2.12 as Kirigami
+import QtQuick.Controls 2.14 as Controls
+import QtQuick.Layouts 1.14 as Layouts
+import QtQuick.Controls 1.4 as Old
+import QtQuick.Dialogs 1.3 as Dialogs
+
+Kirigami.PageRoute {
+    name: "editrecord"
+    Component {
+        Kirigami.Page {
+            id: editRecordPage
+            title: qsTr("Edit Service Record")
+            property var serviceId: Kirigami.PageRouter.data.id
+            property var record: recordModel.getRecord(serviceId)
+            Layouts.ColumnLayout {
+                anchors.fill: parent
+                Kirigami.InlineMessage {
+                    Layouts.Layout.fillWidth: true
+                    Layouts.Layout.leftMargin: 10
+                    Layouts.Layout.rightMargin: 10
+                    z: 9997
+                    type: Kirigami.MessageType.Error
+                    showCloseButton: true
+                    id: formError
+                }
+                Kirigami.FormLayout {
+                    Layouts.Layout.alignment: Qt.AlignHCenter
+                    Layouts.Layout.fillWidth: true
+                    width: editRecordPage.width
+                    
+                    Item {
+                        Kirigami.FormData.isSection: true
+                        Kirigami.FormData.label: "Service Information"
+                    }
+                    
+                    Controls.TextField {
+                        id: providerField
+                        selectByMouse: true
+                        Kirigami.FormData.label: qsTr("Service Provider")+":"
+                        text: record["serviceprovider"]
+                    }
+                    
+                    Controls.TextField {
+                        id: typeField
+                        enabled: false
+                        text: record["servicetypename"]
+                        Kirigami.FormData.label: qsTr("Service Type")+":"
+                    }
+                    
+                    Layouts.RowLayout {
+                        Kirigami.FormData.label: qsTr("Date")+":"
+                        Controls.TextField {
+                            id: dateField
+                            text: new Date(record["servicedate"]).toLocaleDateString(Qt.locale())
+                            readOnly: true
+                        }
+                        Controls.Button {
+                            icon.name: "office-calendar"
+                            text: qsTr("Select Date")
+                            display: Controls.AbstractButton.IconOnly
+                            onClicked: {
+                                calendarPopup.open();
+                            }
+                        }
+                    }
+                    
+                    Controls.TextField {
+                        id: milesField
+                        selectByMouse: true
+                        Kirigami.FormData.label: qsTr("Miles")+":"
+                        text: record["miles"]
+                        inputMethodHints: Qt.ImhDigitsOnly
+                        validator: IntValidator {
+                            bottom: 0
+                            top: 500000
+                        }
+                    }
+                    
+                    Controls.TextArea {
+                        id: notesField
+                        placeholderText: qsTr("Notes about service")
+                        selectByMouse: true
+                        Kirigami.FormData.label: qsTr("Notes")+":"
+                        text: record["notes"]
+                    }
+                    
+                    Layouts.RowLayout {
+                    
+                        Controls.Button {
+                            text: qsTr("Save")
+                            highlighted: true
+                            onClicked: {
+                                var dateObj = Date.fromLocaleDateString(Qt.locale(), dateField.text);
+                                if(milesField.acceptableInput) {
+                                    recordModel.updateRecord(serviceId, providerField.text, dateObj.toISOString(), parseInt(milesField.text), notesField.text);
+                                    router.popRoute();
+                                } else {
+                                    formError.text = qsTr("Invalid number of miles.");
+                                    formError.visible = true;
+                                }
+                            }
+                        }
+                        Controls.Button {
+                            text: qsTr("Cancel")
+                            onClicked: {
+                                router.popRoute();
+                            }
+                        }
+                    }
+                }
+            }
+            
+            Kirigami.OverlaySheet {
+                id: calendarPopup
+                Old.Calendar {
+                    selectedDate: Date.fromLocaleDateString(Qt.locale(), dateField.text)
+                    onClicked: {
+                        dateField.text = date.toLocaleDateString(Qt.locale());
+                    }
+                }
+            }
+        }
+    }
+}

src/contents/ui/MainPage.qml

@@ -0,0 +1,147 @@
+import QtQuick 2.14
+import org.kde.kirigami 2.12 as Kirigami
+import QtQuick.Controls 2.14 as Controls
+import QtQuick.Layouts 1.14 as Layouts
+import QtQuick.Controls 1.4 as Old
+
+Kirigami.PageRoute {
+    name: "main"
+    Component {
+        Kirigami.Page {
+            id: mainPage
+            mainAction: Kirigami.Action {
+                text: qsTr("Add Vehicle")
+                iconName: "list-add"
+                onTriggered: {
+                    router.navigateToRoute(["main","addvehicle"]);
+                }
+            }
+            contextualActions: [
+                Kirigami.Action {
+                    iconName: "preferences-system"
+                    text: qsTr("Settings")
+                    onTriggered: {
+                        router.navigateToRoute(["main","settings"]);
+                    }
+                },
+                Kirigami.Action {
+                    iconName: "help-about"
+                    text: qsTr("About")
+                    onTriggered: {
+                        router.navigateToRoute("about");
+                    }
+                }
+            ]
+            title: "Vehicles"
+            Kirigami.CardsListView {
+                    anchors.fill: parent
+                    id: vehicleView
+                    model: vehicleModel
+                    delegate: Kirigami.Card {
+                        id: card
+                        banner {
+                            title: name
+                        }
+                        header: Row{
+                            topPadding: 10.0
+                            rightPadding: 10.0
+                            leftPadding: 10.0
+                            layoutDirection: Qt.RightToLeft
+                            spacing: 5
+                                Controls.Label {
+                                    text: vin
+                                    visible: root.wideScreen && mainPage.width > 550
+                                    anchors.verticalCenter: parent.verticalCenter
+                                }
+                                Image {
+                                    id: vinIcon
+                                    source: "qrc:/license.svg"
+                                    sourceSize.width: 32
+                                    sourceSize.height: 32
+                                    anchors.verticalCenter: parent.verticalCenter
+                                    MouseArea {
+                                        id: vinMouse
+                                        hoverEnabled: true
+                                        anchors.fill: vinIcon
+                                    }
+                                    Controls.ToolTip {
+                                        id: vinTip
+                                        text: vin
+                                        visible: vinMouse.containsMouse
+                                    }
+                                }
+                        }
+                        contentItem: Item{
+                            implicitHeight: Kirigami.Units.gridUnit * 4
+                            Layouts.ColumnLayout {
+                                Kirigami.Heading {
+                                    text: maker + " " + vmodel
+                                    level: 2
+                                }
+                                Kirigami.Heading {
+                                    text: year
+                                    level: 4
+                                }
+                                Kirigami.Icon {
+                                    property bool oilChangeNeeded: false
+                                    
+                                    id: checkupIcon
+                                    visible: oilChangeNeeded
+                                    width: Kirigami.Units.iconSizes.smallMedium
+                                    height: Kirigami.Units.iconSizes.smallMedium
+                                    source: "dialog-information"
+                                    isMask: true
+                                    color: Kirigami.Theme.activeTextColor
+                                    
+                                    MouseArea {
+                                        id: checkupMouse
+                                        hoverEnabled: true
+                                        anchors.fill: checkupIcon
+                                    }
+                                    Controls.ToolTip {
+                                        id: checkupTip
+                                        text: qsTr("Service is needed")
+                                        visible: checkupMouse.containsMouse
+                                    }
+                                    
+                                    Connections {
+                                        target: dbAnalytics
+                                        function onIsOilChangeNeeded(changeNeeded, vehicleId) {
+                                            if(vehicleId == id) {
+                                                checkupIcon.oilChangeNeeded = changeNeeded;
+                                            }
+                                        }
+                                    }
+                                    
+                                    Component.onCompleted: {
+                                        //Check vehicle warnings
+                                        dbAnalytics.checkOilChangeNeededForVehicle(id, appAnalyticsSettings.value("milesForOilChange",5000), appAnalyticsSettings.value("monthsForOilChange",6));
+                                    }
+                                }
+                            }
+                        }
+                        actions: [
+                            Kirigami.Action {
+                                text: qsTr("Examine Logs")
+                                iconName: "edit-find"
+                                onTriggered: {
+                                    router.navigateToRoute(["main", {"route": "servicerecords", "data": {"id": id, "name": name}}]);
+                                }
+                            }
+                        ]
+                        hiddenActions: [
+                            Kirigami.Action {
+                                text: qsTr("Delete")
+                                iconName: "edit-delete"
+                                onTriggered: {
+                                    vehicleModel.removeVehicle(index);
+                                    router.navigateToRoute(["main"]);
+                                }
+                            }
+                        ]
+                    }
+                    Controls.ScrollBar.vertical: Controls.ScrollBar {}
+            }
+        }
+    }
+}

src/contents/ui/ServiceRecords.qml

@@ -0,0 +1,111 @@
+import QtQuick 2.14
+import org.kde.kirigami 2.12 as Kirigami
+import QtQuick.Controls 2.14 as Controls
+import QtQuick.Layouts 1.14 as Layouts
+
+Kirigami.PageRoute {
+    name: "servicerecords"
+    
+    Component {
+        Kirigami.ScrollablePage {
+            property var vehicleIndex: Kirigami.PageRouter.data.id
+            Component.onCompleted: {
+                recordModel.changeVehicleFilter(vehicleIndex);
+                //Check vehicle warnings
+                dbAnalytics.checkOilChangeNeededForVehicle(vehicleIndex, appAnalyticsSettings.value("milesForOilChange",5000), appAnalyticsSettings.value("monthsForOilChange",6));
+            }
+            Connections {
+                target: recordModel
+                function onVehicleUpdated(vehicleId) {
+                    //Check vehicle warnings
+                    if(vehicleId == vehicleIndex) {
+                        dbAnalytics.checkOilChangeNeededForVehicle(vehicleId, appAnalyticsSettings.value("milesForOilChange",5000), appAnalyticsSettings.value("monthsForOilChange",6));
+                    }
+                }
+            }
+            id: serviceRecordPage
+            title: qsTr("Service Records for ") + Kirigami.PageRouter.data.name
+            mainAction: Kirigami.Action {
+                text: qsTr("Add Service Record")
+                iconName: "list-add"
+                onTriggered: {
+                    router.pushRoute({"route": "addrecord", "data": vehicleIndex});
+                }
+            }
+            ListView {
+                    id: serviceView
+                    Layouts.Layout.fillHeight: true
+                    Layouts.Layout.fillWidth: true
+                    model: recordModel
+                    headerPositioning: ListView.OverlayHeader
+                    header: Kirigami.ListSectionHeader {
+                        z: 9997
+                        contentItem: Layouts.ColumnLayout {
+                            Kirigami.InlineMessage {
+                                Layouts.Layout.fillWidth: true
+                                type: Kirigami.MessageType.Information
+                                id: oilMessage
+                                showCloseButton: false
+                                text: qsTr("You are due for an oil change!")
+                                Connections {
+                                    target: dbAnalytics
+                                    function onIsOilChangeNeeded(changeNeeded, vehicleId) {
+                                        if(vehicleId == vehicleIndex) {
+                                            oilMessage.visible = changeNeeded;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    delegate: Kirigami.SwipeListItem {
+                            contentItem: Layouts.ColumnLayout {
+                                Kirigami.Heading {
+                                    text: serviceprovider
+                                    level: 2
+                                }
+                                Kirigami.Heading {
+                                    text: servicetypename
+                                    level: 2
+                                }
+                                Controls.Label {
+                                    text: new Date(servicedate).toLocaleDateString(Qt.locale())
+                                }
+                                Row {
+                                    Image {
+                                        source: "qrc:/speed.svg"
+                                        sourceSize.width: 16
+                                        sourceSize.height: 16
+                                    }
+                                    Controls.Label {
+                                        text: miles
+                                    }
+                                }
+                                Controls.Label {
+                                    text: notes
+                                }
+                            }
+                            actions: [
+                                Kirigami.Action {
+                                    text: qsTr("Remove")
+                                    iconName: "edit-delete"
+                                    onTriggered: {
+                                        recordModel.removeRecord(index);
+                                    }
+                                },
+                                Kirigami.Action {
+                                    text: qsTr("Edit")
+                                    iconName: "edit-symbolic"
+                                    onTriggered: {
+                                        if(router.routeActive(["main","servicerecords","editrecord"])) {
+                                            router.popRoute();
+                                        }
+                                        router.pushRoute({"route": "editrecord", "data": {"id": index}});
+                                    }
+                                }
+                            ]
+                        }
+            }
+        }
+    }
+}

src/contents/ui/Settings.qml

@@ -0,0 +1,113 @@
+import QtQuick 2.14
+import org.kde.kirigami 2.12 as Kirigami
+import QtQuick.Controls 2.14 as Controls
+import QtQuick.Layouts 1.14 as Layouts
+import QtQuick.Dialogs 1.3 as Dialogs
+import Qt.labs.platform 1.1 as Labs
+
+Kirigami.PageRoute {
+    name: "settings"
+    Component {
+        Kirigami.Page {
+            id: settingsPage
+            title: qsTr("Settings")
+            contextualActions: [
+                Kirigami.Action {
+                    iconName: "application-javascript"
+                    text: qsTr("Import From Carfax JSON")
+                    onTriggered: {
+                        importMessage.visible = true;
+                    }
+                }
+            ]
+            Dialogs.FileDialog {
+                id: importDialog
+                title: qsTr("Select Carfax Json file to import...")
+                nameFilters: ["Carfax Vehicle Json (*.json)"]
+                onAccepted: {
+                    if(jsonConverter.importCarfaxJsonToDB(importDialog.fileUrl)) {
+                        //
+                    } else {
+                        root.showPassiveNotification(qsTr("Failed to parse file."),"short");
+                    }
+                }
+            }
+            Labs.MessageDialog {
+                id:importMessage
+                title: qsTr("Warning")
+                text: qsTr("This is an advanced feature that requires you pulling JSON file from Carfax website unofficially in advanced. Do you want to continue?")
+                buttons: Labs.MessageDialog.Yes | Labs.MessageDialog.No
+                onYesClicked: importDialog.visible = true
+            }
+            Layouts.ColumnLayout {
+                anchors.fill: parent
+                Kirigami.InlineMessage {
+                    Layouts.Layout.fillWidth: true
+                    Layouts.Layout.leftMargin: 10
+                    Layouts.Layout.rightMargin: 10
+                    z: 9997
+                    type: Kirigami.MessageType.Error
+                    showCloseButton: true
+                    id: formError
+                }
+                Kirigami.FormLayout {
+                    Layouts.Layout.alignment: Qt.AlignHCenter
+                    Layouts.Layout.fillWidth: true
+                    width: settingsPage.width
+                    Item {
+                        Kirigami.FormData.label: qsTr("Warning Thresholds")
+                        Kirigami.FormData.isSection: true
+                    }
+                    Controls.TextField {
+                        id: oilChangeMiles
+                        Kirigami.FormData.label: qsTr("Oil Change Miles")
+                        text: appAnalyticsSettings.value("milesForOilChange",5000)
+                        validator: IntValidator {
+                            bottom: 1
+                            top: 500000
+                        }
+                    }
+                    Controls.TextField {
+                        id: oilChangeMonths
+                        Kirigami.FormData.label: qsTr("Oil Change Months")
+                        text: appAnalyticsSettings.value("monthsForOilChange",6)
+                        validator: IntValidator {
+                            bottom: 1
+                            top: 500000
+                        }
+                    }
+                    
+                    Layouts.RowLayout {
+                            
+                            Controls.Button {
+                                text: qsTr("Save")
+                                highlighted: true
+                                onClicked: {
+                                    if(oilChangeMiles.acceptableInput) {
+                                        if(oilChangeMonths.acceptableInput) {
+                                            appAnalyticsSettings.setValue("milesForOilChange", parseInt(oilChangeMiles.text));
+                                            appAnalyticsSettings.setValue("monthsForOilChange", parseInt(oilChangeMonths.text));
+                                            router.popRoute();
+                                        } else {
+                                            formError.text = qsTr("Number of Months is invalid!");
+                                            formError.visible = true;
+                                        }
+                                    } else {
+                                        formError.text = qsTr("Number of Miles is invalid!");
+                                        formError.visible = true;
+                                    }
+                                }
+                            }
+                            
+                            Controls.Button {
+                                text: qsTr("Cancel")
+                                onClicked: {
+                                    router.popRoute();
+                                }
+                            }
+                        }
+                }
+            }
+        }
+    }
+}

src/contents/ui/main.qml

@@ -4,6 +4,7 @@ import QtQuick.Controls 2.14 as Controls
 import QtQuick.Layouts 1.14 as Layouts
 import QtQuick.Controls 1.4 as Old
 import QtQuick.Dialogs 1.3 as Dialogs
+import Qt.labs.settings 1.0 as QtSettings
 
 Kirigami.ApplicationWindow {
     id: root
@@ -24,128 +25,18 @@ Kirigami.ApplicationWindow {
      contextDrawer: Kirigami.ContextDrawer {
         id: contextDrawer
     }
+    
+    QtSettings.Settings {
+        id: appAnalyticsSettings
+        category: "analytics"
+    }
 
     Kirigami.PageRouter {
         id: router
         initialRoute: "main"
         pageStack: root.pageStack.columnView
         
-        Kirigami.PageRoute {
-            name: "main"
-            Component {
-                Kirigami.Page {
-                    id: mainPage
-                    mainAction: Kirigami.Action {
-                        text: qsTr("Add Vehicle")
-                        iconName: "list-add"
-                        onTriggered: {
-                            router.navigateToRoute(["main","addvehicle"]);
-                        }
-                    }
-                    contextualActions: [
-                        Kirigami.Action {
-                            iconName: "application-javascript"
-                            text: qsTr("Import From Carfax JSON")
-                            onTriggered: {
-                                importDialog.visible = true;
-                            }
-                        },
-                        Kirigami.Action {
-                            iconName: "help-about"
-                            text: qsTr("About")
-                            onTriggered: {
-                                router.navigateToRoute("about");
-                            }
-                        }
-                    ]
-                    title: "Vehicles"
-                    Dialogs.FileDialog {
-                        id: importDialog
-                        title: qsTr("Select Carfax Json file to import...")
-                        nameFilters: ["Carfax Vehicle Json (*.json)"]
-                        onAccepted: {
-                            if(jsonConverter.importCarfaxJsonToDB(importDialog.fileUrl)) {
-                                //
-                            } else {
-                                root.showPassiveNotification(qsTr("Failed to parse file."),"short");
-                            }
-                        }
-                    }  
-                    Kirigami.CardsListView {
-                            anchors.fill: parent
-                            id: vehicleView
-                            model: vehicleModel
-                            delegate: Kirigami.Card {
-                                id: card
-                                banner {
-                                    title: name
-                                }
-                                header: Row{
-                                    topPadding: 10.0
-                                    rightPadding: 10.0
-                                    leftPadding: 10.0
-                                    layoutDirection: Qt.RightToLeft
-                                    spacing: 5
-                                        Controls.Label {
-                                            text: vin
-                                            visible: root.wideScreen && mainPage.width > 550
-                                            anchors.verticalCenter: parent.verticalCenter
-                                        }
-                                        Image {
-                                            id: vinIcon
-                                            source: "qrc:/license.svg"
-                                            sourceSize.width: 32
-                                            sourceSize.height: 32
-                                            anchors.verticalCenter: parent.verticalCenter
-                                            MouseArea {
-                                                id: vinMouse
-                                                hoverEnabled: true
-                                                anchors.fill: vinIcon
-                                            }
-                                            Controls.ToolTip {
-                                                id: vinTip
-                                                text: vin
-                                                visible: vinMouse.containsMouse
-                                            }
-                                        }
-                                }
-                                contentItem: Item{
-                                    implicitHeight: Kirigami.Units.gridUnit * 4
-                                    Layouts.ColumnLayout {
-                                        Kirigami.Heading {
-                                            text: maker + " " + vmodel
-                                            level: 2
-                                        }
-                                        Kirigami.Heading {
-                                            text: year
-                                            level: 4
-                                        }
-                                    }
-                                }
-                                actions: [
-                                    Kirigami.Action {
-                                        text: qsTr("Examine Logs")
-                                        iconName: "edit-find"
-                                        onTriggered: {
-                                            router.navigateToRoute(["main", {"route": "servicerecords", "data": {"id": id, "name": name}}]);
-                                        }
-                                    }
-                                ]
-                                hiddenActions: [
-                                    Kirigami.Action {
-                                        text: qsTr("Delete")
-                                        iconName: "edit-delete"
-                                        onTriggered: {
-                                            vehicleModel.removeVehicle(index);
-                                        }
-                                    }
-                                ]
-                            }
-                            Controls.ScrollBar.vertical: Controls.ScrollBar {}
-                    }
-                }
-            }
-        }
+        MainPage{}
     
         Kirigami.PageRoute {
             name: "about"
@@ -164,289 +55,14 @@ Kirigami.ApplicationWindow {
             }
         }
         
-        Kirigami.PageRoute {
-            name: "addvehicle"
-            Component {
-                Kirigami.Page {
-                    id: vehicleAddPage
-                    title: qsTr("Add Vehicle")
-                    Layouts.ColumnLayout {
-                        anchors.fill: parent
-                        Kirigami.InlineMessage {
-                            Layouts.Layout.fillWidth: true
-                            Layouts.Layout.leftMargin: 10
-                            Layouts.Layout.rightMargin: 10
-                            z: 9997
-                            type: Kirigami.MessageType.Error
-                            showCloseButton: true
-                            id: formError
-                        }
-                        Kirigami.FormLayout {
-                            Layouts.Layout.alignment: Qt.AlignHCenter
-                            Layouts.Layout.fillWidth: true
-                            width: vehicleAddPage.width
-                            
-                            Item {
-                                Kirigami.FormData.isSection: true
-                                Kirigami.FormData.label: "Vehicle Information"
-                            }
-                            
-                            Controls.TextField {
-                                id: nameField
-                                selectByMouse: true
-                                Kirigami.FormData.label: qsTr("Vehicle Name")+":"
-                            }
-                            
-                            Controls.TextField {
-                                id: makeField
-                                selectByMouse: true
-                                Kirigami.FormData.label: qsTr("Make")+":"
-                            }
-                            
-                            Controls.TextField {
-                                id: modelField
-                                selectByMouse: true
-                                Kirigami.FormData.label: qsTr("Model")+":"
-                            }
-                            
-                            Controls.TextField {
-                                id: yearField
-                                selectByMouse: true
-                                Kirigami.FormData.label: qsTr("Year")+":"
-                                inputMethodHints: Qt.ImhDigitsOnly
-                                validator: IntValidator {
-                                    bottom: 1900
-                                    top: 4000
-                                }
-                            }
-                            
-                            Controls.TextField {
-                                id: vinField
-                                selectByMouse: true
-                                Kirigami.FormData.label: qsTr("VIN")+":"
-                            }
-                            
-                            Layouts.RowLayout {
-                                
-                                Controls.Button {
-                                    text: qsTr("Add")
-                                    highlighted: true
-                                    onClicked: {
-                                        if(yearField.acceptableInput) {
-                                            vehicleModel.addNewVehicle(nameField.text, makeField.text, modelField.text, parseInt(yearField.text), "", vinField.text);
-                                            router.popRoute();
-                                        } else {
-                                            formError.text = qsTr("Year is invalid!");
-                                            formError.visible = true;
-                                        }
-                                    }
-                                }
-                                
-                                Controls.Button {
-                                    text: qsTr("Cancel")
-                                    onClicked: {
-                                        router.popRoute();
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
+        AddVehicle{}
         
-        Kirigami.PageRoute {
-            name: "servicerecords"
-            Component {
-                Kirigami.ScrollablePage {
-                    property var serviceId: Kirigami.PageRouter.data.id
-                    Component.onCompleted: {
-                        recordModel.changeVehicleFilter(serviceId);
-                    }
-                    id: serviceRecordPage
-                    title: qsTr("Service Records for ") + Kirigami.PageRouter.data.name
-                    mainAction: Kirigami.Action {
-                        text: qsTr("Add Service Record")
-                        iconName: "list-add"
-                        onTriggered: {
-                            router.pushRoute({"route": "addrecord", "data": serviceId});
-                        }
-                    }
-                    ListView {
-                            id: serviceView
-                            model: recordModel
-                            delegate: Kirigami.SwipeListItem {
-                                    contentItem: Layouts.ColumnLayout {
-                                        Kirigami.Heading {
-                                            text: serviceprovider
-                                            level: 2
-                                        }
-                                        Kirigami.Heading {
-                                            text: servicetypename
-                                            level: 2
-                                        }
-                                        Controls.Label {
-                                            text: new Date(servicedate).toLocaleDateString(Qt.locale())
-                                        }
-                                        Row {
-                                            Image {
-                                                source: "qrc:/speed.svg"
-                                                sourceSize.width: 16
-                                                sourceSize.height: 16
-                                            }
-                                            Controls.Label {
-                                                text: miles
-                                            }
-                                        }
-                                        Controls.Label {
-                                            text: notes
-                                        }
-                                    }
-                                    actions: [
-                                        Kirigami.Action {
-                                            text: qsTr("Remove")
-                                            iconName: "edit-delete"
-                                            onTriggered: {
-                                                recordModel.removeRecord(index);
-                                            }
-                                        }
-                                    ]
-                                }
-                    }
-                }
-            }
-        }
+        ServiceRecords{}
         
-        Kirigami.PageRoute {
-            name: "addrecord"
-            Component {
-                Kirigami.Page {
-                    id: recordAddPage
-                    title: qsTr("Add Service Record")
-                    Layouts.ColumnLayout {
-                        anchors.fill: parent
-                        Kirigami.InlineMessage {
-                            Layouts.Layout.fillWidth: true
-                            Layouts.Layout.leftMargin: 10
-                            Layouts.Layout.rightMargin: 10
-                            z: 9997
-                            type: Kirigami.MessageType.Error
-                            showCloseButton: true
-                            id: formError
-                        }
-                        Kirigami.FormLayout {
-                            Layouts.Layout.alignment: Qt.AlignHCenter
-                            Layouts.Layout.fillWidth: true
-                            width: recordAddPage.width
-                            
-                            Item {
-                                Kirigami.FormData.isSection: true
-                                Kirigami.FormData.label: "Service Information"
-                            }
-                            
-                            Controls.TextField {
-                                id: providerField
-                                selectByMouse: true
-                                Kirigami.FormData.label: qsTr("Service Provider")+":"
-                            }
-                            
-                            Controls.ComboBox {
-                                id: typeField
-                                model: serviceTypeModel
-                                textRole: "text"
-                                valueRole: "value"
-                                onActivated: {
-                                    if(currentValue == -1) {
-                                        customTypeField.visible = true;
-                                    } else {
-                                        customTypeField.visible = false;
-                                    }
-                                }
-                                Kirigami.FormData.label: qsTr("Service Type")+":"
-                            }
-                            
-                            Controls.TextField {
-                                id: customTypeField
-                                visible: false
-                                Kirigami.FormData.label: qsTr("Custom Service Type")+":"
-                            }
-                            
-                            Layouts.RowLayout {
-                                Kirigami.FormData.label: qsTr("Date")+":"
-                                Controls.TextField {
-                                    id: dateField
-                                    text: new Date().toLocaleDateString(Qt.locale())
-                                    readOnly: true
-                                }
-                                Controls.Button {
-                                    icon.name: "office-calendar"
-                                    text: qsTr("Select Date")
-                                    display: Controls.AbstractButton.IconOnly
-                                    onClicked: {
-                                        calendarPopup.open();
-                                    }
-                                }
-                            }
-                            
-                            Controls.TextField {
-                                id: milesField
-                                selectByMouse: true
-                                Kirigami.FormData.label: qsTr("Miles")+":"
-                                inputMethodHints: Qt.ImhDigitsOnly
-                                validator: IntValidator {
-                                    bottom: 0
-                                    top: 500000
-                                }
-                            }
-                            
-                            Controls.TextArea {
-                                id: notesField
-                                placeholderText: qsTr("Notes about service")
-                                selectByMouse: true
-                                Kirigami.FormData.label: qsTr("Notes")+":"
-                            }
-                            
-                            Layouts.RowLayout {
-                            
-                                Controls.Button {
-                                    text: qsTr("Add")
-                                    highlighted: true
-                                    onClicked: {
-                                        var dateObj = Date.fromLocaleDateString(Qt.locale(), dateField.text);
-                                        var typeText = typeField.currentText;
-                                        if(typeField.currentValue == -1) {
-                                            typeText = customTypeField.text;
-                                        }
-                                        if(milesField.acceptableInput) {
-                                            recordModel.addNewRecord(providerField.text, typeField.currentValue, typeText, dateObj.toISOString(), parseInt(milesField.text), notesField.text);
-                                            router.popRoute();
-                                        } else {
-                                            formError.text = qsTr("Invalid number of miles.");
-                                            formError.visible = true;
-                                        }
-                                    }
-                                }
-                                Controls.Button {
-                                    text: qsTr("Cancel")
-                                    onClicked: {
-                                        router.popRoute();
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    
-                    Kirigami.OverlaySheet {
-                        id: calendarPopup
-                        Old.Calendar {
-                            selectedDate: Date.fromLocaleDateString(Qt.locale(), dateField.text)
-                            onClicked: {
-                                dateField.text = date.toLocaleDateString(Qt.locale());
-                            }
-                        }
-                    }
-                }
-            }
-        }
+        AddRecord{}
+        
+        Settings{}
+        
+        EditRecord{}
     }
 }

src/db/recordanalytics.cpp

@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2020  <Kevin Whitakerr> <eyecreate@eyecreate.org>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include "recordanalytics.h"
+#include <QtConcurrent/QtConcurrent>
+#include <QSqlQuery>
+#include <QSqlRecord>
+
+RecordAnalytics::RecordAnalytics(QObject* parent, QSqlDatabase db) : _db(db)
+{
+}
+
+void RecordAnalytics::checkOilChangeNeededForVehicle(int vehicleId, int milesForChange, int monthsForChange)
+{
+    QtConcurrent::run([&](int vehicleId, int milesForChange, int monthsForChange){
+        QSqlQuery query = _db.exec("SELECT * FROM records WHERE records.vehicle = "+QString::number(vehicleId));
+        int milesRecord = query.record().indexOf("miles");
+        int dateRecord = query.record().indexOf("servicedate");
+        int typeRecord = query.record().indexOf("servicetype");
+        QDateTime lastOilDate;
+        int lastOilMiles = 0;
+        int lastKnownMiles = 0;
+        while(query.next()) {
+            if(query.value(typeRecord).toInt() == 0) {
+                if(!lastOilDate.isValid() || lastOilDate < QDateTime::fromString(query.value(dateRecord).toString(), Qt::DateFormat::ISODate)) {
+                    lastOilDate = QDateTime::fromString(query.value(dateRecord).toString(), Qt::DateFormat::ISODate);
+                    lastOilMiles = query.value(milesRecord).toInt();
+                }
+            }
+            if(lastKnownMiles < query.value(milesRecord).toInt()) {
+                lastKnownMiles = query.value(milesRecord).toInt();
+            }
+        }
+        if(lastKnownMiles-lastOilMiles > milesForChange || lastOilMiles == 0 || !lastOilDate.isValid() || lastOilDate.daysTo(QDateTime::currentDateTime()) > 30*monthsForChange) {
+            emit this->isOilChangeNeeded(true, vehicleId);
+        } else {
+            emit this->isOilChangeNeeded(false, vehicleId);
+        }
+    },vehicleId, milesForChange, monthsForChange);
+}
+
+
+

src/db/recordanalytics.h

@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2020  <Kevin Whitaker> <eyecreate@eyecreate.org>
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef RECORDANALYTICS_H
+#define RECORDANALYTICS_H
+
+#include <qobject.h>
+#include <QSqlDatabase>
+
+/**
+ * Class to analyze attributes of the data in the database. Used mostly for detecting service scheduling.
+ */
+class RecordAnalytics : public QObject
+{
+    Q_OBJECT
+    
+public:
+    RecordAnalytics(QObject *parent = nullptr, QSqlDatabase db = QSqlDatabase());
+    Q_INVOKABLE void checkOilChangeNeededForVehicle(int vehicleId, int milesForChange=5000, int monthsForChange=6);
+    
+signals:
+    void isOilChangeNeeded(bool changeNeeded, int vehicleId);
+    
+private:
+    QSqlDatabase _db;
+
+};
+
+#endif // RECORDANALYTICS_H

src/db/sqlservicerecord.cpp

@@ -71,6 +71,7 @@ void SqlServiceRecord::addNewRecord(int vehicleId, QString serviceProvider, int
         printf("inserted new service record\n");
         this->database().commit();
         this->select();
+        emit this->vehicleUpdated(this->currentVehicleID);
     } else {
         this->database().rollback();
         printf("database error\n");
@@ -84,6 +85,7 @@ void SqlServiceRecord::removeRecord(int index)
         printf("removed service record\n");
         this->database().commit();
         this->select();
+        emit this->vehicleUpdated(this->currentVehicleID);
     } else {
         this->database().rollback();
         printf("database error\n");
@@ -97,6 +99,37 @@ void SqlServiceRecord::changeVehicleFilter(int id)
     this->currentVehicleID = id;
 }
 
+QVariantMap SqlServiceRecord::getRecord(int index)
+{
+    QHash<int, QByteArray> names = roleNames();
+    QHashIterator<int, QByteArray> i(names);
+    QVariantMap res;
+    QModelIndex idx = this->index(index, 0);
+    while(i.hasNext()) {
+        i.next();
+        QVariant data = idx.data(i.key());
+        res[i.value()] = data;
+
+    }
+    return res;
+}
+
+void SqlServiceRecord::updateRecord(int index, QString serviceProvider, QString dateISO, int miles, QString notes)
+{
+    QSqlRecord record = this->record(index);
+    record.setValue("serviceprovider", serviceProvider);
+    record.setValue("servicedate", dateISO);
+    record.setValue("miles", miles);
+    record.setValue("notes", notes);
+    
+    this->setRecord(index, record);
+    this->database().commit();
+    this->select();
+    emit this->vehicleUpdated(this->currentVehicleID);
+}
+
+
+
 
 
 

src/db/sqlservicerecord.h

@@ -19,6 +19,7 @@
 #define SQLSERVICERECORD_H
 
 #include <QSqlTableModel>
+#include <QSqlRecord>
 
 /**
  * Model to access service records.
@@ -34,7 +35,11 @@ public:
     Q_INVOKABLE void addNewRecord(QString serviceProvider, int serviceType, QString serviceTypeName, QString dateISO, int miles, QString notes);
     Q_INVOKABLE void removeRecord(int index);
     Q_INVOKABLE void changeVehicleFilter(int id);
+    Q_INVOKABLE QVariantMap getRecord(int index);
+    Q_INVOKABLE void updateRecord(int index, QString serviceProvider, QString dateISO, int miles, QString notes);
     
+signals:
+    void vehicleUpdated(int vehicleId);
 private:
     int currentVehicleID = 0;
 

src/jsonio.cpp

@@ -32,11 +32,17 @@ JsonIO::JsonIO(SqlVehicle* vehicles, SqlServiceRecord* records, QObject* parent)
 
 bool JsonIO::importCarfaxJsonToDB(QString fileLocation)
 {
-    QFile file(QUrl(fileLocation).toLocalFile());
-    file.open(QIODevice::ReadOnly);
+    QUrl url(fileLocation);
+    QFile *file;
+    if(url.scheme() == "file") {
+        file = new QFile(url.toLocalFile());
+    } else {
+        file = new QFile(url.toString());
+    }
+    file->open(QIODevice::ReadOnly);
     QString jsonContent;
-    jsonContent = file.readAll();
-    file.close();
+    jsonContent = file->readAll();
+    file->close();
     QJsonDocument doc = QJsonDocument::fromJson(jsonContent.toUtf8());
     QJsonObject root = doc.object();
     if(root.contains("vehicle")) {

src/main.cpp

@@ -32,6 +32,7 @@
 #include "db/sqlvehicle.h"
 #include "db/sqlservicerecord.h"
 #include "jsonio.h"
+#include "db/recordanalytics.h"
 
 Q_DECL_EXPORT int main(int argc, char *argv[])
 {
@@ -44,7 +45,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
 #endif
 
     
-    KAboutData aboutData("org.eyecreate.vehiclevoyage", "Vehicle Voyage", "1.0", "Track vehicle service history.",KAboutLicense::GPL_V3);//TODO:i18n
+    KAboutData aboutData("org.eyecreate.vehiclevoyage", "Vehicle Voyage", "1.1", "Track vehicle service history.",KAboutLicense::GPL_V3);//TODO:i18n
     aboutData.setProductName("vehiclevoyage");
     aboutData.addAuthor("Kevin Whitaker",QString(),"eyecreate@eyecreate.org","https://www.eyecreate.org");
     aboutData.setDesktopFileName("org.eyecreate.vehiclevoyage");
@@ -95,12 +96,14 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
     vehicles.select();
     records.select();
     JsonIO converter(&vehicles, &records);
+    RecordAnalytics analytics(nullptr, db);
     
     QQmlApplicationEngine engine;
     engine.rootContext()->setContextProperty(QStringLiteral("appAboutData"), QVariant::fromValue(aboutData));
     engine.rootContext()->setContextProperty(QStringLiteral("vehicleModel"), &vehicles);
     engine.rootContext()->setContextProperty(QStringLiteral("recordModel"), &records);
     engine.rootContext()->setContextProperty(QStringLiteral("jsonConverter"), &converter);
+    engine.rootContext()->setContextProperty(QStringLiteral("dbAnalytics"), &analytics);
     engine.load(QUrl(QStringLiteral("qrc:///main.qml")));
     
     if (engine.rootObjects().isEmpty()) {

src/resources.qrc

@@ -1,6 +1,12 @@
 <RCC>
     <qresource prefix="/">
         <file alias="main.qml">contents/ui/main.qml</file>
+        <file alias="MainPage.qml">contents/ui/MainPage.qml</file>
+        <file alias="AddVehicle.qml">contents/ui/AddVehicle.qml</file>
+        <file alias="ServiceRecords.qml">contents/ui/ServiceRecords.qml</file>
+        <file alias="AddRecord.qml">contents/ui/AddRecord.qml</file>
+        <file alias="Settings.qml">contents/ui/Settings.qml</file>
+        <file alias="EditRecord.qml">contents/ui/EditRecord.qml</file>
         <file alias="speed.svg">contents/speed.svg</file>
         <file alias="license.svg">contents/license.svg</file>
         <file alias="logo.svg">../packaging/org.eyecreate.vehiclevoyage.svg</file>