From cfad0c822c736c7b0a89510a4f64a4bff616c622 Mon Sep 17 00:00:00 2001 From: Dorian Pula Date: Tue, 2 Apr 2013 19:19:15 -0400 Subject: [PATCH] Crafted a Gradle build for Android. Will separate build out later. --- build.gradle | 80 ++++++++++++------ .../main/AndroidManifest.xml | 0 .../justcheckers/android/GameActivity.java | 0 .../justcheckers/android/InfoActivity.java | 0 .../justcheckers/android/MenuActivity.java | 0 .../android/SettingsActivity.java | 0 .../justcheckers/common/GlobalConstants.java | 0 .../common/LoggingAndStatistics.java | 0 .../java}/org/justcheckers/game/Board.java | 0 .../java}/org/justcheckers/game/Game.java | 0 .../org/justcheckers/game/GameEngine.java | 0 .../java}/org/justcheckers/game/Player.java | 0 .../java}/org/justcheckers/game/Rulebook.java | 0 .../test/game/AmericanGameTest.java | 0 .../justcheckers/test/game/GameLogicTest.java | 0 .../justcheckers/test/game/GameStateTest.java | 0 .../test/game/InternationalGameTest.java | 0 .../org/justcheckers/xml/ConfigSettings.java | 0 .../justcheckers/xml/ConfigSettingsIO.java | 8 +- .../org/justcheckers/xml/GameSettings.java | 0 .../org/justcheckers/xml/GameSettingsIO.java | 8 +- .../java}/org/justcheckers/xml/Settings.java | 0 .../org/justcheckers/xml/UserSettings.java | 0 .../org/justcheckers/xml/UserSettingsIO.java | 10 +-- .../java}/org/justcheckers/xml/VisitDOM.java | 0 .../org/justcheckers/xml/XMLFileFilter.java | 0 .../java}/org/justcheckers/xml/XML_IO.java | 0 proguard.cfg => src/main/proguard.cfg | 0 .../main/project.properties | 0 .../main/res}/drawable-hdpi/attack_king.png | Bin .../main/res}/drawable-hdpi/attack_pawn.png | Bin .../main/res}/drawable-hdpi/backdrop.jpg | Bin .../main/res}/drawable-hdpi/defend_king.png | Bin .../main/res}/drawable-hdpi/defend_pawn.png | Bin {res => src/main/res}/drawable-hdpi/icon.png | Bin {res => src/main/res}/drawable-hdpi/idea.png | Bin {res => src/main/res}/drawable-hdpi/logo.png | Bin .../main/res}/drawable-hdpi/non_play.png | Bin {res => src/main/res}/drawable-hdpi/play.png | Bin .../main/res}/drawable-hdpi/splash.jpg | Bin {res => src/main/res}/drawable-ldpi/icon.png | Bin {res => src/main/res}/drawable-mdpi/icon.png | Bin .../res}/layout/game_screen_landscape.xml | 0 .../main/res}/layout/game_screen_portrait.xml | 0 {res => src/main/res}/layout/info_screen.xml | 0 {res => src/main/res}/layout/main_menu.xml | 0 .../main/res}/layout/settings_screen.xml | 0 {res => src/main/res}/raw/gpl_3_license.txt | 0 {res => src/main/res}/raw/readme.txt | 0 {res => src/main/res}/values/strings.xml | 0 .../main/res}/values/user_interface_en.xml | 0 .../res}/values/user_interface_template.xml | 0 52 files changed, 69 insertions(+), 37 deletions(-) rename AndroidManifest.xml => src/main/AndroidManifest.xml (100%) rename src/{ => main/java}/org/justcheckers/android/GameActivity.java (100%) rename src/{ => main/java}/org/justcheckers/android/InfoActivity.java (100%) rename src/{ => main/java}/org/justcheckers/android/MenuActivity.java (100%) rename src/{ => main/java}/org/justcheckers/android/SettingsActivity.java (100%) rename src/{ => main/java}/org/justcheckers/common/GlobalConstants.java (100%) rename src/{ => main/java}/org/justcheckers/common/LoggingAndStatistics.java (100%) rename src/{ => main/java}/org/justcheckers/game/Board.java (100%) rename src/{ => main/java}/org/justcheckers/game/Game.java (100%) rename src/{ => main/java}/org/justcheckers/game/GameEngine.java (100%) rename src/{ => main/java}/org/justcheckers/game/Player.java (100%) rename src/{ => main/java}/org/justcheckers/game/Rulebook.java (100%) rename src/{ => main/java}/org/justcheckers/test/game/AmericanGameTest.java (100%) rename src/{ => main/java}/org/justcheckers/test/game/GameLogicTest.java (100%) rename src/{ => main/java}/org/justcheckers/test/game/GameStateTest.java (100%) rename src/{ => main/java}/org/justcheckers/test/game/InternationalGameTest.java (100%) rename src/{ => main/java}/org/justcheckers/xml/ConfigSettings.java (100%) rename src/{ => main/java}/org/justcheckers/xml/ConfigSettingsIO.java (98%) rename src/{ => main/java}/org/justcheckers/xml/GameSettings.java (100%) rename src/{ => main/java}/org/justcheckers/xml/GameSettingsIO.java (98%) rename src/{ => main/java}/org/justcheckers/xml/Settings.java (100%) rename src/{ => main/java}/org/justcheckers/xml/UserSettings.java (100%) rename src/{ => main/java}/org/justcheckers/xml/UserSettingsIO.java (98%) rename src/{ => main/java}/org/justcheckers/xml/VisitDOM.java (100%) rename src/{ => main/java}/org/justcheckers/xml/XMLFileFilter.java (100%) rename src/{ => main/java}/org/justcheckers/xml/XML_IO.java (100%) rename proguard.cfg => src/main/proguard.cfg (100%) rename project.properties => src/main/project.properties (100%) rename {res => src/main/res}/drawable-hdpi/attack_king.png (100%) rename {res => src/main/res}/drawable-hdpi/attack_pawn.png (100%) rename {res => src/main/res}/drawable-hdpi/backdrop.jpg (100%) rename {res => src/main/res}/drawable-hdpi/defend_king.png (100%) rename {res => src/main/res}/drawable-hdpi/defend_pawn.png (100%) rename {res => src/main/res}/drawable-hdpi/icon.png (100%) rename {res => src/main/res}/drawable-hdpi/idea.png (100%) rename {res => src/main/res}/drawable-hdpi/logo.png (100%) rename {res => src/main/res}/drawable-hdpi/non_play.png (100%) rename {res => src/main/res}/drawable-hdpi/play.png (100%) rename {res => src/main/res}/drawable-hdpi/splash.jpg (100%) rename {res => src/main/res}/drawable-ldpi/icon.png (100%) rename {res => src/main/res}/drawable-mdpi/icon.png (100%) rename {res => src/main/res}/layout/game_screen_landscape.xml (100%) rename {res => src/main/res}/layout/game_screen_portrait.xml (100%) rename {res => src/main/res}/layout/info_screen.xml (100%) rename {res => src/main/res}/layout/main_menu.xml (100%) rename {res => src/main/res}/layout/settings_screen.xml (100%) rename {res => src/main/res}/raw/gpl_3_license.txt (100%) rename {res => src/main/res}/raw/readme.txt (100%) rename {res => src/main/res}/values/strings.xml (100%) rename {res => src/main/res}/values/user_interface_en.xml (100%) rename {res => src/main/res}/values/user_interface_template.xml (100%) diff --git a/build.gradle b/build.gradle index d7e37df..c3c983c 100755 --- a/build.gradle +++ b/build.gradle @@ -8,8 +8,22 @@ // TODO: Add the Android Gradle plugin: https://github.com/jvoegele/gradle-android-plugin/wiki // TODO: Add in support for multiple projects, to allow for clean separation of projects. -apply plugin: 'war' -apply plugin: 'jetty' +buildscript { + repositories { +maven { + url 'http://repo1.maven.org/maven2' + } + //mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.3' + } +} + +apply plugin: 'android' + +//apply plugin: 'war' +//apply plugin: 'jetty' sourceCompatibility = 1.6 targetCompatibility = 1.6 @@ -18,6 +32,16 @@ targetCompatibility = 1.6 description = 'justCheckers' version = '0.3' +// Androids!!! +android { + //target = "android-14" + compileSdkVersion 14 +/*defaultConfig { + versionCode = 12 + minSdkVersion = 8 + } */ +} + project.ext { appName = 'justCheckers' appBaseName = "justcheckers" @@ -28,15 +52,15 @@ project.ext { } // Setup everything to work with the Eclipse friendly Web setup. -sourceSets.main.java.srcDirs = ['src', 'gen'] -sourceSets.main.resources.srcDirs = ['res'] +//sourceSets.main.java.srcDirs = ['src', 'gen'] +//sourceSets.main.resources.srcDirs = ['res'] //sourceSets.test.java.srcDirs = ['test-src'] // Setup build script repositories starting with Maven repositories repositories { - flatDir { - dirs 'WebContent/WEB-INF/lib' - } +// flatDir { +// dirs 'WebContent/WEB-INF/lib' +// } maven { url 'http://repo1.maven.org/maven2' } @@ -45,8 +69,12 @@ repositories { // Dependency management dependencies { + //compile 'org.jdom:jdom:1.1' + //compile 'jdom:jdom:0.9' + compile 'jdom:jdom:0.7' + // Spring Framework + SLF4J - compile ('org.springframework:spring-context:' + project.springVersion) { + /*compile ('org.springframework:spring-context:' + project.springVersion) { exclude module: 'commons-logging' } compile 'log4j:log4j:1.2.16' @@ -58,26 +86,29 @@ dependencies { compile 'org.springframework:spring-orm:' + project.springVersion compile 'org.springframework:spring-webmvc:' + project.springVersion compile 'org.springframework:spring-parent:' + project.springVersion - compile 'mysql:mysql-connector-java:5.1.22' + */ +//compile 'mysql:mysql-connector-java:5.1.22' // xstream - compile 'com.thoughtworks.xstream:xstream:1.4.4' + //compile 'com.thoughtworks.xstream:xstream:1.4.4' // Hibernate + C3P0 +/* compile 'org.hibernate:hibernate:' + project.hibernateVersion compile 'org.hibernate:hibernate-annotations:' + project.hibernateVersion compile 'org.hibernate:hibernate-c3p0:' + project.hibernateVersion compile 'javassist:javassist:3.9.0.GA' +*/ // Apache Commons Libraries - compile 'commons-httpclient:commons-httpclient:3.1' - compile 'commons-lang:commons-lang:2.4' + //compile 'commons-httpclient:commons-httpclient:3.1' + //compile 'commons-lang:commons-lang:2.4' // FlexJson - compile 'net.sf.flexjson:flexjson:2.1' +// compile 'net.sf.flexjson:flexjson:2.1' // Javax Servlet and Mail APIs - providedCompile 'javax.servlet:servlet-api:2.5' + //providedCompile 'javax.servlet:servlet-api:2.5' } // At the end of day we just need a JAR and a WAR. @@ -98,15 +129,16 @@ ext.sharedManifest = manifest { } // Build the JAR. -jar { - enabled = true - includeEmptyDirs = false - manifest = sharedManifest - include '**/**.class' - exclude 'build/**' -} +//jar { +// enabled = true +// includeEmptyDirs = false +// manifest = sharedManifest +// include '**/**.class' +// exclude 'build/**' +//} // Build WAR files that include the JAR file. Add the resources back in. +/* war { from 'webapp' @@ -126,9 +158,9 @@ jettyRun { contextPath = project.appBaseName webAppSourceDirectory = new File('webapp') } - +*/ // Run embedded Jetty setup. -jettyRunWar { +/*jettyRunWar { httpPort = 8080 contextPath = project.appBaseName -} \ No newline at end of file +}*/ diff --git a/AndroidManifest.xml b/src/main/AndroidManifest.xml similarity index 100% rename from AndroidManifest.xml rename to src/main/AndroidManifest.xml diff --git a/src/org/justcheckers/android/GameActivity.java b/src/main/java/org/justcheckers/android/GameActivity.java similarity index 100% rename from src/org/justcheckers/android/GameActivity.java rename to src/main/java/org/justcheckers/android/GameActivity.java diff --git a/src/org/justcheckers/android/InfoActivity.java b/src/main/java/org/justcheckers/android/InfoActivity.java similarity index 100% rename from src/org/justcheckers/android/InfoActivity.java rename to src/main/java/org/justcheckers/android/InfoActivity.java diff --git a/src/org/justcheckers/android/MenuActivity.java b/src/main/java/org/justcheckers/android/MenuActivity.java similarity index 100% rename from src/org/justcheckers/android/MenuActivity.java rename to src/main/java/org/justcheckers/android/MenuActivity.java diff --git a/src/org/justcheckers/android/SettingsActivity.java b/src/main/java/org/justcheckers/android/SettingsActivity.java similarity index 100% rename from src/org/justcheckers/android/SettingsActivity.java rename to src/main/java/org/justcheckers/android/SettingsActivity.java diff --git a/src/org/justcheckers/common/GlobalConstants.java b/src/main/java/org/justcheckers/common/GlobalConstants.java similarity index 100% rename from src/org/justcheckers/common/GlobalConstants.java rename to src/main/java/org/justcheckers/common/GlobalConstants.java diff --git a/src/org/justcheckers/common/LoggingAndStatistics.java b/src/main/java/org/justcheckers/common/LoggingAndStatistics.java similarity index 100% rename from src/org/justcheckers/common/LoggingAndStatistics.java rename to src/main/java/org/justcheckers/common/LoggingAndStatistics.java diff --git a/src/org/justcheckers/game/Board.java b/src/main/java/org/justcheckers/game/Board.java similarity index 100% rename from src/org/justcheckers/game/Board.java rename to src/main/java/org/justcheckers/game/Board.java diff --git a/src/org/justcheckers/game/Game.java b/src/main/java/org/justcheckers/game/Game.java similarity index 100% rename from src/org/justcheckers/game/Game.java rename to src/main/java/org/justcheckers/game/Game.java diff --git a/src/org/justcheckers/game/GameEngine.java b/src/main/java/org/justcheckers/game/GameEngine.java similarity index 100% rename from src/org/justcheckers/game/GameEngine.java rename to src/main/java/org/justcheckers/game/GameEngine.java diff --git a/src/org/justcheckers/game/Player.java b/src/main/java/org/justcheckers/game/Player.java similarity index 100% rename from src/org/justcheckers/game/Player.java rename to src/main/java/org/justcheckers/game/Player.java diff --git a/src/org/justcheckers/game/Rulebook.java b/src/main/java/org/justcheckers/game/Rulebook.java similarity index 100% rename from src/org/justcheckers/game/Rulebook.java rename to src/main/java/org/justcheckers/game/Rulebook.java diff --git a/src/org/justcheckers/test/game/AmericanGameTest.java b/src/main/java/org/justcheckers/test/game/AmericanGameTest.java similarity index 100% rename from src/org/justcheckers/test/game/AmericanGameTest.java rename to src/main/java/org/justcheckers/test/game/AmericanGameTest.java diff --git a/src/org/justcheckers/test/game/GameLogicTest.java b/src/main/java/org/justcheckers/test/game/GameLogicTest.java similarity index 100% rename from src/org/justcheckers/test/game/GameLogicTest.java rename to src/main/java/org/justcheckers/test/game/GameLogicTest.java diff --git a/src/org/justcheckers/test/game/GameStateTest.java b/src/main/java/org/justcheckers/test/game/GameStateTest.java similarity index 100% rename from src/org/justcheckers/test/game/GameStateTest.java rename to src/main/java/org/justcheckers/test/game/GameStateTest.java diff --git a/src/org/justcheckers/test/game/InternationalGameTest.java b/src/main/java/org/justcheckers/test/game/InternationalGameTest.java similarity index 100% rename from src/org/justcheckers/test/game/InternationalGameTest.java rename to src/main/java/org/justcheckers/test/game/InternationalGameTest.java diff --git a/src/org/justcheckers/xml/ConfigSettings.java b/src/main/java/org/justcheckers/xml/ConfigSettings.java similarity index 100% rename from src/org/justcheckers/xml/ConfigSettings.java rename to src/main/java/org/justcheckers/xml/ConfigSettings.java diff --git a/src/org/justcheckers/xml/ConfigSettingsIO.java b/src/main/java/org/justcheckers/xml/ConfigSettingsIO.java similarity index 98% rename from src/org/justcheckers/xml/ConfigSettingsIO.java rename to src/main/java/org/justcheckers/xml/ConfigSettingsIO.java index 927174c..a3edbbb 100644 --- a/src/org/justcheckers/xml/ConfigSettingsIO.java +++ b/src/main/java/org/justcheckers/xml/ConfigSettingsIO.java @@ -60,10 +60,10 @@ public class ConfigSettingsIO extends XML_IO{ ConfigSettingsIOReader csior = new ConfigSettingsIOReader(); csior.visit(rootElement); } - catch(IOException e){ - String msg = "Problem : " + e.getMessage(); - Log.e("ConfigSettingsIO", msg); - } +// catch(IOException e){ +// String msg = "Problem : " + e.getMessage(); +// Log.e("ConfigSettingsIO", msg); +// } catch(JDOMException e){ String msg = "Problem : " + getFile().toString() + " is not a well formed XML document"; diff --git a/src/org/justcheckers/xml/GameSettings.java b/src/main/java/org/justcheckers/xml/GameSettings.java similarity index 100% rename from src/org/justcheckers/xml/GameSettings.java rename to src/main/java/org/justcheckers/xml/GameSettings.java diff --git a/src/org/justcheckers/xml/GameSettingsIO.java b/src/main/java/org/justcheckers/xml/GameSettingsIO.java similarity index 98% rename from src/org/justcheckers/xml/GameSettingsIO.java rename to src/main/java/org/justcheckers/xml/GameSettingsIO.java index bf54b14..baca3c1 100644 --- a/src/org/justcheckers/xml/GameSettingsIO.java +++ b/src/main/java/org/justcheckers/xml/GameSettingsIO.java @@ -62,10 +62,10 @@ public class GameSettingsIO extends XML_IO{ GameSettingsIOReader gsior = new GameSettingsIOReader(); gsior.visit(rootElement); } - catch(IOException e){ - String msg = "Problem : " + e.getMessage(); - Log.e("GameSettingsIO", msg); - } + //catch(IOException e){ + // String msg = "Problem : " + e.getMessage(); + // Log.e("GameSettingsIO", msg); + //} catch(JDOMException e){ String msg = "Problem : " + getFile().toString() + " is not a well formed XML document"; diff --git a/src/org/justcheckers/xml/Settings.java b/src/main/java/org/justcheckers/xml/Settings.java similarity index 100% rename from src/org/justcheckers/xml/Settings.java rename to src/main/java/org/justcheckers/xml/Settings.java diff --git a/src/org/justcheckers/xml/UserSettings.java b/src/main/java/org/justcheckers/xml/UserSettings.java similarity index 100% rename from src/org/justcheckers/xml/UserSettings.java rename to src/main/java/org/justcheckers/xml/UserSettings.java diff --git a/src/org/justcheckers/xml/UserSettingsIO.java b/src/main/java/org/justcheckers/xml/UserSettingsIO.java similarity index 98% rename from src/org/justcheckers/xml/UserSettingsIO.java rename to src/main/java/org/justcheckers/xml/UserSettingsIO.java index f0e7324..c17007a 100644 --- a/src/org/justcheckers/xml/UserSettingsIO.java +++ b/src/main/java/org/justcheckers/xml/UserSettingsIO.java @@ -62,10 +62,10 @@ public class UserSettingsIO extends XML_IO{ UserSettingsIOReader usior = new UserSettingsIOReader(); usior.visit(rootElement); } - catch(IOException e){ - String msg = "Problem : " + e.getMessage(); - Log.e("UserSettingsIO", msg); - } + // catch(IOException e){ + // String msg = "Problem : " + e.getMessage(); + // Log.e("UserSettingsIO", msg); + // } catch(JDOMException e){ String msg = "Problem : " + getFile().toString() + " is not a well formed XML document"; @@ -292,4 +292,4 @@ public class UserSettingsIO extends XML_IO{ } }//end of inner class UserSettingsIOWriter -}//end of class UserSettingsIO \ No newline at end of file +}//end of class UserSettingsIO diff --git a/src/org/justcheckers/xml/VisitDOM.java b/src/main/java/org/justcheckers/xml/VisitDOM.java similarity index 100% rename from src/org/justcheckers/xml/VisitDOM.java rename to src/main/java/org/justcheckers/xml/VisitDOM.java diff --git a/src/org/justcheckers/xml/XMLFileFilter.java b/src/main/java/org/justcheckers/xml/XMLFileFilter.java similarity index 100% rename from src/org/justcheckers/xml/XMLFileFilter.java rename to src/main/java/org/justcheckers/xml/XMLFileFilter.java diff --git a/src/org/justcheckers/xml/XML_IO.java b/src/main/java/org/justcheckers/xml/XML_IO.java similarity index 100% rename from src/org/justcheckers/xml/XML_IO.java rename to src/main/java/org/justcheckers/xml/XML_IO.java diff --git a/proguard.cfg b/src/main/proguard.cfg similarity index 100% rename from proguard.cfg rename to src/main/proguard.cfg diff --git a/project.properties b/src/main/project.properties similarity index 100% rename from project.properties rename to src/main/project.properties diff --git a/res/drawable-hdpi/attack_king.png b/src/main/res/drawable-hdpi/attack_king.png similarity index 100% rename from res/drawable-hdpi/attack_king.png rename to src/main/res/drawable-hdpi/attack_king.png diff --git a/res/drawable-hdpi/attack_pawn.png b/src/main/res/drawable-hdpi/attack_pawn.png similarity index 100% rename from res/drawable-hdpi/attack_pawn.png rename to src/main/res/drawable-hdpi/attack_pawn.png diff --git a/res/drawable-hdpi/backdrop.jpg b/src/main/res/drawable-hdpi/backdrop.jpg similarity index 100% rename from res/drawable-hdpi/backdrop.jpg rename to src/main/res/drawable-hdpi/backdrop.jpg diff --git a/res/drawable-hdpi/defend_king.png b/src/main/res/drawable-hdpi/defend_king.png similarity index 100% rename from res/drawable-hdpi/defend_king.png rename to src/main/res/drawable-hdpi/defend_king.png diff --git a/res/drawable-hdpi/defend_pawn.png b/src/main/res/drawable-hdpi/defend_pawn.png similarity index 100% rename from res/drawable-hdpi/defend_pawn.png rename to src/main/res/drawable-hdpi/defend_pawn.png diff --git a/res/drawable-hdpi/icon.png b/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from res/drawable-hdpi/icon.png rename to src/main/res/drawable-hdpi/icon.png diff --git a/res/drawable-hdpi/idea.png b/src/main/res/drawable-hdpi/idea.png similarity index 100% rename from res/drawable-hdpi/idea.png rename to src/main/res/drawable-hdpi/idea.png diff --git a/res/drawable-hdpi/logo.png b/src/main/res/drawable-hdpi/logo.png similarity index 100% rename from res/drawable-hdpi/logo.png rename to src/main/res/drawable-hdpi/logo.png diff --git a/res/drawable-hdpi/non_play.png b/src/main/res/drawable-hdpi/non_play.png similarity index 100% rename from res/drawable-hdpi/non_play.png rename to src/main/res/drawable-hdpi/non_play.png diff --git a/res/drawable-hdpi/play.png b/src/main/res/drawable-hdpi/play.png similarity index 100% rename from res/drawable-hdpi/play.png rename to src/main/res/drawable-hdpi/play.png diff --git a/res/drawable-hdpi/splash.jpg b/src/main/res/drawable-hdpi/splash.jpg similarity index 100% rename from res/drawable-hdpi/splash.jpg rename to src/main/res/drawable-hdpi/splash.jpg diff --git a/res/drawable-ldpi/icon.png b/src/main/res/drawable-ldpi/icon.png similarity index 100% rename from res/drawable-ldpi/icon.png rename to src/main/res/drawable-ldpi/icon.png diff --git a/res/drawable-mdpi/icon.png b/src/main/res/drawable-mdpi/icon.png similarity index 100% rename from res/drawable-mdpi/icon.png rename to src/main/res/drawable-mdpi/icon.png diff --git a/res/layout/game_screen_landscape.xml b/src/main/res/layout/game_screen_landscape.xml similarity index 100% rename from res/layout/game_screen_landscape.xml rename to src/main/res/layout/game_screen_landscape.xml diff --git a/res/layout/game_screen_portrait.xml b/src/main/res/layout/game_screen_portrait.xml similarity index 100% rename from res/layout/game_screen_portrait.xml rename to src/main/res/layout/game_screen_portrait.xml diff --git a/res/layout/info_screen.xml b/src/main/res/layout/info_screen.xml similarity index 100% rename from res/layout/info_screen.xml rename to src/main/res/layout/info_screen.xml diff --git a/res/layout/main_menu.xml b/src/main/res/layout/main_menu.xml similarity index 100% rename from res/layout/main_menu.xml rename to src/main/res/layout/main_menu.xml diff --git a/res/layout/settings_screen.xml b/src/main/res/layout/settings_screen.xml similarity index 100% rename from res/layout/settings_screen.xml rename to src/main/res/layout/settings_screen.xml diff --git a/res/raw/gpl_3_license.txt b/src/main/res/raw/gpl_3_license.txt similarity index 100% rename from res/raw/gpl_3_license.txt rename to src/main/res/raw/gpl_3_license.txt diff --git a/res/raw/readme.txt b/src/main/res/raw/readme.txt similarity index 100% rename from res/raw/readme.txt rename to src/main/res/raw/readme.txt diff --git a/res/values/strings.xml b/src/main/res/values/strings.xml similarity index 100% rename from res/values/strings.xml rename to src/main/res/values/strings.xml diff --git a/res/values/user_interface_en.xml b/src/main/res/values/user_interface_en.xml similarity index 100% rename from res/values/user_interface_en.xml rename to src/main/res/values/user_interface_en.xml diff --git a/res/values/user_interface_template.xml b/src/main/res/values/user_interface_template.xml similarity index 100% rename from res/values/user_interface_template.xml rename to src/main/res/values/user_interface_template.xml