reverting

batshalregmi · Apr 4, 2024 · dab6d7a · dab6d7a
1 parent 49f2a03
commit dab6d7a
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 269 deletions.
diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
             android:name=".SummaryView.SummaryActivity"
             android:exported="true" />
         <activity
-            android:name=".settingsActivity"
+            android:name=".LoginActivity"
             android:exported="true">
             <intent-filter>
                 <data

diff --git a/app/src/main/java/com/group3/spotifywrapped/settingsActivity.java b/app/src/main/java/com/group3/spotifywrapped/settingsActivity.java
diff --git a/app/src/main/res/drawable/circlebackground.xml b/app/src/main/res/drawable/circlebackground.xml
diff --git a/app/src/main/res/drawable/pink_background.png b/app/src/main/res/drawable/pink_background.png
diff --git a/app/src/main/res/drawable/settings_background.png b/app/src/main/res/drawable/settings_background.png
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
@@ -9,7 +9,7 @@
     android:orientation="vertical"
     android:gravity="center"
     android:background="#B7E1D7"
-    tools:context=".settingsActivity">
+    tools:context=".CoreAppViews.SettingsActivity">
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="570dp"
@@ -24,7 +24,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:background="@drawable/settings_background"
             android:orientation="vertical"
             android:padding="20dp">
             <TextView
@@ -39,60 +38,28 @@
                 android:textStyle="bold" />
 
             <ImageView
-
-                android:layout_marginTop="5dp"
                 android:id="@+id/userProfilePicture"
-                android:layout_width="330dp"
+                android:layout_width="320dp"
+                android:layout_height="200dp"
                 android:layout_gravity="center"
-                android:layout_height="wrap_content"
-                tools:src="@tools:sample/avatars"
-                android:contentDescription="spotify profile picture" />
+                tools:src="@tools:sample/avatars" />
 
             <TextView
-                android:layout_marginTop="5dp"
                 android:id="@+id/usernameUnderPicture"
                 android:layout_width="93dp"
                 android:layout_height="wrap_content"
                 android:textAlignment="center"
                 android:layout_gravity="center"
-                android:text="@string/username_spotify" />
+                android:text="username" />
 
             <Button
                 android:id="@+id/link_to_spotify"
-                android:layout_width="200dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="30dp"
-                android:layout_gravity="center"
-                android:backgroundTint="@color/green"
-                android:text="@string/link_spotify_account" />
-
-            <Button
-                android:id="@+id/unlink_spotify"
-                android:layout_width="200dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="30dp"
-                android:layout_gravity="center"
-                android:backgroundTint="@color/green"
-                android:text="@string/unlink_spotify_account" />
-
-            <Button
-                android:onClick="ShowPopup"
-                android:id="@+id/change_password"
-                android:layout_width="200dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="30dp"
-                android:layout_gravity="center"
-                android:backgroundTint="@color/green"
-                android:text="@string/change_password" />
-
-            <Button
-                android:id="@+id/delete_account"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="30dp"
                 android:layout_gravity="center"
-                android:backgroundTint="#FF0000"
-                android:text="@string/delete_account" />
+                android:backgroundTint="@color/green"
+                android:text="Link Spotify Account" />
 
 
         </LinearLayout>

diff --git a/app/src/main/res/layout/activity_summary.xml b/app/src/main/res/layout/activity_summary.xml
@@ -2,38 +2,14 @@
 <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"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
     tools:context=".SummaryView.SummaryActivity">
 
-    <ScrollView
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.498"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recycler_view"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-
-    </ScrollView>
-
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="TextView"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/custompopup.xml b/app/src/main/res/layout/custompopup.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -50,9 +50,4 @@
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="string_Settings">Settings</string>
-    <string name="username_spotify">username</string>
-    <string name="link_spotify_account">Link Spotify Account</string>
-    <string name="unlink_spotify_account">Unlink Spotify Account</string>
-    <string name="change_password">Change Password</string>
-    <string name="delete_account">Delete Account</string>
 </resources>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.3.1"
+agp = "8.3.0"
 junit = "4.13.2"
 junitVersion = "1.1.5"
 espressoCore = "3.5.1"