Skip to content

Commit

Permalink
adjust some management gradle
Browse files Browse the repository at this point in the history
  • Loading branch information
@dapoi
dapoi committed Oct 26, 2023
1 parent 7f4fbd1 commit 95b8a25
Show file tree
Hide file tree
Showing 19 changed files with 93 additions and 59 deletions.
29 changes: 28 additions & 1 deletion app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import com.dapascript.buildsrc.Libs
import com.dapascript.buildsrc.SharedLibs

plugins {
id("com.android.application")
Expand All @@ -8,6 +9,7 @@ plugins {
id("dagger.hilt.android.plugin")
id("com.google.gms.google-services")
id("com.google.firebase.crashlytics")
id("androidx.navigation.safeargs.kotlin")
}

android {
Expand Down Expand Up @@ -73,8 +75,33 @@ android {

dependencies {
// Apply shared dependencies
Libs.applySharedDeps(dependencies)
SharedLibs.applySharedDeps(dependencies)

// Core
implementation(project(":core"))

// Main
implementation(Libs.coreKtx)
implementation(Libs.appCompat)
implementation(Libs.material)
implementation(Libs.constraintLayout)
implementation(Libs.datastore)

// Appearance
implementation(Libs.glide)
implementation(Libs.lottie)
implementation(Libs.shimmer)
implementation(Libs.pullToRefresh)
implementation(Libs.dotsIndicator)
implementation(Libs.primeCalendar)

// Navigation
implementation(Libs.navigationFragment)
implementation(Libs.navigationUi)

// Api Splash Screen
implementation(Libs.apiSplashScreen)

// ShowCaseView
implementation(Libs.showCaseView)
}
3 changes: 2 additions & 1 deletion ...a/com/prodev/muslimq/core/utils/Helper.kt → .../java/com/prodev/muslimq/helper/Helper.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.prodev.muslimq.core.utils
package com.prodev.muslimq.helper

import android.app.Activity
import android.content.BroadcastReceiver
Expand Down Expand Up @@ -31,6 +31,7 @@ import com.prodev.muslimq.core.utils.AdzanConstants.CHANNEL_NAME_DZUHUR
import com.prodev.muslimq.core.utils.AdzanConstants.CHANNEL_NAME_ISYA
import com.prodev.muslimq.core.utils.AdzanConstants.CHANNEL_NAME_MAGHRIB
import com.prodev.muslimq.core.utils.AdzanConstants.CHANNEL_NAME_SHUBUH
import com.prodev.muslimq.core.utils.DzikirType
import com.simform.refresh.SSPullToRefreshLayout

fun capitalizeEachWord(str: String, delimiter: String = " ", separator: String = " "): String {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/prodev/muslimq/notification/AdzanReceiver.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import com.prodev.muslimq.core.utils.AdzanConstants.ADZAN_TIME
import com.prodev.muslimq.core.utils.AdzanConstants.IS_SHUBUH
import com.prodev.muslimq.core.utils.AdzanConstants.MUADZIN_REGULAR
import com.prodev.muslimq.core.utils.AdzanConstants.MUADZIN_SHUBUH
import com.prodev.muslimq.core.utils.getChannelId
import com.prodev.muslimq.core.utils.getChannelName
import com.prodev.muslimq.helper.getChannelId
import com.prodev.muslimq.helper.getChannelName
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/prodev/muslimq/notification/AdzanService.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import android.os.IBinder
import androidx.core.app.NotificationCompat
import com.prodev.muslimq.R
import com.prodev.muslimq.core.utils.AdzanConstants
import com.prodev.muslimq.core.utils.getChannelId
import com.prodev.muslimq.core.utils.getChannelName
import com.prodev.muslimq.helper.getChannelId
import com.prodev.muslimq.helper.getChannelName
import okio.IOException

class AdzanService : Service() {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/prodev/muslimq/presentation/adapter/CityAdapter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import android.widget.Filterable
import android.widget.LinearLayout
import androidx.recyclerview.widget.RecyclerView
import com.prodev.muslimq.core.data.source.remote.model.CityResponse
import com.prodev.muslimq.core.utils.capitalizeEachWord
import com.prodev.muslimq.helper.capitalizeEachWord
import com.prodev.muslimq.databinding.ItemListAreaBinding

class CityAdapter(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/prodev/muslimq/presentation/adapter/ProvinceAdapter.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import android.widget.Filterable
import android.widget.LinearLayout
import androidx.recyclerview.widget.RecyclerView
import com.prodev.muslimq.core.data.source.remote.model.ProvinceResponse
import com.prodev.muslimq.core.utils.capitalizeEachWord
import com.prodev.muslimq.helper.capitalizeEachWord
import com.prodev.muslimq.databinding.ItemListAreaBinding

class ProvinceAdapter(
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/prodev/muslimq/presentation/view/doa/DoaFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import androidx.fragment.app.viewModels
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.SimpleItemAnimator
import com.prodev.muslimq.core.utils.Resource
import com.prodev.muslimq.core.utils.hideKeyboard
import com.prodev.muslimq.helper.hideKeyboard
import com.prodev.muslimq.databinding.FragmentDoaBinding
import com.prodev.muslimq.presentation.adapter.DoaAdapter
import com.prodev.muslimq.presentation.view.BaseFragment
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/prodev/muslimq/presentation/view/qibla/QiblaFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle
import androidx.navigation.fragment.findNavController
import com.prodev.muslimq.R
import com.prodev.muslimq.core.utils.Compass
import com.prodev.muslimq.core.utils.SOTWFormatter
import com.prodev.muslimq.core.utils.vibrateApp
import com.prodev.muslimq.helper.Compass
import com.prodev.muslimq.helper.SOTWFormatter
import com.prodev.muslimq.helper.vibrateApp
import com.prodev.muslimq.databinding.FragmentQiblaBinding
import kotlinx.coroutines.launch
import kotlin.math.atan2
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/prodev/muslimq/presentation/view/quran/QuranDetailFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import com.prodev.muslimq.R
import com.prodev.muslimq.core.data.source.local.model.Ayat
import com.prodev.muslimq.core.data.source.local.model.BookmarkEntity
import com.prodev.muslimq.core.utils.Resource
import com.prodev.muslimq.core.utils.isOnline
import com.prodev.muslimq.helper.isOnline
import com.prodev.muslimq.databinding.DialogAudioAyahBinding
import com.prodev.muslimq.databinding.DialogDownloadBinding
import com.prodev.muslimq.databinding.DialogFontSettingBinding
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/prodev/muslimq/presentation/view/quran/QuranFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ import com.google.android.material.appbar.CollapsingToolbarLayout
import com.google.android.material.bottomnavigation.BottomNavigationView
import com.prodev.muslimq.R
import com.prodev.muslimq.core.data.source.local.model.QuranEntity
import com.prodev.muslimq.core.utils.InternetReceiver
import com.prodev.muslimq.helper.InternetReceiver
import com.prodev.muslimq.core.utils.Resource
import com.prodev.muslimq.core.utils.hideKeyboard
import com.prodev.muslimq.core.utils.isOnline
import com.prodev.muslimq.helper.hideKeyboard
import com.prodev.muslimq.helper.isOnline
import com.prodev.muslimq.databinding.FragmentQuranBinding
import com.prodev.muslimq.presentation.adapter.QuranAdapter
import com.prodev.muslimq.presentation.view.BaseFragment
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/prodev/muslimq/presentation/view/shalat/ShalatCityFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import androidx.recyclerview.widget.LinearLayoutManager
import com.prodev.muslimq.R
import com.prodev.muslimq.core.utils.AdzanConstants
import com.prodev.muslimq.core.utils.Resource
import com.prodev.muslimq.core.utils.capitalizeEachWord
import com.prodev.muslimq.core.utils.hideKeyboard
import com.prodev.muslimq.core.utils.swipeRefresh
import com.prodev.muslimq.helper.capitalizeEachWord
import com.prodev.muslimq.helper.hideKeyboard
import com.prodev.muslimq.helper.swipeRefresh
import com.prodev.muslimq.databinding.FragmentShalatCityBinding
import com.prodev.muslimq.presentation.MainActivity
import com.prodev.muslimq.presentation.adapter.CityAdapter
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/prodev/muslimq/presentation/view/shalat/ShalatFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ import com.prodev.muslimq.R
import com.prodev.muslimq.core.data.source.local.model.ShalatEntity
import com.prodev.muslimq.core.utils.AdzanConstants
import com.prodev.muslimq.core.utils.Resource
import com.prodev.muslimq.core.utils.capitalizeEachWord
import com.prodev.muslimq.core.utils.isOnline
import com.prodev.muslimq.helper.capitalizeEachWord
import com.prodev.muslimq.helper.isOnline
import com.prodev.muslimq.databinding.DialogGetLocationBinding
import com.prodev.muslimq.databinding.DialogLoadingBinding
import com.prodev.muslimq.databinding.FragmentShalatBinding
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/prodev/muslimq/presentation/view/shalat/ShalatProvinceFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import androidx.navigation.fragment.findNavController
import androidx.recyclerview.widget.LinearLayoutManager
import com.prodev.muslimq.R
import com.prodev.muslimq.core.utils.Resource
import com.prodev.muslimq.core.utils.hideKeyboard
import com.prodev.muslimq.core.utils.swipeRefresh
import com.prodev.muslimq.helper.hideKeyboard
import com.prodev.muslimq.helper.swipeRefresh
import com.prodev.muslimq.databinding.FragmentShalatProvinceBinding
import com.prodev.muslimq.presentation.adapter.ProvinceAdapter
import com.prodev.muslimq.presentation.view.BaseFragment
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/prodev/muslimq/presentation/view/tasbih/DzikirFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import androidx.navigation.fragment.findNavController
import com.prodev.muslimq.R
import com.prodev.muslimq.core.data.source.local.model.TasbihEntity
import com.prodev.muslimq.core.utils.DzikirType
import com.prodev.muslimq.core.utils.capitalizeEachWord
import com.prodev.muslimq.core.utils.hideKeyboard
import com.prodev.muslimq.helper.capitalizeEachWord
import com.prodev.muslimq.helper.hideKeyboard
import com.prodev.muslimq.databinding.FragmentDzikirBinding
import com.prodev.muslimq.presentation.MainActivity
import com.prodev.muslimq.presentation.adapter.DzikirAdapter
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/prodev/muslimq/presentation/view/tasbih/TasbihFragment.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import com.google.android.material.chip.Chip
import com.prodev.muslimq.R
import com.prodev.muslimq.core.data.source.local.model.TasbihEntity
import com.prodev.muslimq.core.utils.DzikirType
import com.prodev.muslimq.core.utils.capitalizeEachWord
import com.prodev.muslimq.core.utils.defaultDzikir
import com.prodev.muslimq.core.utils.vibrateApp
import com.prodev.muslimq.helper.capitalizeEachWord
import com.prodev.muslimq.helper.defaultDzikir
import com.prodev.muslimq.helper.vibrateApp
import com.prodev.muslimq.databinding.FragmentTasbihBinding
import com.prodev.muslimq.presentation.view.BaseFragment
import com.prodev.muslimq.presentation.viewmodel.DataStoreViewModel
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/com/prodev/muslimq/presentation/viewmodel/TasbihViewModel.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import com.prodev.muslimq.core.data.preference.DataStorePreference
import com.prodev.muslimq.core.data.repository.TasbihRepository
import com.prodev.muslimq.core.data.source.local.model.TasbihEntity
import com.prodev.muslimq.core.utils.DzikirType
import com.prodev.muslimq.core.utils.defaultDzikir
import com.prodev.muslimq.core.utils.defaultDzikirPagi
import com.prodev.muslimq.core.utils.defaultDzikirShalat
import com.prodev.muslimq.core.utils.defaultDzikirSore
import com.prodev.muslimq.helper.defaultDzikir
import com.prodev.muslimq.helper.defaultDzikirPagi
import com.prodev.muslimq.helper.defaultDzikirShalat
import com.prodev.muslimq.helper.defaultDzikirSore
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
Expand Down
1 change: 1 addition & 0 deletions build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ buildscript {
classpath("com.android.tools.build:gradle:8.1.2")
classpath("com.google.gms:google-services:4.4.0")
classpath("com.google.firebase:firebase-crashlytics-gradle:2.9.9")
classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.7.4")
}
}

Expand Down
56 changes: 30 additions & 26 deletions ...main/java/com/dapascript/buildsrc/Libs.kt → ...main/java/com/dapascript/buildsrc/Deps.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,43 @@ import org.gradle.api.artifacts.dsl.DependencyHandler

object Libs {

// App
const val appId = "com.prodev.muslimq"
const val minSdk = 24
const val targetSdk = 34
const val versionCode = 20231018
const val versionName = "2.7.1"
const val testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

// Main
const val coreKtx = "androidx.core:core-ktx:1.12.0"
const val appCompat = "androidx.appcompat:appcompat:1.6.1"
const val material = "com.google.android.material:material:1.10.0"
const val constraintLayout = "androidx.constraintlayout:constraintlayout:2.1.4"
const val datastore = "androidx.datastore:datastore-preferences:1.0.0"

// Appearance
const val glide = "com.github.bumptech.glide:glide:4.14.2"
const val lottie = "com.airbnb.android:lottie:5.2.0"
const val shimmer = "com.facebook.shimmer:shimmer:0.5.0"
const val pullToRefresh = "com.github.SimformSolutionsPvtLtd:SSPullToRefresh:1.3"
const val dotsIndicator = "com.tbuonomo:dotsindicator:4.2"
const val primeCalendar = "com.aminography:primecalendar:1.7.0"

// Navigation
private const val navigationVersion = "2.7.4"
const val navigationFragment = "androidx.navigation:navigation-fragment-ktx:$navigationVersion"
const val navigationUi = "androidx.navigation:navigation-ui-ktx:$navigationVersion"

// Api Splash Screen
const val apiSplashScreen = "androidx.core:core-splashscreen:1.0.1"

// ShowCaseView
const val showCaseView = "uk.co.samuelwall:material-tap-target-prompt:3.3.2"
}

object SharedLibs {

private fun DependencyHandler.implementation(dependency: Any) {
add("implementation", dependency)
}
Expand All @@ -29,31 +59,11 @@ object Libs {

fun applySharedDeps(dependencyHandler: DependencyHandler) {
dependencyHandler.apply {
// Main
implementation("androidx.core:core-ktx:1.12.0")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("com.google.android.material:material:1.10.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
implementation("androidx.datastore:datastore-preferences:1.0.0")

// Testing
implementation("junit:junit:4.13.2")
implementation("androidx.test.ext:junit:1.1.5")
implementation("androidx.test.espresso:espresso-core:3.5.1")

// Appearance
implementation("com.github.bumptech.glide:glide:4.14.2")
implementation("com.airbnb.android:lottie:5.2.0")
implementation("com.facebook.shimmer:shimmer:0.5.0")
implementation("com.github.SimformSolutionsPvtLtd:SSPullToRefresh:1.3")
implementation("com.tbuonomo:dotsindicator:4.2")
implementation("com.aminography:primecalendar:1.7.0")

// Navigation
val navigationVersion = "2.5.3"
implementation("androidx.navigation:navigation-fragment-ktx:$navigationVersion")
implementation("androidx.navigation:navigation-ui-ktx:$navigationVersion")

// Dagger hilt
val daggerHiltVersion = "2.48.1"
implementation("com.google.dagger:hilt-android:$daggerHiltVersion")
Expand All @@ -66,12 +76,6 @@ object Libs {

// Firebase
implementation("com.google.firebase:firebase-crashlytics-ktx:18.4.3")

// API Splash Screen
implementation("androidx.core:core-splashscreen:1.0.1")

// ShowCaseView
implementation("uk.co.samuelwall:material-tap-target-prompt:3.3.2")
}
}
}
3 changes: 2 additions & 1 deletion core/build.gradle.kts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import com.dapascript.buildsrc.Libs
import com.dapascript.buildsrc.SharedLibs

plugins {
id("com.android.library")
Expand Down Expand Up @@ -48,7 +49,7 @@ android {
dependencies {

// Apply shared dependencies
Libs.applySharedDeps(dependencies)
SharedLibs.applySharedDeps(dependencies)

// Serialization
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1")
Expand Down

0 comments on commit 95b8a25

Please sign in to comment.