Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: calls modules #35

Merged
merged 12 commits into from
Dec 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
20 changes: 10 additions & 10 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ android {
}
}
buildFeatures {
dataBinding true
viewBinding true
}
namespace 'dev.alenajam.opendialer'
Expand All @@ -62,6 +61,15 @@ android {
}

dependencies {
implementation(project(":feature:calls"))
implementation(project(":feature:callDetail"))
implementation(project(":feature:contacts"))
implementation(project(":feature:inCall"))
implementation(project(":feature:contactsSearch"))
implementation(project(":feature:settings"))
implementation(project(":data:calls"))
implementation(project(":core:common"))

implementation fileTree(dir: 'libs', include: ['*.jar'])

implementation 'androidx.annotation:annotation:1.7.0'
Expand All @@ -85,24 +93,16 @@ dependencies {

implementation 'com.google.android.material:material:1.10.0'
implementation 'com.google.code.gson:gson:2.9.0'
implementation 'com.google.guava:guava:21.0'
implementation 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava'

implementation 'com.google.dagger:hilt-android:2.48.1'
kapt 'com.google.dagger:hilt-compiler:2.48.1'
// For instrumentation tests
androidTestImplementation 'com.google.dagger:hilt-android-testing:2.48.1'
kaptAndroidTest 'com.google.dagger:hilt-compiler:2.48.1'
// For local unit tests
testImplementation 'com.google.dagger:hilt-android-testing:2.48.1'
kaptTest 'com.google.dagger:hilt-compiler:2.48.1'

implementation 'io.reactivex.rxjava3:rxjava:3.0.0-RC7'
implementation 'org.ocpsoft.prettytime:prettytime:4.0.1.Final'
implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
implementation 'com.squareup.picasso:picasso:2.71828'

testImplementation 'junit:junit:4.12'
testImplementation 'junit:junit:4.13.2'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
}

Expand Down
14 changes: 7 additions & 7 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@
android:theme="@style/AppTheme">

<activity
android:name=".features.inCall.InCallActivity"
android:name=".feature.inCall.ui.InCallActivity"
android:autoRemoveFromRecents="true"
android:documentLaunchMode="intoExisting"
android:launchMode="singleInstance"
android:screenOrientation="portrait" />

<activity
android:name="dev.alenajam.opendialer.activity.SettingsActivity"
android:name=".feature.settings.SettingsActivity"
android:label="@string/option"
android:parentActivityName="dev.alenajam.opendialer.features.main.MainActivity"
android:theme="@style/PreferenceTheme">
Expand Down Expand Up @@ -67,19 +67,19 @@
</intent-filter>
</activity>
<activity
android:name="dev.alenajam.opendialer.activity.AboutActivity"
android:name=".feature.settings.AboutActivity"
android:label="@string/info"
android:parentActivityName="dev.alenajam.opendialer.features.main.MainActivity"
android:theme="@style/AppTheme.NoActionBar" />


<activity
android:name="dev.alenajam.opendialer.activity.CustomizeQuickResponsesActivity"
android:parentActivityName="dev.alenajam.opendialer.activity.SettingsActivity" />
android:name=".feature.settings.CustomizeQuickResponsesActivity"
android:parentActivityName=".feature.settings.SettingsActivity" />


<service
android:name="dev.alenajam.opendialer.service.InCallServiceImpl"
android:name=".feature.inCall.service.InCallServiceImpl"
android:enabled="true"
android:exported="true"
android:permission="android.permission.BIND_INCALL_SERVICE">
Expand All @@ -96,7 +96,7 @@
</service>

<receiver
android:name="dev.alenajam.opendialer.helper.NotificationHelper$CallButtonsListener"
android:name=".feature.inCall.service.NotificationHelper$CallButtonsListener"
android:exported="true">
<intent-filter>
<action android:name="dev.alenajam.opendialer.CALL_ACCEPT" />
Expand Down
5 changes: 0 additions & 5 deletions app/src/main/java/dev/alenajam/opendialer/App.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package dev.alenajam.opendialer;

import android.app.Application;
import android.content.SharedPreferences;

import dagger.hilt.android.HiltAndroidApp;
import dev.alenajam.opendialer.helper.NotificationHelper;
Expand All @@ -16,8 +15,4 @@ public void onCreate() {
NotificationHelper.setupNotificationChannels(this);
SharedPreferenceHelper.init(this);
}

public SharedPreferences getAppSharedPreferences() {
return SharedPreferenceHelper.getSharedPreferences(this);
}
}

This file was deleted.

This file was deleted.

This file was deleted.

Loading