Translate #3
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,4 +8,5 @@ | |
| /captures | ||
| .externalNativeBuild | ||
| .cxx | ||
| /spotify-app-remote/build/ | ||
| /spotify-auth/build/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,9 @@ | ||
| # Проект по курсу InfoMail | ||
|
|
||
| ## Описание идеи: | ||
| Приложение предоставляет сервисы для прослушивания музыки из Spotify и прилагает к каждой песне ее текст в оригинале с возможностью перевода. Работа основывается на использовании API Spotify, Genius и переводчика IBM Watson. | ||
|
|
||
| ## Команда авторов: | ||
| - Игорь Семенов (https://github.com/XJIEBYUJEK) | ||
| - Константин Смирнов (https://github.com/Archrahkshi) | ||
| - Андрей Фомин (https://github.com/HSEc0der) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,10 +7,26 @@ import android.view.ViewGroup | |
| import androidx.fragment.app.Fragment | ||
| import com.archrahkshi.spotifine.R | ||
| import com.archrahkshi.spotifine.data.LyricsAdapter | ||
| import com.archrahkshi.spotifine.data.TRANSLATOR_API_KEY | ||
| import com.archrahkshi.spotifine.data.TRANSLATOR_URL | ||
| import com.archrahkshi.spotifine.data.TRANSLATOR_VERSION | ||
| import com.ibm.cloud.sdk.core.security.IamAuthenticator | ||
| import com.ibm.watson.language_translator.v3.LanguageTranslator | ||
| import com.ibm.watson.language_translator.v3.model.TranslateOptions | ||
| import com.ibm.watson.language_translator.v3.util.Language.RUSSIAN | ||
| import kotlinx.android.synthetic.main.fragment_lyrics.buttonTranslate | ||
| import kotlinx.android.synthetic.main.fragment_lyrics.recyclerViewLyrics | ||
| import kotlinx.coroutines.CoroutineScope | ||
| import kotlinx.coroutines.Dispatchers | ||
| import kotlinx.coroutines.launch | ||
| import kotlinx.coroutines.withContext | ||
| import java.util.Locale | ||
| import kotlin.coroutines.CoroutineContext | ||
|
|
||
| class LyricsFragment( | ||
| private val isLyricsTranslated: Boolean, | ||
| override val coroutineContext: CoroutineContext = Dispatchers.Main.immediate | ||
| ) : Fragment(), CoroutineScope { | ||
|
|
||
| override fun onCreateView( | ||
| inflater: LayoutInflater, | ||
|
|
@@ -21,46 +37,105 @@ class LyricsFragment(private var isLyricsTranslated: Boolean) : Fragment() { | |
| override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
| super.onViewCreated(view, savedInstanceState) | ||
|
|
||
| launch { | ||
| val originalLyrics = getOriginalLyrics() | ||
| if (isLyricsTranslated) { | ||
| val (detectedLanguage, translatedLyrics) = getTranslatedLyrics(originalLyrics) | ||
| val appLocale = Locale(RUSSIAN) | ||
| buttonTranslate.text = getString( | ||
| R.string.detected_language, | ||
| Locale(detectedLanguage).getDisplayLanguage(appLocale), | ||
| appLocale.getDisplayLanguage(appLocale) | ||
| ) | ||
| recyclerViewLyrics.adapter = LyricsAdapter(translatedLyrics.split('\n')) | ||
| } else { | ||
| buttonTranslate.text = getString(R.string.translate) | ||
| recyclerViewLyrics.adapter = LyricsAdapter(originalLyrics.split('\n')) | ||
| } | ||
|
|
||
| buttonTranslate.setOnClickListener { | ||
| fragmentManager?.beginTransaction()?.replace( | ||
| R.id.frameLayoutPlayer, | ||
| LyricsFragment(!isLyricsTranslated) | ||
| )?.commit() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private suspend fun getOriginalLyrics() = withContext(Dispatchers.IO) { | ||
| """ | ||
| Flying over darkened skies the battle will call | ||
| Distant angels crying in the eye of the storm | ||
| And the world falls under the starlight shining from heavens below | ||
| Long years of pain and sorrow searching for more | ||
| Cry for the touch of angels never before | ||
| And the stars fall on the horizon onwards and up through the pain | ||
|
|
||
| Ride the wind and fight the demon steel shining bright | ||
| Standing together forever onwards flames burning strong | ||
| Hot wind in hell of pain and sorrow now and ever onwards | ||
| We stare into the dawn of a new world | ||
|
|
||
|
There was a problem hiding this comment. [checkstyle] reported by reviewdog 🐶 |
||
| [Pre-Chorus] | ||
| Cry out for the fallen heroes | ||
| Lost in time ago | ||
| In our minds they still belong | ||
| When the sands of time are gone | ||
|
|
||
|
There was a problem hiding this comment. [checkstyle] reported by reviewdog 🐶 |
||
| [Chorus] | ||
| Rise over shadow mountains blazing with power | ||
| Crossing valleys endless tears in unity we stand | ||
| Far and wide across the land the victory is ours | ||
| On towards the gates of reason | ||
| Fight for the truth and the freedom | ||
| Gloria | ||
|
|
||
|
There was a problem hiding this comment. [checkstyle] reported by reviewdog 🐶 |
||
| Searching through the memories to open the door | ||
| Living on the edge of life like never before | ||
| And the ground chants under the moonlight facing their fears all the same | ||
|
|
||
|
There was a problem hiding this comment. [checkstyle] reported by reviewdog 🐶 |
||
| Heavens fear now open wide and up for the the call | ||
| All in stark reality the angels will fall | ||
| And the world cries out for the silence lost in the voices unknown | ||
|
|
||
|
There was a problem hiding this comment. [checkstyle] reported by reviewdog 🐶 |
||
| Blinded by the force of evil cries into the night | ||
| Never before have they seen the darkness now they are all gone | ||
| Out from the shadows storming on the wings of revelations | ||
| Your soul will feel no mercy come the dawn | ||
|
|
||
|
There was a problem hiding this comment. [checkstyle] reported by reviewdog 🐶 |
||
| Hold on for the morning after | ||
| Never to let go | ||
| In the fire's burning strong | ||
| When the tides of time roll on | ||
|
|
||
|
There was a problem hiding this comment. [checkstyle] reported by reviewdog 🐶 |
||
| [Chorus] | ||
|
|
||
|
There was a problem hiding this comment. [checkstyle] reported by reviewdog 🐶 |
||
| [Pre-Chorus] | ||
|
|
||
|
There was a problem hiding this comment. [checkstyle] reported by reviewdog 🐶 |
||
| [Chorus] | ||
| """.trimIndent() | ||
| } | ||
|
|
||
| private suspend fun getTranslatedLyrics( | ||
| lyricsOriginal: String | ||
| ) = withContext(Dispatchers.IO) { | ||
| val result = LanguageTranslator( | ||
| TRANSLATOR_VERSION, | ||
| IamAuthenticator(TRANSLATOR_API_KEY) | ||
| ).apply { | ||
| serviceUrl = TRANSLATOR_URL | ||
| }.translate( | ||
| TranslateOptions.Builder() | ||
| // Line separators must be doubled for the lyrics to be translated line by line, | ||
| // not as a uniform text | ||
| .addText(lyricsOriginal.replace("\n", "\n\n")) | ||
| .target(RUSSIAN) | ||
| .build() | ||
| ).execute().result | ||
| Pair( | ||
| result.detectedLanguage, | ||
| // Returning to the original line separators | ||
| result.translations.first().translation.replace("\n\n", "\n") | ||
| ) | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,15 @@ | ||
| package com.archrahkshi.spotifine.ui | ||
|
|
||
| import android.os.Bundle | ||
| import android.util.Log | ||
| import android.widget.SeekBar | ||
| import android.widget.SeekBar.OnSeekBarChangeListener | ||
| import androidx.appcompat.app.AppCompatActivity | ||
| import com.archrahkshi.spotifine.R | ||
| import com.archrahkshi.spotifine.data.DURATION | ||
| import com.archrahkshi.spotifine.data.ID | ||
| import com.archrahkshi.spotifine.data.SPOTIFY_CLIENT_ID | ||
| import com.archrahkshi.spotifine.data.SPOTIFY_REDIRECT_URI | ||
| import com.spotify.android.appremote.api.ConnectionParams | ||
| import com.spotify.android.appremote.api.Connector | ||
| import com.spotify.android.appremote.api.SpotifyAppRemote | ||
|
|
@@ -35,15 +34,14 @@ class PlayerActivity : AppCompatActivity() { | |
| val duration = intent.getLongExtra(DURATION, 0) | ||
| Log.wtf("id", id?.toString()) | ||
| Log.wtf("duration", duration.toString()) | ||
| val connectionParams = ConnectionParams.Builder(SPOTIFY_CLIENT_ID) | ||
| .setRedirectUri(SPOTIFY_REDIRECT_URI) | ||
| .showAuthView(true) | ||
| .build() | ||
| SpotifyAppRemote.connect( | ||
| this, | ||
| connectionParams, | ||
| object : Connector.ConnectionListener { | ||
| override fun onConnected(spotifyAppRemote: SpotifyAppRemote) { | ||
| [email protected] = spotifyAppRemote | ||
| val appRemote = [email protected]!! | ||
|
|
@@ -52,7 +50,7 @@ class PlayerActivity : AppCompatActivity() { | |
| val seekBar = findViewById<SeekBar>(R.id.seekBar) | ||
| seekBar.max = duration.toInt() | ||
| var flag = 0 | ||
| buttonPlay.text = getString(R.string.play) | ||
| seekBar.setOnSeekBarChangeListener( | ||
| object : OnSeekBarChangeListener { | ||
| override fun onProgressChanged(seekBar: SeekBar, i: Int, b: Boolean) { | ||
|
|
@@ -81,17 +79,17 @@ class PlayerActivity : AppCompatActivity() { | |
| 0 -> { | ||
| appRemote.playerApi.play("spotify:track:$id") | ||
| flag = 1 | ||
| buttonPlay.text = getString(R.string.pause) | ||
| } | ||
| 1 -> { | ||
| appRemote.playerApi.pause() | ||
| flag = 2 | ||
| buttonPlay.text = getString(R.string.play) | ||
| } | ||
| 2 -> { | ||
| appRemote.playerApi.resume() | ||
| flag = 1 | ||
| buttonPlay.text = getString(R.string.pause) | ||
| } | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[checkstyle] reported by reviewdog 🐶
Line has trailing spaces.