Code revisions

xebia-functional · Jan 20, 2015 · 3288a06 · 3288a06
1 parent d438559
commit 3288a06
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/src/main/scala/com/fortysevendeg/translatebubble/ui/bubbleservice/BubbleService.scala b/src/main/scala/com/fortysevendeg/translatebubble/ui/bubbleservice/BubbleService.scala
@@ -398,10 +398,10 @@ class BubbleService
       languages <- persistentServices.getLanguagesString
     } yield {
       typeTranslateUI match {
-        case _ if typeTranslateUI == TranslateUIType.BUBBLE =>
+        case TranslateUIType.BUBBLE =>
           contentView.setTexts(languages, originalText, translatedText)
           bubble.stopAnimation()
-        case _ if typeTranslateUI == TranslateUIType.NOTIFICATION =>
+        case TranslateUIType.NOTIFICATION =>
           notificationsServices.showTextTranslated(ShowTextTranslatedRequest(originalText, translatedText))
       }
     }
@@ -410,10 +410,10 @@ class BubbleService
   private def translatedFailed() {
     val typeTranslateUI = persistentServices.getTypeTranslateUI()
     typeTranslateUI match {
-      case _ if typeTranslateUI == TranslateUIType.BUBBLE =>
+      case TranslateUIType.BUBBLE =>
         contentView.setTexts(getString(R.string.failedTitle), getString(R.string.failedMessage), "")
         bubble.stopAnimation()
-      case _ if typeTranslateUI == TranslateUIType.NOTIFICATION =>
+      case TranslateUIType.NOTIFICATION =>
         notificationsServices.failed()
     }
   }

diff --git a/src/main/scala/com/fortysevendeg/translatebubble/ui/preferences/MainActivity.scala b/src/main/scala/com/fortysevendeg/translatebubble/ui/preferences/MainActivity.scala
@@ -71,8 +71,7 @@ class DefaultPreferencesFragment
 
     super.onCreate(savedInstanceState)
 
-    analyticsServices.send(
-      analyticsPreferencesScreen)
+    analyticsServices.send(analyticsPreferencesScreen)
 
     // TODO Don't use 'map'. We should create a Tweak when MacroidExtra module works
 
@@ -101,15 +100,13 @@ class DefaultPreferencesFragment
     openSource map (
       _.setOnPreferenceClickListener(new OnPreferenceClickListener {
         override def onPreferenceClick(preference: Preference): Boolean = {
-          analyticsServices.send(
-            analyticsOpenSourceDialog)
+          analyticsServices.send(analyticsOpenSourceDialog)
           val builder = new AlertDialog.Builder(getActivity)
           builder.setMessage(R.string.openSourceMessage)
               .setPositiveButton(R.string.goToGitHub, new DialogInterface.OnClickListener() {
             def onClick(dialog: DialogInterface, id: Int) {
               // TODO Open github website project
-              analyticsServices.send(
-                analyticsGoToGitHub)
+              analyticsServices.send(analyticsGoToGitHub)
               dialog.dismiss()
             }
           })

diff --git a/src/main/scala/com/fortysevendeg/translatebubble/ui/wizard/WizardActivity.scala b/src/main/scala/com/fortysevendeg/translatebubble/ui/wizard/WizardActivity.scala
@@ -48,8 +48,7 @@ class WizardActivity
       finish()
     }
 
-    analyticsServices.send(
-      if (modeTutorial) analyticsTutorialScreen else analyticsWizardScreen)
+    analyticsServices.send(if (modeTutorial) analyticsTutorialScreen else analyticsWizardScreen)
 
     setContentView(layout)