Merge pull request #6 from BorgRancher/dev

Release 1.0.0
BorgRancher · Jun 5, 2022 · 6a5eb7e · 6a5eb7e
2 parents 9f67ea8 + c98e101
commit 6a5eb7e
Show file tree

Hide file tree

Showing 14 changed files with 66 additions and 9 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -18,9 +18,10 @@ android {
         versionCode 1
         versionName "1.0"
         buildConfigField("String","BASE_URL","\"https://graphql-pokeapi.graphcdn.app\"")
-
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
+        setProperty("archivesBaseName", "connectedex")
+
         javaCompileOptions {
             annotationProcessorOptions {
                 arguments += ["room.schemaLocation": "$projectDir/schemas".toString()]
@@ -29,10 +30,22 @@ android {
         }
     }
 
+
+    signingConfigs {
+        release {
+            storeFile file("$projectDir/BorgRanch.p12")
+            storePassword project.properties['keyStorePass']
+            keyAlias project.properties['keyAlias']
+            keyPassword project.properties['keyStorePass']
+        }
+    }
+
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
         }
 
         debug {
@@ -148,7 +161,7 @@ dependencies {
     implementation "com.airbnb.android:lottie:$lottie_version"
 
     // Paging 3 for taming pokemon
-    def paging_version = '3.0.0'
+    def paging_version = '3.1.1'
     implementation "androidx.paging:paging-runtime:$paging_version"
 
     // alternatively - without Android dependencies for tests

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -18,4 +18,14 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+-dontwarn org.bouncycastle.jsse.BCSSLParameters
+-dontwarn org.bouncycastle.jsse.BCSSLSocket
+-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
+-dontwarn org.conscrypt.Conscrypt.Version
+-dontwarn org.conscrypt.Conscrypt
+-dontwarn org.conscrypt.ConscryptHostnameVerifier
+-dontwarn org.openjsse.javax.net.ssl.SSLParameters
+-dontwarn org.openjsse.javax.net.ssl.SSLSocket
+-dontwarn org.openjsse.net.ssl.OpenJSSE
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="tech.borgranch.pokedex">
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -11,9 +12,11 @@
         android:allowBackup="true"
         android:icon="@mipmap/pokedex_test"
         android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security"
         android:roundIcon="@mipmap/pokedex_test"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Pokedex">
+        android:theme="@style/Theme.Pokedex"
+        tools:ignore="UnusedAttribute">
         <activity
             android:name=".ui.main.MainActivity"
             android:exported="true">

diff --git a/app/src/main/java/tech/borgranch/pokedex/data/repositories/DetailRepository.kt b/app/src/main/java/tech/borgranch/pokedex/data/repositories/DetailRepository.kt
@@ -15,6 +15,13 @@ import tech.borgranch.pokedex.data.dto.PokemonDetail
 import tech.borgranch.pokedex.graphql.PokemonQuery
 import javax.inject.Inject
 
+/**
+ * @author Shaun McDonald
+ * @since 2022-06-01
+ * @version 1.0.0
+ * Repository for Pokemon details
+ */
+
 class DetailRepository @Inject constructor(
     val detailDao: DetailDao,
     val pokedexClient: ApolloClient,

diff --git a/app/src/main/java/tech/borgranch/pokedex/data/repositories/ListPagingSource.kt b/app/src/main/java/tech/borgranch/pokedex/data/repositories/ListPagingSource.kt
@@ -10,6 +10,12 @@ import tech.borgranch.pokedex.data.dto.PokemonItem
 import tech.borgranch.pokedex.graphql.PokemonsQuery
 import java.io.IOException
 
+/**
+ * @author Shaun McDonald
+ * @since 2022-06-01
+ * @version 0.0.1
+ * Paging source for getting list of pokemons
+ */
 class ListPagingSource(
     private val pokeDexClient: ApolloClient,
     private val itemDao: ListDao

diff --git a/app/src/main/java/tech/borgranch/pokedex/di/DispatcherModule.kt b/app/src/main/java/tech/borgranch/pokedex/di/DispatcherModule.kt
@@ -10,7 +10,7 @@ import javax.inject.Singleton
 
 /**
  * @author Shaun McDonald
- * @version 1.2
+ * @version 1.0.0
  *
  * A single source for all dispatchers in the application,
  * neatly avoiding the untestable mess of hardcoded values.

diff --git a/app/src/main/java/tech/borgranch/pokedex/di/NetworkModule.kt b/app/src/main/java/tech/borgranch/pokedex/di/NetworkModule.kt
@@ -13,7 +13,7 @@ import javax.inject.Singleton
 
 /**
  * @author Shaun McDonald
- * @version 1.2
+ * @version 1.0.0
  * Determines the dependencies for the network module.
  */
 

diff --git a/app/src/main/java/tech/borgranch/pokedex/di/PersistenceModule.kt b/app/src/main/java/tech/borgranch/pokedex/di/PersistenceModule.kt
@@ -13,7 +13,7 @@ import javax.inject.Singleton
 
 /**
  * @author Shaun McDonald
- * @version 1.2
+ * @version 1.0.0
  * Offline storage for Pokedex implemented in Android Room
  */
 

diff --git a/app/src/main/java/tech/borgranch/pokedex/di/RepositoryModule.kt b/app/src/main/java/tech/borgranch/pokedex/di/RepositoryModule.kt
@@ -12,6 +12,13 @@ import tech.borgranch.pokedex.data.dao.ListDao
 import tech.borgranch.pokedex.data.repositories.DetailRepository
 import tech.borgranch.pokedex.data.repositories.ListRepository
 
+/**
+ * @author Shaun McDonald
+ * @since 2022-06-01
+ * @version 1.0.0
+ * Module providing dependencies for the ViewModels
+ */
+
 @Module
 @InstallIn(ViewModelComponent::class)
 object RepositoryModule {

diff --git a/app/src/main/res/xml/network_security.xml b/app/src/main/res/xml/network_security.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security>
+    <domain-config cleartextTrafficPermitted="false">
+        <domain includeSubdomains="false">graphql-pokeapi.graphcdn.app</domain>
+    </domain-config>
+</network-security>
diff --git a/build.gradle b/build.gradle
@@ -13,3 +13,5 @@ task clean(type: Delete) {
     delete rootProject.buildDir
 }
 
+
+
diff --git a/gradle.properties b/gradle.properties
@@ -15,4 +15,4 @@ android.nonTransitiveRClass=true
 kotlin.code.style=official
 org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M" -Dfile.encoding\=UTF-8 -XX\:+UseParallelGC
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=true
diff --git a/settings.gradle b/settings.gradle
@@ -16,5 +16,7 @@ dependencyResolutionManagement {
     }
 }
 
+
+
 rootProject.name = "Pokedex"
 include ':app'