From 9a29af2f3c8d619e32b2e8f1a5d12c0d959451c4 Mon Sep 17 00:00:00 2001
From: minhtrannhat <minh@minhtrannhat.com>
Date: Fri, 3 Nov 2023 20:59:27 -0400
Subject: [PATCH] Feat(main activity): Wireframing 1/2

---
 .idea/discord.xml                             |  7 +++
 .idea/misc.xml                                |  4 --
 app/build.gradle                              |  4 +-
 app/src/main/AndroidManifest.xml              | 10 ++++-
 .../Views/MainActivity.java                   | 29 ++++++++++++
 .../ProfileActivity.java}                     |  8 ++--
 app/src/main/res/layout/activity_main.xml     | 45 ++++++++++++++-----
 app/src/main/res/layout/activity_profile.xml  |  9 ++++
 .../main/res/menu/settings_main_activity.xml  |  6 +++
 app/src/main/res/values/strings.xml           |  2 +
 10 files changed, 104 insertions(+), 20 deletions(-)
 create mode 100644 .idea/discord.xml
 create mode 100644 app/src/main/java/com/example/coen390_assignment2/Views/MainActivity.java
 rename app/src/main/java/com/example/coen390_assignment2/{MainActivity.java => Views/ProfileActivity.java} (50%)
 create mode 100644 app/src/main/res/layout/activity_profile.xml
 create mode 100644 app/src/main/res/menu/settings_main_activity.xml

diff --git a/.idea/discord.xml b/.idea/discord.xml
new file mode 100644
index 0000000..d8e9561
--- /dev/null
+++ b/.idea/discord.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DiscordProjectSettings">
+    <option name="show" value="PROJECT_FILES" />
+    <option name="description" value="" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 775eba8..8978d23 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,8 +1,4 @@
 <project version="4">
-  <component name="DiscordProjectSettings">
-    <option name="show" value="ASK" />
-    <option name="description" value="" />
-  </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
diff --git a/app/build.gradle b/app/build.gradle
index c4eb62e..03b5d83 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,12 +4,12 @@ plugins {
 
 android {
     namespace 'com.example.coen390_assignment2'
-    compileSdk 33
+    compileSdk 34
 
     defaultConfig {
         applicationId "com.example.coen390_assignment2"
         minSdk 26
-        targetSdk 33
+        targetSdk 34
         versionCode 1
         versionName "1.0"
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3c0588c..024ec54 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,15 @@
         android:theme="@style/Theme.Coen390_assignment2"
         tools:targetApi="31">
         <activity
-            android:name=".MainActivity"
+            android:name=".Views.ProfileActivity"
+            android:exported="false"
+            android:parentActivityName=".Views.MainActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".Views.MainActivity" />
+        </activity>
+        <activity
+            android:name=".Views.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/example/coen390_assignment2/Views/MainActivity.java b/app/src/main/java/com/example/coen390_assignment2/Views/MainActivity.java
new file mode 100644
index 0000000..84c8a7f
--- /dev/null
+++ b/app/src/main/java/com/example/coen390_assignment2/Views/MainActivity.java
@@ -0,0 +1,29 @@
+package com.example.coen390_assignment2.Views;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+
+import android.os.Bundle;
+import android.view.Menu;
+
+import com.example.coen390_assignment2.R;
+
+public class MainActivity extends AppCompatActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        // Initialize the ActionBar (Toolbar)
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+
+        toolbar.setSubtitle("New Subtitle Text !!!!!!!!!!!!!!");
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.settings_main_activity, menu);
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/example/coen390_assignment2/MainActivity.java b/app/src/main/java/com/example/coen390_assignment2/Views/ProfileActivity.java
similarity index 50%
rename from app/src/main/java/com/example/coen390_assignment2/MainActivity.java
rename to app/src/main/java/com/example/coen390_assignment2/Views/ProfileActivity.java
index b4a4d74..2639b2f 100644
--- a/app/src/main/java/com/example/coen390_assignment2/MainActivity.java
+++ b/app/src/main/java/com/example/coen390_assignment2/Views/ProfileActivity.java
@@ -1,14 +1,16 @@
-package com.example.coen390_assignment2;
+package com.example.coen390_assignment2.Views;
 
 import androidx.appcompat.app.AppCompatActivity;
 
 import android.os.Bundle;
 
-public class MainActivity extends AppCompatActivity {
+import com.example.coen390_assignment2.R;
+
+public class ProfileActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
+        setContentView(R.layout.activity_profile);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 17eab17..a29cd8b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,18 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
+    tools:context=".Views.MainActivity">
 
-    <TextView
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        app:subtitle="Subtitle Text"
+        app:subtitleTextColor="#FFFFFF"
+        app:theme="@style/ThemeOverlay.AppCompat.ActionBar"
+        app:title="Main Activity"
+        app:titleTextColor="#FFFFFF" />
+
+    <!-- Content Layout -->
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="64dp"
+        android:orientation="vertical">
+
+        <ListView
+            android:id="@+id/profilesListView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </LinearLayout>
+
+    <!-- Action Button at the bottom right -->
+    <Button
+        android:id="@+id/actionButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Hello World!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:layout_margin="16dp"
+        android:text="@string/add_profile_text_action_button" />
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml
new file mode 100644
index 0000000..0fa2008
--- /dev/null
+++ b/app/src/main/res/layout/activity_profile.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Views.ProfileActivity">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/settings_main_activity.xml b/app/src/main/res/menu/settings_main_activity.xml
new file mode 100644
index 0000000..f360a17
--- /dev/null
+++ b/app/src/main/res/menu/settings_main_activity.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/toggle_profiles_display_mode"
+        android:title="@string/toggle_profiles_display_mode_text" />
+</menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 25ca071..0642fc5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,5 @@
 <resources>
     <string name="app_name">coen390_assignment2</string>
+    <string name="add_profile_text_action_button">Add Profile</string>
+    <string name="toggle_profiles_display_mode_text">By ID</string>
 </resources>
\ No newline at end of file