Rework module structure and split up flavored Android apps

.github/workflows/CI-build.yml

@@ -50,20 +50,22 @@ jobs:
           --continue
           --no-build-cache
           build
-          :AppEngine:appengineStage
+          :web:status-history:appengineStage
 
       - name: "Upload 'Unit Test Results' artifact."
         if: success() || failure()
         uses: actions/upload-artifact@v3
         with:
           name: 'Unit Test Results'
+          if-no-files-found: error
           path: ${{ github.workspace }}/**/build/reports/tests/*/
 
       - name: "Upload 'Android Lint Results' artifact."
         if: success() || failure()
         uses: actions/upload-artifact@v3
         with:
           name: 'Android Lint Results'
+          if-no-files-found: error
           path: ${{ github.workspace }}/**/build/reports/lint-results*
 
       - name: "Publish 'Unit Results' check suite."
@@ -81,6 +83,7 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: 'APKs'
+          if-no-files-found: error
           path: |
             ${{ github.workspace }}/**/build/outputs/apk/
             ${{ github.workspace }}/**/build/outputs/mapping/

android/app/full/build.gradle

@@ -0,0 +1,30 @@
+plugins {
+	id("net.twisterrob.travel.android-app")
+}
+
+dependencies {
+	implementation(projects.android.component.android)
+	implementation(projects.android.component.data)
+	implementation(projects.android.component.theme)
+	implementation(projects.android.feature.range)
+	implementation("net.twisterrob.lib:twister-lib-android-monolith")
+	implementation("net.twisterrob.lib:twister-lib-android-basics")
+	implementation("net.twisterrob.lib:twister-lib-android-slf4j")
+	implementation("net.twisterrob.lib:twister-lib-android-stringers")
+
+	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 {
+	defaultConfig {
+		applicationId = "net.twisterrob.blt"
+		version {
+			major = 1
+		}
+	}
+}

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

@@ -27,14 +27,14 @@
 			android:value="@integer/google_play_services_version" />
 
 		<provider
-			android:name=".ui.StationSuggestProvider"
+			android:name="net.twisterrob.blt.android.ui.StationSuggestProvider"
 			android:authorities="${applicationId}.suggest_station"
 			android:exported="false"
 			android:syncable="false"
 			/>
 
 		<activity
-			android:name=".ui.activity.main.MainActivity"
+			android:name="net.twisterrob.blt.android.ui.activity.main.MainActivity"
 			android:exported="true"
 			android:label="@string/app_name"
 			tools:ignore="RedundantLabel"
@@ -49,7 +49,7 @@
 		</activity>
 
 		<activity
-			android:name=".ui.activity.StatusActivity"
+			android:name="net.twisterrob.blt.android.ui.activity.StatusActivity"
 			android:exported="false"
 			android:label="@string/launcher__line_status"
 			>
@@ -59,7 +59,7 @@
 		</activity>
 
 		<activity
-			android:name=".ui.activity.PredictionSummaryActivity"
+			android:name="net.twisterrob.blt.android.ui.activity.PredictionSummaryActivity"
 			android:exported="false"
 			android:label="@string/launcher__prediction_summary"
 			>
@@ -69,7 +69,7 @@
 		</activity>
 
 		<activity
-			android:name=".ui.activity.StationListActivity"
+			android:name="net.twisterrob.blt.android.ui.activity.StationListActivity"
 			android:exported="false"
 			android:label="@string/launcher__station_list"
 			>
@@ -85,7 +85,7 @@
 		</activity>
 
 		<activity
-			android:name=".ui.activity.StationInfoActivity"
+			android:name="net.twisterrob.blt.android.ui.activity.StationInfoActivity"
 			android:exported="false"
 			android:label="@string/launcher__station_info"
 			>
@@ -95,7 +95,7 @@
 		</activity>
 
 		<activity
-			android:name=".ui.activity.StationMapsActivity"
+			android:name="net.twisterrob.blt.android.ui.activity.StationMapsActivity"
 			android:exported="false"
 			android:label="@string/launcher__station_map"
 			>
@@ -105,7 +105,7 @@
 		</activity>
 
 		<activity
-			android:name=".ui.activity.PostCodesActivity"
+			android:name="net.twisterrob.blt.android.ui.activity.PostCodesActivity"
 			android:exported="false"
 			android:label="@string/launcher__postcode_map"
 			>
@@ -115,7 +115,7 @@
 		</activity>
 
 		<activity
-			android:name=".ui.activity.RangeMapActivity"
+			android:name="net.twisterrob.blt.android.ui.activity.RangeMapActivity"
 			android:exported="false"
 			android:label="@string/launcher__range_map"
 			android:theme="@style/AppTheme.NoActionBar"
@@ -126,4 +126,5 @@
 		</activity>
 
 	</application>
+
 </manifest>

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

@@ -5,22 +5,18 @@
 import androidx.annotation.NonNull;
 import android.widget.Toast;
 
-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.android.AndroidConstants;
 import net.twisterrob.android.app.BaseApp;
 import net.twisterrob.android.log.AndroidLoggerFactory;
 import net.twisterrob.android.utils.concurrent.*;
 import net.twisterrob.android.utils.tostring.stringers.detailed.*;
+import net.twisterrob.blt.android.app.full.BuildConfig;
 import net.twisterrob.blt.android.data.*;
 import net.twisterrob.blt.android.db.DataBaseHelper;
 import net.twisterrob.blt.io.feeds.*;
 import net.twisterrob.java.utils.tostring.StringerRepo;
 
-public class App extends BaseApp {
+public class App extends BaseApp implements Injector.Provider {
 	static {
 		AndroidLoggerFactory.addReplacement("^net\\.twisterrob\\.blt\\.android\\.(.+\\.)?", "");
 		AndroidLoggerFactory.addReplacement("^net\\.twisterrob\\.blt\\.(.+\\.)?", "");
@@ -48,15 +44,12 @@ public App() {
 
 	@Override public void onCreate() {
 		super.onCreate();
-		StringerRepo.INSTANCE.register(Status.class, new StatusStringer());
-		StringerRepo.INSTANCE.register(Place.class, new PlaceStringer());
-		StringerRepo.INSTANCE.register(LatLng.class, new LatLngStringer());
-		StringerRepo.INSTANCE.register(LatLngBounds.class, new LatLngBoundsStringer());
+		Stringers.register(StringerRepo.INSTANCE);
 		m_static = new AndroidDBStaticData(db());
 	}
 
 	@Override protected Object createDatabase() {
-		DataBaseHelper db = new DataBaseHelper(this);
+		DataBaseHelper db = new DataBaseHelper(this, BuildConfig.DEBUG);
 		@SuppressWarnings({"unused", "deprecation"}) // TODO https://github.com/TWiStErRob/net.twisterrob.travel/issues/15
 		Object task = new BackgroundExecution(new Runnable() {
 			@Override public void run() {
@@ -92,4 +85,14 @@ public static void sendMail(String body) {
 			}
 		}.execute(body);
 	}
+
+	@SuppressWarnings("deprecation")
+	@Override public Injector injector() {
+		return new net.twisterrob.blt.android.feature.range.Injector(
+				new BuildConfigWrapper(),
+				m_static,
+				db(),
+				prefs()
+		);
+	}
 }