diff --git a/source-code/app/src/main/assets/BasicmLearningApp.apk b/source-code/app/src/main/assets/BasicmLearningApp.apk index f9d10df4..f21608f7 100644 Binary files a/source-code/app/src/main/assets/BasicmLearningApp.apk and b/source-code/app/src/main/assets/BasicmLearningApp.apk differ diff --git a/source-code/app/src/main/assets/ComprehensionApp.apk b/source-code/app/src/main/assets/ComprehensionApp.apk index 94c013ee..71dac940 100644 Binary files a/source-code/app/src/main/assets/ComprehensionApp.apk and b/source-code/app/src/main/assets/ComprehensionApp.apk differ diff --git a/source-code/app/src/main/assets/DictationApp.apk b/source-code/app/src/main/assets/DictationApp.apk index 2cc049d6..7db03cdc 100644 Binary files a/source-code/app/src/main/assets/DictationApp.apk and b/source-code/app/src/main/assets/DictationApp.apk differ diff --git a/source-code/app/src/main/assets/FlashCardTemplateApp.apk b/source-code/app/src/main/assets/FlashCardTemplateApp.apk index 56d80ce2..2f04a45f 100644 Binary files a/source-code/app/src/main/assets/FlashCardTemplateApp.apk and b/source-code/app/src/main/assets/FlashCardTemplateApp.apk differ diff --git a/source-code/app/src/main/assets/LearnSpellingsApp.apk b/source-code/app/src/main/assets/LearnSpellingsApp.apk index e1f45b05..f7d0dc1b 100644 Binary files a/source-code/app/src/main/assets/LearnSpellingsApp.apk and b/source-code/app/src/main/assets/LearnSpellingsApp.apk differ diff --git a/source-code/app/src/main/assets/MatchApp.apk b/source-code/app/src/main/assets/MatchApp.apk index 8aaa74e1..6f8af7e1 100644 Binary files a/source-code/app/src/main/assets/MatchApp.apk and b/source-code/app/src/main/assets/MatchApp.apk differ diff --git a/source-code/app/src/main/assets/QuizTemplateApp.apk b/source-code/app/src/main/assets/QuizTemplateApp.apk index f0688666..fc52bd11 100644 Binary files a/source-code/app/src/main/assets/QuizTemplateApp.apk and b/source-code/app/src/main/assets/QuizTemplateApp.apk differ diff --git a/source-code/app/src/main/assets/VideoCollectionApp.apk b/source-code/app/src/main/assets/VideoCollectionApp.apk index 6b1ac0ab..5dbf13a7 100644 Binary files a/source-code/app/src/main/assets/VideoCollectionApp.apk and b/source-code/app/src/main/assets/VideoCollectionApp.apk differ diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/dictationtemplate/fragment/DetailActivityFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/dictationtemplate/fragment/DetailActivityFragment.java index b8acaa41..1c7d2b7b 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/dictationtemplate/fragment/DetailActivityFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/dictationtemplate/fragment/DetailActivityFragment.java @@ -8,6 +8,7 @@ import android.database.Cursor; import android.os.Build; import android.os.Bundle; +import android.support.annotation.Nullable; import android.speech.tts.TextToSpeech; import android.speech.tts.UtteranceProgressListener; import android.support.v4.app.Fragment; @@ -17,6 +18,7 @@ import android.support.v7.app.AlertDialog; import android.support.v7.widget.Toolbar; import android.text.method.LinkMovementMethod; +import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -119,6 +121,25 @@ public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); } + @Override + public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); + getView().setFocusableInTouchMode(true); + getView().requestFocus(); + getView().setOnKeyListener(new View.OnKeyListener() { + @Override + public boolean onKey(View v, int keyCode, KeyEvent event) { + if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN) { + getActivity().getSupportFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE); + getActivity().getSupportFragmentManager().beginTransaction().replace(((ViewGroup) getView().getParent()).getId(), org.buildmlearn.toolkit.dictationtemplate.fragment.MainActivityFragment.newInstance()).addToBackStack(null).commit(); + return true; + } + return false; + } + }); + + } + @Override public Loader onCreateLoader(int id, Bundle args) { if (null != dictId) { diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/flashcardtemplate/fragment/MainFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/flashcardtemplate/fragment/MainFragment.java index c7ff0646..87d08f15 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/flashcardtemplate/fragment/MainFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/flashcardtemplate/fragment/MainFragment.java @@ -1,6 +1,5 @@ package org.buildmlearn.toolkit.flashcardtemplate.fragment; -import android.app.FragmentManager; import android.content.Context; import android.content.Intent; import android.database.Cursor; @@ -132,7 +131,6 @@ public boolean onMenuItemClick(MenuItem item) { Fragment frag = MainFragment.newInstance(); frag.setArguments(arguments); - getActivity().getSupportFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE); getActivity().getSupportFragmentManager().beginTransaction().replace(((ViewGroup) getView().getParent()).getId(), frag).addToBackStack(null).commit(); return false; @@ -194,7 +192,6 @@ public void onClick(View v) { Fragment frag = MainFragment.newInstance(); frag.setArguments(arguments); - getActivity().getSupportFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE); getActivity().getSupportFragmentManager().beginTransaction().replace(((ViewGroup) getView().getParent()).getId(), frag).addToBackStack(null).commit(); } @@ -214,7 +211,6 @@ public void onClick(View v) { Fragment frag = MainFragment.newInstance(); frag.setArguments(arguments); - getActivity().getSupportFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE); getActivity().getSupportFragmentManager().beginTransaction().replace(((ViewGroup) getView().getParent()).getId(), frag).addToBackStack(null).commit(); @@ -223,7 +219,6 @@ public void onClick(View v) { Bundle arguments = new Bundle(); Fragment frag = LastFragment.newInstance(); frag.setArguments(arguments); - getActivity().getSupportFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE); getActivity().getSupportFragmentManager().beginTransaction().replace(((ViewGroup) getView().getParent()).getId(), frag).addToBackStack(null).commit(); } diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/videocollectiontemplate/fragment/DetailActivityFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/videocollectiontemplate/fragment/DetailActivityFragment.java index d1dacef8..82b2473f 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/videocollectiontemplate/fragment/DetailActivityFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/videocollectiontemplate/fragment/DetailActivityFragment.java @@ -104,6 +104,7 @@ public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); } + @Override public Loader onCreateLoader(int id, Bundle args) { if (null != videoId) { diff --git a/source-code/app/src/main/java/org/buildmlearn/toolkit/videocollectiontemplate/fragment/LastFragment.java b/source-code/app/src/main/java/org/buildmlearn/toolkit/videocollectiontemplate/fragment/LastFragment.java index faf27b3f..c696c757 100644 --- a/source-code/app/src/main/java/org/buildmlearn/toolkit/videocollectiontemplate/fragment/LastFragment.java +++ b/source-code/app/src/main/java/org/buildmlearn/toolkit/videocollectiontemplate/fragment/LastFragment.java @@ -36,6 +36,7 @@ public void onClick(View v) { Fragment frag = DetailActivityFragment.newInstance(); frag.setArguments(arguments); getActivity().getSupportFragmentManager().popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE); + getActivity().getSupportFragmentManager().beginTransaction().replace(((ViewGroup) getView().getParent()).getId(), MainActivityFragment.newInstance()).addToBackStack(null).commit(); getActivity().getSupportFragmentManager().beginTransaction().replace(((ViewGroup) getView().getParent()).getId(), frag).addToBackStack(null).commit(); } }); diff --git a/source-code/gradle.properties b/source-code/gradle.properties index 5b45bc44..74d56b1f 100644 --- a/source-code/gradle.properties +++ b/source-code/gradle.properties @@ -1,18 +1,15 @@ -# Project-wide Gradle settings. - -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. - +## Project-wide Gradle settings. +# # For more details on how to configure your build environment visit # http://www.gradle.org/docs/current/userguide/build_environment.html - +# # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -# Default value: -Xmx10248m -XX:MaxPermSize=256m - - +# Default value: -Xmx1024m -XX:MaxPermSize=256m +# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +# # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true +#Sat Jan 14 09:01:08 IST 2017