From 05417b10d0d22a4404dabcae0e3f99a0845f5778 Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Thu, 15 Jan 2015 17:44:31 +0100 Subject: [PATCH] Added fullscreen graph for landscape mode. [artf472308] --- .idea/libraries/GraphView_3_1_3.xml | 4 +++- .../libraries/support_annotations_21_0_0.xml | 11 +++++++++ .idea/libraries/support_v4_21_0_0.xml | 11 +++++++++ app/app.iml | 3 ++- app/build.gradle | 2 +- .../ericsson/uecontrol/gui/MainActivity.java | 24 ++++++++++--------- .../gui/fragments/BehaviourListFragment.java | 6 +++-- .../gui/fragments/StatusFragment.java | 8 ++++--- .../main/res/layout-land/activity_main.xml | 22 +++++++++++++++++ app/src/main/res/layout/activity_main.xml | 11 +++++---- 10 files changed, 79 insertions(+), 23 deletions(-) create mode 100755 .idea/libraries/support_annotations_21_0_0.xml create mode 100755 .idea/libraries/support_v4_21_0_0.xml create mode 100755 app/src/main/res/layout-land/activity_main.xml diff --git a/.idea/libraries/GraphView_3_1_3.xml b/.idea/libraries/GraphView_3_1_3.xml index b3b6a26..eafc475 100755 --- a/.idea/libraries/GraphView_3_1_3.xml +++ b/.idea/libraries/GraphView_3_1_3.xml @@ -4,6 +4,8 @@ - + + + \ No newline at end of file diff --git a/.idea/libraries/support_annotations_21_0_0.xml b/.idea/libraries/support_annotations_21_0_0.xml new file mode 100755 index 0000000..8f7df71 --- /dev/null +++ b/.idea/libraries/support_annotations_21_0_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_v4_21_0_0.xml b/.idea/libraries/support_v4_21_0_0.xml new file mode 100755 index 0000000..ee37424 --- /dev/null +++ b/.idea/libraries/support_v4_21_0_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/app.iml b/app/app.iml index fb36e3b..d3dba95 100755 --- a/app/app.iml +++ b/app/app.iml @@ -83,13 +83,14 @@ - + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 15d043e..2f0ad26 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,6 +34,6 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) // You must install or update the Support Repository through the SDK manager to use this dependency. - compile 'com.android.support:support-v4:19.1.+' + compile 'com.android.support:support-v4:+' } diff --git a/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java b/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java index 036669d..73c4a1e 100755 --- a/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java +++ b/app/src/main/java/com/ericsson/uecontrol/gui/MainActivity.java @@ -40,13 +40,14 @@ public class MainActivity extends FragmentActivity implements OnSharedPreference public static final String BEHAVIOUR_SAVE_FILE = "behaviour_list.json"; - /** Fragments **/ + /* Fragments */ private StatusFragment statusFragment; private BehaviourListFragment behaviourListFragment; private MenuItem action_execute; private MenuItem action_mark; private boolean backButtonPressed = false; + /* Static Data */ private static UeControlExecutor currentExecutor; private static CSVWriter csvLogger; private static int uid; @@ -68,14 +69,6 @@ public class MainActivity extends FragmentActivity implements OnSharedPreference // Setup Debugging setupDebugLogging(); - // Setup Main GUI - setContentView(R.layout.activity_main); - statusFragment = (StatusFragment) - getFragmentManager().findFragmentById(R.id.status_fragment); - behaviourListFragment = new BehaviourListFragment(); - getFragmentManager().beginTransaction() - .replace(R.id.container, behaviourListFragment).commit(); - // Setup Executor if(currentExecutor == null) { log.info("Creating new instance of executor"); @@ -101,8 +94,16 @@ public class MainActivity extends FragmentActivity implements OnSharedPreference log.info("Using existing executor"); } - currentExecutor.setThroughputListener(statusFragment.getThroughputListener()); + // Setup Main GUI + setContentView(R.layout.activity_main); + statusFragment = (StatusFragment) + getFragmentManager().findFragmentById(R.id.status_fragment); + behaviourListFragment = (BehaviourListFragment) + getFragmentManager().findFragmentById(R.id.behaviour_list_fragment); + + + currentExecutor.setThroughputListener(statusFragment.getThroughputListener()); updateExecutionState(); } @@ -225,7 +226,8 @@ public class MainActivity extends FragmentActivity implements OnSharedPreference try { if(tag.equals("import")) { currentExecutor.read(file.getAbsolutePath()); - behaviourListFragment.onResume(); + if(behaviourListFragment != null) + behaviourListFragment.onResume(); } else if(tag.equals("export")) { currentExecutor.save(file.getAbsolutePath()); diff --git a/app/src/main/java/com/ericsson/uecontrol/gui/fragments/BehaviourListFragment.java b/app/src/main/java/com/ericsson/uecontrol/gui/fragments/BehaviourListFragment.java index 9374190..36cee3a 100755 --- a/app/src/main/java/com/ericsson/uecontrol/gui/fragments/BehaviourListFragment.java +++ b/app/src/main/java/com/ericsson/uecontrol/gui/fragments/BehaviourListFragment.java @@ -61,8 +61,10 @@ public class BehaviourListFragment extends Fragment { @Override public void onResume() { - adapter.generateIds(); - adapter.notifyDataSetChanged(); + if(adapter != null) { + adapter.generateIds(); + adapter.notifyDataSetChanged(); + } super.onResume(); } diff --git a/app/src/main/java/com/ericsson/uecontrol/gui/fragments/StatusFragment.java b/app/src/main/java/com/ericsson/uecontrol/gui/fragments/StatusFragment.java index 899938f..50c56e4 100755 --- a/app/src/main/java/com/ericsson/uecontrol/gui/fragments/StatusFragment.java +++ b/app/src/main/java/com/ericsson/uecontrol/gui/fragments/StatusFragment.java @@ -65,12 +65,14 @@ public class StatusFragment extends Fragment { LineGraphView graphView = new LineGraphView(this.getActivity(), "GraphView"); graphView.addSeries(downGraph); graphView.addSeries(upGraph); - //graphView.setDrawDataPoints(true); - graphView.setViewPort(0, 120); - graphView.setScrollable(true); graphView.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); graphView.getGraphViewStyle().setGridStyle(GraphViewStyle.GridStyle.BOTH); graphView.setShowVerticalLabels(false); + //graphView.setDrawDataPoints(true); + graphView.setViewPort(0, 120); + graphView.setScrollable(true); + graphView.setDisableTouch(true); + graphView.scrollToEnd(); LinearLayout layout = (LinearLayout) view.findViewById(R.id.graph); layout.addView(graphView); diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml new file mode 100755 index 0000000..435c21f --- /dev/null +++ b/app/src/main/res/layout-land/activity_main.xml @@ -0,0 +1,22 @@ + + + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index f48d188..5e9de07 100755 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -12,7 +12,8 @@ android:layout_height="match_parent" android:orientation="vertical"> - - + android:layout_height="match_parent" + android:name="com.ericsson.uecontrol.gui.fragments.BehaviourListFragment" + tools:layout="@layout/fragment_item" />