Manually merging the other branch

Author: nxabdullah

.idea/modules/app/FitAppA.app.iml

@@ -0,0 +1,39 @@
+plugins {
+    id 'com.android.application'
+}
+
+android {
+    compileSdkVersion 30
+    buildToolsVersion '30.0.3'
+
+    defaultConfig {
+        applicationId "com.example.fitappa"
+        minSdkVersion 16
+        targetSdkVersion 31
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    testImplementation 'junit:junit:4.+'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+}

app/build.gradle

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-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

app/proguard-rules.pro

@@ -0,0 +1,25 @@
+package com.example.fitappa;
+
+import android.content.Context;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        assertEquals("com.example.fitappa", appContext.getPackageName());
+    }
+}

app/src/androidTest/java/com/example/fitappa/ExampleInstrumentedTest.java

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.example.fitappa">
+
+    <application
+            android:allowBackup="true"
+            android:icon="@mipmap/ic_launcher"
+            android:label="@string/app_name"
+            android:roundIcon="@mipmap/ic_launcher_round"
+            android:supportsRtl="true"
+            android:theme="@style/Theme.FitAppA">
+        <activity android:name=".Interactor"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+        <activity
+                android:name=".InteractorCreateAccount"
+                android:exported="true">
+        </activity>
+        <activity
+                android:name=".InteractorProfile"
+                android:exported="true">
+        </activity>
+
+    </application>
+
+
+</manifest>

app/src/main/AndroidManifest.xml

@@ -0,0 +1,48 @@
+package com.example.fitappa;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
+
+public class Interactor extends AppCompatActivity {
+    private TextView messageCreate;
+    private TextView messageLog;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        messageCreate = findViewById(R.id.createATitle);
+        messageLog = findViewById(R.id.logIn);
+
+        //Define and attach click listener
+        messageCreate.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                createA();
+            }
+        });
+
+        messageLog.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                logIn();
+            }
+        });
+    }
+
+    private void createA() {
+        Intent intent = new Intent(this, InteractorCreateAccount.class);
+        startActivity(intent);
+    }
+
+    private void logIn() {
+        Intent intent = new Intent(this, InteractorProfile.class);
+
+        startActivity(intent);
+    }
+}

app/src/main/java/com/example/fitappa/Interactor.java

@@ -0,0 +1,52 @@
+package com.example.fitappa;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
+import com.google.android.material.textfield.TextInputEditText;
+import fitappfiles.Profiles;
+
+import java.util.Observable;
+import java.util.Observer;
+
+
+public class InteractorCreateAccount extends AppCompatActivity {
+    private TextInputEditText user;
+    private TextInputEditText pass;
+    private TextInputEditText mail;
+    private TextView enter;
+    private Profiles profiles;
+    private ModelProfile Mprofile;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.create_account);
+        this.profiles = new Profiles();
+        this.Mprofile = new ModelProfile();
+
+
+        user = findViewById(R.id.userName);
+        pass = findViewById(R.id.password);
+        mail = findViewById(R.id.email);
+        enter = findViewById(R.id.submit);
+
+        enter.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                createA(user.getText().toString(),pass.getText().toString(),mail.getText().toString());
+            }
+        });
+
+    }
+
+    private void createA(String username, String password, String email) {
+        System.out.println(this.profiles.signUp(username,password,email));
+
+        Intent intent = new Intent(this, InteractorProfile.class);
+        startActivity(intent);
+    }
+
+}

app/src/main/java/com/example/fitappa/InteractorCreateAccount.java

@@ -0,0 +1,53 @@
+package com.example.fitappa;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
+import fitappfiles.Profile;
+
+import java.util.Observable;
+import java.util.Observer;
+
+public class InteractorProfile extends AppCompatActivity implements Observer {
+    private TextView user;
+    private TextView b;
+    private Profile profile;
+    private ModelProfile modelProfile;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.main_profile);
+
+        System.out.println("heleleoeoeoeoeoeo");
+
+        modelProfile = new ModelProfile();
+        modelProfile.addObserver(this);
+        user = findViewById(R.id.userName);
+        b = findViewById(R.id.back);
+
+        b.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mainMenu();
+            }
+        });
+
+    }
+
+    private void mainMenu() {
+
+        Intent intent = new Intent(this, Interactor.class);
+        startActivity(intent);
+    }
+
+
+    @Override
+    public void update(Observable o, Object arg) {
+        this.profile = modelProfile.getProfile();
+        user.setText(profile.getUser().getUsername());
+    }
+}