From f34ae7f136344c12fced40bdbd3dbc470b2d3e83 Mon Sep 17 00:00:00 2001 From: bujlaki Date: Wed, 26 Oct 2016 16:37:03 +0200 Subject: [PATCH 1/2] built new todo fragment layout --- .../animated_vector_drawable_23_4_0.xml | 12 ++++ .idea/libraries/appcompat_v7_23_4_0.xml | 15 ++++ .idea/libraries/espresso_core_2_2_2.xml | 12 ++++ .../espresso_idling_resource_2_2_2.xml | 12 ++++ ...xposed_instrumentation_api_publish_0_5.xml | 12 ++++ .idea/libraries/hamcrest_core_1_3.xml | 11 +++ .idea/libraries/hamcrest_integration_1_3.xml | 9 +++ .idea/libraries/hamcrest_library_1_3.xml | 9 +++ .idea/libraries/javawriter_2_1_1.xml | 9 +++ .idea/libraries/javax_annotation_api_1_2.xml | 9 +++ .idea/libraries/javax_inject_1.xml | 9 +++ .idea/libraries/jsr305_2_0_1.xml | 9 +++ .idea/libraries/junit_4_12.xml | 11 +++ .idea/libraries/rules_0_5.xml | 15 ++++ .idea/libraries/runner_0_5.xml | 15 ++++ .../libraries/support_annotations_23_4_0.xml | 11 +++ .idea/libraries/support_v4_23_4_0.xml | 16 +++++ .../support_vector_drawable_23_4_0.xml | 12 ++++ .idea/modules.xml | 9 +++ .idea/runConfigurations.xml | 12 ++++ .idea/vcs.xml | 1 - build.gradle | 2 +- todoman/build.gradle | 1 + .../uab/dedam/todoman/NewTodoFragment.java | 29 ++++++++ .../uab/dedam/todoman/TodoListFragment.java | 29 ++++++++ todoman/src/main/res/layout/activity_home.xml | 3 +- .../src/main/res/layout/fragment_new_todo.xml | 70 +++++++++++++++++++ .../main/res/layout/fragment_todo_list.xml | 23 ++++++ todoman/src/main/res/values/strings.xml | 11 +++ 29 files changed, 394 insertions(+), 4 deletions(-) create mode 100644 .idea/libraries/animated_vector_drawable_23_4_0.xml create mode 100644 .idea/libraries/appcompat_v7_23_4_0.xml create mode 100644 .idea/libraries/espresso_core_2_2_2.xml create mode 100644 .idea/libraries/espresso_idling_resource_2_2_2.xml create mode 100644 .idea/libraries/exposed_instrumentation_api_publish_0_5.xml create mode 100644 .idea/libraries/hamcrest_core_1_3.xml create mode 100644 .idea/libraries/hamcrest_integration_1_3.xml create mode 100644 .idea/libraries/hamcrest_library_1_3.xml create mode 100644 .idea/libraries/javawriter_2_1_1.xml create mode 100644 .idea/libraries/javax_annotation_api_1_2.xml create mode 100644 .idea/libraries/javax_inject_1.xml create mode 100644 .idea/libraries/jsr305_2_0_1.xml create mode 100644 .idea/libraries/junit_4_12.xml create mode 100644 .idea/libraries/rules_0_5.xml create mode 100644 .idea/libraries/runner_0_5.xml create mode 100644 .idea/libraries/support_annotations_23_4_0.xml create mode 100644 .idea/libraries/support_v4_23_4_0.xml create mode 100644 .idea/libraries/support_vector_drawable_23_4_0.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/runConfigurations.xml create mode 100644 todoman/src/main/java/org/uab/dedam/todoman/NewTodoFragment.java create mode 100644 todoman/src/main/java/org/uab/dedam/todoman/TodoListFragment.java create mode 100644 todoman/src/main/res/layout/fragment_new_todo.xml create mode 100644 todoman/src/main/res/layout/fragment_todo_list.xml diff --git a/.idea/libraries/animated_vector_drawable_23_4_0.xml b/.idea/libraries/animated_vector_drawable_23_4_0.xml new file mode 100644 index 0000000..2fdbff8 --- /dev/null +++ b/.idea/libraries/animated_vector_drawable_23_4_0.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/appcompat_v7_23_4_0.xml b/.idea/libraries/appcompat_v7_23_4_0.xml new file mode 100644 index 0000000..2341f14 --- /dev/null +++ b/.idea/libraries/appcompat_v7_23_4_0.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/espresso_core_2_2_2.xml b/.idea/libraries/espresso_core_2_2_2.xml new file mode 100644 index 0000000..5e31ba6 --- /dev/null +++ b/.idea/libraries/espresso_core_2_2_2.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/espresso_idling_resource_2_2_2.xml b/.idea/libraries/espresso_idling_resource_2_2_2.xml new file mode 100644 index 0000000..e524528 --- /dev/null +++ b/.idea/libraries/espresso_idling_resource_2_2_2.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml b/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml new file mode 100644 index 0000000..0e76409 --- /dev/null +++ b/.idea/libraries/exposed_instrumentation_api_publish_0_5.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/hamcrest_core_1_3.xml b/.idea/libraries/hamcrest_core_1_3.xml new file mode 100644 index 0000000..157e3f3 --- /dev/null +++ b/.idea/libraries/hamcrest_core_1_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/hamcrest_integration_1_3.xml b/.idea/libraries/hamcrest_integration_1_3.xml new file mode 100644 index 0000000..58b2c4b --- /dev/null +++ b/.idea/libraries/hamcrest_integration_1_3.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/hamcrest_library_1_3.xml b/.idea/libraries/hamcrest_library_1_3.xml new file mode 100644 index 0000000..676cc63 --- /dev/null +++ b/.idea/libraries/hamcrest_library_1_3.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/javawriter_2_1_1.xml b/.idea/libraries/javawriter_2_1_1.xml new file mode 100644 index 0000000..a66fefb --- /dev/null +++ b/.idea/libraries/javawriter_2_1_1.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/javax_annotation_api_1_2.xml b/.idea/libraries/javax_annotation_api_1_2.xml new file mode 100644 index 0000000..811e73f --- /dev/null +++ b/.idea/libraries/javax_annotation_api_1_2.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/javax_inject_1.xml b/.idea/libraries/javax_inject_1.xml new file mode 100644 index 0000000..0d1d5fc --- /dev/null +++ b/.idea/libraries/javax_inject_1.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/jsr305_2_0_1.xml b/.idea/libraries/jsr305_2_0_1.xml new file mode 100644 index 0000000..cdf9878 --- /dev/null +++ b/.idea/libraries/jsr305_2_0_1.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/junit_4_12.xml b/.idea/libraries/junit_4_12.xml new file mode 100644 index 0000000..305df30 --- /dev/null +++ b/.idea/libraries/junit_4_12.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/rules_0_5.xml b/.idea/libraries/rules_0_5.xml new file mode 100644 index 0000000..f480407 --- /dev/null +++ b/.idea/libraries/rules_0_5.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/runner_0_5.xml b/.idea/libraries/runner_0_5.xml new file mode 100644 index 0000000..b1ac45f --- /dev/null +++ b/.idea/libraries/runner_0_5.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_annotations_23_4_0.xml b/.idea/libraries/support_annotations_23_4_0.xml new file mode 100644 index 0000000..cfc8b8a --- /dev/null +++ b/.idea/libraries/support_annotations_23_4_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_v4_23_4_0.xml b/.idea/libraries/support_v4_23_4_0.xml new file mode 100644 index 0000000..afa6753 --- /dev/null +++ b/.idea/libraries/support_v4_23_4_0.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_vector_drawable_23_4_0.xml b/.idea/libraries/support_vector_drawable_23_4_0.xml new file mode 100644 index 0000000..3065305 --- /dev/null +++ b/.idea/libraries/support_vector_drawable_23_4_0.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..0280779 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 8306744..94a25f7 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,7 +1,6 @@ - \ No newline at end of file diff --git a/build.gradle b/build.gradle index 168baf1..900de7b 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.1' + classpath 'com.android.tools.build:gradle:2.2.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/todoman/build.gradle b/todoman/build.gradle index 1c3b43d..1c35422 100644 --- a/todoman/build.gradle +++ b/todoman/build.gradle @@ -28,5 +28,6 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' }) compile 'com.android.support:appcompat-v7:23.4.0' + compile 'com.android.support:support-v4:23.4.0' testCompile 'junit:junit:4.12' } diff --git a/todoman/src/main/java/org/uab/dedam/todoman/NewTodoFragment.java b/todoman/src/main/java/org/uab/dedam/todoman/NewTodoFragment.java new file mode 100644 index 0000000..619087f --- /dev/null +++ b/todoman/src/main/java/org/uab/dedam/todoman/NewTodoFragment.java @@ -0,0 +1,29 @@ +package org.uab.dedam.todoman; + + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + + +/** + * A simple {@link Fragment} subclass. + */ +public class NewTodoFragment extends Fragment { + + + public NewTodoFragment() { + // Required empty public constructor + } + + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_new_todo, container, false); + } + +} diff --git a/todoman/src/main/java/org/uab/dedam/todoman/TodoListFragment.java b/todoman/src/main/java/org/uab/dedam/todoman/TodoListFragment.java new file mode 100644 index 0000000..fcd67e3 --- /dev/null +++ b/todoman/src/main/java/org/uab/dedam/todoman/TodoListFragment.java @@ -0,0 +1,29 @@ +package org.uab.dedam.todoman; + + +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + + +/** + * A simple {@link Fragment} subclass. + */ +public class TodoListFragment extends Fragment { + + + public TodoListFragment() { + // Required empty public constructor + } + + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_todo_list, container, false); + } + +} diff --git a/todoman/src/main/res/layout/activity_home.xml b/todoman/src/main/res/layout/activity_home.xml index 8a669a2..942a331 100644 --- a/todoman/src/main/res/layout/activity_home.xml +++ b/todoman/src/main/res/layout/activity_home.xml @@ -8,6 +8,5 @@ android:paddingTop="@dimen/activity_vertical_margin" tools:context="org.uab.dedam.todoman.HomeActivity"> - + diff --git a/todoman/src/main/res/layout/fragment_new_todo.xml b/todoman/src/main/res/layout/fragment_new_todo.xml new file mode 100644 index 0000000..8ebfde2 --- /dev/null +++ b/todoman/src/main/res/layout/fragment_new_todo.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + +