diff --git a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java index 563b4af4..e790e092 100644 --- a/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java +++ b/app/src/main/java/com/gmeremit/online/gmeremittance_native/splash_screen/view/SplashScreen.java @@ -56,7 +56,7 @@ import butterknife.ButterKnife; public class SplashScreen extends BaseActivity implements View.OnClickListener, LanguageSelectionRVAdapter.LanguageSelectionListener, SplashScreenPresenterInterface.SplashScreenContractInterfacee { @BindView(R.id.view_pager) - ViewPager view_pager; + ConstraintLayout view_pager; ViewPagerAVDSplashAdapter viewPagerAdapter; @@ -134,7 +134,7 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener, if (savedInstanceState == null) { languageViewTransitionManager.underlineTitleText(true); presenter.checkCurrentSelectedLanguage(); - view_pager.post(() -> viewPageChangeListener.onPageSelected(view_pager.getCurrentItem())); +// view_pager.post(() -> viewPageChangeListener.onPageSelected(view_pager.getCurrentItem())); } } @@ -144,14 +144,14 @@ public class SplashScreen extends BaseActivity implements View.OnClickListener, initAntiDebugger(); languageViewTransitionManager = new LanguageViewTransitionManager(this); - addBottomDots(0); +// addBottomDots(0); - view_pager.addOnPageChangeListener(viewPageChangeListener); - viewPagerAdapter = new ViewPagerAVDSplashAdapter(getSupportFragmentManager()); -// viewPagerAdapter = new ViewPagerAdapter(); - setupViewPagerAdapter(); - view_pager.setAdapter(viewPagerAdapter); - view_pager.setOffscreenPageLimit(3); +// view_pager.addOnPageChangeListener(viewPageChangeListener); +// viewPagerAdapter = new ViewPagerAVDSplashAdapter(getSupportFragmentManager()); +//// viewPagerAdapter = new ViewPagerAdapter(); +// setupViewPagerAdapter(); +// view_pager.setAdapter(viewPagerAdapter); +// view_pager.setOffscreenPageLimit(3); languageSelectionRVAdapter = new LanguageSelectionRVAdapter(); languageSelectionRVAdapter.setLanguageSelectionListener(this); diff --git a/app/src/main/res/drawable/curve_rectangle_grey_outline_white_bg.xml b/app/src/main/res/drawable/curve_rectangle_grey_outline_white_bg.xml new file mode 100644 index 00000000..0db6895d --- /dev/null +++ b/app/src/main/res/drawable/curve_rectangle_grey_outline_white_bg.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/app/src/main/res/layout/activity_splash_screen_key_1.xml b/app/src/main/res/layout/activity_splash_screen_key_1.xml index 26dd8e72..c67da999 100644 --- a/app/src/main/res/layout/activity_splash_screen_key_1.xml +++ b/app/src/main/res/layout/activity_splash_screen_key_1.xml @@ -12,23 +12,23 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:adjustViewBounds="false" - android:paddingBottom="@dimen/_16sdp" - android:paddingEnd="@dimen/_10sdp" + android:alpha="0" android:paddingStart="@dimen/_16sdp" android:paddingTop="@dimen/_26sdp" + android:paddingEnd="@dimen/_10sdp" + android:paddingBottom="@dimen/_16sdp" android:scaleType="center" android:src="@drawable/ic_back_white" - android:alpha="0" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toBottomOf="@+id/selectedLanguageText" /> - + app:layout_constraintTop_toBottomOf="@+id/selectedLanguageIcon"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + app:layout_constraintEnd_toStartOf="@+id/btn_new_user" + app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintStart_toEndOf="@+id/languageRv" + app:layout_constraintStart_toStartOf="parent" /> + app:layout_constraintHorizontal_bias="0.5" + app:layout_constraintStart_toEndOf="@+id/btn_login" /> + app:layout_constraintStart_toStartOf="parent" />