Skip to content

Commit

Permalink
#15: Remove WebRtc and Streaming part
Browse files Browse the repository at this point in the history
  • Loading branch information
Entreco committed Nov 24, 2018
1 parent 833a355 commit 337260c
Show file tree
Hide file tree
Showing 115 changed files with 18 additions and 4,189 deletions.
1 change: 0 additions & 1 deletion android/DartsScorecard/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ dependencies {
implementation "com.github.bumptech.glide:glide:$glide"
implementation "com.github.yalantis:jellytoolbar:$jelly"
implementation "de.hdodenhof:circleimageview:$circleImageView"
implementation "org.webrtc:google-webrtc:$webRtc"

implementation("com.crashlytics.sdk.android:crashlytics:$crash") {
transitive = true
Expand Down
32 changes: 0 additions & 32 deletions android/DartsScorecard/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="nl.entreco.dartsscorecard">

<uses-feature
android:name="android.hardware.touchscreen"
android:required="false" />
<uses-feature
android:name="android.software.leanback"
android:required="false" />

<uses-feature
android:name="android.hardware.camera"
android:required="false" />
Expand Down Expand Up @@ -58,22 +51,7 @@
</intent-filter>

</activity>
<activity
android:name=".tv.splash.SplashTvActivity"
android:banner="@drawable/tv_promo"
android:icon="@drawable/tv_promo"
android:label="@string/app_name"
android:logo="@drawable/tv_promo"
android:noHistory="true"
android:screenOrientation="landscape"
android:theme="@style/SplashTheme">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".launch.LaunchActivity" />
<activity android:name=".tv.launch.LaunchTvActivity" />
<activity
android:name=".beta.BetaActivity"
android:parentActivityName=".launch.LaunchActivity" />
Expand Down Expand Up @@ -107,16 +85,6 @@
android:exported="true"
android:permission="android.permission.BIND_JOB_SERVICE" />

<service
android:name=".streaming.StreamingService"
android:description="@string/streaming_service"
android:exported="true" />

<service
android:name=".streaming.ReceiverService"
android:description="@string/receiving_service"
android:exported="true" />

</application>

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,9 @@ import android.content.ActivityNotFoundException
import android.content.Context
import android.content.Intent
import android.net.Uri
import android.support.design.widget.TextInputEditText
import android.support.v7.app.AlertDialog
import android.text.InputType
import android.view.LayoutInflater
import android.view.View
import android.widget.RatingBar
import nl.entreco.dartsscorecard.R
import nl.entreco.dartsscorecard.di.play.Play01Scope
import nl.entreco.dartsscorecard.di.viewmodel.ActivityScope
import nl.entreco.domain.Analytics
import nl.entreco.domain.model.players.Team
import nl.entreco.domain.repository.RatingPrefRepository
import javax.inject.Inject
Expand All @@ -22,7 +15,8 @@ import javax.inject.Inject
/**
* Created by entreco on 20/02/2018.
*/
class DialogHelper @Inject constructor(private val builder: AlertDialog.Builder, @ActivityScope private val ratingPrefRepository: RatingPrefRepository) {
class DialogHelper @Inject constructor(
private val builder: AlertDialog.Builder, @ActivityScope private val ratingPrefRepository: RatingPrefRepository) {

fun revanche(previousIndex: Int, teams: Array<Team>, select: (Int) -> Unit) {

Expand Down Expand Up @@ -51,32 +45,7 @@ class DialogHelper @Inject constructor(private val builder: AlertDialog.Builder,
private fun onlyOneTeam(teams: Array<Team>) = teams.size == 1
private fun moreThanOneTeam(teams: Array<Team>) = teams.size > 1

fun showStreamDialog(done: (String) -> Unit, cancel: () -> Unit) {
val view = createCodeEditText()
val et = view.findViewById<TextInputEditText>(R.id.enter)
et.maxLines = 1
et.inputType = InputType.TYPE_CLASS_NUMBER

builder
.setView(view)
.setPositiveButton(R.string.live_stream_connect) { dialog, _ ->
done(et.text.toString())
dialog.dismiss()
}
.setNegativeButton(R.string.cancel) { dialog, _ ->
cancel()
dialog.dismiss()
}
.create()
.show()
}

private fun createCodeEditText(): View {
return LayoutInflater.from(builder.context)
.inflate(R.layout.dialog_connect_stream, null, false)
}

fun showConfirmDeleteDialog(onConfirmed: ()->Unit){
fun showConfirmDeleteDialog(onConfirmed: () -> Unit) {
builder
.setTitle(R.string.confirm_delete_title)
.setMessage(R.string.confirm_delete_message)
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ import android.arch.persistence.room.Room
import com.google.firebase.database.FirebaseDatabase
import com.google.firebase.firestore.FirebaseFirestore
import com.google.firebase.remoteconfig.FirebaseRemoteConfig
import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings
import dagger.Module
import dagger.Provides
import nl.entreco.dartsscorecard.App
import nl.entreco.dartsscorecard.BuildConfig
import nl.entreco.dartsscorecard.AppLogger
import nl.entreco.dartsscorecard.BuildConfig
import nl.entreco.dartsscorecard.R
import nl.entreco.data.analytics.FirebaseAnalytics
import nl.entreco.data.db.DscDatabase
import nl.entreco.domain.Analytics
import nl.entreco.shared.log.Logger
import javax.inject.Named
import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings
import nl.entreco.dartsscorecard.R
import java.util.*
import javax.inject.Named


/**
Expand Down Expand Up @@ -64,7 +64,7 @@ class AppModule(val app: App) {
@Provides
@ApplicationScope
@Named("uuid")
fun provideUuid() : String {
fun provideUuid(): String {
return UUID.randomUUID().toString()
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import nl.entreco.dartsscorecard.play.Play01ViewModel
import nl.entreco.dartsscorecard.play.input.InputViewModel
import nl.entreco.dartsscorecard.play.score.ScoreViewModel
import nl.entreco.dartsscorecard.play.live.LiveStatViewModel
import nl.entreco.dartsscorecard.play.stream.ControlStreamViewModel
import nl.entreco.domain.play.finish.GetFinishUsecase

/**
Expand All @@ -18,7 +17,6 @@ interface Play01Component {
fun viewModel(): Play01ViewModel
fun navigator(): Play01Navigator
fun scoreViewModel(): ScoreViewModel
fun streamViewModel(): ControlStreamViewModel
fun inputViewModel(): InputViewModel
fun statViewModel(): LiveStatViewModel
fun finishUsecase(): GetFinishUsecase
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@ package nl.entreco.dartsscorecard.di.service
import dagger.Subcomponent
import nl.entreco.dartsscorecard.di.archive.ArchiveComponent
import nl.entreco.dartsscorecard.di.archive.ArchiveModule
import nl.entreco.dartsscorecard.di.streaming.StreamingComponent
import nl.entreco.dartsscorecard.di.streaming.StreamingModule
import nl.entreco.dartsscorecard.di.viewmodel.threading.ThreadingModule

@ServiceScope
@Subcomponent(modules = [(ServiceModule::class), (ThreadingModule::class)])
interface ServiceComponent {
fun plus(module: ArchiveModule): ArchiveComponent
fun plus(module: StreamingModule): StreamingComponent
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,47 +2,13 @@ package nl.entreco.dartsscorecard.di.service

import android.app.Service
import android.content.Context
import com.google.firebase.database.FirebaseDatabase
import dagger.Module
import dagger.Provides
import nl.entreco.dartsscorecard.di.application.ApplicationScope
import nl.entreco.data.stream.FirebaseAnswersRepository
import nl.entreco.data.stream.FirebaseIceRepository
import nl.entreco.data.stream.FirebaseOffersRepository
import nl.entreco.domain.repository.AnswersRepository
import nl.entreco.domain.repository.IceRepository
import nl.entreco.domain.repository.OffersRepository
import nl.entreco.shared.log.Logger
import javax.inject.Named

@Module
class ServiceModule(private val service: Service) {

@Provides
@ServiceScope
fun context(): Context = service

@Provides
@ServiceScope
fun provideIceRepository(@ApplicationScope db: FirebaseDatabase,
@ApplicationScope logger: Logger,
@ApplicationScope @Named("uuid") uuid: String): IceRepository {
return FirebaseIceRepository(db, logger, uuid)
}

@Provides
@ServiceScope
fun provideOffersRepository(@ApplicationScope db: FirebaseDatabase,
@ApplicationScope logger: Logger,
@ApplicationScope @Named("uuid") uuid: String): OffersRepository {
return FirebaseOffersRepository(db, logger, uuid)
}

@Provides
@ServiceScope
fun provideAnswersRepository(@ApplicationScope db: FirebaseDatabase,
@ApplicationScope logger: Logger,
@ApplicationScope @Named("uuid") uuid: String): AnswersRepository {
return FirebaseAnswersRepository(db, logger, uuid)
}
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 337260c

Please sign in to comment.