diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index fb7f4a8..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index 5cd135a..0000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
deleted file mode 100644
index 0380d8d..0000000
--- a/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="MavenRepo" />
-      <option name="name" value="MavenRepo" />
-      <option name="url" value="https://repo.maven.apache.org/maven2/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="BintrayJCenter" />
-      <option name="name" value="BintrayJCenter" />
-      <option name="url" value="https://jcenter.bintray.com/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="Google" />
-      <option name="name" value="Google" />
-      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
-    </remote-repository>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 4700283..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 797acea..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 02a3d89..beb8280 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.magdamiu.androidfundamentalsmai2021">
+<<<<<<< HEAD
 
     <uses-permission android:name="android.permission.INTERNET" />
 
+=======
+    <uses-permission android:name="android.permission.INTERNET"/>
+>>>>>>> curs3_cc1
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/com/magdamiu/androidfundamentalsmai2021/MainActivity.java b/app/src/main/java/com/magdamiu/androidfundamentalsmai2021/MainActivity.java
index ab7184b..fa65e8a 100644
--- a/app/src/main/java/com/magdamiu/androidfundamentalsmai2021/MainActivity.java
+++ b/app/src/main/java/com/magdamiu/androidfundamentalsmai2021/MainActivity.java
@@ -4,6 +4,7 @@
 
 import android.os.Bundle;
 import android.util.Log;
+import android.util.Patterns;
 import android.view.View;
 import android.webkit.WebView;
 import android.widget.AdapterView;
@@ -16,13 +17,20 @@
 
 import java.util.ArrayList;
 import java.util.List;
+<<<<<<< HEAD
+=======
+import java.util.regex.Pattern;
+>>>>>>> curs3_cc1
 
 public class MainActivity extends AppCompatActivity {
     private static final String ANDROID_URL = "https://developer.android.com/";
 
+    private EditText phone;
+    private EditText email;
     private EditText editTextName;
     private Button buttonDisplayGreetings;
     private TextView textViewGreetings;
+<<<<<<< HEAD
 
     private WebView webView;
 
@@ -30,10 +38,17 @@ public class MainActivity extends AppCompatActivity {
     private List<String> androidVersions;
     private ArrayAdapter<String> spinnerAdapter;
 
+=======
+    private WebView webView;
+    private Spinner spinnerAndroidVersions;
+    private List<String> androidVersions;
+    private ArrayAdapter<String> spinnerAdapter;
+>>>>>>> curs3_cc1
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         /*setContentView(R.layout.activity_main);*/
+<<<<<<< HEAD
         /*setContentView(R.layout.sample);*/
         // setContentView(R.layout.scrollview_sample);
         // setContentView(R.layout.webview_sample);
@@ -47,8 +62,57 @@ protected void onCreate(Bundle savedInstanceState) {
         //loadUrl();
 
         // initViews();
+=======
+//        setContentView(R.layout.web_view_sample);
+//        load_url();
+        setContentView(R.layout.spinner_sample);
+        setAndroidVersions();
+//        initViews();
+        initializeSpinnerAdapter();
+        setSpinnerAdapter();
+>>>>>>> curs3_cc1
         displayLogs();
     }
+    // step 1:  data source for our spinner
+    private void setAndroidVersions() {
+        androidVersions = new ArrayList<>();
+        androidVersions.add("cupcake");
+        androidVersions.add("eclair");
+        androidVersions.add("donut");
+        androidVersions.add("pie");
+    }
+
+    private void initializeSpinnerAdapter() {
+        spinnerAdapter = new ArrayAdapter<>(MainActivity.this,
+                android.R.layout.simple_spinner_item,
+                androidVersions);
+    }
+
+    private void setSpinnerAdapter() {
+        spinnerAndroidVersions = findViewById(R.id.spinnerAndroidVersions);
+        spinnerAndroidVersions.setAdapter(spinnerAdapter);
+    }
+
+    private void handlingSpinnerListener() {
+        spinnerAndroidVersions.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int i, long l) {
+                String selectedAndroidVersion = androidVersions.get(i);
+                Toast.makeText(MainActivity.this, selectedAndroidVersion, Toast.LENGTH_LONG).show();
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
+        });
+    }
+
+    private void load_url() {
+        webView = findViewById(R.id.webViewSample);
+        webView.getSettings().setJavaScriptEnabled(true);
+        webView.loadUrl(getString(R.string.ANDROID_URL));
+    }
 
     // step 1: data source for our spinner
     private void setAndroidVersions() {
@@ -128,4 +192,26 @@ public void displayGreetingsOnClick(View view) {
             Toast.makeText(MainActivity.this, getString(R.string.error_insert_name), Toast.LENGTH_LONG).show();
         }
     }
+
+    boolean isPhoneNumber(String phoneNumber) {
+        return Patterns.PHONE.matcher(phoneNumber).matches();
+    }
+
+    boolean isEmail(String email) {
+        return Patterns.EMAIL_ADDRESS.matcher(email).matches();
+    }
+
+    public void submitInformation(View view) {
+
+        phone = findViewById(R.id.phone);
+        email = findViewById(R.id.email);
+        if (!isPhoneNumber(phone.toString())) {
+            Toast.makeText(MainActivity.this, getString(R.string.wrong_phone_pattern), Toast.LENGTH_LONG).show();
+            return;
+        }
+
+        if (!isEmail(email.toString())) {
+            Toast.makeText(MainActivity.this, getString(R.string.wrong_email_pattern), Toast.LENGTH_LONG).show();
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/frame_layout_sample.xml b/app/src/main/res/layout/frame_layout_sample.xml
new file mode 100644
index 0000000..93d38ed
--- /dev/null
+++ b/app/src/main/res/layout/frame_layout_sample.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+   <TextView
+       android:layout_width="match_parent"
+       android:layout_height="@dimen/space_128"
+       android:background="@color/purple_200"
+       />
+   <TextView
+       android:layout_width="match_parent"
+       android:layout_height="@dimen/space_256"
+       android:background="@color/purple_200"
+       />
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/realtive_layout_sample.xml b/app/src/main/res/layout/realtive_layout_sample.xml
new file mode 100644
index 0000000..2649b2b
--- /dev/null
+++ b/app/src/main/res/layout/realtive_layout_sample.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:id="@+id/textViewTop"
+        android:text="@string/text_on_the_right" />
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/textViewTop"
+        android:text="@string/text_below" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/scroll_view_sample.xml b/app/src/main/res/layout/scroll_view_sample.xml
new file mode 100644
index 0000000..bbddbbb
--- /dev/null
+++ b/app/src/main/res/layout/scroll_view_sample.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/medium_space"
+            android:text="@string/long_text"
+            />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/medium_space"
+            android:text="@string/long_text"
+            />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/medium_space"
+            android:text="@string/long_text"
+            />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/medium_space"
+            android:text="@string/long_text"
+            />
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/web_view_sample.xml b/app/src/main/res/layout/web_view_sample.xml
new file mode 100644
index 0000000..10496cb
--- /dev/null
+++ b/app/src/main/res/layout/web_view_sample.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WebView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/webViewSample">
+
+</WebView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/week3_cc1.xml b/app/src/main/res/layout/week3_cc1.xml
new file mode 100644
index 0000000..802a8ba
--- /dev/null
+++ b/app/src/main/res/layout/week3_cc1.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/login"
+        android:textColor="@color/orange"
+        android:textSize="@dimen/medium_text"
+        android:layout_marginLeft="@dimen/small_space"
+        android:layout_marginRight="@dimen/small_space"/>
+
+    <EditText
+        android:id="@+id/email"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/email"
+        android:autofillHints="@string/email"
+        android:inputType="textEmailAddress" />
+
+    <EditText
+        android:id="@+id/phone"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/phone"
+        android:inputType="phone"
+        android:autofillHints="@string/phone" />
+
+    <CheckBox
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/i_accept_t_amp_c" />
+
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/submit"
+        android:onClick="submitInformation" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/week3_cc2.xml b/app/src/main/res/layout/week3_cc2.xml
new file mode 100644
index 0000000..6fe6182
--- /dev/null
+++ b/app/src/main/res/layout/week3_cc2.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/scrollView"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:fillViewport="true">
+    <RelativeLayout
+        android:id="@+id/relLayout1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+        <View
+            android:layout_width="@dimen/space_64"
+            android:layout_height="@dimen/space_64"
+            android:layout_alignParentStart="true"
+            android:background="@color/purple_200" />
+        <View
+            android:layout_width="@dimen/space_64"
+            android:layout_height="@dimen/space_64"
+            android:layout_alignParentEnd="true"
+            android:background="@color/purple_700" />
+        <View
+            android:id="@+id/viewCentre"
+            android:layout_centerInParent="true"
+            android:layout_width="@dimen/space_64"
+            android:layout_height="@dimen/space_64"
+            android:layout_alignParentEnd="true"
+            android:background="@color/purple_700" />
+        <View
+            android:layout_width="@dimen/space_64"
+            android:layout_height="@dimen/space_64"
+            android:layout_centerHorizontal="true"
+            android:background="@color/teal_700" />
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/viewCentre">
+
+            <TextView
+                android:id="@+id/textView1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/scroll_view_def">
+            </TextView>
+
+            <TextView
+                android:id="@+id/textView2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/textView1"
+                android:text="@string/scroll_view_def">
+            </TextView>
+
+            <TextView
+                android:id="@+id/textView3"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/textView2"
+                android:text="@string/scroll_view_def">
+            </TextView>
+
+            <TextView
+                android:id="@+id/textView4"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/textView3"
+                android:text="@string/scroll_view_def">
+            </TextView>
+
+            <TextView
+                android:id="@+id/textView5"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/textView4"
+                android:text="@string/scroll_view_def">
+            </TextView>
+
+            <TextView
+                android:id="@+id/textView6"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/textView5"
+                android:text="@string/scroll_view_def">
+            </TextView>
+        </RelativeLayout>
+    </RelativeLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/week3_cc2_screen3.xml b/app/src/main/res/layout/week3_cc2_screen3.xml
new file mode 100644
index 0000000..32ea8a0
--- /dev/null
+++ b/app/src/main/res/layout/week3_cc2_screen3.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:background="#e5e5cc"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/big_height"
+        android:layout_marginStart="@dimen/small_lateral_margin"
+        android:layout_marginEnd="@dimen/small_lateral_margin"
+        android:layout_gravity="center"
+        android:background="@color/pink" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/medium_height"
+        android:layout_marginStart="@dimen/medium_lateral_margin"
+        android:layout_marginEnd="@dimen/medium_lateral_margin"
+        android:layout_gravity="center"
+        android:background="@color/blue" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/small_height"
+        android:layout_gravity="center"
+        android:layout_marginStart="@dimen/large_margin_space"
+        android:layout_marginEnd="@dimen/large_margin_space"
+        android:background="@color/yellow" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d8ce349..bef2985 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,4 +8,8 @@
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
     <color name="red">#ff3412</color>
+    <color name="orange">#FF4500</color>
+    <color name="pink">#b30086</color>
+    <color name="blue">#33ccff</color>
+    <color name="yellow">#ffcc66</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e8b2c28..9aa8b8d 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="medium_text">23sp</dimen>
-    <dimen name="medium_space">16dp</dimen>
-    <dimen name="space_128">128dp</dimen>
-    <dimen name="space_64">64dp</dimen>
+    <dimen name="medium_space">12dp</dimen>
+    <dimen name="small_space">8dp</dimen>
+    <dimen name="space_128">128sp</dimen>
+    <dimen name="space_256">256sp</dimen>
+    <dimen name="space_64">64sp</dimen>
+    <dimen name="small_lateral_margin">12dp</dimen>
+    <dimen name="medium_lateral_margin">20dp</dimen>
+    <dimen name="large_margin_space">27dp</dimen>
+    <dimen name="big_height">200dp</dimen>
+    <dimen name="medium_height">100dp</dimen>
+    <dimen name="small_height">50dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0f8b9c3..7fca20b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,4 +18,14 @@
     <string name="long_text">Of course, you’d want to replace the URL after git remote add upstream with the appropriate clone URL for the original project repository. For the rest of this article, I’m going to assume you used upstream as the name for this additional Git remote. Now, you could try pushing changes to the original repository using git push at this point, but it would probably fail because you probably don’t have permission to push changes directly to the repository. Besides, it really wouldn’t be a good idea. That’s because other people might be working on the project as well, and how in the world would we keep track of everyone’s changes? That’s where branches come in.</string>
     <string name="text_on_the_right">text on the right</string>
     <string name="text_centered_in_parent">text centered in parent</string>
+    <string name="ANDROID_URL">https://developer.android.com/</string>
+    <string name="text_below">text below</string>
+    <string name="email">Email</string>
+    <string name="phone">Phone</string>
+    <string name="i_accept_t_amp_c"><![CDATA[I accept T&C]]></string>
+    <string name="submit">SUBMIT</string>
+    <string name="login">LOGIN</string>
+    <string name="wrong_phone_pattern">Please enter a valid phone number!</string>
+    <string name="wrong_email_pattern">Please eneter a valid email address!\n</string>
+    <string name="scroll_view_def">A view group that allows the view hierarchy placed within it to be scrolled. Scroll view may have only one direct child placed within it. To add multiple views within the scroll view, make the direct child you add a view group, for example LinearLayout, and place additional views within that LinearLayout.</string>
 </resources>
\ No newline at end of file