diff --git a/app/build.gradle b/app/build.gradle index e709e72..29ef630 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -22,15 +22,15 @@ android { dependencies { implementation project(':medusalib') implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'com.google.android.material:material:1.0.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation 'androidx.vectordrawable:vectordrawable:1.0.1' + implementation 'androidx.vectordrawable:vectordrawable:1.1.0' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' } repositories { mavenCentral() diff --git a/app/src/main/java/com/trendyol/medusa/BaseFragment.kt b/app/src/main/java/com/trendyol/medusa/BaseFragment.kt index f3519bc..724e43b 100644 --- a/app/src/main/java/com/trendyol/medusa/BaseFragment.kt +++ b/app/src/main/java/com/trendyol/medusa/BaseFragment.kt @@ -9,7 +9,7 @@ open class BaseFragment : Fragment() { var multipleStackNavigator: MultipleStackNavigator? = null - override fun onAttach(context: Context?) { + override fun onAttach(context: Context) { super.onAttach(context) initStackNavigator(context) } diff --git a/app/src/main/java/com/trendyol/medusa/MainActivity.kt b/app/src/main/java/com/trendyol/medusa/MainActivity.kt index 89a27de..e988e38 100644 --- a/app/src/main/java/com/trendyol/medusa/MainActivity.kt +++ b/app/src/main/java/com/trendyol/medusa/MainActivity.kt @@ -15,6 +15,7 @@ import com.trendyol.medusalib.navigator.MultipleStackNavigator import com.trendyol.medusalib.navigator.Navigator import com.trendyol.medusalib.navigator.NavigatorConfiguration import com.trendyol.medusalib.navigator.transaction.NavigatorTransaction +import com.trendyol.medusalib.navigator.transitionanimation.TransitionAnimationType class MainActivity : AppCompatActivity(), Navigator.NavigatorListener { diff --git a/app/src/main/java/com/trendyol/medusa/MainActivity2.java b/app/src/main/java/com/trendyol/medusa/MainActivity2.java index 1323371..21ba623 100644 --- a/app/src/main/java/com/trendyol/medusa/MainActivity2.java +++ b/app/src/main/java/com/trendyol/medusa/MainActivity2.java @@ -15,6 +15,7 @@ import com.trendyol.medusalib.navigator.Navigator; import com.trendyol.medusalib.navigator.NavigatorConfiguration; import com.trendyol.medusalib.navigator.transaction.NavigatorTransaction; +import com.trendyol.medusalib.navigator.transitionanimation.TransitionAnimationType; import java.util.Arrays; import java.util.List; @@ -28,26 +29,26 @@ public class MainActivity2 extends AppCompatActivity implements Navigator.Naviga MultipleStackNavigator multipleStackNavigator; private List> rootsFragmentProvider = Arrays - .asList( - new Function0() { - @Override - public Fragment invoke() { - return FragmentGenerator.generateNewFragment(); - } - }, - new Function0() { - @Override - public Fragment invoke() { - return FragmentGenerator.generateNewFragment(); - } - }, - new Function0() { - @Override - public Fragment invoke() { - return FragmentGenerator.generateNewFragment(); - } - } - ); + .asList( + new Function0() { + @Override + public Fragment invoke() { + return FragmentGenerator.generateNewFragment(); + } + }, + new Function0() { + @Override + public Fragment invoke() { + return FragmentGenerator.generateNewFragment(); + } + }, + new Function0() { + @Override + public Fragment invoke() { + return FragmentGenerator.generateNewFragment(); + } + } + ); private BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener = new BottomNavigationView.OnNavigationItemSelectedListener() { @Override @@ -75,11 +76,12 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { navigation = findViewById(R.id.navigation); multipleStackNavigator = new MultipleStackNavigator( - getSupportFragmentManager(), - R.id.fragmentContainer, - rootsFragmentProvider, - this, - new NavigatorConfiguration(1, true, NavigatorTransaction.SHOW_HIDE)); + getSupportFragmentManager(), + R.id.fragmentContainer, + rootsFragmentProvider, + this, + new NavigatorConfiguration(1, true, NavigatorTransaction.SHOW_HIDE), + null); multipleStackNavigator.initialize(savedInstanceState); final SwitchCompat restartRootFragmentCheckBox = findViewById(R.id.restartSwitch); diff --git a/app/src/main/java/com/trendyol/medusa/SampleFragment.kt b/app/src/main/java/com/trendyol/medusa/SampleFragment.kt index 6daa923..61ed00e 100644 --- a/app/src/main/java/com/trendyol/medusa/SampleFragment.kt +++ b/app/src/main/java/com/trendyol/medusa/SampleFragment.kt @@ -1,19 +1,26 @@ package com.trendyol.medusa +import android.graphics.Color import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.Button +import android.widget.LinearLayout import android.widget.TextView +import com.trendyol.medusalib.navigator.transitionanimation.TransitionAnimationType +import kotlin.random.Random -class SampleFragment : BaseFragment(){ +class SampleFragment : BaseFragment() { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { val view = inflater.inflate(R.layout.fragment_sample, container, false)!! view.findViewById(R.id.textview).text = arguments!!.getString(KEY) + + view.findViewById(R.id.root).setBackgroundColor(Color.argb(255, Random.nextInt(256), Random.nextInt(256), Random.nextInt(256))) + view.findViewById