start of cleanup/restucturing of code

Author: joreilly

README.md

@@ -4,37 +4,14 @@
 [![Get it on Google Play](https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png)](https://play.google.com/store/apps/details?id=com.surrus.galwaybus)
 
 
-This was created as part of effort to get more familiar with developing Android apps using 
-Kotlin and the new [Android Architecture Components](https://developer.android.com/topic/libraries/architecture/index.html),
-and also to explore use of the increasingly popular [Clean Architecture](https://8thlight.com/blog/uncle-bob/2012/08/13/the-clean-architecture.html) approach. It's heavily based on https://github.com/bufferapp/clean-architecture-components-boilerplate. 
-This is stil work in progress and also, at least for now,
- have omitted formal `Mapper` classes (though some data model translation does occur between the layers).
-
-As I'm pretty new to Kotlin and some of the libraries used I'm sure 
-there are better ways of implementing some of the code I have so feedback (and PRs!)
-are very welcome.  I also continue to incorporate changes based on articles and other
-repos I come across.  
-
 Note also that this is using [REST endpoint](https://github.com/appsandwich/galwaybus) provided by @appsandwich to retrieve
  Galway Bus route/timetable info  (Thanks Vinny!)
 
 
 
-### Use of Clean Architecture
-
-For an app of this size and complexity it can be argued that full use
- of Clean Architecture abstractions is overkill....at least right now method implementations 
- in many of the layers simply delegate to corresponding method in layer below (though
- starting to see a few exceptions to that).
-A reasonable approach for an app like this might be, for example, to have `ViewModel` 
-implementations interact directly with the `Repository`.  In either case,
- a key important benefit of this architecture is that code below the UI layer should not have 
- any dependencies on Android framework and can be easily unit tested.
-
-
 ### Kotlin Multiplatform
 
-More recently I've also been using this project to explore some of the relatively new Kotlin Multiplatform
+Currently this project is being mostly used as platform to explore some of the relatively new Kotlin Multiplatform
 capabilities.  There is now **kotlin-multiplatform** `ShareCode` module for example and some sample iOS apps in `ios` folder. Have also 
 written a couple of post about some of my experiences doing this so far
 

SharedCode/build.gradle

@@ -114,8 +114,11 @@ kotlin {
 
         iOSMain.dependencies {
             // Coroutines
-            implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core-native:${Versions.kotlinCoroutines}"
-
+            implementation('org.jetbrains.kotlinx:kotlinx-coroutines-core-native') {
+                version {
+                    strictly '1.3.3-native-mt'
+                }
+            }
             // Ktor
             implementation "io.ktor:ktor-client-ios:${Versions.ktor}"
             implementation "io.ktor:ktor-client-core-native:${Versions.ktor}"

SharedCode/src/androidMain/kotlin/com/surrus/galwaybus/common/Dispatcher.kt

@@ -6,6 +6,7 @@ import com.surrus.galwaybus.common.model.BusRoute
 import com.surrus.galwaybus.common.model.BusStop
 import com.surrus.galwaybus.common.remote.GalwayBusApi
 import com.surrus.galwaybus.db.MyDatabase
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -21,13 +22,13 @@ class GalwayBusRepository {
     private val galwayBusQueries = galwayBusDb?.galwayBusQueries
 
     init {
-        GlobalScope.launch (ApplicationDispatcher) {
-            //fetchAndStoreBusStops()
+        GlobalScope.launch (Dispatchers.Main) {
+            fetchAndStoreBusStops()
         }
     }
 
 
-    suspend fun fetchAndStoreBusStops() {
+    private suspend fun fetchAndStoreBusStops() {
         val busStops = galwayBusApi.fetchBusStops()
 
         busStops.forEach {
@@ -42,16 +43,14 @@ class GalwayBusRepository {
 
 
     suspend fun getBusStops(): List<BusStop> {
-        return galwayBusQueries?.let {
-            it.selectAll(mapper = { stop_id, short_name, irish_short_name ->
-                BusStop(stop_id.toInt(), short_name, irish_short_name)
-            }).executeAsList()
-        } ?: emptyList<BusStop>()
+        return galwayBusQueries?.selectAll(mapper = { stop_id, short_name, irish_short_name ->
+            BusStop(stop_id.toInt(), short_name, irish_short_name)
+        })?.executeAsList() ?: emptyList<BusStop>()
     }
 
 
     fun getBusStops(success: (List<BusStop>) -> Unit) {
-        GlobalScope.launch(ApplicationDispatcher) {
+        GlobalScope.launch(Dispatchers.Main) {
             success(getBusStops())
         }
     }
@@ -62,7 +61,7 @@ class GalwayBusRepository {
     }
 
     fun fetchBusRoutes(success: (List<BusRoute>) -> Unit) {
-        GlobalScope.launch(ApplicationDispatcher) {
+        GlobalScope.launch(Dispatchers.Main) {
             success(fetchBusRoutes())
         }
     }
@@ -72,7 +71,7 @@ class GalwayBusRepository {
     }
 
     fun getNearestStops(latitude: Double, longitude: Double, success: (List<BusStop>) -> Unit) {
-        GlobalScope.launch(ApplicationDispatcher) {
+        GlobalScope.launch(Dispatchers.Main) {
             success(getNearestStops(latitude, longitude))
         }
     }

SharedCode/src/commonMain/kotlin/com/surrus/galwaybus/common/Dispatcher.kt

@@ -23,7 +23,7 @@ class GalwayBusApi(val baseUrl: String = "https://galwaybus.herokuapp.com") {
     private val client by lazy {
         HttpClient() {
             install(JsonFeature) {
-                serializer = KotlinxSerializer(Json(JsonConfiguration(strictMode = false))).apply {
+                serializer = KotlinxSerializer(Json.nonstrict).apply {
                     setMapper(BusRoute::class, BusRoute.serializer())
                     setMapper(BusStop::class, BusStop.serializer())
                     //setListMapper(BusStop::class, BusStop.serializer())

SharedCode/src/commonMain/kotlin/com/surrus/galwaybus/common/GalwayBusRepository.kt

@@ -1,6 +1,11 @@
 apply plugin: 'com.android.application'
 //apply plugin: 'com.google.firebase.firebase-perf'
 apply plugin: 'io.fabric'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlinx-serialization'
+apply plugin: "androidx.navigation.safeargs"
 
 
 def keystorePropertiesFile = rootProject.file("keystore.properties")
@@ -65,6 +70,9 @@ android {
         versionName this.versionName()
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        final String googleMapsKey = System.getenv('GOOGLE_API_KEY') ?: 'test'
+        resValue 'string', 'google_maps_key', googleMapsKey
     }
 
     buildTypes {
@@ -87,14 +95,6 @@ android {
         }
     }
 
-    flavorDimensions "experience"
-    productFlavors {
-        instant {
-        }
-        installed {
-        }
-    }
-
     packagingOptions {
         exclude 'META-INF/common.kotlin_module'
         exclude 'META-INF/*.kotlin_module'
@@ -103,10 +103,69 @@ android {
 }
 
 dependencies {
-    implementation project(':base')
-    //implementation project(':ar')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    implementation Kotlin.stdLib
+    implementation Kotlin.coroutinesCore
+    implementation Kotlin.coroutinesAndroid
+
+    implementation Koin.core
+    implementation Koin.android
+    implementation Koin.androidViewModel
+
+    implementation "com.crashlytics.sdk.android:crashlytics:2.10.1"
+
+    implementation Firebase.core
+    implementation PlayServices.location
+    implementation PlayServices.maps
+
+    implementation 'com.karumi:dexter:4.2.0'
+    implementation 'net.danlew:android.joda:2.10.1.2'
+    implementation 'com.orhanobut:logger:1.15'
+
+    implementation 'es.voghdev.pdfviewpager:library:1.0.6'
+    implementation "com.google.code.gson:gson:2.8.5"
+
+    implementation Okhttp.okhttp
+    implementation Okhttp.loggingInterceptor
+
+    implementation Retrofit.retrofit
+    implementation Retrofit.converterGson
+    implementation Retrofit.converterScalars
+    implementation Retrofit.coroutinesAdapter
+
+
+    implementation ArchComponents.navFragmentKtx
+    implementation ArchComponents.navUiKtx
+    implementation ArchComponents.work
+    implementation ArchComponents.fragment
+
+    implementation ArchComponents.lifecycleExtensions
+    implementation ArchComponents.roomRuntime
+    kapt ArchComponents.roomCompiler
+    kapt ArchComponents.lifecycleCompiler
+
+    implementation "com.squareup.sqldelight:android-driver:${Versions.sqlDelight}"
+
+    // Testing
+    testImplementation Testing.junit
+    testImplementation Testing.robolectric
+    testImplementation Testing.mockWebServer
+    testImplementation Mockito.core
+    testImplementation Mockito.kotlin
+    testImplementation Testing.coreTesting
+    testImplementation Testing.couroutinesTest
+
+    androidTestImplementation Testing.screengrab
+    androidTestImplementation Mockito.android
+    androidTestImplementation Mockito.kotlin
+    androidTestImplementation Testing.fragmentTesting
+    androidTestImplementation 'androidx.test:rules:1.2.0'
+
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.2.0"
+
 
-    //implementation Firebase.performance
+    implementation project(":SharedCode")
 }
 
 apply plugin: 'com.google.gms.google-services'

SharedCode/src/commonMain/kotlin/com/surrus/galwaybus/common/remote/GalwayBusApi.kt

@@ -10,7 +10,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withId
 import com.nhaarman.mockitokotlin2.doReturn
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.whenever
-import com.surrus.galwaybus.base.R
+import com.surrus.galwaybus.R
 import com.surrus.galwaybus.domain.model.BusRouteSchedule
 import com.surrus.galwaybus.support.RecyclerViewMatchers.withRecyclerView
 import com.surrus.galwaybus.ui.viewmodel.BusRoutesViewModel

SharedCode/src/iosMain/kotlin/com/surrus/galwaybus/common/Dispatcher.kt

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.surrus.galwaybus.base">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.surrus.galwaybus">
 
 
     <!-- Needed for fastlane screengrab -->

SharedCode/src/jsMain/kotlin/com/surrus/galwaybus/common/Dispatcher.kt

@@ -1,4 +1,82 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.surrus.galwaybus">
 
+
+    <!--     <uses-permission android:name="android.permission.CAMERA" /> -->
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
+    <application
+        android:name="com.surrus.galwaybus.GalwayBusApplication"
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+
+        <uses-library android:name="org.apache.http.legacy" android:required="false" />
+
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="@string/google_maps_key" />
+
+
+        <meta-data
+            android:name="firebase_crashlytics_collection_enabled"
+            android:value="false" />
+
+
+        <activity
+            android:name="com.surrus.galwaybus.ui.HomeActivity"
+            android:launchMode="singleTop"
+            android:label="@string/title_activity_home">
+
+            <meta-data android:name="android.app.searchable"
+                android:resource="@xml/searchable" />
+
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
+            <intent-filter android:autoVerify="true">
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+                <data android:host="www.surrus.com" android:pathPrefix="/galwaybus" android:scheme="http"/>
+                <data android:host="www.surrus.com" android:pathPrefix="/galwaybus" android:scheme="https"/>
+            </intent-filter>
+
+            <meta-data android:name="default-url" android:value="https://www.surrus.com/galwaybus" />
+
+        </activity>
+
+        <activity
+            android:name="com.surrus.galwaybus.ui.SettingsActivity"
+            android:label="@string/title_activity_settings"
+            android:parentActivityName="com.surrus.galwaybus.ui.HomeActivity" />
+        <activity
+            android:name="com.surrus.galwaybus.ui.SchedulePdfActivity"
+            android:parentActivityName="com.surrus.galwaybus.ui.HomeActivity" />
+
+
+        <provider
+            android:name="com.google.firebase.provider.FirebaseInitProvider"
+            android:authorities="com.surrus.galwaybus.firebaseinitprovider"
+            android:exported="false"
+            tools:node="merge"/>
+
+    </application>
+
+
 </manifest>