From 612ff0259ce507a69e1461f088419d195d2795c6 Mon Sep 17 00:00:00 2001 From: Eric House Date: Wed, 18 Jan 2017 07:01:25 -0800 Subject: [PATCH] move and start processing res .xml files --- xwords4/android/app/build.gradle | 250 ++++++++++++++++++ .../src/main}/res/layout-small/board.xml | 0 .../src/main}/res/layout/about_dlg.xml | 0 .../src/main}/res/layout/board.xml | 0 .../src/main}/res/layout/bt_buttons.xml | 0 .../src/main}/res/layout/chat.xml | 0 .../src/main}/res/layout/chat_row.xml | 0 .../src/main}/res/layout/color_display.xml | 0 .../src/main}/res/layout/color_edit.xml | 0 .../src/main}/res/layout/confirm_sms.xml | 0 .../main}/res/layout/conn_types_display.xml | 0 .../src/main}/res/layout/dflt_name.xml | 0 .../src/main}/res/layout/dict_browse.xml | 0 .../src/main}/res/layout/dict_browser.xml | 0 .../main}/res/layout/dict_browser_list.xml | 0 .../src/main}/res/layout/divider_view.xml | 0 .../src/main}/res/layout/dualcontainer.xml | 0 .../src/main}/res/layout/expander_header.xml | 0 .../src/main}/res/layout/force_remote.xml | 0 .../src/main}/res/layout/game_config.xml | 0 .../src/main}/res/layout/game_list.xml | 0 .../src/main}/res/layout/game_list_group.xml | 0 .../src/main}/res/layout/game_list_item.xml | 0 .../src/main}/res/layout/import_dict.xml | 0 .../src/main}/res/layout/import_dict_item.xml | 0 .../src/main}/res/layout/inviter.xml | 0 .../main}/res/layout/inviter_item_frame.xml | 0 .../src/main}/res/layout/list_group.xml | 0 .../src/main}/res/layout/list_item.xml | 0 .../src/main}/res/layout/loc_item_edit.xml | 0 .../src/main}/res/layout/loc_list_item.xml | 0 .../src/main}/res/layout/loc_main.xml | 0 .../src/main}/res/layout/lookup.xml | 0 .../main}/res/layout/msg_label_and_edit.xml | 0 .../src/main}/res/layout/not_again_view.xml | 0 .../src/main}/res/layout/passwd_view.xml | 0 .../src/main}/res/layout/player_edit.xml | 0 .../src/main}/res/layout/player_list_elem.xml | 0 .../src/main}/res/layout/prefs_w_buttons.xml | 0 .../src/main}/res/layout/relay_buttons.xml | 0 .../main}/res/layout/remote_dict_details.xml | 0 .../src/main}/res/layout/rename_game.xml | 0 .../src/main}/res/layout/sms_buttons.xml | 0 .../src/main}/res/layout/studylist.xml | 0 .../src/main}/res/layout/toolbar.xml | 0 .../src/main}/res/layout/two_strs_item.xml | 0 .../src/main}/res/menu-small/board_menu.xml | 0 .../src/main}/res/menu/board_menu.xml | 0 .../src/main}/res/menu/chat_menu.xml | 0 .../src/main}/res/menu/dicts_menu.xml | 0 .../src/main}/res/menu/empty.xml | 0 .../main}/res/menu/games_list_game_menu.xml | 0 .../main}/res/menu/games_list_group_menu.xml | 0 .../src/main}/res/menu/games_list_menu.xml | 0 .../src/main}/res/menu/loc_item_menu.xml | 0 .../src/main}/res/menu/studylist.xml | 0 .../src/main}/res/values-large/styles.xml | 0 .../src/main}/res/values-xlarge/styles.xml | 0 .../src/main}/res/values/app_name.xml | 0 .../src/main}/res/values/common_rsrc.xml | 0 .../src/main}/res/values/config.xml | 0 .../src/main}/res/values/dimensions.xml | 0 .../src/main}/res/values/strings.xml | 0 .../src/main}/res/values/styles.xml | 0 .../src/main}/res/xml/xwprefs.xml | 0 xwords4/android/scripts/Variant.mk | 35 +-- 66 files changed, 252 insertions(+), 33 deletions(-) create mode 100644 xwords4/android/app/build.gradle rename xwords4/android/{XWords4 => app/src/main}/res/layout-small/board.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/about_dlg.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/board.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/bt_buttons.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/chat.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/chat_row.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/color_display.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/color_edit.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/confirm_sms.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/conn_types_display.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/dflt_name.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/dict_browse.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/dict_browser.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/dict_browser_list.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/divider_view.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/dualcontainer.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/expander_header.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/force_remote.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/game_config.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/game_list.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/game_list_group.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/game_list_item.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/import_dict.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/import_dict_item.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/inviter.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/inviter_item_frame.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/list_group.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/list_item.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/loc_item_edit.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/loc_list_item.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/loc_main.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/lookup.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/msg_label_and_edit.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/not_again_view.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/passwd_view.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/player_edit.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/player_list_elem.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/prefs_w_buttons.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/relay_buttons.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/remote_dict_details.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/rename_game.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/sms_buttons.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/studylist.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/toolbar.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/layout/two_strs_item.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/menu-small/board_menu.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/menu/board_menu.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/menu/chat_menu.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/menu/dicts_menu.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/menu/empty.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/menu/games_list_game_menu.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/menu/games_list_group_menu.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/menu/games_list_menu.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/menu/loc_item_menu.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/menu/studylist.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/values-large/styles.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/values-xlarge/styles.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/values/app_name.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/values/common_rsrc.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/values/config.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/values/dimensions.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/values/strings.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/values/styles.xml (100%) rename xwords4/android/{XWords4 => app/src/main}/res/xml/xwprefs.xml (100%) diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle new file mode 100644 index 000000000..3237fad30 --- /dev/null +++ b/xwords4/android/app/build.gradle @@ -0,0 +1,250 @@ +import groovy.swing.SwingBuilder + +def INITIAL_CLIENT_VERS = 8 +def LIBS_DEBUG = 'libs-debug' +def LIBS_RELEASE = 'libs-release' +def VERSION_CODE_BASE = 111 +def VERSION_NAME = '4.4.115' +def VARIANTS = [ "xw4", "xw4dbg" ] +def BUILDS = [ "Debug", "Release" ] + +apply plugin: 'com.android.application' + +dependencies { + compile files('../libs/gcm.jar') + compile files('../libs/android-support-v13.jar') +} + +android { + buildToolsVersion '23.0.2' + defaultConfig { + minSdkVersion 7 + targetSdkVersion 23 + versionCode VERSION_CODE_BASE + versionName VERSION_NAME + } + + // Rename all output artifacts to include version information + applicationVariants.all { variant -> + // renameArtifact(variant) + // variant.buildConfigField "String", "FIELD_NAME", "\"my String\"" + def GCM_SENDER_ID = System.getenv("GCM_SENDER_ID") + variant.buildConfigField "String", "SENDER_ID", "\"$GCM_SENDER_ID\"" + def CRITTERCISM_APP_ID = System.getenv("CRITTERCISM_APP_ID") + variant.buildConfigField "String", "CRITTERCISM_APP_ID", "\"$CRITTERCISM_APP_ID\"" + + def gitHash = "../scripts/gitversion.sh".execute().text.trim() + resValue "string", "git_rev", "$gitHash" + } + + flavorDimensions "variant"//, "abi" + productFlavors { + xw4 { + dimension "variant" + applicationId "org.eehouse.android.${VARIANTS[0]}" + manifestPlaceholders = [ APP_ID: applicationId ] + resValue "string", "app_name", "CrossWords" + resValue "string", "nbs_port", "3344" + resValue "string", "invite_prefix", "/and/" + } + xw4dbg { + dimension "variant" + applicationId "org.eehouse.android.${VARIANTS[1]}" + manifestPlaceholders = [ APP_ID: applicationId ] + resValue "string", "app_name", "CrossDbg" + resValue "string", "nbs_port", "3345" + resValue "string", "invite_prefix", "/anddbg/" + } + + // WARNING: "all" breaks things. Seems to be a keyword. Need + // to figure out how to express include-all-abis + // all { + // dimension "abi" + // versionCode 0 + VERSION_CODE_BASE + // } + // armeabi { + // dimension "abi" + // versionCode 1 + VERSION_CODE_BASE + // } + // x86 { + // dimension "abi" + // versionCode 2 + VERSION_CODE_BASE + // } + // armeabiv7a { + // dimension "abi" + // versionCode 3 + VERSION_CODE_BASE + // } + } + + signingConfigs { + release { + storeFile file(System.getenv("HOME") + "/.keystore") + keyAlias "mykey" + + // These two lines make gradle believe that the signingConfigs + // section is complete. Without them, tasks like installRelease + // will not be available! + storePassword "notReal" + keyPassword "notReal" + } + } + + buildTypes { + release { + signingConfig signingConfigs.release + debuggable false + minifyEnabled true + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + debug { + debuggable true + // This doesn't work on marshmallow: duplicate permission error + // applicationIdSuffix ".debug" + } + } + + sourceSets { + // Use symlinks instead of setting non-conventional + // directories here. AS doesn't respect what's set here: it'll + // compile, but post-install app launch and source-level + // debugging don't work. + release { + jniLibs.srcDir "../$LIBS_RELEASE" + } + debug { + jniLibs.srcDir "../$LIBS_DEBUG" + } + } + + lintOptions { + abortOnError false + } + + def gitrev = "git describe --tags".execute().text.trim() + applicationVariants.all { variant -> + variant.outputs.each { output -> + output.outputFile = + new File(output.outputFile.parent, + output.outputFile.name.replace(".apk", "-${gitrev}.apk")) + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) +} + +task mkImages(type: Exec) { + workingDir '../' + commandLine './scripts/mkimages.sh' +} + +task copyStrings(type: Exec) { + workingDir '../' + commandLine './scripts/copy-strings.py' +} + +task ndkSetup(type: Exec) { + workingDir '../' + commandLine "./scripts/ndksetup.sh", "--with-clang" +} + +task myPreBuild(dependsOn: ['ndkSetup', 'mkImages', 'copyStrings', 'mkXml']) { +} +preBuild.dependsOn myPreBuild + +task mkXml(type: Exec) { + workingDir '../' + commandLine './scripts/mk_xml.py', '-o', + "app/src/main/java/org/eehouse/android/xw4/loc/LocIDsData.java", + '-t', "debug" +} + +afterEvaluate { + VARIANTS.each { VARIANT -> + String variantCaps = VARIANT.capitalize() + BUILDS.each { BUILD -> + String lib = BUILD == 'Debug' ? LIBS_DEBUG : LIBS_RELEASE + String nameLC = BUILD.toLowerCase() + String name = "ndkBuild${variantCaps}${BUILD}" + task "$name"(type: Exec) { + workingDir '../' + commandLine './scripts/ndkbuild.sh', '-j3', + "BUILD_TARGET=${nameLC}", "INITIAL_CLIENT_VERS=$INITIAL_CLIENT_VERS", + "VARIANT=$VARIANT", "NDK_LIBS_OUT=${lib}", "NDK_OUT=./obj-${nameLC}" + } + + String compileTask = "compile${variantCaps}${BUILD}Ndk" + tasks.getByName(compileTask).dependsOn name + } + } + + String copyStringsTask = "copyStringsXw4Dbg" + task "$copyStringsTask"(type: Exec) { + workingDir './' + environment.put('APPNAME', 'CrossDbg') + commandLine 'make', '-f', '../scripts/Variant.mk', + "src/xw4dbg/res/values/strings.xml" + } + preBuild.dependsOn copyStringsTask +} + +gradle.taskGraph.whenReady { taskGraph -> + if ( taskGraph.hasTask(':app:validateReleaseSigning') ) { + def pass + if (System.getenv("ANDROID_RELEASE_PASSWORD")) { + pass = System.getenv("ANDROID_RELEASE_PASSWORD") + } else if ( null != System.console() ) { + pass = System.console().readPassword("\nPlease enter key passphrase: ") + pass = new String(pass) + } else { + new SwingBuilder().edt { + dialog(modal: true, // Otherwise the build will continue running before you closed the dialog + title: 'Enter password', // Dialog title + alwaysOnTop: true, // pretty much what the name says + resizable: false, // Don't allow the user to resize the dialog + locationRelativeTo: null, // Place dialog in center of the screen + pack: true, // We need to pack the dialog (so it will take the size of it's children + show: true // Let's show it + ) { + vbox { // Put everything below each other + label(text: "Please enter key passphrase:") + input = passwordField(); + button(defaultButton: true, text: 'OK', actionPerformed: { + pass = new String(input.password); // Set pass variable to value of input field + // println "myPass: $myPass" + + dispose(); // Close dialog + }) + } + } + } + } + + android.signingConfigs.release.storePassword = pass + android.signingConfigs.release.keyPassword = pass + } +} + +// def getVersionName() { +// try { +// def stdout = new ByteArrayOutputStream() +// exec { +// commandLine 'git', 'describe', '--dirty' +// standardOutput = stdout +// } +// return stdout.toString().trim() +// } +// catch (ignored) { +// return null; +// } +// } + +// def renameArtifact(variant) { +// variant.outputs.each { output -> +// def name = String.format( "XWords4-%s-%s.apk", variant.name, +// getVersionName() ) +// output.outputFile = new File( (String)output.outputFile.parent, +// (String)name ) +// } +// } diff --git a/xwords4/android/XWords4/res/layout-small/board.xml b/xwords4/android/app/src/main/res/layout-small/board.xml similarity index 100% rename from xwords4/android/XWords4/res/layout-small/board.xml rename to xwords4/android/app/src/main/res/layout-small/board.xml diff --git a/xwords4/android/XWords4/res/layout/about_dlg.xml b/xwords4/android/app/src/main/res/layout/about_dlg.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/about_dlg.xml rename to xwords4/android/app/src/main/res/layout/about_dlg.xml diff --git a/xwords4/android/XWords4/res/layout/board.xml b/xwords4/android/app/src/main/res/layout/board.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/board.xml rename to xwords4/android/app/src/main/res/layout/board.xml diff --git a/xwords4/android/XWords4/res/layout/bt_buttons.xml b/xwords4/android/app/src/main/res/layout/bt_buttons.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/bt_buttons.xml rename to xwords4/android/app/src/main/res/layout/bt_buttons.xml diff --git a/xwords4/android/XWords4/res/layout/chat.xml b/xwords4/android/app/src/main/res/layout/chat.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/chat.xml rename to xwords4/android/app/src/main/res/layout/chat.xml diff --git a/xwords4/android/XWords4/res/layout/chat_row.xml b/xwords4/android/app/src/main/res/layout/chat_row.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/chat_row.xml rename to xwords4/android/app/src/main/res/layout/chat_row.xml diff --git a/xwords4/android/XWords4/res/layout/color_display.xml b/xwords4/android/app/src/main/res/layout/color_display.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/color_display.xml rename to xwords4/android/app/src/main/res/layout/color_display.xml diff --git a/xwords4/android/XWords4/res/layout/color_edit.xml b/xwords4/android/app/src/main/res/layout/color_edit.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/color_edit.xml rename to xwords4/android/app/src/main/res/layout/color_edit.xml diff --git a/xwords4/android/XWords4/res/layout/confirm_sms.xml b/xwords4/android/app/src/main/res/layout/confirm_sms.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/confirm_sms.xml rename to xwords4/android/app/src/main/res/layout/confirm_sms.xml diff --git a/xwords4/android/XWords4/res/layout/conn_types_display.xml b/xwords4/android/app/src/main/res/layout/conn_types_display.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/conn_types_display.xml rename to xwords4/android/app/src/main/res/layout/conn_types_display.xml diff --git a/xwords4/android/XWords4/res/layout/dflt_name.xml b/xwords4/android/app/src/main/res/layout/dflt_name.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/dflt_name.xml rename to xwords4/android/app/src/main/res/layout/dflt_name.xml diff --git a/xwords4/android/XWords4/res/layout/dict_browse.xml b/xwords4/android/app/src/main/res/layout/dict_browse.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/dict_browse.xml rename to xwords4/android/app/src/main/res/layout/dict_browse.xml diff --git a/xwords4/android/XWords4/res/layout/dict_browser.xml b/xwords4/android/app/src/main/res/layout/dict_browser.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/dict_browser.xml rename to xwords4/android/app/src/main/res/layout/dict_browser.xml diff --git a/xwords4/android/XWords4/res/layout/dict_browser_list.xml b/xwords4/android/app/src/main/res/layout/dict_browser_list.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/dict_browser_list.xml rename to xwords4/android/app/src/main/res/layout/dict_browser_list.xml diff --git a/xwords4/android/XWords4/res/layout/divider_view.xml b/xwords4/android/app/src/main/res/layout/divider_view.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/divider_view.xml rename to xwords4/android/app/src/main/res/layout/divider_view.xml diff --git a/xwords4/android/XWords4/res/layout/dualcontainer.xml b/xwords4/android/app/src/main/res/layout/dualcontainer.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/dualcontainer.xml rename to xwords4/android/app/src/main/res/layout/dualcontainer.xml diff --git a/xwords4/android/XWords4/res/layout/expander_header.xml b/xwords4/android/app/src/main/res/layout/expander_header.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/expander_header.xml rename to xwords4/android/app/src/main/res/layout/expander_header.xml diff --git a/xwords4/android/XWords4/res/layout/force_remote.xml b/xwords4/android/app/src/main/res/layout/force_remote.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/force_remote.xml rename to xwords4/android/app/src/main/res/layout/force_remote.xml diff --git a/xwords4/android/XWords4/res/layout/game_config.xml b/xwords4/android/app/src/main/res/layout/game_config.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/game_config.xml rename to xwords4/android/app/src/main/res/layout/game_config.xml diff --git a/xwords4/android/XWords4/res/layout/game_list.xml b/xwords4/android/app/src/main/res/layout/game_list.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/game_list.xml rename to xwords4/android/app/src/main/res/layout/game_list.xml diff --git a/xwords4/android/XWords4/res/layout/game_list_group.xml b/xwords4/android/app/src/main/res/layout/game_list_group.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/game_list_group.xml rename to xwords4/android/app/src/main/res/layout/game_list_group.xml diff --git a/xwords4/android/XWords4/res/layout/game_list_item.xml b/xwords4/android/app/src/main/res/layout/game_list_item.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/game_list_item.xml rename to xwords4/android/app/src/main/res/layout/game_list_item.xml diff --git a/xwords4/android/XWords4/res/layout/import_dict.xml b/xwords4/android/app/src/main/res/layout/import_dict.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/import_dict.xml rename to xwords4/android/app/src/main/res/layout/import_dict.xml diff --git a/xwords4/android/XWords4/res/layout/import_dict_item.xml b/xwords4/android/app/src/main/res/layout/import_dict_item.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/import_dict_item.xml rename to xwords4/android/app/src/main/res/layout/import_dict_item.xml diff --git a/xwords4/android/XWords4/res/layout/inviter.xml b/xwords4/android/app/src/main/res/layout/inviter.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/inviter.xml rename to xwords4/android/app/src/main/res/layout/inviter.xml diff --git a/xwords4/android/XWords4/res/layout/inviter_item_frame.xml b/xwords4/android/app/src/main/res/layout/inviter_item_frame.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/inviter_item_frame.xml rename to xwords4/android/app/src/main/res/layout/inviter_item_frame.xml diff --git a/xwords4/android/XWords4/res/layout/list_group.xml b/xwords4/android/app/src/main/res/layout/list_group.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/list_group.xml rename to xwords4/android/app/src/main/res/layout/list_group.xml diff --git a/xwords4/android/XWords4/res/layout/list_item.xml b/xwords4/android/app/src/main/res/layout/list_item.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/list_item.xml rename to xwords4/android/app/src/main/res/layout/list_item.xml diff --git a/xwords4/android/XWords4/res/layout/loc_item_edit.xml b/xwords4/android/app/src/main/res/layout/loc_item_edit.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/loc_item_edit.xml rename to xwords4/android/app/src/main/res/layout/loc_item_edit.xml diff --git a/xwords4/android/XWords4/res/layout/loc_list_item.xml b/xwords4/android/app/src/main/res/layout/loc_list_item.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/loc_list_item.xml rename to xwords4/android/app/src/main/res/layout/loc_list_item.xml diff --git a/xwords4/android/XWords4/res/layout/loc_main.xml b/xwords4/android/app/src/main/res/layout/loc_main.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/loc_main.xml rename to xwords4/android/app/src/main/res/layout/loc_main.xml diff --git a/xwords4/android/XWords4/res/layout/lookup.xml b/xwords4/android/app/src/main/res/layout/lookup.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/lookup.xml rename to xwords4/android/app/src/main/res/layout/lookup.xml diff --git a/xwords4/android/XWords4/res/layout/msg_label_and_edit.xml b/xwords4/android/app/src/main/res/layout/msg_label_and_edit.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/msg_label_and_edit.xml rename to xwords4/android/app/src/main/res/layout/msg_label_and_edit.xml diff --git a/xwords4/android/XWords4/res/layout/not_again_view.xml b/xwords4/android/app/src/main/res/layout/not_again_view.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/not_again_view.xml rename to xwords4/android/app/src/main/res/layout/not_again_view.xml diff --git a/xwords4/android/XWords4/res/layout/passwd_view.xml b/xwords4/android/app/src/main/res/layout/passwd_view.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/passwd_view.xml rename to xwords4/android/app/src/main/res/layout/passwd_view.xml diff --git a/xwords4/android/XWords4/res/layout/player_edit.xml b/xwords4/android/app/src/main/res/layout/player_edit.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/player_edit.xml rename to xwords4/android/app/src/main/res/layout/player_edit.xml diff --git a/xwords4/android/XWords4/res/layout/player_list_elem.xml b/xwords4/android/app/src/main/res/layout/player_list_elem.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/player_list_elem.xml rename to xwords4/android/app/src/main/res/layout/player_list_elem.xml diff --git a/xwords4/android/XWords4/res/layout/prefs_w_buttons.xml b/xwords4/android/app/src/main/res/layout/prefs_w_buttons.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/prefs_w_buttons.xml rename to xwords4/android/app/src/main/res/layout/prefs_w_buttons.xml diff --git a/xwords4/android/XWords4/res/layout/relay_buttons.xml b/xwords4/android/app/src/main/res/layout/relay_buttons.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/relay_buttons.xml rename to xwords4/android/app/src/main/res/layout/relay_buttons.xml diff --git a/xwords4/android/XWords4/res/layout/remote_dict_details.xml b/xwords4/android/app/src/main/res/layout/remote_dict_details.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/remote_dict_details.xml rename to xwords4/android/app/src/main/res/layout/remote_dict_details.xml diff --git a/xwords4/android/XWords4/res/layout/rename_game.xml b/xwords4/android/app/src/main/res/layout/rename_game.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/rename_game.xml rename to xwords4/android/app/src/main/res/layout/rename_game.xml diff --git a/xwords4/android/XWords4/res/layout/sms_buttons.xml b/xwords4/android/app/src/main/res/layout/sms_buttons.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/sms_buttons.xml rename to xwords4/android/app/src/main/res/layout/sms_buttons.xml diff --git a/xwords4/android/XWords4/res/layout/studylist.xml b/xwords4/android/app/src/main/res/layout/studylist.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/studylist.xml rename to xwords4/android/app/src/main/res/layout/studylist.xml diff --git a/xwords4/android/XWords4/res/layout/toolbar.xml b/xwords4/android/app/src/main/res/layout/toolbar.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/toolbar.xml rename to xwords4/android/app/src/main/res/layout/toolbar.xml diff --git a/xwords4/android/XWords4/res/layout/two_strs_item.xml b/xwords4/android/app/src/main/res/layout/two_strs_item.xml similarity index 100% rename from xwords4/android/XWords4/res/layout/two_strs_item.xml rename to xwords4/android/app/src/main/res/layout/two_strs_item.xml diff --git a/xwords4/android/XWords4/res/menu-small/board_menu.xml b/xwords4/android/app/src/main/res/menu-small/board_menu.xml similarity index 100% rename from xwords4/android/XWords4/res/menu-small/board_menu.xml rename to xwords4/android/app/src/main/res/menu-small/board_menu.xml diff --git a/xwords4/android/XWords4/res/menu/board_menu.xml b/xwords4/android/app/src/main/res/menu/board_menu.xml similarity index 100% rename from xwords4/android/XWords4/res/menu/board_menu.xml rename to xwords4/android/app/src/main/res/menu/board_menu.xml diff --git a/xwords4/android/XWords4/res/menu/chat_menu.xml b/xwords4/android/app/src/main/res/menu/chat_menu.xml similarity index 100% rename from xwords4/android/XWords4/res/menu/chat_menu.xml rename to xwords4/android/app/src/main/res/menu/chat_menu.xml diff --git a/xwords4/android/XWords4/res/menu/dicts_menu.xml b/xwords4/android/app/src/main/res/menu/dicts_menu.xml similarity index 100% rename from xwords4/android/XWords4/res/menu/dicts_menu.xml rename to xwords4/android/app/src/main/res/menu/dicts_menu.xml diff --git a/xwords4/android/XWords4/res/menu/empty.xml b/xwords4/android/app/src/main/res/menu/empty.xml similarity index 100% rename from xwords4/android/XWords4/res/menu/empty.xml rename to xwords4/android/app/src/main/res/menu/empty.xml diff --git a/xwords4/android/XWords4/res/menu/games_list_game_menu.xml b/xwords4/android/app/src/main/res/menu/games_list_game_menu.xml similarity index 100% rename from xwords4/android/XWords4/res/menu/games_list_game_menu.xml rename to xwords4/android/app/src/main/res/menu/games_list_game_menu.xml diff --git a/xwords4/android/XWords4/res/menu/games_list_group_menu.xml b/xwords4/android/app/src/main/res/menu/games_list_group_menu.xml similarity index 100% rename from xwords4/android/XWords4/res/menu/games_list_group_menu.xml rename to xwords4/android/app/src/main/res/menu/games_list_group_menu.xml diff --git a/xwords4/android/XWords4/res/menu/games_list_menu.xml b/xwords4/android/app/src/main/res/menu/games_list_menu.xml similarity index 100% rename from xwords4/android/XWords4/res/menu/games_list_menu.xml rename to xwords4/android/app/src/main/res/menu/games_list_menu.xml diff --git a/xwords4/android/XWords4/res/menu/loc_item_menu.xml b/xwords4/android/app/src/main/res/menu/loc_item_menu.xml similarity index 100% rename from xwords4/android/XWords4/res/menu/loc_item_menu.xml rename to xwords4/android/app/src/main/res/menu/loc_item_menu.xml diff --git a/xwords4/android/XWords4/res/menu/studylist.xml b/xwords4/android/app/src/main/res/menu/studylist.xml similarity index 100% rename from xwords4/android/XWords4/res/menu/studylist.xml rename to xwords4/android/app/src/main/res/menu/studylist.xml diff --git a/xwords4/android/XWords4/res/values-large/styles.xml b/xwords4/android/app/src/main/res/values-large/styles.xml similarity index 100% rename from xwords4/android/XWords4/res/values-large/styles.xml rename to xwords4/android/app/src/main/res/values-large/styles.xml diff --git a/xwords4/android/XWords4/res/values-xlarge/styles.xml b/xwords4/android/app/src/main/res/values-xlarge/styles.xml similarity index 100% rename from xwords4/android/XWords4/res/values-xlarge/styles.xml rename to xwords4/android/app/src/main/res/values-xlarge/styles.xml diff --git a/xwords4/android/XWords4/res/values/app_name.xml b/xwords4/android/app/src/main/res/values/app_name.xml similarity index 100% rename from xwords4/android/XWords4/res/values/app_name.xml rename to xwords4/android/app/src/main/res/values/app_name.xml diff --git a/xwords4/android/XWords4/res/values/common_rsrc.xml b/xwords4/android/app/src/main/res/values/common_rsrc.xml similarity index 100% rename from xwords4/android/XWords4/res/values/common_rsrc.xml rename to xwords4/android/app/src/main/res/values/common_rsrc.xml diff --git a/xwords4/android/XWords4/res/values/config.xml b/xwords4/android/app/src/main/res/values/config.xml similarity index 100% rename from xwords4/android/XWords4/res/values/config.xml rename to xwords4/android/app/src/main/res/values/config.xml diff --git a/xwords4/android/XWords4/res/values/dimensions.xml b/xwords4/android/app/src/main/res/values/dimensions.xml similarity index 100% rename from xwords4/android/XWords4/res/values/dimensions.xml rename to xwords4/android/app/src/main/res/values/dimensions.xml diff --git a/xwords4/android/XWords4/res/values/strings.xml b/xwords4/android/app/src/main/res/values/strings.xml similarity index 100% rename from xwords4/android/XWords4/res/values/strings.xml rename to xwords4/android/app/src/main/res/values/strings.xml diff --git a/xwords4/android/XWords4/res/values/styles.xml b/xwords4/android/app/src/main/res/values/styles.xml similarity index 100% rename from xwords4/android/XWords4/res/values/styles.xml rename to xwords4/android/app/src/main/res/values/styles.xml diff --git a/xwords4/android/XWords4/res/xml/xwprefs.xml b/xwords4/android/app/src/main/res/xml/xwprefs.xml similarity index 100% rename from xwords4/android/XWords4/res/xml/xwprefs.xml rename to xwords4/android/app/src/main/res/xml/xwprefs.xml diff --git a/xwords4/android/scripts/Variant.mk b/xwords4/android/scripts/Variant.mk index cd58f03e9..2617414a0 100644 --- a/xwords4/android/scripts/Variant.mk +++ b/xwords4/android/scripts/Variant.mk @@ -1,38 +1,7 @@ # -*- mode: Makefile; -*- -$(DEST_PATH)/%.java : $(SRC_PATH)/%.java +src/xw4dbg/res/values/strings.xml: src/main/res/values/strings.xml + @mkdir -p $(shell dirname $@) @sed \ - -e "s,\(package org.eehouse.android.\)xw4\(.*\);,\1$(VARIANT)\2;," \ - -e "s,\(import org.eehouse.android.\)xw4\(.*\);,\1$(VARIANT)\2;," \ - < $< > $@ - -$(DEST_PATH)/icon48x48.png : $(SRC_PATH)/icon48x48.png - convert $< -rotate 180 -gravity Center $@ - -$(DEST_PATH)/notify.png : $(SRC_PATH)/notify.png - convert $< -rotate 180 -gravity Center $@ - -$(DEST_PATH)/%.png : $(SRC_PATH)/%.png - @cp $< $@ - -$(DEST_PATH)/%.xml : $(SRC_PATH)/%.xml - @sed \ - -e "s,\(^.*org.eehouse.android.\)xw4\(.*$$\),\1$(VARIANT)\2," \ -e "s,Crosswords,$(APPNAME),g" \ < $< > $@ - -$(DEST_PATH)/%.h : $(SRC_PATH)/%.h - @sed \ - -e "s,\(^.*org/eehouse/android/\)xw4\(.*$$\),\1$(VARIANT)\2," \ - < $< > $@ - -$(DEST_PATH)/%.c : $(SRC_PATH)/%.c - @sed \ - -e "s,\(^.*Java_org_eehouse_android_\)xw4\(.*$$\),\1$(VARIANT)\2," \ - < $< > $@ - -$(DEST_PATH)/%.jar : $(SRC_PATH)/%.jar - @cp $< $@ - -$(DEST_PATH)/% : $(SRC_PATH)/% - @cp $< $@