julian/EndlessRoll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added different flavors so that ad-unit-id neednt be switched for tests / releases

Browse Source
This commit is contained in:
julian 2018-07-14 11:20:44 +02:00
parent ed065c3108
commit 17971cd781
11 changed files with 231 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

86
app/app.iml
View File

@ -8,40 +8,82 @@
</facet> </facet>
<facet type="android" name="Android"> <facet type="android" name="Android">
<configuration> <configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" /> <option name="SELECTED_BUILD_VARIANT" value="flavorTestDebug" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" /> <option name="ASSEMBLE_TASK_NAME" value="assembleFlavorTestDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" /> <option name="COMPILE_JAVA_TASK_NAME" value="compileFlavorTestDebugSources" />
<afterSyncTasks> <afterSyncTasks>
<task>generateDebugSources</task> <task>generateFlavorTestDebugSources</task>
</afterSyncTasks> </afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" /> <option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" /> <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" /> <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/flavorTest/res" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" /> <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration> </configuration>
</facet> </facet>
</component> </component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" /> <output url="file://$MODULE_DIR$/build/intermediates/classes/flavorTest/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" /> <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/flavorTest/debug" />
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/flavorTest/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/flavorTest/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/aidl/flavorTest/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/buildConfig/flavorTest/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/source/rs/flavorTest/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/rs/flavorTest/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/flavorTest/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/src/flavorTestDebug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/src/flavorTestDebug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/src/flavorTestDebug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/src/flavorTestDebug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/src/flavorTestDebug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/flavorTestDebug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/flavorTestDebug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/flavorTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/flavorTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/flavorTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/flavorTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/flavorTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/flavorTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/flavorTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorTestDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorTestDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorTestDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorTestDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorTestDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorTestDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorTestDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/flavorTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorTestDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorTestDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorTestDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorTestDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorTestDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorTestDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorTestDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/flavorTest/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/flavorTest/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/flavorTest/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/flavorTest/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/flavorTest/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/flavorTest/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/flavorTest/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFlavorTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestFlavorTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" /> <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/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />

11
app/build.gradle
View File

@ -16,8 +16,8 @@ android {
applicationId 'de.frajul.endlessroll' applicationId 'de.frajul.endlessroll'
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 26 targetSdkVersion 26
versionCode 8 versionCode 9
versionName '0.7.1' versionName '1.0'
} }
buildTypes { buildTypes {
release { release {
@ -25,7 +25,14 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
} }
flavorDimensions 'releaseTargetGroup'
productFlavors { productFlavors {
flavorStoreRelease {
dimension 'releaseTargetGroup'
}
flavorTest {
dimension 'releaseTargetGroup'
}
} }
} }

4
app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
View File

@ -772,8 +772,8 @@ public final class R {
public static final int abc_shareactionprovider_share_with = 0x7f0d001c; public static final int abc_shareactionprovider_share_with = 0x7f0d001c;
public static final int abc_shareactionprovider_share_with_application = 0x7f0d001d; public static final int abc_shareactionprovider_share_with_application = 0x7f0d001d;
public static final int abc_toolbar_collapse_description = 0x7f0d001e; public static final int abc_toolbar_collapse_description = 0x7f0d001e;
public static final int search_menu_title = 0x7f0d0065; public static final int search_menu_title = 0x7f0d0067;
public static final int status_bar_notification_info_overflow = 0x7f0d0072; public static final int status_bar_notification_info_overflow = 0x7f0d0074;
} }
public static final class style { public static final class style {
public static final int AlertDialog_AppCompat = 0x7f0e0000; public static final int AlertDialog_AppCompat = 0x7f0e0000;

2
app/build/intermediates/incremental/mergeDebugResources/merger.xml
View File

File diff suppressed because one or more lines are too long

5
app/build/intermediates/manifests/full/debug/AndroidManifest.xml
View File

@ -7,8 +7,8 @@
--> -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.frajul.endlessroll" package="de.frajul.endlessroll"
android:versionCode="8" android:versionCode="9"
android:versionName="0.7.1" > android:versionName="1.0" >
<uses-sdk <uses-sdk
android:minSdkVersion="14" android:minSdkVersion="14"
@ -27,6 +27,7 @@
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:supportsRtl="true" android:supportsRtl="true"
android:testOnly="true"
android:theme="@style/AppTheme" > android:theme="@style/AppTheme" >
<activity <activity
android:name="de.frajul.endlessroll.main.GameActivity" android:name="de.frajul.endlessroll.main.GameActivity"

246
app/build/intermediates/symbols/debug/R.txt
View File

@ -1071,128 +1071,130 @@ int string abc_searchview_description_voice 0x7f0d001b
int string abc_shareactionprovider_share_with 0x7f0d001c int string abc_shareactionprovider_share_with 0x7f0d001c
int string abc_shareactionprovider_share_with_application 0x7f0d001d int string abc_shareactionprovider_share_with_application 0x7f0d001d
int string abc_toolbar_collapse_description 0x7f0d001e int string abc_toolbar_collapse_description 0x7f0d001e
int string app_name 0x7f0d001f int string ad_unit_id_levels 0x7f0d001f
int string bounty_message_resource_format_s 0x7f0d0020 int string ad_unit_id_test 0x7f0d0020
int string bounty_message_shape_unlocked 0x7f0d0021 int string app_name 0x7f0d0021
int string bounty_message_tool_format_s 0x7f0d0022 int string bounty_message_resource_format_s 0x7f0d0022
int string bounty_message_tool_slot 0x7f0d0023 int string bounty_message_shape_unlocked 0x7f0d0023
int string common_google_play_services_unknown_issue 0x7f0d0024 int string bounty_message_tool_format_s 0x7f0d0024
int string confirm_dialog_button_no 0x7f0d0025 int string bounty_message_tool_slot 0x7f0d0025
int string confirm_dialog_button_yes 0x7f0d0026 int string common_google_play_services_unknown_issue 0x7f0d0026
int string confirm_dialog_exit 0x7f0d0027 int string confirm_dialog_button_no 0x7f0d0027
int string confirm_dialog_finish_world_1 0x7f0d0028 int string confirm_dialog_button_yes 0x7f0d0028
int string confirm_dialog_placeholder 0x7f0d0029 int string confirm_dialog_exit 0x7f0d0029
int string confirm_dialog_reset 0x7f0d002a int string confirm_dialog_finish_world_1 0x7f0d002a
int string credits_art 0x7f0d002b int string confirm_dialog_placeholder 0x7f0d002b
int string credits_art_title 0x7f0d002c int string confirm_dialog_reset 0x7f0d002c
int string credits_author 0x7f0d002d int string credits_art 0x7f0d002d
int string credits_music 0x7f0d002e int string credits_art_title 0x7f0d002e
int string credits_music_title 0x7f0d002f int string credits_author 0x7f0d002f
int string credits_sounds 0x7f0d0030 int string credits_music 0x7f0d0030
int string credits_sounds_title 0x7f0d0031 int string credits_music_title 0x7f0d0031
int string credits_testers 0x7f0d0032 int string credits_sounds 0x7f0d0032
int string credits_testers_title 0x7f0d0033 int string credits_sounds_title 0x7f0d0033
int string credits_title 0x7f0d0034 int string credits_testers 0x7f0d0034
int string game_bomb_error_message 0x7f0d0035 int string credits_testers_title 0x7f0d0035
int string game_fps_format_d 0x7f0d0036 int string credits_title 0x7f0d0036
int string game_fps_placeholder 0x7f0d0037 int string game_bomb_error_message 0x7f0d0037
int string game_playerprogress_format_d 0x7f0d0038 int string game_fps_format_d 0x7f0d0038
int string game_playerprogress_placeholder 0x7f0d0039 int string game_fps_placeholder 0x7f0d0039
int string goal_message_next_level_format_d 0x7f0d003a int string game_playerprogress_format_d 0x7f0d003a
int string goal_message_next_world_format_s 0x7f0d003b int string game_playerprogress_placeholder 0x7f0d003b
int string goal_message_restart_format_d 0x7f0d003c int string goal_message_next_level_format_d 0x7f0d003c
int string level_button_format_d 0x7f0d003d int string goal_message_next_world_format_s 0x7f0d003d
int string levelup 0x7f0d003e int string goal_message_restart_format_d 0x7f0d003e
int string message_game_over 0x7f0d003f int string level_button_format_d 0x7f0d003f
int string message_level_finished 0x7f0d0040 int string levelup 0x7f0d0040
int string message_restart 0x7f0d0041 int string message_game_over 0x7f0d0041
int string message_to_menu 0x7f0d0042 int string message_level_finished 0x7f0d0042
int string message_try_again 0x7f0d0043 int string message_restart 0x7f0d0043
int string placeholder_button 0x7f0d0044 int string message_to_menu 0x7f0d0044
int string placeholder_number 0x7f0d0045 int string message_try_again 0x7f0d0045
int string placeholder_textview 0x7f0d0046 int string placeholder_button 0x7f0d0046
int string playershape_description_ball 0x7f0d0047 int string placeholder_number 0x7f0d0047
int string playershape_description_blue 0x7f0d0048 int string placeholder_textview 0x7f0d0048
int string playershape_description_clock 0x7f0d0049 int string playershape_description_ball 0x7f0d0049
int string playershape_description_hypno_spiral 0x7f0d004a int string playershape_description_blue 0x7f0d004a
int string playershape_description_locked 0x7f0d004b int string playershape_description_clock 0x7f0d004b
int string playershape_description_pacman 0x7f0d004c int string playershape_description_hypno_spiral 0x7f0d004c
int string playershape_description_smiley 0x7f0d004d int string playershape_description_locked 0x7f0d004d
int string playershape_description_soccer 0x7f0d004e int string playershape_description_pacman 0x7f0d004e
int string playershape_description_sun 0x7f0d004f int string playershape_description_smiley 0x7f0d004f
int string playershape_description_wheel 0x7f0d0050 int string playershape_description_soccer 0x7f0d0050
int string playershape_name_ball 0x7f0d0051 int string playershape_description_sun 0x7f0d0051
int string playershape_name_blue 0x7f0d0052 int string playershape_description_wheel 0x7f0d0052
int string playershape_name_clock 0x7f0d0053 int string playershape_name_ball 0x7f0d0053
int string playershape_name_hypno_spiral 0x7f0d0054 int string playershape_name_blue 0x7f0d0054
int string playershape_name_locked 0x7f0d0055 int string playershape_name_clock 0x7f0d0055
int string playershape_name_pacman 0x7f0d0056 int string playershape_name_hypno_spiral 0x7f0d0056
int string playershape_name_smiley 0x7f0d0057 int string playershape_name_locked 0x7f0d0057
int string playershape_name_soccer 0x7f0d0058 int string playershape_name_pacman 0x7f0d0058
int string playershape_name_sun 0x7f0d0059 int string playershape_name_smiley 0x7f0d0059
int string playershape_name_wheel 0x7f0d005a int string playershape_name_soccer 0x7f0d005a
int string pre_start_screen_loading 0x7f0d005b int string playershape_name_sun 0x7f0d005b
int string price_button_buy 0x7f0d005c int string playershape_name_wheel 0x7f0d005c
int string price_button_upgrade 0x7f0d005d int string pre_start_screen_loading 0x7f0d005d
int string s1 0x7f0d005e int string price_button_buy 0x7f0d005e
int string s2 0x7f0d005f int string price_button_upgrade 0x7f0d005f
int string s3 0x7f0d0060 int string s1 0x7f0d0060
int string s4 0x7f0d0061 int string s2 0x7f0d0061
int string s5 0x7f0d0062 int string s3 0x7f0d0062
int string s6 0x7f0d0063 int string s4 0x7f0d0063
int string s7 0x7f0d0064 int string s5 0x7f0d0064
int string search_menu_title 0x7f0d0065 int string s6 0x7f0d0065
int string settings_credits 0x7f0d0066 int string s7 0x7f0d0066
int string settings_music 0x7f0d0067 int string search_menu_title 0x7f0d0067
int string settings_reset 0x7f0d0068 int string settings_credits 0x7f0d0068
int string settings_show_fps 0x7f0d0069 int string settings_music 0x7f0d0069
int string settings_sounds 0x7f0d006a int string settings_reset 0x7f0d006a
int string short_menu_continue 0x7f0d006b int string settings_show_fps 0x7f0d006b
int string short_menu_exit 0x7f0d006c int string settings_sounds 0x7f0d006c
int string start_screen_finish_world_1 0x7f0d006d int string short_menu_continue 0x7f0d006d
int string start_screen_gain_90_ep 0x7f0d006e int string short_menu_exit 0x7f0d006e
int string start_screen_play 0x7f0d006f int string start_screen_finish_world_1 0x7f0d006f
int string start_screen_to_gl_test_screen 0x7f0d0070 int string start_screen_gain_90_ep 0x7f0d0070
int string start_screen_unlock_all_levels 0x7f0d0071 int string start_screen_play 0x7f0d0071
int string status_bar_notification_info_overflow 0x7f0d0072 int string start_screen_to_gl_test_screen 0x7f0d0072
int string task_collect_energy_format_d 0x7f0d0073 int string start_screen_unlock_all_levels 0x7f0d0073
int string task_collect_energy_progress_format_ddd 0x7f0d0074 int string status_bar_notification_info_overflow 0x7f0d0074
int string task_collect_stars_format_d 0x7f0d0075 int string task_collect_energy_format_d 0x7f0d0075
int string task_collect_stars_progress_format_ddd 0x7f0d0076 int string task_collect_energy_progress_format_ddd 0x7f0d0076
int string task_complete_world_format_d 0x7f0d0077 int string task_collect_stars_format_d 0x7f0d0077
int string task_empty 0x7f0d0078 int string task_collect_stars_progress_format_ddd 0x7f0d0078
int string tool_description_bomb 0x7f0d0079 int string task_complete_world_format_d 0x7f0d0079
int string tool_description_locked_format_d 0x7f0d007a int string task_empty 0x7f0d007a
int string tool_description_magnet 0x7f0d007b int string tool_description_bomb 0x7f0d007b
int string tool_description_power_mushroom 0x7f0d007c int string tool_description_locked_format_d 0x7f0d007c
int string tool_description_ramp 0x7f0d007d int string tool_description_magnet 0x7f0d007d
int string tool_description_spring 0x7f0d007e int string tool_description_power_mushroom 0x7f0d007e
int string tool_description_stasis 0x7f0d007f int string tool_description_ramp 0x7f0d007f
int string tool_level_format_d 0x7f0d0080 int string tool_description_spring 0x7f0d0080
int string tool_name_bomb 0x7f0d0081 int string tool_description_stasis 0x7f0d0081
int string tool_name_locked 0x7f0d0082 int string tool_level_format_d 0x7f0d0082
int string tool_name_magnet 0x7f0d0083 int string tool_name_bomb 0x7f0d0083
int string tool_name_power_mushroom 0x7f0d0084 int string tool_name_locked 0x7f0d0084
int string tool_name_ramp 0x7f0d0085 int string tool_name_magnet 0x7f0d0085
int string tool_name_spring 0x7f0d0086 int string tool_name_power_mushroom 0x7f0d0086
int string tool_name_stasis 0x7f0d0087 int string tool_name_ramp 0x7f0d0087
int string topbar_level_format_d 0x7f0d0088 int string tool_name_spring 0x7f0d0088
int string topbar_level_placeholder 0x7f0d0089 int string tool_name_stasis 0x7f0d0089
int string tutorial_leveled_up_to_toolshop 0x7f0d008a int string topbar_level_format_d 0x7f0d008a
int string tutorial_place_ramp_air 0x7f0d008b int string topbar_level_placeholder 0x7f0d008b
int string tutorial_place_ramp_air_2 0x7f0d008c int string tutorial_leveled_up_to_toolshop 0x7f0d008c
int string tutorial_place_ramp_gap 0x7f0d008d int string tutorial_place_ramp_air 0x7f0d008d
int string tutorial_place_ramp_obstacle 0x7f0d008e int string tutorial_place_ramp_air_2 0x7f0d008e
int string tutorial_place_tools 0x7f0d008f int string tutorial_place_ramp_gap 0x7f0d008f
int string tutorial_placeholder 0x7f0d0090 int string tutorial_place_ramp_obstacle 0x7f0d0090
int string tutorial_spring_equipped 0x7f0d0091 int string tutorial_place_tools 0x7f0d0091
int string tutorial_switch_tools_switch 0x7f0d0092 int string tutorial_placeholder 0x7f0d0092
int string tutorial_switch_tools_two_neccessary 0x7f0d0093 int string tutorial_spring_equipped 0x7f0d0093
int string tutorial_welcome 0x7f0d0094 int string tutorial_switch_tools_switch 0x7f0d0094
int string unlock_message_placeholder 0x7f0d0095 int string tutorial_switch_tools_two_neccessary 0x7f0d0095
int string world_button_count_format_dd 0x7f0d0096 int string tutorial_welcome 0x7f0d0096
int string world_button_progress_placeholder 0x7f0d0097 int string unlock_message_placeholder 0x7f0d0097
int string world_button_title_placeholder 0x7f0d0098 int string world_button_count_format_dd 0x7f0d0098
int string world_button_progress_placeholder 0x7f0d0099
int string world_button_title_placeholder 0x7f0d009a
int style AlertDialog_AppCompat 0x7f0e0000 int style AlertDialog_AppCompat 0x7f0e0000
int style AlertDialog_AppCompat_Light 0x7f0e0001 int style AlertDialog_AppCompat_Light 0x7f0e0001
int style Animation_AppCompat_Dialog 0x7f0e0002 int style Animation_AppCompat_Dialog 0x7f0e0002

13
app/src/flavorStoreRelease/res/values/strings.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Created by Julian Mutter on 7/14/18 11:11 AM
~ Copyright (c) 2018. All rights reserved.
~ Last modified 7/14/18 11:11 AM
~
-->
<resources>
<string name="ad_unit_id_levels" translatable="false">ca-app-pub-7069685539417779/4627811894</string>
</resources>

13
app/src/flavorTest/res/values/strings.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Created by Julian Mutter on 7/14/18 11:12 AM
~ Copyright (c) 2018. All rights reserved.
~ Last modified 7/14/18 11:12 AM
~
-->
<resources>
<!--Test-ID: ca-app-pub-3940256099942544/6300978111-->
<string name="ad_unit_id_levels" translatable="false">ca-app-pub-3940256099942544/6300978111</string>
</resources>

2
app/src/main/res/layout/levels.xml
View File

@ -29,7 +29,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
ads:adSize="SMART_BANNER" ads:adSize="SMART_BANNER"
ads:adUnitId="ca-app-pub-3940256099942544/6300978111"/> ads:adUnitId="@string/ad_unit_id_levels"/>
<HorizontalScrollView <HorizontalScrollView
android:layout_width="match_parent" android:layout_width="match_parent"

2
app/src/main/res/layout/start_screen.xml
View File

@ -44,7 +44,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:orientation="vertical" android:orientation="vertical"
android:visibility="visible"> android:visibility="gone">
<Button <Button
android:id="@+id/startscreen_to_gl_test_screen" android:id="@+id/startscreen_to_gl_test_screen"