Merge pull request #154 from nimblehq/release/3.4.0

[Release] 3.4.0
nimblehq · Jan 31, 2022 · 038623b · 038623b
2 parents 98ecdbc + 0e4518f
commit 038623b
Show file tree

Hide file tree

Showing 23 changed files with 175 additions and 183 deletions.
diff --git a/.github/ISSUE_TEMPLATE/rfc_template.md b/.github/ISSUE_TEMPLATE/rfc_template.md
@@ -0,0 +1,28 @@
+---
+name: "Request For Comments (RFC)"
+about: "You have an idea on how to improve our processes. Propose your idea so that the team can provide feedback."
+title: "RFC: "
+labels: "type : rfc"
+---
+
+## Issue
+
+Describe the issue the team is currently facing. Provide as much content as possible.
+
+## Solution
+
+Describe the solution you are prescribing for the issue
+
+## Who Benefits?
+
+Describe who will be the beneficiaries e.g. everyone, specific chapters, clients...
+
+## What's Next?
+
+Provide an actionable list of things that must happen in order to implement the solution:
+
+- [ ]
+- [ ]
+- [ ]
+
+Using a poll is encouraged to gather feedback on the RFA 👉 Use this tool: https://gh-polls.com/
diff --git a/.github/workflows/verify_newproject_script.yml b/.github/workflows/verify_newproject_script.yml
@@ -0,0 +1,37 @@
+name: Verify newproject script
+
+on:
+  pull_request:
+    types: [ opened, reopened, synchronize ]
+    branches: [ develop ]
+
+jobs:
+  verify_newproject_script:
+    name: Verify newproject script
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+
+      - name: Checkout source code
+        uses: actions/[email protected]
+
+      - name: Cache Gradle
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.gradle/caches/modules-*
+            ~/.gradle/caches/jars-*
+            ~/.gradle/caches/build-cache-*
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: Verify generating new project from RxTemplate
+        run: ./newproject.sh -t rx -p co.myproject.example -n "MyProjectExampleRx"
+
+      - name: Verify generating new project from CoroutineTemplate
+        run: ./newproject.sh -t crt -p co.myproject.example -n "MyProjectExampleCoroutine"
diff --git a/CoroutineTemplate/app/build.gradle.kts b/CoroutineTemplate/app/build.gradle.kts
@@ -123,6 +123,8 @@ dependencies {
 
     implementation("com.jakewharton.timber:timber:${Versions.TIMBER_LOG_VERSION}")
 
+    implementation("com.github.nimblehq:android-common-ktx:${Versions.ANDROID_COMMON_KTX_VERSION}")
+
     implementation("org.jetbrains.kotlin:kotlin-stdlib:${Versions.KOTLIN_VERSION}")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.KOTLINX_COROUTINES_VERSION}")
 

diff --git a/CoroutineTemplate/app/src/main/java/co/nimblehq/coroutine/extension/ActivityExt.kt b/CoroutineTemplate/app/src/main/java/co/nimblehq/coroutine/extension/ActivityExt.kt
diff --git a/CoroutineTemplate/app/src/main/java/co/nimblehq/coroutine/extension/ContextExt.kt b/CoroutineTemplate/app/src/main/java/co/nimblehq/coroutine/extension/ContextExt.kt
diff --git a/CoroutineTemplate/app/src/main/java/co/nimblehq/coroutine/extension/ViewExt.kt b/CoroutineTemplate/app/src/main/java/co/nimblehq/coroutine/extension/ViewExt.kt
diff --git a/CoroutineTemplate/app/src/main/java/co/nimblehq/coroutine/ui/base/BaseFragment.kt b/CoroutineTemplate/app/src/main/java/co/nimblehq/coroutine/ui/base/BaseFragment.kt
@@ -10,7 +10,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.viewbinding.ViewBinding
-import co.nimblehq.coroutine.extension.hideSoftKeyboard
+import co.nimblehq.common.extensions.hideSoftKeyboard
 import co.nimblehq.coroutine.ui.common.Toaster
 import co.nimblehq.coroutine.ui.userReadableMessage
 import kotlinx.coroutines.flow.Flow

diff --git a/CoroutineTemplate/app/src/main/java/co/nimblehq/coroutine/ui/base/BaseNavigator.kt b/CoroutineTemplate/app/src/main/java/co/nimblehq/coroutine/ui/base/BaseNavigator.kt
@@ -6,7 +6,7 @@ import androidx.annotation.IdRes
 import androidx.fragment.app.Fragment
 import androidx.navigation.NavController
 import androidx.navigation.fragment.findNavController
-import co.nimblehq.coroutine.extension.getResourceName
+import co.nimblehq.common.extensions.getResourceName
 import timber.log.Timber
 
 interface BaseNavigator {

diff --git a/CoroutineTemplate/app/src/main/java/co/nimblehq/coroutine/ui/screens/home/HomeFragment.kt b/CoroutineTemplate/app/src/main/java/co/nimblehq/coroutine/ui/screens/home/HomeFragment.kt
@@ -2,10 +2,10 @@ package co.nimblehq.coroutine.ui.screens.home
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import co.nimblehq.common.extensions.visibleOrGone
 import co.nimblehq.coroutine.databinding.FragmentHomeBinding
 import co.nimblehq.coroutine.databinding.ViewLoadingBinding
 import co.nimblehq.coroutine.extension.provideViewModels
-import co.nimblehq.coroutine.extension.visibleOrGone
 import co.nimblehq.coroutine.lib.IsLoading
 import co.nimblehq.coroutine.model.UserUiModel
 import co.nimblehq.coroutine.ui.base.BaseFragment

diff --git a/CoroutineTemplate/build.gradle.kts b/CoroutineTemplate/build.gradle.kts
@@ -20,7 +20,7 @@ plugins {
 allprojects {
     repositories {
         google()
-        maven { url = uri("https://jitpack.io") }
+        maven(url = "https://jitpack.io")
         mavenCentral()
     }
 }

diff --git a/CoroutineTemplate/buildSrc/src/main/java/Versions.kt b/CoroutineTemplate/buildSrc/src/main/java/Versions.kt
@@ -6,9 +6,10 @@ object Versions {
     const val ANDROID_TARGET_SDK_VERSION = 30
 
     const val ANDROID_VERSION_CODE = 1
-    const val ANDROID_VERSION_NAME = "3.3.0"
+    const val ANDROID_VERSION_NAME = "3.4.0"
 
     // Dependencies (Alphabet sorted)
+    const val ANDROID_COMMON_KTX_VERSION = "0.1.1"
     const val ANDROID_CRYPTO_VERSION = "1.0.0"
     const val ANDROIDX_ACTIVITY_KTX_VERSION = "1.2.1"
     const val ANDROIDX_CORE_KTX_VERSION = "1.3.0"

diff --git a/RxJavaTemplate/app/build.gradle.kts b/RxJavaTemplate/app/build.gradle.kts
@@ -160,6 +160,7 @@ dependencies {
     implementation("com.jakewharton.timber:timber:${Versions.TIMBER_LOG_VERSION}")
     implementation("com.github.bumptech.glide:glide:${Versions.GLIDE_VERSION}")
     implementation("com.github.tbruyelle:rxpermissions:${Versions.RXPERMISSION_VERSION}")
+    implementation("com.github.nimblehq:android-common-ktx:${Versions.ANDROID_COMMON_KTX_VERSION}")
 
     debugImplementation("androidx.fragment:fragment-testing:${Versions.ANDROID_FRAGMENT_VERSION}")
     debugImplementation("com.github.chuckerteam.chucker:library:${Versions.CHUCKER_INTERCEPTOR_VERSION}")

diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/extension/ActivityExt.kt b/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/extension/ActivityExt.kt
diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/extension/ContextExt.kt b/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/extension/ContextExt.kt
diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/extension/ToastExtension.kt b/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/extension/ToastExtension.kt
diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/extension/ViewExt.kt b/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/extension/ViewExt.kt
diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/base/BaseFragment.kt b/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/base/BaseFragment.kt
@@ -5,12 +5,10 @@ import android.os.Bundle
 import android.view.*
 import android.view.View.*
 import androidx.annotation.CallSuper
-import androidx.annotation.VisibleForTesting
 import androidx.fragment.app.Fragment
 import androidx.viewbinding.ViewBinding
+import co.nimblehq.common.extensions.hideSoftKeyboard
 import co.nimblehq.rxjava.domain.schedulers.BaseSchedulerProvider
-import co.nimblehq.rxjava.domain.schedulers.SchedulerProvider
-import co.nimblehq.rxjava.extension.hideSoftKeyboard
 import co.nimblehq.rxjava.extension.subscribeOnClick
 import co.nimblehq.rxjava.ui.common.Toaster
 import co.nimblehq.rxjava.ui.userReadableMessage

diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/base/BaseNavigator.kt b/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/base/BaseNavigator.kt
@@ -6,7 +6,7 @@ import androidx.annotation.IdRes
 import androidx.fragment.app.Fragment
 import androidx.navigation.NavController
 import androidx.navigation.fragment.findNavController
-import co.nimblehq.rxjava.extension.getResourceName
+import co.nimblehq.common.extensions.getResourceName
 import timber.log.Timber
 
 interface BaseNavigator {
@@ -49,7 +49,8 @@ abstract class BaseNavigatorImpl(
     protected fun unsupportedNavigation() {
         val navController = findNavController()
         val currentGraph = fragment.requireActivity().getResourceName(navController?.graph?.id)
-        val currentDestination = fragment.requireActivity().getResourceName(navController?.currentDestination?.id)
+        val currentDestination =
+            fragment.requireActivity().getResourceName(navController?.currentDestination?.id)
         handleError(NavigationError.UnsupportedNavigationError(currentGraph, currentDestination))
     }
 

diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/home/HomeFragment.kt b/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/home/HomeFragment.kt
@@ -6,12 +6,12 @@ import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import co.nimblehq.common.extensions.visibleOrGone
 import co.nimblehq.rxjava.databinding.FragmentHomeBinding
 import co.nimblehq.rxjava.databinding.ViewLoadingBinding
 import co.nimblehq.rxjava.domain.data.Data
 import co.nimblehq.rxjava.extension.subscribeOnClick
 import co.nimblehq.rxjava.extension.subscribeOnItemClick
-import co.nimblehq.rxjava.extension.visibleOrGone
 import co.nimblehq.rxjava.lib.IsLoading
 import co.nimblehq.rxjava.ui.base.BaseFragment
 import co.nimblehq.rxjava.ui.helpers.handleVisualOverlaps

diff --git a/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/webview/WebViewFragment.kt b/RxJavaTemplate/app/src/main/java/co/nimblehq/rxjava/ui/screens/webview/WebViewFragment.kt
@@ -5,10 +5,10 @@ import android.view.ViewGroup
 import android.webkit.WebViewClient
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.navArgs
+import co.nimblehq.common.extensions.visibleOrGone
 import co.nimblehq.rxjava.databinding.FragmentWebviewBinding
 import co.nimblehq.rxjava.databinding.ViewLoadingBinding
 import co.nimblehq.rxjava.extension.initialSetup
-import co.nimblehq.rxjava.extension.visibleOrGone
 import co.nimblehq.rxjava.lib.IsLoading
 import co.nimblehq.rxjava.ui.base.BaseFragment
 import co.nimblehq.rxjava.ui.helpers.handleVisualOverlaps

diff --git a/RxJavaTemplate/build.gradle.kts b/RxJavaTemplate/build.gradle.kts
@@ -22,7 +22,7 @@ allprojects {
     repositories {
         google()
         jcenter()
-        maven { url = uri("https://jitpack.io") }
+        maven(url = "https://jitpack.io")
         mavenCentral()
     }
 }

diff --git a/RxJavaTemplate/buildSrc/src/main/java/Versions.kt b/RxJavaTemplate/buildSrc/src/main/java/Versions.kt
@@ -2,12 +2,13 @@ object Versions {
     const val BUILD_GRADLE_VERSION = "4.2.2"
 
     const val ANDROID_VERSION_CODE = 9
-    const val ANDROID_VERSION_NAME = "3.3.0"
+    const val ANDROID_VERSION_NAME = "3.4.0"
     const val ANDROID_MIN_SDK_VERSION = 23
     const val ANDROID_TARGET_SDK_VERSION = 28
     const val ANDROID_COMPILE_SDK_VERSION = 28
 
     // Dependencies (Alphabet sorted)
+    const val ANDROID_COMMON_KTX_VERSION = "0.1.1"
     const val ANDROID_CORE_VERSION = "1.2.0"
     const val ANDROID_CRYPTO_VERSION = "1.0.0"
     const val ANDROID_FRAGMENT_VERSION = "1.3.3"