From 56e7303659506ad4eb8d14b29e54135e9d76a690 Mon Sep 17 00:00:00 2001
From: Johnny Tan <tannjohnny03@gmail.com>
Date: Tue, 24 Feb 2026 11:33:00 -0500
Subject: [PATCH 1/4] New tablet layout implemented

---
 .idea/gradle.xml                           | 2 +-
 app/src/main/res/layout-sw600dp/tablet.xml | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/layout-sw600dp/tablet.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0897082..639c779 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,6 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
@@ -12,7 +13,6 @@
             <option value="$PROJECT_DIR$/app" />
           </set>
         </option>
-        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/app/src/main/res/layout-sw600dp/tablet.xml b/app/src/main/res/layout-sw600dp/tablet.xml
new file mode 100644
index 0000000..77d9ef6
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp/tablet.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 539360bab07f8137c9e50a93c0c9592d313f29b6 Mon Sep 17 00:00:00 2001
From: Johnny Tan <tannjohnny03@gmail.com>
Date: Tue, 24 Feb 2026 11:44:23 -0500
Subject: [PATCH 2/4] Delete

---
 app/src/main/res/layout-sw600dp/tablet.xml | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 app/src/main/res/layout-sw600dp/tablet.xml

diff --git a/app/src/main/res/layout-sw600dp/tablet.xml b/app/src/main/res/layout-sw600dp/tablet.xml
deleted file mode 100644
index 77d9ef6..0000000
--- a/app/src/main/res/layout-sw600dp/tablet.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 36e6342852b9e7c25bfcbffdcc14167de55de58e Mon Sep 17 00:00:00 2001
From: Johnny Tan <tannjohnny03@gmail.com>
Date: Tue, 24 Feb 2026 12:02:59 -0500
Subject: [PATCH 3/4] Implementation of Table Layout

---
 .../main/res/layout-sw600dp/activity_main.xml | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 app/src/main/res/layout-sw600dp/activity_main.xml

diff --git a/app/src/main/res/layout-sw600dp/activity_main.xml b/app/src/main/res/layout-sw600dp/activity_main.xml
new file mode 100644
index 0000000..dbaaea6
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp/activity_main.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    android:padding="16dp">
+
+    <!-- LEFT SIDE: Profile Info -->
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:padding="16dp">
+
+        <ImageView
+            android:id="@+id/profile_photo"
+            android:layout_width="200dp"
+            android:layout_height="200dp"
+            android:layout_gravity="center"
+            android:scaleType="centerCrop" />
+
+        <TextView
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="24sp"
+            android:layout_marginTop="16dp"/>
+
+        <TextView
+            android:id="@+id/email"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"/>
+
+        <TextView
+            android:id="@+id/extension"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"/>
+
+        <TextView
+            android:id="@+id/department"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"/>
+
+        <TextView
+            android:id="@+id/supervisor"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"/>
+
+    </LinearLayout>
+
+    <!-- RIGHT SIDE: Direct Reports -->
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/directReportsRecyclerView"
+        android:layout_width="0dp"
+        android:layout_weight="1"
+        android:layout_height="match_parent"
+        android:padding="16dp"/>
+
+</LinearLayout>
\ No newline at end of file

From d4b8b942717678e0446af74dfa39fe3b59259c27 Mon Sep 17 00:00:00 2001
From: Johnny Tan <tannjohnny03@gmail.com>
Date: Thu, 26 Feb 2026 11:57:49 -0500
Subject: [PATCH 4/4] Removed hard code with the translation to french values

---
 .idea/deploymentTargetSelector.xml            |  8 +++++++
 .../edu/temple/fancyscreen/MainActivity.kt    | 22 +++++++++----------
 app/src/main/res/values-fr/strings.xml        | 15 +++++++++++++
 app/src/main/res/values/strings.xml           | 13 +++++++++++
 4 files changed, 47 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/res/values-fr/strings.xml

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index b268ef3..e0d1528 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,6 +4,14 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2026-02-26T16:46:03.582262Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="LocalEmulator" identifier="path=/Users/johnnyboii/.android/avd/Medium_Phone.avd" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
       </SelectionState>
     </selectionStates>
   </component>
diff --git a/app/src/main/java/edu/temple/fancyscreen/MainActivity.kt b/app/src/main/java/edu/temple/fancyscreen/MainActivity.kt
index 2471898..5cbec9a 100644
--- a/app/src/main/java/edu/temple/fancyscreen/MainActivity.kt
+++ b/app/src/main/java/edu/temple/fancyscreen/MainActivity.kt
@@ -18,28 +18,28 @@ class MainActivity : AppCompatActivity() {
 
         findViewById<ImageView>(R.id.profile_photo).setImageResource(R.drawable.istockphoto)
 
-        findViewById<TextView>(R.id.name).setText("Michelle Townsend")
+        findViewById<TextView>(R.id.name).setText(getString(R.string.michelle_townsend))
 
         with(findViewById<TextView>(R.id.email)) {
-            text = "mt@ourcompany.com"
+            text = context.getString(R.string.mt_ourcompany_com)
             setTextColor(Color.BLUE)
         }
 
-        findViewById<TextView>(R.id.extension).text = "2253"
+        findViewById<TextView>(R.id.extension).text = getString(R.string._2253)
 
-        findViewById<TextView>(R.id.department).text = "Design"
+        findViewById<TextView>(R.id.department).text = getString(R.string.design)
 
-        findViewById<TextView>(R.id.supervisor).text = "Gail Davers"
+        findViewById<TextView>(R.id.supervisor).text = getString(R.string.gail_davers)
 
         with (findViewById<RecyclerView>(R.id.directReportsRecyclerView)) {
             adapter = RecyclerViewAdapter(
                 arrayOf(
-                    "Kate Sacloff",
-                    "Andrew Klein",
-                    "Maria Ortega",
-                    "Brent Stevenson",
-                    "Daniel Cho",
-                    "Jorge Gomez"
+                    getString(R.string.kate_sacloff),
+                    getString(R.string.andrew_klein),
+                    getString(R.string.maria_ortega),
+                    getString(R.string.brent_stevenson),
+                    getString(R.string.daniel_cho),
+                    getString(R.string.jorge_gomez)
                 )
             )
             layoutManager = LinearLayoutManager(this@MainActivity)
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
new file mode 100644
index 0000000..d026ae5
--- /dev/null
+++ b/app/src/main/res/values-fr/strings.xml
@@ -0,0 +1,15 @@
+<resources>
+    <string name="app_name">FancyScreen</string>
+
+    <string name="michelle_townsend">Michelle Townsend</string>
+    <string name="mt_ourcompany_com">mt@ourcompany.com</string>
+    <string name="_2253">2253</string>
+    <string name="design">Conception</string>
+    <string name="gail_davers">Gail Davers</string>
+    <string name="kate_sacloff">Kate Sacloff</string>
+    <string name="andrew_klein">Andrew Klein</string>
+    <string name="maria_ortega">Maria Ortega</string>
+    <string name="brent_stevenson">Brent Stevenson</string>
+    <string name="daniel_cho">Daniel Cho</string>
+    <string name="jorge_gomez">Jorge Gomez</string>
+</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 3c22b7e..ea51c29 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,16 @@
 <resources>
     <string name="app_name">FancyScreen</string>
+
+    <string name="michelle_townsend">Michelle Townsend</string>
+    <string name="mt_ourcompany_com">mt@ourcompany.com</string>
+    <string name="_2253">2253</string>
+    <string name="design">Design</string>
+    <string name="gail_davers">Gail Davers</string>
+
+    <string name="kate_sacloff">Kate Sacloff</string>
+    <string name="andrew_klein">Andrew Klein</string>
+    <string name="maria_ortega">Maria Ortega</string>
+    <string name="brent_stevenson">Brent Stevenson</string>
+    <string name="daniel_cho">Daniel Cho</string>
+    <string name="jorge_gomez">Jorge Gomez</string>
 </resources>
\ No newline at end of file