mirror of
https://github.com/googlemaps/android-samples.git
synced 2025-12-08 18:02:20 +00:00
0595432ad3
* chore: unified Kotlin and Java modules
* chore: unified resources
* chore: removed Kotlin
* chore: headers
* chore: headers
* chore: headers
* chore: headers
* chore: added insets
* chore: headers
* chore: renamed
* fix: Refactor map creation, centralize Map ID, add Kotlin boundary controls
This commit refactors how map fragments and Map IDs are handled across the Java and Kotlin demo applications, and introduces feature parity for boundary layer controls in the Kotlin demo.
Key changes include:
- **Programmatic Map Fragment Creation:**
- Replaced static `<fragment>` map declarations with `<FrameLayout>` containers (`map_fragment_container`) in `data_driven_boundaries_demo.xml` and `data_driven_styling_demo.xml` layouts.
- Modified `DataDrivenBoundariesActivity` and `DataDrivenDatasetStylingActivity` (Java & Kotlin) to instantiate `SupportMapFragment` programmatically using `SupportMapFragment.newInstance(mapOptions)`.
- Map options (`GoogleMapOptions`) are now created with the dynamically retrieved Map ID before fragment creation.
- this allows moving the Map ID out of the xml files
- **Centralized Map ID and Configuration Logic:**
- Introduced `ApiDemoApplication` in both Java (`java-app`) and Kotlin (`kotlin-app`) modules.
- This class centralizes Map ID retrieval, checking `BuildConfig.MAP_ID` first, then the `R.string.map_id` resource, providing a consistent source.
- The Kotlin `ApiDemoApplication` also includes API Key validation on application startup.
- **Kotlin DataDrivenBoundaries Feature Enhancement:**
- Added boundary layer selection controls (popup menu via `button_feature_type`) to the Kotlin `DataDrivenBoundariesActivity`, achieving parity with the Java version's functionality.
- Implemented state management for toggling Locality, Administrative Area Level 1, and Country layers.
- Added dynamic styling logic to apply/remove styles based on layer visibility.
- Updated feature click handling for country selection, respecting layer activation state.
- **Miscellaneous Improvements:**
- Added distinct demo titles (`demo_title_java`, `demo_title_kotlin`) in `strings.xml` for better app identification.
- Updated resource references within Java/Kotlin activities for cleaner imports (e.g., `R.id...` instead of fully qualified names).
* chore: address various lint issues
* fix: explicitly bind checkboxes in the UI
---------
Co-authored-by: dkhawk <107309+dkhawk@users.noreply.github.com>
91 lines
2.3 KiB
Batchfile
91 lines
2.3 KiB
Batchfile
@if "%DEBUG%" == "" @echo off
|
|
@rem ##########################################################################
|
|
@rem
|
|
@rem Gradle startup script for Windows
|
|
@rem
|
|
@rem ##########################################################################
|
|
|
|
@rem Set local scope for the variables with windows NT shell
|
|
if "%OS%"=="Windows_NT" setlocal
|
|
|
|
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
|
set DEFAULT_JVM_OPTS=
|
|
|
|
set DIRNAME=%~dp0
|
|
if "%DIRNAME%" == "" set DIRNAME=.
|
|
set APP_BASE_NAME=%~n0
|
|
set APP_HOME=%DIRNAME%
|
|
|
|
@rem Find java.exe
|
|
if defined JAVA_HOME goto findJavaFromJavaHome
|
|
|
|
set JAVA_EXE=java.exe
|
|
%JAVA_EXE% -version >NUL 2>&1
|
|
if "%ERRORLEVEL%" == "0" goto init
|
|
|
|
echo.
|
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
|
echo.
|
|
echo Please set the JAVA_HOME variable in your environment to match the
|
|
echo location of your Java installation.
|
|
|
|
goto fail
|
|
|
|
:findJavaFromJavaHome
|
|
set JAVA_HOME=%JAVA_HOME:"=%
|
|
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|
|
|
if exist "%JAVA_EXE%" goto init
|
|
|
|
echo.
|
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
|
echo.
|
|
echo Please set the JAVA_HOME variable in your environment to match the
|
|
echo location of your Java installation.
|
|
|
|
goto fail
|
|
|
|
:init
|
|
@rem Get command-line arguments, handling Windowz variants
|
|
|
|
if not "%OS%" == "Windows_NT" goto win9xME_args
|
|
if "%@eval[2+2]" == "4" goto 4NT_args
|
|
|
|
:win9xME_args
|
|
@rem Slurp the command line arguments.
|
|
set CMD_LINE_ARGS=
|
|
set _SKIP=2
|
|
|
|
:win9xME_args_slurp
|
|
if "x%~1" == "x" goto execute
|
|
|
|
set CMD_LINE_ARGS=%*
|
|
goto execute
|
|
|
|
:4NT_args
|
|
@rem Get arguments from the 4NT Shell from JP Software
|
|
set CMD_LINE_ARGS=%$
|
|
|
|
:execute
|
|
@rem Setup the command line
|
|
|
|
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
|
|
|
@rem Execute Gradle
|
|
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
|
|
|
|
:end
|
|
@rem End local scope for the variables with windows NT shell
|
|
if "%ERRORLEVEL%"=="0" goto mainEnd
|
|
|
|
:fail
|
|
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
|
rem the _cmd.exe /c_ return code!
|
|
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
|
exit /b 1
|
|
|
|
:mainEnd
|
|
if "%OS%"=="Windows_NT" endlocal
|
|
|
|
:omega
|