From: Good Guy Date: Sat, 5 Jan 2019 04:47:44 +0000 (-0700) Subject: switch from eclipse to android studio X-Git-Tag: 2019-08~128 X-Git-Url: https://cinelerra-gg.org/git/?a=commitdiff_plain;h=da82546b4d3b6b056c6c333b2d52fba1bdcb1f50;p=goodguy%2Fcinelerra.git switch from eclipse to android studio --- diff --git a/CineRmt/.classpath b/CineRmt/.classpath deleted file mode 100644 index 7bc01d9a..00000000 --- a/CineRmt/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/CineRmt/.gitignore b/CineRmt/.gitignore new file mode 100644 index 00000000..fd45b12f --- /dev/null +++ b/CineRmt/.gitignore @@ -0,0 +1,11 @@ +*.iml +.gradle +/local.properties +/.idea/caches/build_file_checksums.ser +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +.DS_Store +/build +/captures +.externalNativeBuild diff --git a/CineRmt/.idea/codeStyles/Project.xml b/CineRmt/.idea/codeStyles/Project.xml new file mode 100644 index 00000000..30aa626c --- /dev/null +++ b/CineRmt/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/CineRmt/.idea/gradle.xml b/CineRmt/.idea/gradle.xml new file mode 100644 index 00000000..7ac24c77 --- /dev/null +++ b/CineRmt/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/CineRmt/.idea/misc.xml b/CineRmt/.idea/misc.xml new file mode 100644 index 00000000..17426a40 --- /dev/null +++ b/CineRmt/.idea/misc.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/CineRmt/.idea/runConfigurations.xml b/CineRmt/.idea/runConfigurations.xml new file mode 100644 index 00000000..7f68460d --- /dev/null +++ b/CineRmt/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/CineRmt/.project b/CineRmt/.project deleted file mode 100644 index 44111f88..00000000 --- a/CineRmt/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - cinermt - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/CineRmt/.settings/org.eclipse.jdt.core.prefs b/CineRmt/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index b080d2dd..00000000 --- a/CineRmt/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/CineRmt/COPYING b/CineRmt/COPYING deleted file mode 100644 index eeb586b3..00000000 --- a/CineRmt/COPYING +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) 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 -this service 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 make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. 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. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -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 -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the 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 a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE 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. - - 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 -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) 19yy - - 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 2 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, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) 19yy name of author - Gnomovision 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, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This 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 Library General -Public License instead of this License. diff --git a/CineRmt/app-release.apk b/CineRmt/app-release.apk deleted file mode 100644 index 5f8d5296..00000000 Binary files a/CineRmt/app-release.apk and /dev/null differ diff --git a/CineRmt/app/.gitignore b/CineRmt/app/.gitignore new file mode 100644 index 00000000..796b96d1 --- /dev/null +++ b/CineRmt/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/CineRmt/app/build.gradle b/CineRmt/app/build.gradle new file mode 100644 index 00000000..d2efeeaa --- /dev/null +++ b/CineRmt/app/build.gradle @@ -0,0 +1,37 @@ +apply plugin: 'com.android.application' + +android { + signingConfigs { + cinermt { + keyAlias 'good_guy' + keyPassword 'good_guy' + storeFile file('/root/android-keystore') + storePassword 'debug-cooter' + } + } + compileSdkVersion 27 + defaultConfig { + applicationId "com.local.cinermt" + minSdkVersion 14 + targetSdkVersion 27 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.cinermt + } + } +} + +dependencies { + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' +} diff --git a/CineRmt/app/proguard-rules.pro b/CineRmt/app/proguard-rules.pro new file mode 100644 index 00000000..f1b42451 --- /dev/null +++ b/CineRmt/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/CineRmt/app/release/output.json b/CineRmt/app/release/output.json new file mode 100644 index 00000000..9f0c9596 --- /dev/null +++ b/CineRmt/app/release/output.json @@ -0,0 +1 @@ +[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}] \ No newline at end of file diff --git a/CineRmt/app/src/androidTest/java/com/local/cinermt/ExampleInstrumentedTest.java b/CineRmt/app/src/androidTest/java/com/local/cinermt/ExampleInstrumentedTest.java new file mode 100644 index 00000000..713c9499 --- /dev/null +++ b/CineRmt/app/src/androidTest/java/com/local/cinermt/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.local.cinermt; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("com.local.cinermt", appContext.getPackageName()); + } +} diff --git a/CineRmt/src/main/AndroidManifest.xml b/CineRmt/app/src/main/AndroidManifest.xml similarity index 89% rename from CineRmt/src/main/AndroidManifest.xml rename to CineRmt/app/src/main/AndroidManifest.xml index e86c150e..c323e1eb 100644 --- a/CineRmt/src/main/AndroidManifest.xml +++ b/CineRmt/app/src/main/AndroidManifest.xml @@ -13,7 +13,7 @@ + android:theme="@style/AppTheme"> @@ -23,7 +23,7 @@ + android:theme="@style/AppTheme"> diff --git a/CineRmt/src/main/java/com/local/cinermt/ConfigActivity.java b/CineRmt/app/src/main/java/com/local/cinermt/ConfigActivity.java similarity index 100% rename from CineRmt/src/main/java/com/local/cinermt/ConfigActivity.java rename to CineRmt/app/src/main/java/com/local/cinermt/ConfigActivity.java diff --git a/CineRmt/src/main/java/com/local/cinermt/MainActivity.java b/CineRmt/app/src/main/java/com/local/cinermt/MainActivity.java similarity index 98% rename from CineRmt/src/main/java/com/local/cinermt/MainActivity.java rename to CineRmt/app/src/main/java/com/local/cinermt/MainActivity.java index 366a5ab6..dd28537b 100644 --- a/CineRmt/src/main/java/com/local/cinermt/MainActivity.java +++ b/CineRmt/app/src/main/java/com/local/cinermt/MainActivity.java @@ -8,7 +8,8 @@ import android.net.NetworkInfo; import android.os.Bundle; import android.os.Handler; import android.os.SystemClock; -import android.support.v7.app.AppCompatActivity; +//import android.support.v7.app.AppCompatActivity; +import android.app.Activity; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -21,7 +22,7 @@ import java.net.DatagramSocket; import java.net.InetAddress; //public class MainActivity extends Activity -public class MainActivity extends AppCompatActivity +public class MainActivity extends Activity implements OnClickListener { String ip_addr; int sport, dport; diff --git a/CineRmt/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/CineRmt/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 00000000..1f6bb290 --- /dev/null +++ b/CineRmt/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/CineRmt/app/src/main/res/drawable/ic_launcher_background.xml b/CineRmt/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 00000000..0d025f9b --- /dev/null +++ b/CineRmt/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CineRmt/src/main/res/layout/activity_config.xml b/CineRmt/app/src/main/res/layout/activity_config.xml similarity index 100% rename from CineRmt/src/main/res/layout/activity_config.xml rename to CineRmt/app/src/main/res/layout/activity_config.xml diff --git a/CineRmt/src/main/res/layout/activity_main.xml b/CineRmt/app/src/main/res/layout/activity_main.xml similarity index 100% rename from CineRmt/src/main/res/layout/activity_main.xml rename to CineRmt/app/src/main/res/layout/activity_main.xml diff --git a/CineRmt/src/main/res/layout/content_main.xml b/CineRmt/app/src/main/res/layout/content_main.xml similarity index 100% rename from CineRmt/src/main/res/layout/content_main.xml rename to CineRmt/app/src/main/res/layout/content_main.xml diff --git a/CineRmt/src/main/res/menu/menu_main.xml b/CineRmt/app/src/main/res/menu/menu_main.xml similarity index 100% rename from CineRmt/src/main/res/menu/menu_main.xml rename to CineRmt/app/src/main/res/menu/menu_main.xml diff --git a/CineRmt/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/CineRmt/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..eca70cfe --- /dev/null +++ b/CineRmt/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/CineRmt/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/CineRmt/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 00000000..eca70cfe --- /dev/null +++ b/CineRmt/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/CineRmt/src/main/res/mipmap-hdpi/config.png b/CineRmt/app/src/main/res/mipmap-hdpi/config.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/config.png rename to CineRmt/app/src/main/res/mipmap-hdpi/config.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/exit.png b/CineRmt/app/src/main/res/mipmap-hdpi/exit.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/exit.png rename to CineRmt/app/src/main/res/mipmap-hdpi/exit.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/fast_lt.png b/CineRmt/app/src/main/res/mipmap-hdpi/fast_lt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/fast_lt.png rename to CineRmt/app/src/main/res/mipmap-hdpi/fast_lt.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/fast_rt.png b/CineRmt/app/src/main/res/mipmap-hdpi/fast_rt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/fast_rt.png rename to CineRmt/app/src/main/res/mipmap-hdpi/fast_rt.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/full_scr.png b/CineRmt/app/src/main/res/mipmap-hdpi/full_scr.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/full_scr.png rename to CineRmt/app/src/main/res/mipmap-hdpi/full_scr.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/ic_launcher.png b/CineRmt/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/ic_launcher.png rename to CineRmt/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/CineRmt/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/CineRmt/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 00000000..dffca360 Binary files /dev/null and b/CineRmt/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/CineRmt/src/main/res/mipmap-hdpi/launch.png b/CineRmt/app/src/main/res/mipmap-hdpi/launch.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/launch.png rename to CineRmt/app/src/main/res/mipmap-hdpi/launch.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/media_dn.png b/CineRmt/app/src/main/res/mipmap-hdpi/media_dn.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/media_dn.png rename to CineRmt/app/src/main/res/mipmap-hdpi/media_dn.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/media_lt.png b/CineRmt/app/src/main/res/mipmap-hdpi/media_lt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/media_lt.png rename to CineRmt/app/src/main/res/mipmap-hdpi/media_lt.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/media_rt.png b/CineRmt/app/src/main/res/mipmap-hdpi/media_rt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/media_rt.png rename to CineRmt/app/src/main/res/mipmap-hdpi/media_rt.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/media_up.png b/CineRmt/app/src/main/res/mipmap-hdpi/media_up.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/media_up.png rename to CineRmt/app/src/main/res/mipmap-hdpi/media_up.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/menu.png b/CineRmt/app/src/main/res/mipmap-hdpi/menu.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/menu.png rename to CineRmt/app/src/main/res/mipmap-hdpi/menu.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/pause.png b/CineRmt/app/src/main/res/mipmap-hdpi/pause.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/pause.png rename to CineRmt/app/src/main/res/mipmap-hdpi/pause.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/play.png b/CineRmt/app/src/main/res/mipmap-hdpi/play.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/play.png rename to CineRmt/app/src/main/res/mipmap-hdpi/play.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/power.png b/CineRmt/app/src/main/res/mipmap-hdpi/power.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/power.png rename to CineRmt/app/src/main/res/mipmap-hdpi/power.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/rev.png b/CineRmt/app/src/main/res/mipmap-hdpi/rev.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/rev.png rename to CineRmt/app/src/main/res/mipmap-hdpi/rev.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/slow_lt.png b/CineRmt/app/src/main/res/mipmap-hdpi/slow_lt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/slow_lt.png rename to CineRmt/app/src/main/res/mipmap-hdpi/slow_lt.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/slow_rt.png b/CineRmt/app/src/main/res/mipmap-hdpi/slow_rt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/slow_rt.png rename to CineRmt/app/src/main/res/mipmap-hdpi/slow_rt.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/stop.png b/CineRmt/app/src/main/res/mipmap-hdpi/stop.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/stop.png rename to CineRmt/app/src/main/res/mipmap-hdpi/stop.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/suspend.png b/CineRmt/app/src/main/res/mipmap-hdpi/suspend.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/suspend.png rename to CineRmt/app/src/main/res/mipmap-hdpi/suspend.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/zfig0.png b/CineRmt/app/src/main/res/mipmap-hdpi/zfig0.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/zfig0.png rename to CineRmt/app/src/main/res/mipmap-hdpi/zfig0.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/zfig1.png b/CineRmt/app/src/main/res/mipmap-hdpi/zfig1.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/zfig1.png rename to CineRmt/app/src/main/res/mipmap-hdpi/zfig1.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/zfig2.png b/CineRmt/app/src/main/res/mipmap-hdpi/zfig2.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/zfig2.png rename to CineRmt/app/src/main/res/mipmap-hdpi/zfig2.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/zfig3.png b/CineRmt/app/src/main/res/mipmap-hdpi/zfig3.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/zfig3.png rename to CineRmt/app/src/main/res/mipmap-hdpi/zfig3.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/zfig4.png b/CineRmt/app/src/main/res/mipmap-hdpi/zfig4.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/zfig4.png rename to CineRmt/app/src/main/res/mipmap-hdpi/zfig4.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/zfig5.png b/CineRmt/app/src/main/res/mipmap-hdpi/zfig5.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/zfig5.png rename to CineRmt/app/src/main/res/mipmap-hdpi/zfig5.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/zfig6.png b/CineRmt/app/src/main/res/mipmap-hdpi/zfig6.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/zfig6.png rename to CineRmt/app/src/main/res/mipmap-hdpi/zfig6.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/zfig7.png b/CineRmt/app/src/main/res/mipmap-hdpi/zfig7.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/zfig7.png rename to CineRmt/app/src/main/res/mipmap-hdpi/zfig7.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/zfig8.png b/CineRmt/app/src/main/res/mipmap-hdpi/zfig8.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/zfig8.png rename to CineRmt/app/src/main/res/mipmap-hdpi/zfig8.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/zfig9.png b/CineRmt/app/src/main/res/mipmap-hdpi/zfig9.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/zfig9.png rename to CineRmt/app/src/main/res/mipmap-hdpi/zfig9.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/zfiga.png b/CineRmt/app/src/main/res/mipmap-hdpi/zfiga.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/zfiga.png rename to CineRmt/app/src/main/res/mipmap-hdpi/zfiga.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/zfigb.png b/CineRmt/app/src/main/res/mipmap-hdpi/zfigb.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/zfigb.png rename to CineRmt/app/src/main/res/mipmap-hdpi/zfigb.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/zfigc.png b/CineRmt/app/src/main/res/mipmap-hdpi/zfigc.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/zfigc.png rename to CineRmt/app/src/main/res/mipmap-hdpi/zfigc.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/zfigd.png b/CineRmt/app/src/main/res/mipmap-hdpi/zfigd.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/zfigd.png rename to CineRmt/app/src/main/res/mipmap-hdpi/zfigd.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/zfigdot.png b/CineRmt/app/src/main/res/mipmap-hdpi/zfigdot.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/zfigdot.png rename to CineRmt/app/src/main/res/mipmap-hdpi/zfigdot.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/zfige.png b/CineRmt/app/src/main/res/mipmap-hdpi/zfige.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/zfige.png rename to CineRmt/app/src/main/res/mipmap-hdpi/zfige.png diff --git a/CineRmt/src/main/res/mipmap-hdpi/zfigf.png b/CineRmt/app/src/main/res/mipmap-hdpi/zfigf.png similarity index 100% rename from CineRmt/src/main/res/mipmap-hdpi/zfigf.png rename to CineRmt/app/src/main/res/mipmap-hdpi/zfigf.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/config.png b/CineRmt/app/src/main/res/mipmap-mdpi/config.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/config.png rename to CineRmt/app/src/main/res/mipmap-mdpi/config.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/exit.png b/CineRmt/app/src/main/res/mipmap-mdpi/exit.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/exit.png rename to CineRmt/app/src/main/res/mipmap-mdpi/exit.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/fast_lt.png b/CineRmt/app/src/main/res/mipmap-mdpi/fast_lt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/fast_lt.png rename to CineRmt/app/src/main/res/mipmap-mdpi/fast_lt.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/fast_rt.png b/CineRmt/app/src/main/res/mipmap-mdpi/fast_rt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/fast_rt.png rename to CineRmt/app/src/main/res/mipmap-mdpi/fast_rt.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/full_scr.png b/CineRmt/app/src/main/res/mipmap-mdpi/full_scr.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/full_scr.png rename to CineRmt/app/src/main/res/mipmap-mdpi/full_scr.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/ic_launcher.png b/CineRmt/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/ic_launcher.png rename to CineRmt/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/CineRmt/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/CineRmt/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 00000000..dae5e082 Binary files /dev/null and b/CineRmt/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/CineRmt/src/main/res/mipmap-mdpi/launch.png b/CineRmt/app/src/main/res/mipmap-mdpi/launch.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/launch.png rename to CineRmt/app/src/main/res/mipmap-mdpi/launch.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/media_dn.png b/CineRmt/app/src/main/res/mipmap-mdpi/media_dn.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/media_dn.png rename to CineRmt/app/src/main/res/mipmap-mdpi/media_dn.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/media_lt.png b/CineRmt/app/src/main/res/mipmap-mdpi/media_lt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/media_lt.png rename to CineRmt/app/src/main/res/mipmap-mdpi/media_lt.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/media_rt.png b/CineRmt/app/src/main/res/mipmap-mdpi/media_rt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/media_rt.png rename to CineRmt/app/src/main/res/mipmap-mdpi/media_rt.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/media_up.png b/CineRmt/app/src/main/res/mipmap-mdpi/media_up.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/media_up.png rename to CineRmt/app/src/main/res/mipmap-mdpi/media_up.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/menu.png b/CineRmt/app/src/main/res/mipmap-mdpi/menu.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/menu.png rename to CineRmt/app/src/main/res/mipmap-mdpi/menu.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/pause.png b/CineRmt/app/src/main/res/mipmap-mdpi/pause.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/pause.png rename to CineRmt/app/src/main/res/mipmap-mdpi/pause.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/play.png b/CineRmt/app/src/main/res/mipmap-mdpi/play.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/play.png rename to CineRmt/app/src/main/res/mipmap-mdpi/play.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/power.png b/CineRmt/app/src/main/res/mipmap-mdpi/power.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/power.png rename to CineRmt/app/src/main/res/mipmap-mdpi/power.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/rev.png b/CineRmt/app/src/main/res/mipmap-mdpi/rev.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/rev.png rename to CineRmt/app/src/main/res/mipmap-mdpi/rev.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/slow_lt.png b/CineRmt/app/src/main/res/mipmap-mdpi/slow_lt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/slow_lt.png rename to CineRmt/app/src/main/res/mipmap-mdpi/slow_lt.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/slow_rt.png b/CineRmt/app/src/main/res/mipmap-mdpi/slow_rt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/slow_rt.png rename to CineRmt/app/src/main/res/mipmap-mdpi/slow_rt.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/stop.png b/CineRmt/app/src/main/res/mipmap-mdpi/stop.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/stop.png rename to CineRmt/app/src/main/res/mipmap-mdpi/stop.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/suspend.png b/CineRmt/app/src/main/res/mipmap-mdpi/suspend.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/suspend.png rename to CineRmt/app/src/main/res/mipmap-mdpi/suspend.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/zfig0.png b/CineRmt/app/src/main/res/mipmap-mdpi/zfig0.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/zfig0.png rename to CineRmt/app/src/main/res/mipmap-mdpi/zfig0.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/zfig1.png b/CineRmt/app/src/main/res/mipmap-mdpi/zfig1.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/zfig1.png rename to CineRmt/app/src/main/res/mipmap-mdpi/zfig1.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/zfig2.png b/CineRmt/app/src/main/res/mipmap-mdpi/zfig2.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/zfig2.png rename to CineRmt/app/src/main/res/mipmap-mdpi/zfig2.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/zfig3.png b/CineRmt/app/src/main/res/mipmap-mdpi/zfig3.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/zfig3.png rename to CineRmt/app/src/main/res/mipmap-mdpi/zfig3.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/zfig4.png b/CineRmt/app/src/main/res/mipmap-mdpi/zfig4.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/zfig4.png rename to CineRmt/app/src/main/res/mipmap-mdpi/zfig4.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/zfig5.png b/CineRmt/app/src/main/res/mipmap-mdpi/zfig5.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/zfig5.png rename to CineRmt/app/src/main/res/mipmap-mdpi/zfig5.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/zfig6.png b/CineRmt/app/src/main/res/mipmap-mdpi/zfig6.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/zfig6.png rename to CineRmt/app/src/main/res/mipmap-mdpi/zfig6.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/zfig7.png b/CineRmt/app/src/main/res/mipmap-mdpi/zfig7.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/zfig7.png rename to CineRmt/app/src/main/res/mipmap-mdpi/zfig7.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/zfig8.png b/CineRmt/app/src/main/res/mipmap-mdpi/zfig8.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/zfig8.png rename to CineRmt/app/src/main/res/mipmap-mdpi/zfig8.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/zfig9.png b/CineRmt/app/src/main/res/mipmap-mdpi/zfig9.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/zfig9.png rename to CineRmt/app/src/main/res/mipmap-mdpi/zfig9.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/zfiga.png b/CineRmt/app/src/main/res/mipmap-mdpi/zfiga.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/zfiga.png rename to CineRmt/app/src/main/res/mipmap-mdpi/zfiga.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/zfigb.png b/CineRmt/app/src/main/res/mipmap-mdpi/zfigb.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/zfigb.png rename to CineRmt/app/src/main/res/mipmap-mdpi/zfigb.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/zfigc.png b/CineRmt/app/src/main/res/mipmap-mdpi/zfigc.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/zfigc.png rename to CineRmt/app/src/main/res/mipmap-mdpi/zfigc.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/zfigd.png b/CineRmt/app/src/main/res/mipmap-mdpi/zfigd.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/zfigd.png rename to CineRmt/app/src/main/res/mipmap-mdpi/zfigd.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/zfigdot.png b/CineRmt/app/src/main/res/mipmap-mdpi/zfigdot.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/zfigdot.png rename to CineRmt/app/src/main/res/mipmap-mdpi/zfigdot.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/zfige.png b/CineRmt/app/src/main/res/mipmap-mdpi/zfige.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/zfige.png rename to CineRmt/app/src/main/res/mipmap-mdpi/zfige.png diff --git a/CineRmt/src/main/res/mipmap-mdpi/zfigf.png b/CineRmt/app/src/main/res/mipmap-mdpi/zfigf.png similarity index 100% rename from CineRmt/src/main/res/mipmap-mdpi/zfigf.png rename to CineRmt/app/src/main/res/mipmap-mdpi/zfigf.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/config.png b/CineRmt/app/src/main/res/mipmap-xhdpi/config.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/config.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/config.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/exit.png b/CineRmt/app/src/main/res/mipmap-xhdpi/exit.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/exit.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/exit.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/fast_lt.png b/CineRmt/app/src/main/res/mipmap-xhdpi/fast_lt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/fast_lt.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/fast_lt.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/fast_rt.png b/CineRmt/app/src/main/res/mipmap-xhdpi/fast_rt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/fast_rt.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/fast_rt.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/full_scr.png b/CineRmt/app/src/main/res/mipmap-xhdpi/full_scr.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/full_scr.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/full_scr.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/ic_launcher.png b/CineRmt/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/ic_launcher.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/CineRmt/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/CineRmt/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 00000000..14ed0af3 Binary files /dev/null and b/CineRmt/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/CineRmt/src/main/res/mipmap-xhdpi/launch.png b/CineRmt/app/src/main/res/mipmap-xhdpi/launch.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/launch.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/launch.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/media_dn.png b/CineRmt/app/src/main/res/mipmap-xhdpi/media_dn.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/media_dn.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/media_dn.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/media_lt.png b/CineRmt/app/src/main/res/mipmap-xhdpi/media_lt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/media_lt.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/media_lt.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/media_rt.png b/CineRmt/app/src/main/res/mipmap-xhdpi/media_rt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/media_rt.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/media_rt.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/media_up.png b/CineRmt/app/src/main/res/mipmap-xhdpi/media_up.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/media_up.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/media_up.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/menu.png b/CineRmt/app/src/main/res/mipmap-xhdpi/menu.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/menu.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/menu.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/pause.png b/CineRmt/app/src/main/res/mipmap-xhdpi/pause.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/pause.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/pause.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/play.png b/CineRmt/app/src/main/res/mipmap-xhdpi/play.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/play.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/play.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/power.png b/CineRmt/app/src/main/res/mipmap-xhdpi/power.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/power.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/power.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/rev.png b/CineRmt/app/src/main/res/mipmap-xhdpi/rev.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/rev.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/rev.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/slow_lt.png b/CineRmt/app/src/main/res/mipmap-xhdpi/slow_lt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/slow_lt.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/slow_lt.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/slow_rt.png b/CineRmt/app/src/main/res/mipmap-xhdpi/slow_rt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/slow_rt.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/slow_rt.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/stop.png b/CineRmt/app/src/main/res/mipmap-xhdpi/stop.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/stop.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/stop.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/suspend.png b/CineRmt/app/src/main/res/mipmap-xhdpi/suspend.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/suspend.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/suspend.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/zfig0.png b/CineRmt/app/src/main/res/mipmap-xhdpi/zfig0.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/zfig0.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/zfig0.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/zfig1.png b/CineRmt/app/src/main/res/mipmap-xhdpi/zfig1.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/zfig1.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/zfig1.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/zfig2.png b/CineRmt/app/src/main/res/mipmap-xhdpi/zfig2.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/zfig2.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/zfig2.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/zfig3.png b/CineRmt/app/src/main/res/mipmap-xhdpi/zfig3.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/zfig3.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/zfig3.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/zfig4.png b/CineRmt/app/src/main/res/mipmap-xhdpi/zfig4.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/zfig4.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/zfig4.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/zfig5.png b/CineRmt/app/src/main/res/mipmap-xhdpi/zfig5.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/zfig5.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/zfig5.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/zfig6.png b/CineRmt/app/src/main/res/mipmap-xhdpi/zfig6.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/zfig6.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/zfig6.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/zfig7.png b/CineRmt/app/src/main/res/mipmap-xhdpi/zfig7.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/zfig7.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/zfig7.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/zfig8.png b/CineRmt/app/src/main/res/mipmap-xhdpi/zfig8.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/zfig8.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/zfig8.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/zfig9.png b/CineRmt/app/src/main/res/mipmap-xhdpi/zfig9.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/zfig9.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/zfig9.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/zfiga.png b/CineRmt/app/src/main/res/mipmap-xhdpi/zfiga.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/zfiga.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/zfiga.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/zfigb.png b/CineRmt/app/src/main/res/mipmap-xhdpi/zfigb.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/zfigb.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/zfigb.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/zfigc.png b/CineRmt/app/src/main/res/mipmap-xhdpi/zfigc.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/zfigc.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/zfigc.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/zfigd.png b/CineRmt/app/src/main/res/mipmap-xhdpi/zfigd.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/zfigd.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/zfigd.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/zfigdot.png b/CineRmt/app/src/main/res/mipmap-xhdpi/zfigdot.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/zfigdot.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/zfigdot.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/zfige.png b/CineRmt/app/src/main/res/mipmap-xhdpi/zfige.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/zfige.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/zfige.png diff --git a/CineRmt/src/main/res/mipmap-xhdpi/zfigf.png b/CineRmt/app/src/main/res/mipmap-xhdpi/zfigf.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xhdpi/zfigf.png rename to CineRmt/app/src/main/res/mipmap-xhdpi/zfigf.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/config.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/config.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/config.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/config.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/exit.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/exit.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/exit.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/exit.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/fast_lt.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/fast_lt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/fast_lt.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/fast_lt.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/fast_rt.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/fast_rt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/fast_rt.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/fast_rt.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/full_scr.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/full_scr.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/full_scr.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/full_scr.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/ic_launcher.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/CineRmt/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..d8ae0315 Binary files /dev/null and b/CineRmt/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/launch.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/launch.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/launch.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/launch.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/media_dn.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/media_dn.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/media_dn.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/media_dn.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/media_lt.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/media_lt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/media_lt.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/media_lt.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/media_rt.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/media_rt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/media_rt.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/media_rt.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/media_up.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/media_up.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/media_up.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/media_up.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/menu.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/menu.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/menu.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/menu.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/pause.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/pause.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/pause.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/pause.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/play.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/play.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/play.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/play.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/power.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/power.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/power.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/power.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/rev.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/rev.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/rev.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/rev.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/slow_lt.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/slow_lt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/slow_lt.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/slow_lt.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/slow_rt.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/slow_rt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/slow_rt.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/slow_rt.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/stop.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/stop.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/stop.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/stop.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/suspend.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/suspend.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/suspend.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/suspend.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/zfig0.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/zfig0.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/zfig0.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/zfig0.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/zfig1.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/zfig1.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/zfig1.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/zfig1.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/zfig2.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/zfig2.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/zfig2.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/zfig2.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/zfig3.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/zfig3.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/zfig3.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/zfig3.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/zfig4.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/zfig4.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/zfig4.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/zfig4.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/zfig5.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/zfig5.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/zfig5.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/zfig5.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/zfig6.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/zfig6.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/zfig6.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/zfig6.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/zfig7.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/zfig7.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/zfig7.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/zfig7.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/zfig8.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/zfig8.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/zfig8.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/zfig8.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/zfig9.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/zfig9.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/zfig9.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/zfig9.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/zfiga.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/zfiga.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/zfiga.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/zfiga.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/zfigb.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/zfigb.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/zfigb.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/zfigb.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/zfigc.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/zfigc.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/zfigc.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/zfigc.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/zfigd.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/zfigd.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/zfigd.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/zfigd.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/zfigdot.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/zfigdot.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/zfigdot.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/zfigdot.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/zfige.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/zfige.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/zfige.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/zfige.png diff --git a/CineRmt/src/main/res/mipmap-xxhdpi/zfigf.png b/CineRmt/app/src/main/res/mipmap-xxhdpi/zfigf.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxhdpi/zfigf.png rename to CineRmt/app/src/main/res/mipmap-xxhdpi/zfigf.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/config.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/config.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/config.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/config.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/exit.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/exit.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/exit.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/exit.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/fast_lt.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/fast_lt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/fast_lt.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/fast_lt.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/fast_rt.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/fast_rt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/fast_rt.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/fast_rt.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/full_scr.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/full_scr.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/full_scr.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/full_scr.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/CineRmt/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..beed3cdd Binary files /dev/null and b/CineRmt/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/launch.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/launch.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/launch.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/launch.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/media_dn.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/media_dn.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/media_dn.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/media_dn.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/media_lt.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/media_lt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/media_lt.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/media_lt.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/media_rt.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/media_rt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/media_rt.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/media_rt.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/media_up.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/media_up.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/media_up.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/media_up.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/menu.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/menu.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/menu.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/menu.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/pause.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/pause.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/pause.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/pause.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/play.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/play.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/play.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/play.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/power.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/power.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/power.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/power.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/rev.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/rev.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/rev.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/rev.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/slow_lt.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/slow_lt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/slow_lt.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/slow_lt.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/slow_rt.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/slow_rt.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/slow_rt.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/slow_rt.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/stop.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/stop.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/stop.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/stop.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/suspend.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/suspend.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/suspend.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/suspend.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/zfig0.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/zfig0.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/zfig0.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/zfig0.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/zfig1.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/zfig1.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/zfig1.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/zfig1.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/zfig2.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/zfig2.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/zfig2.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/zfig2.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/zfig3.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/zfig3.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/zfig3.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/zfig3.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/zfig4.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/zfig4.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/zfig4.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/zfig4.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/zfig5.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/zfig5.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/zfig5.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/zfig5.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/zfig6.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/zfig6.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/zfig6.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/zfig6.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/zfig7.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/zfig7.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/zfig7.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/zfig7.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/zfig8.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/zfig8.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/zfig8.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/zfig8.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/zfig9.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/zfig9.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/zfig9.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/zfig9.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/zfiga.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/zfiga.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/zfiga.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/zfiga.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/zfigb.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/zfigb.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/zfigb.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/zfigb.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/zfigc.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/zfigc.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/zfigc.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/zfigc.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/zfigd.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/zfigd.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/zfigd.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/zfigd.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/zfigdot.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/zfigdot.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/zfigdot.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/zfigdot.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/zfige.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/zfige.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/zfige.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/zfige.png diff --git a/CineRmt/src/main/res/mipmap-xxxhdpi/zfigf.png b/CineRmt/app/src/main/res/mipmap-xxxhdpi/zfigf.png similarity index 100% rename from CineRmt/src/main/res/mipmap-xxxhdpi/zfigf.png rename to CineRmt/app/src/main/res/mipmap-xxxhdpi/zfigf.png diff --git a/CineRmt/src/main/res/values/colors.xml b/CineRmt/app/src/main/res/values/colors.xml similarity index 100% rename from CineRmt/src/main/res/values/colors.xml rename to CineRmt/app/src/main/res/values/colors.xml diff --git a/CineRmt/src/main/res/values/dimens.xml b/CineRmt/app/src/main/res/values/dimens.xml similarity index 100% rename from CineRmt/src/main/res/values/dimens.xml rename to CineRmt/app/src/main/res/values/dimens.xml diff --git a/CineRmt/src/main/res/values/strings.xml b/CineRmt/app/src/main/res/values/strings.xml similarity index 100% rename from CineRmt/src/main/res/values/strings.xml rename to CineRmt/app/src/main/res/values/strings.xml diff --git a/CineRmt/app/src/main/res/values/styles.xml b/CineRmt/app/src/main/res/values/styles.xml new file mode 100644 index 00000000..0d653f37 --- /dev/null +++ b/CineRmt/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/CineRmt/app/src/test/java/com/local/cinermt/ExampleUnitTest.java b/CineRmt/app/src/test/java/com/local/cinermt/ExampleUnitTest.java new file mode 100644 index 00000000..2a94f590 --- /dev/null +++ b/CineRmt/app/src/test/java/com/local/cinermt/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.local.cinermt; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/CineRmt/build.gradle b/CineRmt/build.gradle new file mode 100644 index 00000000..8d3ef8e5 --- /dev/null +++ b/CineRmt/build.gradle @@ -0,0 +1,27 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + + repositories { + google() + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:3.2.1' + + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + google() + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/CineRmt/gradle.properties b/CineRmt/gradle.properties new file mode 100644 index 00000000..82618cec --- /dev/null +++ b/CineRmt/gradle.properties @@ -0,0 +1,15 @@ +# Project-wide Gradle settings. +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m +# When configured, Gradle will run in incubating parallel mode. +# This option should only be used with decoupled projects. More details, visit +# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects +# org.gradle.parallel=true + + diff --git a/CineRmt/gradle/wrapper/gradle-wrapper.jar b/CineRmt/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..f6b961fd Binary files /dev/null and b/CineRmt/gradle/wrapper/gradle-wrapper.jar differ diff --git a/CineRmt/gradle/wrapper/gradle-wrapper.properties b/CineRmt/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..9a4163a4 --- /dev/null +++ b/CineRmt/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/CineRmt/gradlew b/CineRmt/gradlew new file mode 100755 index 00000000..cccdd3d5 --- /dev/null +++ b/CineRmt/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/CineRmt/gradlew.bat b/CineRmt/gradlew.bat new file mode 100644 index 00000000..e95643d6 --- /dev/null +++ b/CineRmt/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/CineRmt/settings.gradle b/CineRmt/settings.gradle new file mode 100644 index 00000000..e7b4def4 --- /dev/null +++ b/CineRmt/settings.gradle @@ -0,0 +1 @@ +include ':app' diff --git a/CineRmt/src/androidTest/java/com/local/cinermt/ApplicationTest.java b/CineRmt/src/androidTest/java/com/local/cinermt/ApplicationTest.java deleted file mode 100644 index d2c1b8f1..00000000 --- a/CineRmt/src/androidTest/java/com/local/cinermt/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.local.cinermt; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} \ No newline at end of file diff --git a/CineRmt/src/main/res/values-v21/styles.xml b/CineRmt/src/main/res/values-v21/styles.xml deleted file mode 100644 index 251fb9fb..00000000 --- a/CineRmt/src/main/res/values-v21/styles.xml +++ /dev/null @@ -1,9 +0,0 @@ -> - - - diff --git a/CineRmt/src/main/res/values-w820dp/dimens.xml b/CineRmt/src/main/res/values-w820dp/dimens.xml deleted file mode 100644 index 63fc8164..00000000 --- a/CineRmt/src/main/res/values-w820dp/dimens.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - 64dp - diff --git a/CineRmt/src/main/res/values/styles.xml b/CineRmt/src/main/res/values/styles.xml deleted file mode 100644 index 545b9c6d..00000000 --- a/CineRmt/src/main/res/values/styles.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - -