Extract :map, split up :data and :model (#37)

.github/workflows/CI-build.yml

@@ -38,8 +38,8 @@ jobs:
         run: |
           curl --silent --show-error --location --remote-name \
               https://github.com/TWiStErRob/net.twisterrob.travel/releases/download/v1.0.0/LULDLRRiverTramCable.zip
-          mkdir -p temp/feed15/LULDLRRiverTramCable
-          unzip LULDLRRiverTramCable.zip 'tfl_*-*-_-y05-*.xml' -d temp/feed15/LULDLRRiverTramCable
+          mkdir -p data/feed15/LULDLRRiverTramCable
+          unzip LULDLRRiverTramCable.zip 'tfl_*-*-_-y05-*.xml' -d data/feed15/LULDLRRiverTramCable
 
       - name: "Build project."
         working-directory: .

android/app/full/build.gradle

@@ -10,8 +10,12 @@ android.defaultConfig.version {
 dependencies {
 	implementation(projects.android.component.android)
 	implementation(projects.android.component.data)
+	implementation(projects.android.component.map)
 	implementation(projects.android.component.theme)
 	implementation(projects.android.feature.range)
+	implementation(projects.common.feed.feeds)
+	implementation(projects.common.feed.facilities)
+	implementation(projects.common.feed.trackernet)
 	implementation("net.twisterrob.lib:twister-lib-android-monolith")
 	implementation("net.twisterrob.lib:twister-lib-android-basics")
 	implementation("net.twisterrob.lib:twister-lib-android-slf4j")
@@ -20,7 +24,6 @@ dependencies {
 	implementation("net.twisterrob.lib:twister-lib-android-about")
 	implementation("net.twisterrob.lib:twister-lib-android-settings")
 
-	implementation(libs.gms.maps)
 	implementation(libs.jsr305)
 	implementation(libs.androidx.swiperefreshlayout)
 }

android/app/full/src/debug/res/values/overrides.xml

@@ -1,5 +1,5 @@
 <resources>
+
 	<string name="app_name">!Better London Travel</string>
-	<!-- Debug 3A:01:32:8E:53:38:57:08:8F:6C:0D:2D:2F:9C:1C:0E:5A:35:96:44;net.twisterrob.blt.debug -->
-	<string name="gms_key_geo">AIzaSyDEBLxBF4iOGFUtzAm-Z8OeDYd-sShe_LA</string>
+
 </resources>

android/app/full/src/main/AndroidManifest.xml

@@ -19,13 +19,6 @@
 		android:theme="@style/AppTheme.Default"
 		>
 
-		<meta-data
-			android:name="com.google.android.geo.API_KEY"
-			android:value="@string/gms_key_geo" />
-		<meta-data
-			android:name="com.google.android.gms.version"
-			android:value="@integer/google_play_services_version" />
-
 		<provider
 			android:name="net.twisterrob.blt.android.ui.StationSuggestProvider"
 			android:authorities="${applicationId}.suggest_station"

android/app/full/src/main/java/net/twisterrob/blt/android/App.java

@@ -44,7 +44,7 @@ public App() {
 
 	@Override public void onCreate() {
 		super.onCreate();
-		Stringers.register(StringerRepo.INSTANCE);
+		RangeStringers.register(StringerRepo.INSTANCE);
 		m_static = new AndroidDBStaticData(db());
 	}
 

android/app/range/src/debug/res/values/overrides.xml

@@ -2,7 +2,4 @@
 
 	<string name="app_name">!Tube Range Map</string>
 
-	<!-- Debug 3A:01:32:8E:53:38:57:08:8F:6C:0D:2D:2F:9C:1C:0E:5A:35:96:44;net.twisterrob.blt.range.debug -->
-	<string name="gms_key_geo">AIzaSyDEBLxBF4iOGFUtzAm-Z8OeDYd-sShe_LA</string>
-
 </resources>

android/app/range/src/main/AndroidManifest.xml

@@ -13,13 +13,6 @@
 		android:theme="@style/AppTheme.Default"
 		>
 
-		<meta-data
-			android:name="com.google.android.geo.API_KEY"
-			android:value="@string/gms_key_geo" />
-		<meta-data
-			android:name="com.google.android.gms.version"
-			android:value="@integer/google_play_services_version" />
-
 		<activity
 			android:name="net.twisterrob.blt.android.ui.activity.StandaloneRangeMapActivity"
 			android:exported="true"

android/app/range/src/main/java/net/twisterrob/blt/android/app/range/App.java

@@ -6,7 +6,7 @@
 
 import net.twisterrob.android.app.BaseApp;
 import net.twisterrob.android.log.AndroidLoggerFactory;
-import net.twisterrob.android.utils.tostring.stringers.detailed.Stringers;
+import net.twisterrob.android.utils.tostring.stringers.detailed.RangeStringers;
 import net.twisterrob.blt.android.BuildConfig;
 import net.twisterrob.blt.android.Injector;
 import net.twisterrob.blt.android.data.AndroidDBStaticData;
@@ -24,7 +24,7 @@ public class App extends BaseApp implements Injector.Provider {
 
 	@Override public void onCreate() {
 		super.onCreate();
-		Stringers.register(StringerRepo.INSTANCE);
+		RangeStringers.register(StringerRepo.INSTANCE);
 		this.injector = createInjector(this);
 	}
 

android/component/data/build.gradle

@@ -2,23 +2,26 @@ plugins {
 	id("net.twisterrob.travel.android-library")
 }
 
+configurations.create("database")
+
 dependencies {
 	api(projects.common.model)
+	api(projects.common.data.static)
 	implementation("net.twisterrob.lib:twister-lib-android-monolith")
 	implementation("net.twisterrob.lib:twister-lib-android-basics")
 	implementation("net.twisterrob.lib:twister-lib-android-slf4j")
+	database(projects.common.data.postcodes) { targetConfiguration = "output" }
+	database(projects.common.data.network) { targetConfiguration = "output" }
 }
 
-// TODO this is hacky, replace with proper publishing things after :common:data is split up.
 abstract class GenerateDatabase extends Copy {
 
 	@Internal("An intermediate property to satisfy AGP, tracked in destination.")
 	abstract DirectoryProperty getOutput()
 }
 
 def generateDataBase = tasks.register("generateDataBase", GenerateDatabase.class) {
-	dependsOn(":common:data:runNetwork", ":common:data:runPostCode")
-	from(new File(project(":common:data").projectDir, "output")) {
+	from(configurations.database) {
 		include("*.data.*.sql")
 	}
 	into(output)

android/component/map/build.gradle

@@ -0,0 +1,12 @@
+plugins {
+	id("net.twisterrob.travel.android-library")
+}
+
+dependencies {
+	implementation(projects.common.maptiler)
+	api(libs.gms.maps)
+	implementation(libs.slf4j.api)
+	implementation(libs.androidx.fragment)
+	implementation("net.twisterrob.lib:twister-lib-android-stringers")
+	implementation("net.twisterrob.lib:twister-lib-stringer")
+}

android/component/map/src/debug/res/values/keys.xml

@@ -0,0 +1,7 @@
+<resources>
+
+	<!-- Debug 3A:01:32:8E:53:38:57:08:8F:6C:0D:2D:2F:9C:1C:0E:5A:35:96:44;net.twisterrob.blt.debug -->
+	<!-- Debug 3A:01:32:8E:53:38:57:08:8F:6C:0D:2D:2F:9C:1C:0E:5A:35:96:44;net.twisterrob.blt.range.debug -->
+	<string name="gms_key_geo">AIzaSyDEBLxBF4iOGFUtzAm-Z8OeDYd-sShe_LA</string>
+
+</resources>

android/component/map/src/main/AndroidManifest.xml

@@ -0,0 +1,17 @@
+<manifest
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	>
+
+	<application>
+
+		<meta-data
+			android:name="com.google.android.geo.API_KEY"
+			android:value="@string/gms_key_geo" />
+
+		<meta-data
+			android:name="com.google.android.gms.version"
+			android:value="@integer/google_play_services_version" />
+
+	</application>
+
+</manifest>

android/feature/range/src/main/java/net/twisterrob/android/utils/tostring/stringers/detailed/LatLngBoundsStringer.java → android/component/map/src/main/java/net/twisterrob/android/utils/tostring/stringers/detailed/LatLngBoundsStringer.java

@@ -1,16 +1,16 @@
 package net.twisterrob.android.utils.tostring.stringers.detailed;
 
-import javax.annotation.Nonnull;
-
 import com.google.android.gms.maps.model.LatLngBounds;
 
+import androidx.annotation.NonNull;
+
 import net.twisterrob.java.utils.tostring.*;
 
 public class LatLngBoundsStringer extends Stringer<LatLngBounds> {
 	@Override public String getType(LatLngBounds object) {
 		return "LatLngBounds";
 	}
-	@Override public void toString(@Nonnull ToStringAppender append, LatLngBounds bounds) {
+	@Override public void toString(@NonNull ToStringAppender append, LatLngBounds bounds) {
 		append.complexProperty("SW", bounds.southwest);
 		append.complexProperty("NE", bounds.northeast);
 	}

android/feature/range/src/main/java/net/twisterrob/android/utils/tostring/stringers/detailed/LatLngStringer.java → android/component/map/src/main/java/net/twisterrob/android/utils/tostring/stringers/detailed/LatLngStringer.java

@@ -1,16 +1,16 @@
 package net.twisterrob.android.utils.tostring.stringers.detailed;
 
-import javax.annotation.Nonnull;
-
 import com.google.android.gms.maps.model.LatLng;
 
+import androidx.annotation.NonNull;
+
 import net.twisterrob.java.utils.tostring.*;
 
 public class LatLngStringer extends Stringer<LatLng> {
 	@Override public String getType(LatLng object) {
 		return "LatLng";
 	}
-	@Override public void toString(@Nonnull ToStringAppender append, LatLng latlng) {
+	@Override public void toString(@NonNull ToStringAppender append, LatLng latlng) {
 		append.formattedProperty(null, null, "%f,%f", latlng.latitude, latlng.longitude);
 	}
 }

android/feature/range/src/main/java/net/twisterrob/android/utils/tostring/stringers/detailed/Stringers.java → android/component/map/src/main/java/net/twisterrob/android/utils/tostring/stringers/detailed/MapStringers.java

@@ -3,15 +3,13 @@
 import com.google.android.gms.common.api.Status;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.LatLngBounds;
-import com.google.android.libraries.places.api.model.Place;
 
 import net.twisterrob.java.utils.tostring.StringerRepo;
 
-public class Stringers {
+public class MapStringers {
 
 	public static void register(StringerRepo repo) {
 		repo.register(Status.class, new StatusStringer());
-		repo.register(Place.class, new PlaceStringer());
 		repo.register(LatLng.class, new LatLngStringer());
 		repo.register(LatLngBounds.class, new LatLngBoundsStringer());
 	}

android/feature/range/src/main/java/net/twisterrob/android/utils/tostring/stringers/detailed/StatusStringer.java → android/component/map/src/main/java/net/twisterrob/android/utils/tostring/stringers/detailed/StatusStringer.java

@@ -1,16 +1,16 @@
 package net.twisterrob.android.utils.tostring.stringers.detailed;
 
-import javax.annotation.Nonnull;
-
 import android.annotation.SuppressLint;
 
 import com.google.android.gms.common.api.Status;
 
+import androidx.annotation.NonNull;
+
 import net.twisterrob.java.utils.tostring.*;
 
 public class StatusStringer extends Stringer<Status> {
 	@SuppressLint("VisibleForTests")
-	@Override public void toString(@Nonnull ToStringAppender append, Status status) {
+	@Override public void toString(@NonNull ToStringAppender append, Status status) {
 		append.rawProperty("code", status.getStatusCode());
 		append.rawProperty("message", status.getStatusMessage());
 		append.booleanProperty(status.isSuccess(), "success");

android/feature/range/src/main/java/net/twisterrob/blt/android/data/range/tiles/GeneratedGeoTileProvider.java → android/component/map/src/main/java/net/twisterrob/blt/android/data/range/tiles/GeneratedGeoTileProvider.java

@@ -8,7 +8,6 @@
 import androidx.core.util.Pools;
 import android.text.TextPaint;
 
-import com.bumptech.glide.util.Util;
 import com.google.android.gms.maps.model.Tile;
 
 public abstract class GeneratedGeoTileProvider extends GeoTileProvider {
@@ -31,7 +30,7 @@ protected GeneratedGeoTileProvider(int tileSize) {
 						+ "drawing a {}x{} Bitmap ({} bytes) compressed into {} bytes "
 						+ "took {} ms (create = {} ms, draw = {} ms, compress = {} ms)",
 				x, y, zoom,
-				bitmap.getWidth(), bitmap.getHeight(), Util.getBitmapByteSize(bitmap), tile.data.length,
+				bitmap.getWidth(), bitmap.getHeight(), bitmap.getAllocationByteCount(), tile.data.length,
 				converted - begin, created - begin, drawn - created, converted - drawn);
 		return tile;
 	}

android/app/range/src/release/res/values/overrides.xml → android/component/map/src/release/res/values/keys.xml

@@ -1,5 +1,6 @@
 <resources>
 
+	<!-- Release F6:35:98:18:C9:2F:99:F9:60:F3:74:EA:CA:73:45:93:24:F6:E2:60;net.twisterrob.blt -->
 	<!-- Release F6:35:98:18:C9:2F:99:F9:60:F3:74:EA:CA:73:45:93:24:F6:E2:60;net.twisterrob.blt.range -->
 	<string name="gms_key_geo">AIzaSyB6qc9WlSDbaNGO-c-mnu8ajlq3jroh2E4</string>
 

android/feature/range/build.gradle

@@ -5,6 +5,7 @@ plugins {
 dependencies {
 	implementation(projects.android.component.android)
 	implementation(projects.android.component.data)
+	implementation(projects.android.component.map)
 	implementation(projects.android.component.theme)
 
 	api("net.twisterrob.lib:twister-lib-android-monolith") // api because AppCompatActivity.
@@ -17,7 +18,6 @@ dependencies {
 	implementation("net.twisterrob.lib:twister-lib-android-settings")
 
 	implementation(projects.common.model)
-	implementation(libs.gms.maps)
 	implementation(libs.gms.places)
 	implementation(libs.jsr305)
 	implementation(libs.glide)

android/feature/range/src/main/java/net/twisterrob/android/utils/tostring/stringers/detailed/RangeStringers.java

@@ -0,0 +1,13 @@
+package net.twisterrob.android.utils.tostring.stringers.detailed;
+
+import com.google.android.libraries.places.api.model.Place;
+
+import net.twisterrob.java.utils.tostring.StringerRepo;
+
+public class RangeStringers {
+
+	public static void register(StringerRepo repo) {
+		MapStringers.register(repo);
+		repo.register(Place.class, new PlaceStringer());
+	}
+}

build.gradle

@@ -10,6 +10,7 @@ idea {
 			file(".gradle"),
 			file("build"),
 			file(".idea"),
+			file("data"),
 			file("temp"),
 		]
 	}