diff --git a/Week_04_Simple_Views_and_Layouts/README.md b/Week_04_Simple_Views_and_Layouts/README.md
index 6fb7bf1..d4b2dff 100644
--- a/Week_04_Simple_Views_and_Layouts/README.md
+++ b/Week_04_Simple_Views_and_Layouts/README.md
@@ -132,6 +132,8 @@ Note here:
1. The 'home' button doesn't destroy your activity. The system will remember your app's current state. So press 'home' button and then press your app icon to restart your app is **NOT** a way to show data persistence.
2. If the system must recover memory in an emergency, `onStop()` and `onDestroy()` might not be called. Again, to save data for the sake of persistence you'll need to do it in `onPause()`.
+> [What is the correct order of calling superclass methods in onPause, onStop and onDestroy methods? and Why?](https://stackoverflow.com/questions/18821481/what-is-the-correct-order-of-calling-superclass-methods-in-onpause-onstop-and-o)
+
### FrameLayout, ScrollView and TableLayouts
In this section, you'll continue working on 'My Activities' project and make it a 3-activity app. The idea is that in the main activity if you click a button (i.e. 'write note') it'll take you to a second activity where you can take some notes. Once finished, if you click 'display', all the info you typed will be displayed in a new 3rd activity.
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/AdapterViewHierarchy.png b/Week_05_AdapterViews_and_Fragments/.md_images/AdapterViewHierarchy.png
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/AdapterViewHierarchy.png
rename to Week_05_AdapterViews_and_Fragments/.md_images/AdapterViewHierarchy.png
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/HeirarchyOfAdapter.png b/Week_05_AdapterViews_and_Fragments/.md_images/HeirarchyOfAdapter.png
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/HeirarchyOfAdapter.png
rename to Week_05_AdapterViews_and_Fragments/.md_images/HeirarchyOfAdapter.png
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/adapters-1.png b/Week_05_AdapterViews_and_Fragments/.md_images/adapters-1.png
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/adapters-1.png
rename to Week_05_AdapterViews_and_Fragments/.md_images/adapters-1.png
diff --git a/Week_05_AdapterViews_and_Fragments/.md_images/blank.png b/Week_05_AdapterViews_and_Fragments/.md_images/blank.png
new file mode 100644
index 0000000..3f179d2
Binary files /dev/null and b/Week_05_AdapterViews_and_Fragments/.md_images/blank.png differ
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/complete_android_fragment_lifecycle.png b/Week_05_AdapterViews_and_Fragments/.md_images/complete_android_fragment_lifecycle.png
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/complete_android_fragment_lifecycle.png
rename to Week_05_AdapterViews_and_Fragments/.md_images/complete_android_fragment_lifecycle.png
diff --git a/Week_05_AdapterViews_and_Fragments/.md_images/frag_warn.png b/Week_05_AdapterViews_and_Fragments/.md_images/frag_warn.png
new file mode 100644
index 0000000..3d67017
Binary files /dev/null and b/Week_05_AdapterViews_and_Fragments/.md_images/frag_warn.png differ
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/grid.png b/Week_05_AdapterViews_and_Fragments/.md_images/grid.png
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/grid.png
rename to Week_05_AdapterViews_and_Fragments/.md_images/grid.png
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/land.png b/Week_05_AdapterViews_and_Fragments/.md_images/land.png
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/land.png
rename to Week_05_AdapterViews_and_Fragments/.md_images/land.png
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/list_res.png b/Week_05_AdapterViews_and_Fragments/.md_images/list_res.png
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/list_res.png
rename to Week_05_AdapterViews_and_Fragments/.md_images/list_res.png
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/listitem.png b/Week_05_AdapterViews_and_Fragments/.md_images/listitem.png
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/listitem.png
rename to Week_05_AdapterViews_and_Fragments/.md_images/listitem.png
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/lists.png b/Week_05_AdapterViews_and_Fragments/.md_images/lists.png
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/lists.png
rename to Week_05_AdapterViews_and_Fragments/.md_images/lists.png
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/package.png b/Week_05_AdapterViews_and_Fragments/.md_images/package.png
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/package.png
rename to Week_05_AdapterViews_and_Fragments/.md_images/package.png
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/panels.png b/Week_05_AdapterViews_and_Fragments/.md_images/panels.png
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/panels.png
rename to Week_05_AdapterViews_and_Fragments/.md_images/panels.png
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/photo.png b/Week_05_AdapterViews_and_Fragments/.md_images/photo.png
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/photo.png
rename to Week_05_AdapterViews_and_Fragments/.md_images/photo.png
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/port.png b/Week_05_AdapterViews_and_Fragments/.md_images/port.png
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/port.png
rename to Week_05_AdapterViews_and_Fragments/.md_images/port.png
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/simple.png b/Week_05_AdapterViews_and_Fragments/.md_images/simple.png
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/simple.png
rename to Week_05_AdapterViews_and_Fragments/.md_images/simple.png
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/static.png b/Week_05_AdapterViews_and_Fragments/.md_images/static.png
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/static.png
rename to Week_05_AdapterViews_and_Fragments/.md_images/static.png
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/todo.png b/Week_05_AdapterViews_and_Fragments/.md_images/todo.png
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/.md_images/todo.png
rename to Week_05_AdapterViews_and_Fragments/.md_images/todo.png
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/.gitignore b/Week_05_AdapterViews_and_Fragments/MyFragments/.gitignore
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/.gitignore
rename to Week_05_AdapterViews_and_Fragments/MyFragments/.gitignore
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/.idea/compiler.xml b/Week_05_AdapterViews_and_Fragments/MyFragments/.idea/compiler.xml
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/.idea/compiler.xml
rename to Week_05_AdapterViews_and_Fragments/MyFragments/.idea/compiler.xml
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/.idea/copyright/profiles_settings.xml b/Week_05_AdapterViews_and_Fragments/MyFragments/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/.idea/copyright/profiles_settings.xml
rename to Week_05_AdapterViews_and_Fragments/MyFragments/.idea/copyright/profiles_settings.xml
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyLists/.idea/gradle.xml b/Week_05_AdapterViews_and_Fragments/MyFragments/.idea/gradle.xml
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyLists/.idea/gradle.xml
rename to Week_05_AdapterViews_and_Fragments/MyFragments/.idea/gradle.xml
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/.idea/misc.xml b/Week_05_AdapterViews_and_Fragments/MyFragments/.idea/misc.xml
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/.idea/misc.xml
rename to Week_05_AdapterViews_and_Fragments/MyFragments/.idea/misc.xml
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/.idea/modules.xml b/Week_05_AdapterViews_and_Fragments/MyFragments/.idea/modules.xml
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/.idea/modules.xml
rename to Week_05_AdapterViews_and_Fragments/MyFragments/.idea/modules.xml
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/.idea/runConfigurations.xml b/Week_05_AdapterViews_and_Fragments/MyFragments/.idea/runConfigurations.xml
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/.idea/runConfigurations.xml
rename to Week_05_AdapterViews_and_Fragments/MyFragments/.idea/runConfigurations.xml
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/.gitignore b/Week_05_AdapterViews_and_Fragments/MyFragments/app/.gitignore
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/.gitignore
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/.gitignore
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/build.gradle b/Week_05_AdapterViews_and_Fragments/MyFragments/app/build.gradle
similarity index 75%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/build.gradle
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/build.gradle
index bf0af7b..40e1c11 100644
--- a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/build.gradle
+++ b/Week_05_AdapterViews_and_Fragments/MyFragments/app/build.gradle
@@ -1,12 +1,12 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 24
- buildToolsVersion "24.0.3"
+ compileSdkVersion 26
+ buildToolsVersion "26.0.0"
defaultConfig {
applicationId "com.example.jianhuayang.myfragments"
minSdkVersion 15
- targetSdkVersion 24
+ targetSdkVersion 26
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -24,9 +24,8 @@ dependencies {
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
- compile 'com.android.support:appcompat-v7:24.2.1'
- compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha8'
- compile 'com.android.support:support-v4:24.2.1'
- compile 'com.android.support:recyclerview-v7:24.2.1'
+ compile 'com.android.support:appcompat-v7:26.+'
+ compile 'com.android.support.constraint:constraint-layout:1.0.2'
+ compile 'com.android.support:support-v4:26.+'
testCompile 'junit:junit:4.12'
}
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/proguard-rules.pro b/Week_05_AdapterViews_and_Fragments/MyFragments/app/proguard-rules.pro
similarity index 71%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/proguard-rules.pro
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/proguard-rules.pro
index cce7213..6d3585e 100644
--- a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/proguard-rules.pro
+++ b/Week_05_AdapterViews_and_Fragments/MyFragments/app/proguard-rules.pro
@@ -15,3 +15,11 @@
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/androidTest/java/com/example/jianhuayang/myfragments/ExampleInstrumentedTest.java b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/androidTest/java/com/example/jianhuayang/myfragments/ExampleInstrumentedTest.java
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/androidTest/java/com/example/jianhuayang/myfragments/ExampleInstrumentedTest.java
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/androidTest/java/com/example/jianhuayang/myfragments/ExampleInstrumentedTest.java
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyLists_copy/app/src/main/AndroidManifest.xml b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/AndroidManifest.xml
similarity index 62%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyLists_copy/app/src/main/AndroidManifest.xml
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/AndroidManifest.xml
index 4e563c3..f3263c6 100644
--- a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyLists_copy/app/src/main/AndroidManifest.xml
+++ b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/AndroidManifest.xml
@@ -1,22 +1,27 @@
+ package="com.example.jianhuayang.myfragments">
-
+
-
+
-
-
+
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/DetailsFragment.java b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/com/example/jianhuayang/myfragments/DetailsFragment.java
similarity index 99%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/DetailsFragment.java
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/com/example/jianhuayang/myfragments/DetailsFragment.java
index 62715c9..9f4d90e 100644
--- a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/DetailsFragment.java
+++ b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/com/example/jianhuayang/myfragments/DetailsFragment.java
@@ -17,19 +17,13 @@ import com.example.jianhuayang.myfragments.data.Candidates;
*/
public class DetailsFragment extends Fragment {
+
public static final String POSITION = "position";
public DetailsFragment() {
// 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_details, container, false);
- }
-
@Override
public void onStart() {
super.onStart();
@@ -45,4 +39,12 @@ public class DetailsFragment extends Fragment {
description.setText("Click on the names on the left to see details");
}
}
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ // Inflate the layout for this fragment
+ return inflater.inflate(R.layout.fragment_details, container, false);
+ }
+
}
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/DynamicActivity.java b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/com/example/jianhuayang/myfragments/DynamicActivity.java
similarity index 94%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/DynamicActivity.java
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/com/example/jianhuayang/myfragments/DynamicActivity.java
index 28571c9..042b7da 100644
--- a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/DynamicActivity.java
+++ b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/com/example/jianhuayang/myfragments/DynamicActivity.java
@@ -1,17 +1,19 @@
package com.example.jianhuayang.myfragments;
import android.content.res.Configuration;
+import android.os.Bundle;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
+
+import layout.BlankFragment;
+import layout.BlankFragment2;
public class DynamicActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_dynamic);
FragmentManager fragmentManager = getSupportFragmentManager();
FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
@@ -23,5 +25,6 @@ public class DynamicActivity extends AppCompatActivity {
fragmentTransaction.replace(R.id.activity_dynamic, frag2);
}
fragmentTransaction.commit();
+ setContentView(R.layout.activity_dynamic);
}
}
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/ItemFragment.java b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/com/example/jianhuayang/myfragments/ItemFragment.java
similarity index 82%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/ItemFragment.java
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/com/example/jianhuayang/myfragments/ItemFragment.java
index 111694c..c921816 100644
--- a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/ItemFragment.java
+++ b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/com/example/jianhuayang/myfragments/ItemFragment.java
@@ -5,14 +5,10 @@ import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.app.ListFragment;
-import android.util.Log;
-import android.view.LayoutInflater;
import android.view.View;
-import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.ListView;
-import android.widget.TextView;
import android.widget.Toast;
import com.example.jianhuayang.myfragments.data.Candidates;
@@ -27,11 +23,21 @@ public class ItemFragment extends ListFragment implements AdapterView.OnItemClic
// Required empty public constructor
}
+
+// @Override
+// public View onCreateView(LayoutInflater inflater, ViewGroup container,
+// Bundle savedInstanceState) {
+// TextView textView = new TextView(getActivity());
+// textView.setText(R.string.hello_blank_fragment);
+// return textView;
+// }
+
@Override
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
setListAdapter(new ArrayAdapter(getActivity(),
android.R.layout.simple_list_item_1, android.R.id.text1, Candidates.candidateNames));
+// getListView().setOnItemClickListener(this);
if (getActivity() instanceof ListFragmentActivity) {
getListView().setOnItemClickListener(this);
}
@@ -49,9 +55,7 @@ public class ItemFragment extends ListFragment implements AdapterView.OnItemClic
@Override
public void onStart() {
super.onStart();
-
getListView().setChoiceMode(ListView.CHOICE_MODE_SINGLE);
getListView().setSelector(android.R.color.darker_gray);
-// above from http://stackoverflow.com/questions/5853719/highlighting-the-selected-item-in-the-listview-in-android
}
}
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/ListFragmentActivity.java b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/com/example/jianhuayang/myfragments/ListFragmentActivity.java
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/ListFragmentActivity.java
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/com/example/jianhuayang/myfragments/ListFragmentActivity.java
index 0d6754b..1af84c6 100644
--- a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/ListFragmentActivity.java
+++ b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/com/example/jianhuayang/myfragments/ListFragmentActivity.java
@@ -9,7 +9,7 @@ public class ListFragmentActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_list_fragment);
-
getSupportFragmentManager().beginTransaction().add(R.id.activity_list_fragment, new ItemFragment()).commit();
+
}
}
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/MainActivity.java b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/com/example/jianhuayang/myfragments/MainActivity.java
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/MainActivity.java
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/com/example/jianhuayang/myfragments/MainActivity.java
index 474ff66..ef71c58 100644
--- a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/MainActivity.java
+++ b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/com/example/jianhuayang/myfragments/MainActivity.java
@@ -1,8 +1,8 @@
package com.example.jianhuayang.myfragments;
import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
import android.view.View;
public class MainActivity extends AppCompatActivity {
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/MultiPanelActivity.java b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/com/example/jianhuayang/myfragments/MultiPanelActivity.java
similarity index 87%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/MultiPanelActivity.java
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/com/example/jianhuayang/myfragments/MultiPanelActivity.java
index bec7d5e..dc0d26c 100644
--- a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/MultiPanelActivity.java
+++ b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/com/example/jianhuayang/myfragments/MultiPanelActivity.java
@@ -1,22 +1,23 @@
package com.example.jianhuayang.myfragments;
+import android.os.Bundle;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
import android.view.View;
import android.widget.AdapterView;
-public class MultiPanelActivity extends AppCompatActivity implements AdapterView.OnItemClickListener {
+public class MultiPanelActivity extends AppCompatActivity implements AdapterView.OnItemClickListener{
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_multi_panel);
-
- if (savedInstanceState == null) {
- getSupportFragmentManager().beginTransaction().add(R.id.fragmentLeft, new ItemFragment()).commit();
- getSupportFragmentManager().beginTransaction().add(R.id.fragmentRight, new DetailsFragment()).commit();
+ if (savedInstanceState == null){
+ getSupportFragmentManager().beginTransaction().add(R.id.fragmentLeft, new
+ ItemFragment()).commit();
+ getSupportFragmentManager().beginTransaction().add(R.id.fragmentRight, new
+ DetailsFragment()).commit();
}
}
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/data/Candidates.java b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/com/example/jianhuayang/myfragments/data/Candidates.java
similarity index 96%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/data/Candidates.java
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/com/example/jianhuayang/myfragments/data/Candidates.java
index dad36aa..506e211 100644
--- a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/data/Candidates.java
+++ b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/com/example/jianhuayang/myfragments/data/Candidates.java
@@ -3,11 +3,10 @@ package com.example.jianhuayang.myfragments.data;
import com.example.jianhuayang.myfragments.R;
/**
- * Created by jianhuayang on 28/10/2016.
+ * Created by jianhuayang on 31/10/2017.
*/
public class Candidates {
-
public static final String[] candidateNames = {
"Hillary Clinton",
"Bernie Sanders",
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/BlankFragment.java b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/layout/BlankFragment.java
similarity index 90%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/BlankFragment.java
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/layout/BlankFragment.java
index 3e86301..4595ee7 100644
--- a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/BlankFragment.java
+++ b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/layout/BlankFragment.java
@@ -1,4 +1,4 @@
-package com.example.jianhuayang.myfragments;
+package layout;
import android.os.Bundle;
@@ -7,6 +7,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import com.example.jianhuayang.myfragments.R;
/**
* A simple {@link Fragment} subclass.
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/BlankFragment2.java b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/layout/BlankFragment2.java
similarity index 90%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/BlankFragment2.java
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/layout/BlankFragment2.java
index 7e85346..c301afa 100644
--- a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/java/com/example/jianhuayang/myfragments/BlankFragment2.java
+++ b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/java/layout/BlankFragment2.java
@@ -1,4 +1,4 @@
-package com.example.jianhuayang.myfragments;
+package layout;
import android.os.Bundle;
@@ -7,6 +7,7 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import com.example.jianhuayang.myfragments.R;
/**
* A simple {@link Fragment} subclass.
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/drawable/bush.jpg b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/drawable/bush.jpg
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/drawable/bush.jpg
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/drawable/bush.jpg
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/drawable/carson.jpg b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/drawable/carson.jpg
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/drawable/carson.jpg
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/drawable/carson.jpg
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/drawable/chafee.jpg b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/drawable/chafee.jpg
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/drawable/chafee.jpg
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/drawable/chafee.jpg
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/drawable/clinton.jpg b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/drawable/clinton.jpg
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/drawable/clinton.jpg
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/drawable/clinton.jpg
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/drawable/omalley.jpg b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/drawable/omalley.jpg
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/drawable/omalley.jpg
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/drawable/omalley.jpg
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/drawable/rubio.jpg b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/drawable/rubio.jpg
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/drawable/rubio.jpg
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/drawable/rubio.jpg
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/drawable/sanders.jpg b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/drawable/sanders.jpg
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/drawable/sanders.jpg
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/drawable/sanders.jpg
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/drawable/trump.jpg b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/drawable/trump.jpg
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/drawable/trump.jpg
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/drawable/trump.jpg
diff --git a/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/layout/activity_dynamic.xml b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/layout/activity_dynamic.xml
new file mode 100644
index 0000000..4e7e9f6
--- /dev/null
+++ b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/layout/activity_dynamic.xml
@@ -0,0 +1,11 @@
+
+
+
+
diff --git a/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/layout/activity_list_fragment.xml b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/layout/activity_list_fragment.xml
new file mode 100644
index 0000000..7972b2b
--- /dev/null
+++ b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/layout/activity_list_fragment.xml
@@ -0,0 +1,12 @@
+
+
+
+
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/layout/activity_main.xml b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/layout/activity_main.xml
similarity index 62%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/layout/activity_main.xml
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/layout/activity_main.xml
index 7f57b02..4c840f8 100644
--- a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/layout/activity_main.xml
+++ b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/layout/activity_main.xml
@@ -1,14 +1,11 @@
-
+ android:text="Dynamic fragments"/>
+ android:text="List Fragment"/>
+ android:text="Multipanel"/>
+ tools:layout="@layout/fragment_blank"/>
+ tools:layout="@layout/fragment_blank2"/>
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/layout/activity_multi_panel.xml b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/layout/activity_multi_panel.xml
similarity index 66%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/layout/activity_multi_panel.xml
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/layout/activity_multi_panel.xml
index e95b6c7..0d2d541 100644
--- a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/layout/activity_multi_panel.xml
+++ b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/layout/activity_multi_panel.xml
@@ -1,16 +1,12 @@
-
-
+
+
+
+
diff --git a/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/layout/fragment_blank2.xml b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/layout/fragment_blank2.xml
new file mode 100644
index 0000000..e170380
--- /dev/null
+++ b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/layout/fragment_blank2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
diff --git a/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/layout/fragment_details.xml b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/layout/fragment_details.xml
new file mode 100644
index 0000000..83b1b6f
--- /dev/null
+++ b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/layout/fragment_details.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/mipmap-hdpi/ic_launcher.png b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyLists/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyLists/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/mipmap-mdpi/ic_launcher.png b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyLists/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyLists/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyLists/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyLists/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyLists/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyLists/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyLists/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyLists/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/values/colors.xml b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/values/colors.xml
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/values/colors.xml
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/values/colors.xml
diff --git a/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/values/strings.xml b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000..f3487ac
--- /dev/null
+++ b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+
+ My Fragments
+
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/values/styles.xml b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/values/styles.xml
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/main/res/values/styles.xml
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/main/res/values/styles.xml
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/test/java/com/example/jianhuayang/myfragments/ExampleUnitTest.java b/Week_05_AdapterViews_and_Fragments/MyFragments/app/src/test/java/com/example/jianhuayang/myfragments/ExampleUnitTest.java
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/app/src/test/java/com/example/jianhuayang/myfragments/ExampleUnitTest.java
rename to Week_05_AdapterViews_and_Fragments/MyFragments/app/src/test/java/com/example/jianhuayang/myfragments/ExampleUnitTest.java
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyLists/build.gradle b/Week_05_AdapterViews_and_Fragments/MyFragments/build.gradle
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyLists/build.gradle
rename to Week_05_AdapterViews_and_Fragments/MyFragments/build.gradle
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/gradle.properties b/Week_05_AdapterViews_and_Fragments/MyFragments/gradle.properties
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/gradle.properties
rename to Week_05_AdapterViews_and_Fragments/MyFragments/gradle.properties
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/gradle/wrapper/gradle-wrapper.jar b/Week_05_AdapterViews_and_Fragments/MyFragments/gradle/wrapper/gradle-wrapper.jar
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/gradle/wrapper/gradle-wrapper.jar
rename to Week_05_AdapterViews_and_Fragments/MyFragments/gradle/wrapper/gradle-wrapper.jar
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/gradle/wrapper/gradle-wrapper.properties b/Week_05_AdapterViews_and_Fragments/MyFragments/gradle/wrapper/gradle-wrapper.properties
similarity index 79%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/gradle/wrapper/gradle-wrapper.properties
rename to Week_05_AdapterViews_and_Fragments/MyFragments/gradle/wrapper/gradle-wrapper.properties
index 04e285f..f658c82 100644
--- a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/gradle/wrapper/gradle-wrapper.properties
+++ b/Week_05_AdapterViews_and_Fragments/MyFragments/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Tue Oct 31 09:58:19 GMT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/gradlew b/Week_05_AdapterViews_and_Fragments/MyFragments/gradlew
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/gradlew
rename to Week_05_AdapterViews_and_Fragments/MyFragments/gradlew
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/gradlew.bat b/Week_05_AdapterViews_and_Fragments/MyFragments/gradlew.bat
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/gradlew.bat
rename to Week_05_AdapterViews_and_Fragments/MyFragments/gradlew.bat
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/settings.gradle b/Week_05_AdapterViews_and_Fragments/MyFragments/settings.gradle
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyFragments_copy/settings.gradle
rename to Week_05_AdapterViews_and_Fragments/MyFragments/settings.gradle
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyLists/.gitignore b/Week_05_AdapterViews_and_Fragments/MyLists/.gitignore
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyLists/.gitignore
rename to Week_05_AdapterViews_and_Fragments/MyLists/.gitignore
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyLists/.idea/compiler.xml b/Week_05_AdapterViews_and_Fragments/MyLists/.idea/compiler.xml
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyLists/.idea/compiler.xml
rename to Week_05_AdapterViews_and_Fragments/MyLists/.idea/compiler.xml
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyLists/.idea/copyright/profiles_settings.xml b/Week_05_AdapterViews_and_Fragments/MyLists/.idea/copyright/profiles_settings.xml
similarity index 100%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyLists/.idea/copyright/profiles_settings.xml
rename to Week_05_AdapterViews_and_Fragments/MyLists/.idea/copyright/profiles_settings.xml
diff --git a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyLists_copy/.idea/gradle.xml b/Week_05_AdapterViews_and_Fragments/MyLists/.idea/gradle.xml
similarity index 77%
rename from old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyLists_copy/.idea/gradle.xml
rename to Week_05_AdapterViews_and_Fragments/MyLists/.idea/gradle.xml
index 0e23f8e..7ac24c7 100644
--- a/old(needs_updating)/Week_05_AdapterViews_and_Fragments/MyLists_copy/.idea/gradle.xml
+++ b/Week_05_AdapterViews_and_Fragments/MyLists/.idea/gradle.xml
@@ -3,9 +3,8 @@