diff --git a/android/Omnivore/app/build.gradle b/android/Omnivore/app/build.gradle index 9a55d5953..4bb871bc5 100644 --- a/android/Omnivore/app/build.gradle +++ b/android/Omnivore/app/build.gradle @@ -1,6 +1,8 @@ plugins { id 'com.android.application' id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'dagger.hilt.android.plugin' } android { @@ -101,5 +103,17 @@ dependencies { implementation "androidx.security:security-crypto:1.0.0" implementation "androidx.datastore:datastore-preferences:1.0.0" + + + +// Activity KTX for viewModels() + // TODO: remove this since compose-activity imports ktx? +// implementation "androidx.activity:activity-ktx:1.3.1" + +//Dagger - Hilt + implementation 'com.google.dagger:hilt-android:2.43.2' + kapt 'com.google.dagger:hilt-compiler:2.43.2' + + implementation 'androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03' } diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/Constants.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/Constants.kt new file mode 100644 index 000000000..67d2cd529 --- /dev/null +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/Constants.kt @@ -0,0 +1,5 @@ +package app.omnivore.omnivore + +object Constants { + const val serverProdURL = "https://api-demo.omnivore.app" +} diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/MainActivity.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/MainActivity.kt index 43a236ee7..fa310f6ae 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/MainActivity.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/MainActivity.kt @@ -64,7 +64,6 @@ fun LoginView(viewModel: LoginViewModel = LoginViewModel()) { } } -//Log.v(TAG, "${numerator / denominator}") @Composable fun LoginFields( email: String, diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/RESTNetworker.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/RESTNetworker.kt index 4336f88ad..d9bbf1ed6 100644 --- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/RESTNetworker.kt +++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/RESTNetworker.kt @@ -26,10 +26,8 @@ interface EmailLoginSubmit { } object RetrofitHelper { - private const val baseUrl = "https://api-demo.omnivore.app" - fun getInstance(): Retrofit { - return Retrofit.Builder().baseUrl(baseUrl) + return Retrofit.Builder().baseUrl(Constants.serverProdURL) .addConverterFactory(GsonConverterFactory.create()) .build() } diff --git a/android/Omnivore/build.gradle b/android/Omnivore/build.gradle index 8c51a74fc..a78e10a1b 100644 --- a/android/Omnivore/build.gradle +++ b/android/Omnivore/build.gradle @@ -3,6 +3,11 @@ buildscript { compose_version = '1.1.0-beta01' lifecycle_version = '2.5.1' } + + dependencies { + classpath "com.google.dagger:hilt-android-gradle-plugin:2.43.2" + } + }// Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'com.android.application' version '7.2.1' apply false @@ -13,3 +18,4 @@ plugins { task clean(type: Delete) { delete rootProject.buildDir } +