ДЗ-6: Clean Architecture

.gitignore

@@ -9,3 +9,5 @@
 /captures
 .externalNativeBuild
 .idea/
+**/*/res/values/secrets.xml
+app/schemas/

app/build.gradle

@@ -13,6 +13,12 @@ android {
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         buildConfigField "String", "DATA_BASE_NAME", '"contacts-database.db"'
+
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
+            }
+        }
     }
     buildTypes {
         release {
@@ -27,12 +33,13 @@ android {
 }
 
 dependencies {
-
     // Support libs
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     implementation 'com.android.support:recyclerview-v7:28.0.0'
     implementation 'com.android.support:cardview-v7:28.0.0'
+    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
 
     // Moxy mvp
     implementation 'com.arello-mobile:moxy:1.5.5'
@@ -47,20 +54,34 @@ dependencies {
     implementation 'com.google.android.gms:play-services-maps:16.0.0'
     implementation 'com.google.android.gms:play-services-location:16.0.0'
 
+    // Google maps util
+    implementation 'com.google.maps.android:android-maps-utils:0.5'
+
     // RxJava
     implementation 'io.reactivex.rxjava2:rxjava:2.2.4'
     implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
 
     // Dagger2 DI
-    implementation 'com.google.dagger:dagger:2.19'
-    annotationProcessor 'com.google.dagger:dagger-compiler:2.19'
+    def dagger_version = "2.20"
+    implementation "com.google.dagger:dagger:$dagger_version"
+    annotationProcessor "com.google.dagger:dagger-compiler:$dagger_version"
+    implementation "com.google.dagger:dagger-android-support:$dagger_version"
+    annotationProcessor "com.google.dagger:dagger-android-processor:$dagger_version"
 
     // Room DB
     def room_version = "1.1.1"
     implementation "android.arch.persistence.room:runtime:$room_version"
     annotationProcessor "android.arch.persistence.room:compiler:$room_version"
     implementation "android.arch.persistence.room:rxjava2:$room_version"
 
+    // Retrofit
+    implementation 'com.squareup.retrofit2:retrofit:2.5.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
+    implementation 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
+
+    // Logger HTTP
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.11.0'
+
     // Test
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'

app/src/main/AndroidManifest.xml

@@ -7,7 +7,7 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <application
-        android:name=".app.AppDelegate"
+        android:name=".presentation.app.AppDelegate"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"

app/src/main/java/com/kkaysheva/ituniver/database/AppDatabase.java → app/src/main/java/com/kkaysheva/ituniver/data/database/AppDatabase.java

@@ -1,9 +1,9 @@
-package com.kkaysheva.ituniver.database;
+package com.kkaysheva.ituniver.data.database;
 
 import android.arch.persistence.room.Database;
 import android.arch.persistence.room.RoomDatabase;
 
-import com.kkaysheva.ituniver.model.ContactInfo;
+import com.kkaysheva.ituniver.domain.model.ContactInfo;
 
 /**
  * AppDatabase
@@ -13,5 +13,5 @@
  */
 @Database(entities = {ContactInfo.class}, version = 1)
 public abstract class AppDatabase extends RoomDatabase {
-    public abstract ContactDao getContactDaO();
+    public abstract ContactDao getContactDao();
 }

app/src/main/java/com/kkaysheva/ituniver/database/BaseRepository.java → app/src/main/java/com/kkaysheva/ituniver/data/database/BaseRepository.java

@@ -1,11 +1,11 @@
-package com.kkaysheva.ituniver.database;
+package com.kkaysheva.ituniver.data.database;
 
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
 import java.util.List;
 
 import io.reactivex.Completable;
+import io.reactivex.Maybe;
 import io.reactivex.Single;
 
 /**
@@ -19,17 +19,16 @@ public interface BaseRepository<Entity, Id> {
     @NonNull
     Single<List<Entity>> getAll();
 
-    @Nullable
-    Single<Entity> getById(@NonNull Id id);
+    @NonNull
+    Maybe<Entity> getById(@NonNull Id id);
 
     @NonNull
     Completable update(@NonNull Entity entity);
 
     @NonNull
     Completable insert(@NonNull Entity entity);
 
-    @NonNull
-    Completable delete(@NonNull Entity entity);
+    void delete(@NonNull Entity entity);
 
     @NonNull
     Completable deleteAll();

app/src/main/java/com/kkaysheva/ituniver/database/ContactDao.java → app/src/main/java/com/kkaysheva/ituniver/data/database/ContactDao.java

@@ -1,4 +1,4 @@
-package com.kkaysheva.ituniver.database;
+package com.kkaysheva.ituniver.data.database;
 
 import android.arch.persistence.room.Dao;
 import android.arch.persistence.room.Delete;
@@ -7,12 +7,12 @@
 import android.arch.persistence.room.Query;
 import android.arch.persistence.room.Update;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
 
-import com.kkaysheva.ituniver.model.ContactInfo;
+import com.kkaysheva.ituniver.domain.model.ContactInfo;
 
 import java.util.List;
 
+import io.reactivex.Maybe;
 import io.reactivex.Single;
 
 /**
@@ -28,9 +28,9 @@ public interface ContactDao {
     @Query("SELECT * FROM contacts")
     Single<List<ContactInfo>> getAll();
 
-    @Nullable
+    @NonNull
     @Query("SELECT * FROM contacts WHERE id = :id")
-    Single<ContactInfo> getContactInfoById(Long id);
+    Maybe<ContactInfo> getContactInfoById(Long id);
 
     @Update
     void updateContactInfo(ContactInfo contactInfo);

app/src/main/java/com/kkaysheva/ituniver/data/database/ContactInfoRepositoryRoom.java

@@ -0,0 +1,66 @@
+package com.kkaysheva.ituniver.data.database;
+
+import android.support.annotation.NonNull;
+
+import com.kkaysheva.ituniver.domain.ContactInfoRepository;
+import com.kkaysheva.ituniver.domain.model.ContactInfo;
+
+import java.util.List;
+
+import javax.inject.Inject;
+
+import io.reactivex.Completable;
+import io.reactivex.Maybe;
+import io.reactivex.Single;
+
+/**
+ * ContactInfoRepositoryRoom
+ *
+ * @author Ksenya Kaysheva (murrcha@me.com)
+ * @since 12.2018
+ */
+public final class ContactInfoRepositoryRoom implements ContactInfoRepository {
+
+    @NonNull
+    private final ContactDao contactDao;
+
+    @Inject
+    public ContactInfoRepositoryRoom(@NonNull ContactDao contactDao) {
+        this.contactDao = contactDao;
+    }
+
+    @NonNull
+    @Override
+    public Single<List<ContactInfo>> getAll() {
+        return contactDao.getAll();
+    }
+
+    @NonNull
+    @Override
+    public Maybe<ContactInfo> getById(@NonNull Long id) {
+        return contactDao.getContactInfoById(id);
+    }
+
+    @NonNull
+    @Override
+    public Completable update(@NonNull ContactInfo contactInfo) {
+        return Completable.fromAction(() -> contactDao.updateContactInfo(contactInfo));
+    }
+
+    @NonNull
+    @Override
+    public Completable insert(@NonNull ContactInfo contactInfo) {
+        return Completable.fromAction(() -> contactDao.insertContactInfo(contactInfo));
+    }
+
+    @Override
+    public void delete(@NonNull ContactInfo contactInfo) {
+        contactDao.deleteContactInfo(contactInfo);
+    }
+
+    @NonNull
+    @Override
+    public Completable deleteAll() {
+        return Completable.fromAction(contactDao::deleteAll);
+    }
+}

app/src/main/java/com/kkaysheva/ituniver/data/network/directions/DirectionsResponse.java

@@ -0,0 +1,106 @@
+package com.kkaysheva.ituniver.data.network.directions;
+
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+/**
+ * DirectionsResponse
+ *
+ * @author Ksenya Kaysheva (murrcha@me.com)
+ * @since 01.2019
+ */
+public final class DirectionsResponse {
+
+    @SerializedName("status")
+    private String status;
+
+    @SerializedName("routes")
+    private List<Route> routes;
+
+    public String getStatus() {
+        return status;
+    }
+
+    public List<Route> getRoutes() {
+        return routes;
+    }
+
+    public static class Route {
+
+        @SerializedName("overview_polyline")
+        private OverviewPolyLine overviewPolyLine;
+
+        @SerializedName("legs")
+        private List<Legs> legs;
+
+        public OverviewPolyLine getOverviewPolyLine() {
+            return overviewPolyLine;
+        }
+
+        public List<Legs> getLegs() {
+            return legs;
+        }
+
+        public static class OverviewPolyLine {
+
+            @SerializedName("points")
+            private String points;
+
+            public String getPoints() {
+                return points;
+            }
+        }
+
+        public static class Legs {
+
+            @SerializedName("steps")
+            private List<Steps> steps;
+
+            public List<Steps> getSteps() {
+                return steps;
+            }
+
+            public static class Steps {
+
+                @SerializedName("start_location")
+                private Location startLocation;
+
+                @SerializedName("end_location")
+                private Location endLocation;
+
+                @SerializedName("polyline")
+                private OverviewPolyLine polyline;
+
+                public Location getStartLocation() {
+                    return startLocation;
+                }
+
+                public Location getEndLocation() {
+                    return endLocation;
+                }
+
+                public OverviewPolyLine getPolyline() {
+                    return polyline;
+                }
+
+                public static class Location {
+
+                    @SerializedName("lat")
+                    private double lat;
+
+                    @SerializedName("lng")
+                    private double lng;
+
+                    public double getLat() {
+                        return lat;
+                    }
+
+                    public double getLng() {
+                        return lng;
+                    }
+                }
+            }
+        }
+    }
+}

app/src/main/java/com/kkaysheva/ituniver/data/network/directions/GoogleDirectionsApi.java

@@ -0,0 +1,23 @@
+package com.kkaysheva.ituniver.data.network.directions;
+
+import io.reactivex.Single;
+import retrofit2.http.GET;
+import retrofit2.http.Query;
+
+/**
+ * GoogleDirectionsApi
+ *
+ * @author Ksenya Kaysheva (murrcha@me.com)
+ * @since 01.2019
+ */
+public interface GoogleDirectionsApi {
+
+    String GOOGLE_BASE_URL = "https://maps.googleapis.com/";
+
+    @GET("maps/api/directions/json")
+    Single<DirectionsResponse> getDirections(
+            @Query("origin") String origin,
+            @Query("destination") String destination,
+            @Query("mode") String travelMode,
+            @Query("key") String key);
+}

app/src/main/java/com/kkaysheva/ituniver/data/network/directions/GoogleDirectionsService.java

@@ -0,0 +1,21 @@
+package com.kkaysheva.ituniver.data.network.directions;
+
+import android.support.annotation.NonNull;
+
+import com.google.android.gms.maps.model.LatLng;
+
+import java.util.List;
+
+import io.reactivex.Single;
+
+/**
+ * GoogleDirectionsService
+ *
+ * @author Ksenya Kaysheva (murrcha@me.com)
+ * @since 01.2019
+ */
+public interface GoogleDirectionsService {
+
+    @NonNull
+    Single<List<LatLng>> loadDirections(@NonNull String origin, @NonNull String destination);
+}