Skip to content

Commit

Permalink
Updated project, bugs fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
Wisekitten committed Oct 4, 2023
1 parent a7dc33f commit 8edc765
Show file tree
Hide file tree
Showing 283 changed files with 3,707 additions and 2,502 deletions.
202 changes: 133 additions & 69 deletions README.md

Large diffs are not rendered by default.

92 changes: 41 additions & 51 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,23 +1,28 @@
plugins {
id(Plugins.application)
id(Plugins.daggerHiltPlugin)
kotlin(Plugins.android)
id(Plugins.kotlinKapt)
id(Plugins.googlePlugins)
id(Plugins.firebaseCrashlyticsPlugin)
id(Plugins.kotlinAndroid)
id("telematics.android.application")
id("telematics.android.hilt")
id("telematics.android.room")
id("telematics.android.retrofit")
id("telematics.android.application.firebase")
}

android {

compileSdk = AppConfig.compileSdk
namespace = "com.telematics.zenroad"

defaultConfig {
applicationId = AppConfig.applicationId
versionCode = AppConfig.versionCode
versionName = AppConfig.versionName
minSdk = AppConfig.minSdk
targetSdk = AppConfig.targetSdk

applicationVariants.all {
val variant = this
variant.outputs
.map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl }
.forEach { output ->
val outputFileName = "Telematics-${variant.baseName}-${variant.versionName}(${variant.versionCode}).apk"
output.outputFileName = outputFileName
}
}
}

buildTypes {
Expand Down Expand Up @@ -50,51 +55,36 @@ android {
}
}*/

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = "1.8"
}

buildFeatures {
viewBinding = true
}

//dynamicFeatures = DynamicModules.modules
}

dependencies {

implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))

implementation(AppDependencies.appLibraries)

implementation(AppDependencies.daggerHiltLibraries)
kapt(AppDependencies.daggerHiltCompiler)
implementation(AppDependencies.retrofitLibraries)
implementation(AppDependencies.lifecycleKtx)
implementation(AppDependencies.navigateLibraries)
implementation(platform(AppDependencies.firebaseBom))
implementation(AppDependencies.firebaseCrashlytics)

implementation(project(Modules.data))
implementation(project(Modules.domain))
implementation(project(Modules.content))
implementation(project(Modules.authentication))
implementation(project(Modules.feed))
implementation(project(Modules.dashboard))
implementation(project(Modules.account))
implementation(project(Modules.leaderboard))
implementation(project(Modules.reward))
implementation(project(Modules.obd))

implementation(AppDependencies.countryCodePicker)

implementation(AppDependencies.trackingApi)
implementation(AppDependencies.circleIndicatorView)
implementation(AppDependencies.roomRuntime)
kapt(AppDependencies.roomCompiler)
implementation(project(":data"))
implementation(project(":domain"))
implementation(project(":content"))
implementation(project(":authentication"))
implementation(project(":features:feed"))
implementation(project(":features:dashboard"))
implementation(project(":features:account"))
implementation(project(":features:leaderboard"))
implementation(project(":features:reward"))
implementation(project(":features:obd"))

// telematics sdk
implementation(libs.trackingApi)

// lifecycle
implementation(libs.androidx.lifecycle.runtime.ktx)
implementation(libs.androidx.lifecycle.viewmodel.ktx)

// ui
implementation(libs.countryCodePicker)
implementation(libs.circleIndicatorView)

// navigation
implementation(libs.androidx.navigation.fragment.ktx)
implementation(libs.androidx.navigation.ui.ktx)
}
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?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="com.telematics.zenroad">
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />

<application
android:name="com.telematics.zenroad.MainApplication"
Expand Down
5 changes: 4 additions & 1 deletion app/src/main/java/com/telematics/zenroad/MainApplication.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.telematics.zenroad

import android.app.Application
import androidx.appcompat.app.AppCompatDelegate
import com.telematics.data.extentions.isExactAlarmGranted
import com.telematics.data.tracking.TrackingUseCase
import dagger.hilt.android.HiltAndroidApp
import javax.inject.Inject
Expand All @@ -16,6 +17,8 @@ class MainApplication : Application() {
super.onCreate()
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)

trackingUseCase.initializeSdk()
if (isExactAlarmGranted(this)) {
trackingUseCase.initializeSdk()
}
}
}
2 changes: 1 addition & 1 deletion app/src/main/java/com/telematics/zenroad/MainViewModel.kt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class MainViewModel @Inject constructor(
private val trackingUseCase: TrackingUseCase
) : ViewModel() {

fun allPermissionsGranted(){
fun allPermissionsGranted() {

trackingUseCase.enableTrackingSDK()
}
Expand Down

This file was deleted.

Loading

0 comments on commit 8edc765

Please sign in to comment.