From c1e57e25cba662b6e088da4198eaa05de1e7a976 Mon Sep 17 00:00:00 2001 From: Amin Date: Mon, 5 Oct 2020 18:39:08 +0330 Subject: [PATCH 1/2] animations added to fragment transaction for better performance --- .../codingguide/activity/ControlActivity.kt | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/anant/codingguide/activity/ControlActivity.kt b/app/src/main/java/com/anant/codingguide/activity/ControlActivity.kt index e91c2a0..332556c 100644 --- a/app/src/main/java/com/anant/codingguide/activity/ControlActivity.kt +++ b/app/src/main/java/com/anant/codingguide/activity/ControlActivity.kt @@ -17,6 +17,7 @@ import com.anant.codingguide.R import com.anant.codingguide.fragment.* import com.google.android.material.navigation.NavigationView import androidx.appcompat.app.AlertDialog.Builder +import androidx.fragment.app.FragmentTransaction class ControlActivity : AppCompatActivity() { @@ -71,7 +72,9 @@ class ControlActivity : AppCompatActivity() { R.id.language->{ supportFragmentManager.beginTransaction().replace(R.id.frame, LanguagesFragment() - ).commit() + ) + .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE) + .commit() supportActionBar?.title="Programming languages" drawerLayout.closeDrawers() } @@ -79,7 +82,9 @@ class ControlActivity : AppCompatActivity() { R.id.dev->{ supportFragmentManager.beginTransaction().replace(R.id.frame, DevelopmentFragment() - ).commit() + ) + .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE) + .commit() supportActionBar?.title="Software Development" drawerLayout.closeDrawers() } @@ -87,7 +92,9 @@ class ControlActivity : AppCompatActivity() { R.id.quest->{ supportFragmentManager.beginTransaction().replace(R.id.frame, CompetitiveProgrammingFragment() - ).commit() + ) + .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE) + .commit() supportActionBar?.title="Competitive programming" drawerLayout.closeDrawers() } @@ -97,7 +104,9 @@ class ControlActivity : AppCompatActivity() { R.id.compiler->{ supportFragmentManager.beginTransaction().replace(R.id.frame, CompilerFragment() - ).commit() + ) + .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE) + .commit() supportActionBar?.title="Test your Code" drawerLayout.closeDrawers() } From 0bde394f2245d630117ee7032ca23aa2bb480319 Mon Sep 17 00:00:00 2001 From: Amin Date: Mon, 5 Oct 2020 19:48:25 +0330 Subject: [PATCH 2/2] nestedScrollView added to competetiveprogrammingFragment and hardcoded colors for backgrounds fixed! --- .../anant/codingguide/activity/ControlActivity.kt | 1 - app/src/main/res/drawable/mybutton.xml | 2 +- app/src/main/res/layout/activity_control.xml | 1 - app/src/main/res/layout/activity_splash.xml | 2 +- app/src/main/res/layout/activity_welcome.xml | 11 +++++++---- app/src/main/res/layout/drawer_header.xml | 3 ++- .../res/layout/fragment_competitiveprogramming.xml | 12 +++++++++--- app/src/main/res/layout/fragment_compiler.xml | 2 +- app/src/main/res/layout/fragment_development.xml | 2 +- app/src/main/res/layout/fragment_home.xml | 2 +- app/src/main/res/layout/fragment_languages.xml | 2 +- app/src/main/res/values/colors.xml | 3 +++ 12 files changed, 27 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/anant/codingguide/activity/ControlActivity.kt b/app/src/main/java/com/anant/codingguide/activity/ControlActivity.kt index 332556c..5a9a153 100644 --- a/app/src/main/java/com/anant/codingguide/activity/ControlActivity.kt +++ b/app/src/main/java/com/anant/codingguide/activity/ControlActivity.kt @@ -1,6 +1,5 @@ package com.anant.codingguide.activity -//import android.widget.Toolbar import android.content.DialogInterface import android.os.Bundle diff --git a/app/src/main/res/drawable/mybutton.xml b/app/src/main/res/drawable/mybutton.xml index 11271cc..d5b300f 100644 --- a/app/src/main/res/drawable/mybutton.xml +++ b/app/src/main/res/drawable/mybutton.xml @@ -3,6 +3,6 @@ android:shape="rectangle" > - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_control.xml b/app/src/main/res/layout/activity_control.xml index d579ff6..6417185 100644 --- a/app/src/main/res/layout/activity_control.xml +++ b/app/src/main/res/layout/activity_control.xml @@ -16,7 +16,6 @@ diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index 73f9566..78b7956 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#bbdefb" + android:background="@color/blueOcean" tools:context=".activity.SplashActivity"> diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml index cefdc08..96b2e35 100644 --- a/app/src/main/res/layout/activity_welcome.xml +++ b/app/src/main/res/layout/activity_welcome.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".activity.WelcomeActivity" - android:background="#bbdefb"> + android:background="@color/blueOcean"> @@ -23,6 +24,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/cod" + android:elevation="4dp" android:layout_below="@id/txtWelcome" android:layout_centerHorizontal="true" android:layout_marginTop="50dp"/> @@ -33,9 +35,10 @@ android:layout_height="wrap_content" android:layout_below="@id/txtWelcome" android:layout_centerInParent="true" + android:elevation="4dp" android:layout_marginTop="300dp" - android:background="@color/colorPrimary" - android:textColor="#000000" + android:background="@drawable/mybutton" + android:textColor="@color/white" android:text="Get Started"/> diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml index e3a1972..154265e 100644 --- a/app/src/main/res/layout/drawer_header.xml +++ b/app/src/main/res/layout/drawer_header.xml @@ -20,6 +20,7 @@ android:layout_below="@id/imgLogo" android:textSize="38sp" android:layout_centerInParent="true" - android:textColor="@color/colorPrimaryDark" /> + android:textStyle="bold" + android:textColor="@color/white" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_competitiveprogramming.xml b/app/src/main/res/layout/fragment_competitiveprogramming.xml index 8a411e5..5cb705b 100644 --- a/app/src/main/res/layout/fragment_competitiveprogramming.xml +++ b/app/src/main/res/layout/fragment_competitiveprogramming.xml @@ -1,10 +1,14 @@ - + + android:background="@color/blueOcean"> \ No newline at end of file + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_compiler.xml b/app/src/main/res/layout/fragment_compiler.xml index fc8b357..c78656b 100644 --- a/app/src/main/res/layout/fragment_compiler.xml +++ b/app/src/main/res/layout/fragment_compiler.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".fragment.CompilerFragment" - android:background="#bbdefb"> + android:background="@color/blueOcean"> + android:background="@color/blueOcean"> diff --git a/app/src/main/res/layout/fragment_languages.xml b/app/src/main/res/layout/fragment_languages.xml index e196b95..228cf3a 100644 --- a/app/src/main/res/layout/fragment_languages.xml +++ b/app/src/main/res/layout/fragment_languages.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#bbdefb"> + android:background="@color/blueOcean"> #4dabf5 #1769aa #2196f3 + + #FFFFFF + #bbdefb \ No newline at end of file