Merge branch 'feature/refactoring' into 'master'

Rename methods See merge request !8
Yalantis · Jun 30, 2017 · 18951aa · 18951aa
2 parents 97cc488 + 03dc792
commit 18951aa
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/app/src/main/java/com/yalantis/colormatchtabs/colortabs/MainActivity.kt b/app/src/main/java/com/yalantis/colormatchtabs/colortabs/MainActivity.kt
@@ -8,7 +8,7 @@ import android.util.Log
 import android.view.Menu
 import android.widget.Toast
 import com.facebook.drawee.backends.pipeline.Fresco
-import com.yalantis.colormatchtabs.colormatchtabs.MenuToggleListener
+import com.yalantis.colormatchtabs.colormatchtabs.menu.MenuToggleListener
 import com.yalantis.colormatchtabs.colormatchtabs.adapter.ColorTabAdapter
 import com.yalantis.colormatchtabs.colormatchtabs.listeners.ColorTabLayoutOnPageChangeListener
 import com.yalantis.colormatchtabs.colormatchtabs.listeners.OnArcMenuListener
@@ -41,7 +41,6 @@ class MainActivity : AppCompatActivity() {
 
         viewPager.adapter = ColorTabsAdapter(supportFragmentManager, colorMatchTabLayout.count())
         viewPager.addOnPageChangeListener(ColorTabLayoutOnPageChangeListener(colorMatchTabLayout))
-        //TODO think how change this ugly methods!!
         viewPager.setBackgroundColor(ContextCompat.getColor(this, R.color.colorGreen))
         viewPager.background.alpha = 128
         colorMatchTabLayout.addArcMenu(arcMenu)

diff --git a/...src/main/java/com/yalantis/colormatchtabs/colormatchtabs/colortabs/ColorMatchTabLayout.kt b/...src/main/java/com/yalantis/colormatchtabs/colormatchtabs/colortabs/ColorMatchTabLayout.kt
@@ -8,7 +8,7 @@ import android.util.Log
 import android.view.WindowManager
 import android.widget.HorizontalScrollView
 import android.widget.LinearLayout
-import com.yalantis.colormatchtabs.colormatchtabs.MenuToggleListener
+import com.yalantis.colormatchtabs.colormatchtabs.menu.MenuToggleListener
 import com.yalantis.colormatchtabs.colormatchtabs.R
 import com.yalantis.colormatchtabs.colormatchtabs.listeners.OnColorTabSelectedListener
 import com.yalantis.colormatchtabs.colormatchtabs.menu.ArcMenu

diff --git a/...c/main/java/com/yalantis/colormatchtabs/colormatchtabs/colortabs/SlidingTabStripLayout.kt b/...c/main/java/com/yalantis/colormatchtabs/colormatchtabs/colortabs/SlidingTabStripLayout.kt
@@ -14,9 +14,9 @@ import android.view.Gravity
 import android.widget.LinearLayout
 import com.yalantis.colormatchtabs.colormatchtabs.Constant
 import com.yalantis.colormatchtabs.colormatchtabs.Constant.Companion.ANIMATION_DURATION
-import com.yalantis.colormatchtabs.colormatchtabs.MenuToggleListener
+import com.yalantis.colormatchtabs.colormatchtabs.menu.MenuToggleListener
 import com.yalantis.colormatchtabs.colormatchtabs.R
-import com.yalantis.colormatchtabs.colormatchtabs.utils.InvalidNumberOfTabs
+import com.yalantis.colormatchtabs.colormatchtabs.utils.InvalidNumberOfTabsExeption
 import com.yalantis.colormatchtabs.colormatchtabs.utils.getDimen
 import com.yalantis.colormatchtabs.colormatchtabs.utils.getDimenToFloat
 
@@ -149,7 +149,7 @@ class SlidingTabStripLayout : LinearLayout, MenuToggleListener {
         if ((parent as ColorMatchTabLayout).tabs.count() <= INVALID_TABS_AMOUNT && (parent as ColorMatchTabLayout).tabs.count() > 2) {
             animateIconTabs(0f, (height * 2).toFloat())
         } else {
-            throw InvalidNumberOfTabs()
+            throw InvalidNumberOfTabsExeption()
         }
     }
 

diff --git a/library/src/main/java/com/yalantis/colormatchtabs/colormatchtabs/menu/ArcMenu.kt b/library/src/main/java/com/yalantis/colormatchtabs/colormatchtabs/menu/ArcMenu.kt
@@ -20,7 +20,7 @@ import android.view.animation.AnimationUtils
 import android.widget.FrameLayout
 import com.yalantis.colormatchtabs.colormatchtabs.Constant
 import com.yalantis.colormatchtabs.colormatchtabs.Constant.Companion.ANIMATION_DURATION
-import com.yalantis.colormatchtabs.colormatchtabs.MenuToggleListener
+import com.yalantis.colormatchtabs.colormatchtabs.menu.MenuToggleListener
 import com.yalantis.colormatchtabs.colormatchtabs.R
 import com.yalantis.colormatchtabs.colormatchtabs.listeners.OnArcMenuListener
 import com.yalantis.colormatchtabs.colormatchtabs.model.CircleSubMenu

diff --git a/...tabs/colormatchtabs/MenuToggleListener.kt → ...colormatchtabs/menu/MenuToggleListener.kt b/...tabs/colormatchtabs/MenuToggleListener.kt → ...colormatchtabs/menu/MenuToggleListener.kt
@@ -1,4 +1,4 @@
-package com.yalantis.colormatchtabs.colormatchtabs
+package com.yalantis.colormatchtabs.colormatchtabs.menu
 
 /**
  * Created by anna on 23.05.17.

diff --git a/...lormatchtabs/utils/InvalidNumberOfTabs.kt → ...tabs/utils/InvalidNumberOfTabsExeption.kt b/...lormatchtabs/utils/InvalidNumberOfTabs.kt → ...tabs/utils/InvalidNumberOfTabsExeption.kt
@@ -3,6 +3,6 @@ package com.yalantis.colormatchtabs.colormatchtabs.utils
 /**
  * Created by anna on 24.05.17.
  */
-class InvalidNumberOfTabs : Exception() {
+class InvalidNumberOfTabsExeption : Exception() {
     override val message: String? = "Your should add more than three and less then six tabs to use ArcMenu"
 }