Skip to content

GitLab

Commit 5bd15d13 authored by rakam's avatar rakam
Browse files
Options

productFlavor to use different api

parent ac6379e7
Hide whitespace changes
Inline Side-by-side
Showing with 180 additions and 44 deletions
.idea/compiler.xml
View file @ 5bd15d13
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
<resourceExtensions />
<wildcardResourcePatterns>
<entry name="!?*.java" />
......@@ -19,4 +20,5 @@
</profile>
</annotationProcessing>
</component>
</project>
\ No newline at end of file
</project>
.idea/encodings.xml 0 → 100644
View file @ 5bd15d13
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
</project>
.idea/gradle.xml
View file @ 5bd15d13
......@@ -6,7 +6,6 @@
<option name="distributionType" value="LOCAL" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1" />
<option name="gradleJvm" value="1.7" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
......@@ -16,4 +15,5 @@
</GradleProjectSettings>
</option>
</component>
</project>
\ No newline at end of file
</project>
.idea/misc.xml
View file @ 5bd15d13
......@@ -3,20 +3,11 @@
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkout" />
<OptionsSetting value="true" id="Update" />
<OptionsSetting value="true" id="Status" />
<OptionsSetting value="true" id="Edit" />
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
<option name="id" value="Android" />
</component>
</project>
\ No newline at end of file
</project>
.idea/modules.xml
View file @ 5bd15d13
......@@ -6,4 +6,5 @@
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
</modules>
</component>
</project>
\ No newline at end of file
</project>
.idea/scopes/scope_settings.xml 0 → 100644
View file @ 5bd15d13
<component name="DependencyValidationManager">
<state>
<option name="SKIP_IMPORT_STATEMENTS" value="false" />
</state>
</component>
\ No newline at end of file
.idea/vcs.xml
View file @ 5bd15d13
......@@ -3,4 +3,5 @@
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
</project>
android.iml
View file @ 5bd15d13
......@@ -4,7 +4,6 @@
<facet type="java-gradle" name="Java-Gradle">
<configuration>
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
</component>
......@@ -16,4 +15,5 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
</module>
app/app.iml
View file @ 5bd15d13
......@@ -8,39 +8,59 @@
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="SELECTED_BUILD_VARIANT" value="p22222Debug" />
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
<option name="ASSEMBLE_TASK_NAME" value="assembleP22222Debug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileP22222DebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleP22222DebugTest" />
<option name="SOURCE_GEN_TASK_NAME" value="generateP22222DebugSources" />
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateP22222DebugTestSources" />
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/p22222/res" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<output url="file://$MODULE_DIR$/build/intermediates/classes/p22222/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/p22222/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/p22222/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/p22222/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/p22222/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/p22222/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/p22222/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/p22222/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/p22222Debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/p22222Debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/p22222Debug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/p22222Debug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/p22222Debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/p22222Debug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/p22222Debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/p22222/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/p22222/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/p22222/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/p22222/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/p22222/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/p22222/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/p22222/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/p22222/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/p22222/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/p22222/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/p22222/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/p22222/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/p22222/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestP22222/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestP22222/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestP22222/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestP22222/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestP22222/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestP22222/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestP22222/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
......@@ -92,4 +112,5 @@
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
<orderEntry type="library" exported="" name="gson-2.3" level="project" />
</component>
</module>
\ No newline at end of file
</module>
app/build.gradle
View file @ 5bd15d13
......@@ -8,8 +8,22 @@ android {
applicationId "fr.istic.masteru.android"
minSdkVersion 15
targetSdkVersion 21
versionCode 2
versionName "AceCream 1.0"
versionCode 3
versionName "AceCream 1.1"
}
productFlavors {
p2222 {
applicationId "fr.istic.masteru.android.p2222"
versionName "AceCream 1.1 p2222"
}
p9222 {
applicationId "fr.istic.master.android.p9222"
versionName "AceCream 1.1 p9222"
}
p22222 {
applicationId "fr.istic.master.android.p22222"
versionName "AceCream 1.1 p22222"
}
}
buildTypes {
release {
......
app/src/p2222/res/values/strings.xml 0 → 100644
View file @ 5bd15d13
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">AceCream p2222</string>
</resources>
app/src/p22222/java/fr/istic/masteru/android/utils/API_URLS.java 0 → 100644
View file @ 5bd15d13
package fr.istic.masteru.android.utils;
public class API_URLS {
public static final String AUTH_TOKEN = "ac_token";
public static final String BASE_URL = "http://5.196.21.161:22222";
public static final String PING_ADD_NUMBER = BASE_URL + "/test/nombres/ajouterNombre";
public static final String SCORE_UPDATE = BASE_URL + "/score/update";
public static final String MATCH_WINNER = BASE_URL + "/match/finMatch";
public static final String MATCHS = BASE_URL + "/matches";
public static final String AVAILABLE_COURTS = BASE_URL + "/courts/available";
public static final String LOGIN = BASE_URL + "/login";
public static String TEAM_PLAYERS(String teamId, String gender) {
return BASE_URL + "/teams/" + teamId + "/players?gender=" + (gender == null ? "X" : gender);
}
public static String INFO_MATCH(int matchId) {
return BASE_URL + "/matches/" + matchId;
}
public static String UPDATE_MATCH(int matchId) {
return BASE_URL + "/matches/" + matchId;
}
public static String UPDATE_SCORE(int matchId, int pointId) {
return BASE_URL + "/matches/" + matchId + "/score/" + pointId;
}
public static String UPDATE_SET_SCORE(int matchId, int setId) {
return BASE_URL + "/matches/" + matchId + "/set/" + setId;
}
public static String DELETE_SCORE(int matchId, int pointId) {
return BASE_URL + "/matches/" + matchId + "/score/" + pointId;
}
}
app/src/p22222/res/values/strings.xml 0 → 100644
View file @ 5bd15d13
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">AceCream p22222</string>
</resources>
app/src/p9222/java/fr/istic/masteru/android/utils/API_URLS.java 0 → 100644
View file @ 5bd15d13
package fr.istic.masteru.android.utils;
public class API_URLS {
public static final String AUTH_TOKEN = "ac_token";
public static final String BASE_URL = "http://5.196.21.161:9222";
public static final String PING_ADD_NUMBER = BASE_URL + "/test/nombres/ajouterNombre";
public static final String SCORE_UPDATE = BASE_URL + "/score/update";
public static final String MATCH_WINNER = BASE_URL + "/match/finMatch";
public static final String MATCHS = BASE_URL + "/matches";
public static final String AVAILABLE_COURTS = BASE_URL + "/courts/available";
public static final String LOGIN = BASE_URL + "/login";
public static String TEAM_PLAYERS(String teamId, String gender) {
return BASE_URL + "/teams/" + teamId + "/players?gender=" + (gender == null ? "X" : gender);
}
public static String INFO_MATCH(int matchId) {
return BASE_URL + "/matches/" + matchId;
}
public static String UPDATE_MATCH(int matchId) {
return BASE_URL + "/matches/" + matchId;
}
public static String UPDATE_SCORE(int matchId, int pointId) {
return BASE_URL + "/matches/" + matchId + "/score/" + pointId;
}
public static String UPDATE_SET_SCORE(int matchId, int setId) {
return BASE_URL + "/matches/" + matchId + "/set/" + setId;
}
public static String DELETE_SCORE(int matchId, int pointId) {
return BASE_URL + "/matches/" + matchId + "/score/" + pointId;
}
}
app/src/p9222/res/values/strings.xml 0 → 100644
View file @ 5bd15d13
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">AceCream p9222</string>
</resources>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment