diff --git a/app/build.gradle b/app/build.gradle index 8ff25c9..75ecc71 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,7 +11,7 @@ android { targetSdkVersion versions.targetSdkVersion versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" resConfigs "en" } buildTypes { @@ -28,8 +28,8 @@ dependencies { implementation project(':space') implementation project(':dance') implementation project(':dogos') - implementation "com.android.support:palette-v7:$support.compat" - testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + implementation 'androidx.palette:palette:1.0.0' + testImplementation 'junit:junit:4.13' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' } diff --git a/app/src/main/java/cl/cutiko/firebaseuiauth/Example.java b/app/src/main/java/cl/cutiko/firebaseuiauth/Example.java deleted file mode 100644 index 10d900b..0000000 --- a/app/src/main/java/cl/cutiko/firebaseuiauth/Example.java +++ /dev/null @@ -1,127 +0,0 @@ -package cl.cutiko.firebaseuiauth; - -import android.animation.Animator; -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.os.Handler; -import android.text.Editable; -import android.text.TextWatcher; -import android.view.KeyEvent; -import android.view.MotionEvent; -import android.view.View; -import android.widget.ScrollView; -import android.widget.TextView; - -import java.lang.reflect.Field; - -public class Example { - - private Callback callback; - - - - private void something(){ - new Handler().post(new Runnable() { - @Override - public void run() { - - } - }); - ScrollView scrollView; - //scrollView.post() - - if (0 == 0) { - return; - } else { - - } - - scrollView.setOnTouchListener(new View.OnTouchListener() { - @Override - public boolean onTouch(View v, MotionEvent event) { - return false; - } - }); - scrollView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - - } - }); - - scrollView.performClick(); - - try { - Field field = View.class.getField(" mOnClickListener"); - View.OnClickListener clickListener = (View.OnClickListener) field.get(scrollView); - new View.OnClickListener() { - @Override - public void onClick(View v) { - - } - }; - - - } catch (NoSuchFieldException | IllegalAccessException e) { - e.printStackTrace(); - } - - scrollView.animate().setListener(new Animator.AnimatorListener() { - @Override - public void onAnimationStart(Animator animation) { - - } - - @Override - public void onAnimationEnd(Animator animation) { - - } - - @Override - public void onAnimationCancel(Animator animation) { - - } - - @Override - public void onAnimationRepeat(Animator animation) { - - } - }); - - TextView textView = null; - textView.setOnEditorActionListener(new TextView.OnEditorActionListener() { - @Override - public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { - return false; - } - }); - textView.addTextChangedListener(new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { - - } - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - - } - - @Override - public void afterTextChanged(Editable s) { - - } - }); - - BroadcastReceiver receiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - - } - }; - } - - interface Callback { - void done(); - } -} diff --git a/app/src/main/java/cl/cutiko/firebaseuiauth/SplashActivity.kt b/app/src/main/java/cl/cutiko/firebaseuiauth/SplashActivity.kt index daec3bc..c4428b9 100644 --- a/app/src/main/java/cl/cutiko/firebaseuiauth/SplashActivity.kt +++ b/app/src/main/java/cl/cutiko/firebaseuiauth/SplashActivity.kt @@ -2,7 +2,7 @@ package cl.cutiko.firebaseuiauth import android.content.Intent import android.os.Bundle -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.AppCompatActivity import cl.cutiko.dance.DanceIntent import cl.cutiko.dance.RC_DANCE_AUTH import cl.cutiko.dogos.DogosIntent diff --git a/app/src/main/java/cl/cutiko/firebaseuiauth/menu/MenuFragment.kt b/app/src/main/java/cl/cutiko/firebaseuiauth/menu/MenuFragment.kt index 6d747b5..f98afa5 100644 --- a/app/src/main/java/cl/cutiko/firebaseuiauth/menu/MenuFragment.kt +++ b/app/src/main/java/cl/cutiko/firebaseuiauth/menu/MenuFragment.kt @@ -2,7 +2,7 @@ package cl.cutiko.firebaseuiauth.menu import android.app.Activity import android.os.Bundle -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -42,13 +42,13 @@ class MenuFragment : Fragment() { setText(demo, getString(R.string.logged)) return } else { - var result = "" + val result: String if (response == null) { result = getString(R.string.cancelled) setText(demo, result) return } - if (response.getError()?.getErrorCode() == ErrorCodes.NO_NETWORK) { + if (response.error?.errorCode == ErrorCodes.NO_NETWORK) { result = getString(R.string.no_internet) setText(demo, result) return diff --git a/app/src/main/java/cl/cutiko/firebaseuiauth/widgets/IntroView.kt b/app/src/main/java/cl/cutiko/firebaseuiauth/widgets/IntroView.kt index 79653f7..23550d7 100644 --- a/app/src/main/java/cl/cutiko/firebaseuiauth/widgets/IntroView.kt +++ b/app/src/main/java/cl/cutiko/firebaseuiauth/widgets/IntroView.kt @@ -3,32 +3,40 @@ package cl.cutiko.firebaseuiauth.widgets import android.content.Context import android.content.res.ColorStateList import android.graphics.BitmapFactory -import android.support.annotation.DrawableRes -import android.support.annotation.StringRes -import android.support.v4.content.ContextCompat -import android.support.v7.graphics.Palette import android.util.AttributeSet import android.view.LayoutInflater import android.view.View import android.widget.FrameLayout +import androidx.annotation.DrawableRes +import androidx.annotation.StringRes +import androidx.core.content.ContextCompat +import androidx.palette.graphics.Palette import cl.cutiko.firebaseuiauth.R import kotlinx.android.synthetic.main.content_intro_view.view.* -class IntroView(context: Context?, attrs: AttributeSet?) : FrameLayout(context, attrs) { +class IntroView(context: Context, attrs: AttributeSet?) : FrameLayout(context, attrs) { - fun setView(@DrawableRes image : Int, @StringRes text : Int) : View { + fun setView(@DrawableRes image: Int, @StringRes text: Int): View { LayoutInflater.from(context).inflate(R.layout.content_intro_view, this, true) val bitmap = BitmapFactory.decodeResource(resources, image) val palette = Palette.from(bitmap).generate() - val mainColor = palette.getDarkMutedColor(ContextCompat.getColor(context, R.color.blackTransparent)) + val mainColor = + palette.getDarkMutedColor(ContextCompat.getColor(context, R.color.blackTransparent)) imageIv.setImageBitmap(bitmap) overlayIv.backgroundTintList = ColorStateList.valueOf(mainColor) - textIv.setTextColor(palette.getLightVibrantColor(ContextCompat.getColor(context, R.color.white))) + textIv.setTextColor( + palette.getLightVibrantColor( + ContextCompat.getColor( + context, + R.color.white + ) + ) + ) textIv.setText(text) return textIv diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index 6ccfe57..beaecbc 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -7,7 +7,7 @@ android:orientation="vertical" tools:context=".SplashActivity"> - @@ -19,7 +19,7 @@ android:layout_height="match_parent" tools:layout="@layout/fragment_menu"/> - + + android:gravity="center" + android:textSize="21sp" + tools:text="Texto de Pruebas" /> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 57818f9..a2044fa 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,11 @@ buildscript { ext { versions = [ - 'kotlin': '1.3.10', + 'kotlin': '1.3.72', 'compileSdkVersion': 28, 'targetSdkVersion': 28, 'minSdkVersion': 21 ] - support = [ - 'compat': '28.0.0', - 'constraints': '1.1.3' - ] } repositories { @@ -17,9 +13,9 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.6.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin" - classpath 'com.google.gms:google-services:4.2.0' + classpath 'com.google.gms:google-services:4.3.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/core/build.gradle b/core/build.gradle index c069963..dbb3f14 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -10,7 +10,7 @@ android { targetSdkVersion versions.targetSdkVersion versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -25,11 +25,15 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin" - api "com.android.support:appcompat-v7:$support.compat" - api "com.android.support:support-v4:$support.compat" - api "com.android.support.constraint:constraint-layout:$support.constraint" - api 'com.firebaseui:firebase-ui-auth:4.3.0' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + api 'androidx.appcompat:appcompat:1.1.0' + api 'androidx.legacy:legacy-support-v4:1.0.0' + api "androidx.constraintlayout:constraintlayout:1.1.3" + api 'com.firebaseui:firebase-ui-auth:5.0.0' + + def recyclerViewVersion = "1.1.0" + api "androidx.recyclerview:recyclerview:$recyclerViewVersion" + + testImplementation 'junit:junit:4.13' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' } \ No newline at end of file diff --git a/core/src/androidTest/java/cl/cutiko/core/ExampleInstrumentedTest.java b/core/src/androidTest/java/cl/cutiko/core/ExampleInstrumentedTest.java index 1da2a01..8c5cf22 100644 --- a/core/src/androidTest/java/cl/cutiko/core/ExampleInstrumentedTest.java +++ b/core/src/androidTest/java/cl/cutiko/core/ExampleInstrumentedTest.java @@ -1,8 +1,10 @@ package cl.cutiko.core; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; + import org.junit.Test; import org.junit.runner.RunWith; @@ -18,7 +20,7 @@ public class ExampleInstrumentedTest { @Test public void useAppContext() { // Context of the app under test. - Context appContext = InstrumentationRegistry.getTargetContext(); + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); assertEquals("cl.cutiko.core.test", appContext.getPackageName()); } diff --git a/dance/build.gradle b/dance/build.gradle index 9d93623..17c7662 100644 --- a/dance/build.gradle +++ b/dance/build.gradle @@ -10,7 +10,7 @@ android { targetSdkVersion versions.targetSdkVersion versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { @@ -24,7 +24,7 @@ android { dependencies { implementation project(':core') - testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + testImplementation 'junit:junit:4.13' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' } \ No newline at end of file diff --git a/dance/src/androidTest/java/cl/cutiko/dance/ExampleInstrumentedTest.java b/dance/src/androidTest/java/cl/cutiko/dance/ExampleInstrumentedTest.java index cdf7e86..e64dc62 100644 --- a/dance/src/androidTest/java/cl/cutiko/dance/ExampleInstrumentedTest.java +++ b/dance/src/androidTest/java/cl/cutiko/dance/ExampleInstrumentedTest.java @@ -1,8 +1,10 @@ package cl.cutiko.dance; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; + +import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; + import org.junit.Test; import org.junit.runner.RunWith; @@ -18,7 +20,7 @@ public class ExampleInstrumentedTest { @Test public void useAppContext() { // Context of the app under test. - Context appContext = InstrumentationRegistry.getTargetContext(); + Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); assertEquals("cl.cutiko.dance.test", appContext.getPackageName()); } diff --git a/dance/src/main/java/cl/cutiko/dance/adapters/DotsAdapter.kt b/dance/src/main/java/cl/cutiko/dance/adapters/DotsAdapter.kt index 27b1278..390524d 100644 --- a/dance/src/main/java/cl/cutiko/dance/adapters/DotsAdapter.kt +++ b/dance/src/main/java/cl/cutiko/dance/adapters/DotsAdapter.kt @@ -1,6 +1,6 @@ package cl.cutiko.dance.adapters -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -13,7 +13,7 @@ class DotsAdapter : RecyclerView.Adapter() { private const val DEFAULT = 0 } - private val dots : Array = Array(INTRO_SLIDES) { DEFAULT } + private val dots: Array = Array(INTRO_SLIDES) { DEFAULT } private var previous = 0 init { @@ -21,15 +21,16 @@ class DotsAdapter : RecyclerView.Adapter() { } override fun onCreateViewHolder(container: ViewGroup, type: Int): DotHolder { - val view = LayoutInflater.from(container.context).inflate(R.layout.holder_dot, container, false) + val view = LayoutInflater.from(container.context).inflate( + R.layout.holder_dot, container, false + ) return DotHolder(view) } override fun onBindViewHolder(holder: DotHolder, position: Int) { - val dot = dots[position] - val view = holder.itemView - val background = if (SELECTED == dot) R.drawable.bg_dot_selected else R.drawable.bg_dot_default - view.setBackgroundResource(background) + holder.itemView.setBackgroundResource( + if (SELECTED == dots[position]) R.drawable.bg_dot_selected else R.drawable.bg_dot_default + ) } override fun getItemCount(): Int { diff --git a/dance/src/main/java/cl/cutiko/dance/adapters/IntroAdapter.kt b/dance/src/main/java/cl/cutiko/dance/adapters/IntroAdapter.kt index 2102bdf..2d14406 100644 --- a/dance/src/main/java/cl/cutiko/dance/adapters/IntroAdapter.kt +++ b/dance/src/main/java/cl/cutiko/dance/adapters/IntroAdapter.kt @@ -1,8 +1,8 @@ package cl.cutiko.dance.adapters -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentManager -import android.support.v4.app.FragmentPagerAdapter +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentManager +import androidx.fragment.app.FragmentPagerAdapter import cl.cutiko.dance.body.intro.LoginFragment import cl.cutiko.dance.body.intro.MusicFragment import cl.cutiko.dance.body.intro.PartyFragment @@ -10,10 +10,11 @@ import cl.cutiko.dance.body.intro.PermissionFragment const val INTRO_SLIDES = 4 -class IntroAdapter(fm: FragmentManager) : FragmentPagerAdapter(fm) { +class IntroAdapter(fm: FragmentManager) : + FragmentPagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) { override fun getItem(position: Int): Fragment { - return when(position) { + return when (position) { 0 -> MusicFragment.newInstance() 1 -> PartyFragment.newInstance() 2 -> PermissionFragment.newInstance() diff --git a/dance/src/main/java/cl/cutiko/dance/body/PagerFragment.kt b/dance/src/main/java/cl/cutiko/dance/body/PagerFragment.kt index 6f5de60..26f05b9 100644 --- a/dance/src/main/java/cl/cutiko/dance/body/PagerFragment.kt +++ b/dance/src/main/java/cl/cutiko/dance/body/PagerFragment.kt @@ -1,8 +1,8 @@ package cl.cutiko.dance.body import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v4.view.ViewPager +import androidx.fragment.app.Fragment +import androidx.viewpager.widget.ViewPager import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -11,7 +11,11 @@ import cl.cutiko.dance.adapters.IntroAdapter class PagerFragment : Fragment() { - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { return inflater.inflate(R.layout.fragment_pager, container, false) } diff --git a/dance/src/main/java/cl/cutiko/dance/body/intro/IntroFragment.kt b/dance/src/main/java/cl/cutiko/dance/body/intro/IntroFragment.kt index a8e3274..8d80f12 100644 --- a/dance/src/main/java/cl/cutiko/dance/body/intro/IntroFragment.kt +++ b/dance/src/main/java/cl/cutiko/dance/body/intro/IntroFragment.kt @@ -1,11 +1,11 @@ package cl.cutiko.dance.body.intro import android.os.Bundle -import android.support.annotation.CallSuper -import android.support.annotation.DrawableRes -import android.support.annotation.StringRes -import android.support.v4.app.Fragment -import android.support.v4.content.ContextCompat +import androidx.annotation.CallSuper +import androidx.annotation.DrawableRes +import androidx.annotation.StringRes +import androidx.fragment.app.Fragment +import androidx.core.content.ContextCompat import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/dance/src/main/java/cl/cutiko/dance/body/intro/LoginFragment.kt b/dance/src/main/java/cl/cutiko/dance/body/intro/LoginFragment.kt index 55ed606..75fd2e2 100644 --- a/dance/src/main/java/cl/cutiko/dance/body/intro/LoginFragment.kt +++ b/dance/src/main/java/cl/cutiko/dance/body/intro/LoginFragment.kt @@ -1,7 +1,7 @@ package cl.cutiko.dance.body.intro import android.os.Bundle -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -11,18 +11,22 @@ import kotlinx.android.synthetic.main.fragment_login.* class LoginFragment : Fragment() { companion object { - fun newInstance() : LoginFragment = LoginFragment() + fun newInstance(): LoginFragment = LoginFragment() } - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { return inflater.inflate(R.layout.fragment_login, container, false) } override fun onActivityCreated(savedInstanceState: Bundle?) { super.onActivityCreated(savedInstanceState) - val googleBtn = activity!!.findViewById(R.id.googleBtn) - googleTv.setOnClickListener {googleBtn.performClick() } - val emailBtn = activity!!.findViewById(R.id.emailBtn) + val googleBtn = requireActivity().findViewById(R.id.googleBtn) + googleTv.setOnClickListener { googleBtn.performClick() } + val emailBtn = requireActivity().findViewById(R.id.emailBtn) emailTv.setOnClickListener { emailBtn.performClick() } } diff --git a/dance/src/main/java/cl/cutiko/dance/body/intro/PermissionFragment.kt b/dance/src/main/java/cl/cutiko/dance/body/intro/PermissionFragment.kt index 9157d5b..687d6a3 100644 --- a/dance/src/main/java/cl/cutiko/dance/body/intro/PermissionFragment.kt +++ b/dance/src/main/java/cl/cutiko/dance/body/intro/PermissionFragment.kt @@ -4,7 +4,7 @@ import android.Manifest import android.annotation.SuppressLint import android.content.pm.PackageManager import android.os.Bundle -import android.support.v4.content.ContextCompat +import androidx.core.content.ContextCompat import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/dance/src/main/java/cl/cutiko/dance/bottom/BottomFragment.kt b/dance/src/main/java/cl/cutiko/dance/bottom/BottomFragment.kt index 1193e46..62596c5 100644 --- a/dance/src/main/java/cl/cutiko/dance/bottom/BottomFragment.kt +++ b/dance/src/main/java/cl/cutiko/dance/bottom/BottomFragment.kt @@ -2,10 +2,10 @@ package cl.cutiko.dance.bottom import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v4.view.ViewPager -import android.support.v7.widget.LinearLayoutManager -import android.support.v7.widget.RecyclerView +import androidx.fragment.app.Fragment +import androidx.viewpager.widget.ViewPager +import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -29,7 +29,11 @@ class BottomFragment : Fragment(), ViewPager.OnPageChangeListener { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) view as RecyclerView - view.layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false) + view.layoutManager = LinearLayoutManager( + context, + LinearLayoutManager.HORIZONTAL, + false + ) view.setHasFixedSize(true) adapter = DotsAdapter() view.adapter = adapter diff --git a/dance/src/main/res/drawable/bg_login_btn_ripple.xml b/dance/src/main/res/drawable/bg_login_btn_ripple.xml index 672b347..b93a729 100644 --- a/dance/src/main/res/drawable/bg_login_btn_ripple.xml +++ b/dance/src/main/res/drawable/bg_login_btn_ripple.xml @@ -1,9 +1,10 @@ - + - - + + \ No newline at end of file diff --git a/dance/src/main/res/layout/content_fragment_permission.xml b/dance/src/main/res/layout/content_fragment_permission.xml index 2fc08aa..a00ec59 100644 --- a/dance/src/main/res/layout/content_fragment_permission.xml +++ b/dance/src/main/res/layout/content_fragment_permission.xml @@ -1,7 +1,7 @@ -