diff --git a/Listify/app/src/main/AndroidManifest.xml b/Listify/app/src/main/AndroidManifest.xml index b23f14d..b7d7ef8 100644 --- a/Listify/app/src/main/AndroidManifest.xml +++ b/Listify/app/src/main/AndroidManifest.xml @@ -16,17 +16,20 @@ android:theme="@style/AppTheme.NoActionBar"> - - + + + + + \ No newline at end of file diff --git a/Listify/app/src/main/java/com/example/listify/MainActivity.java b/Listify/app/src/main/java/com/example/listify/MainActivity.java index f3961f5..b674798 100644 --- a/Listify/app/src/main/java/com/example/listify/MainActivity.java +++ b/Listify/app/src/main/java/com/example/listify/MainActivity.java @@ -20,7 +20,6 @@ import androidx.appcompat.widget.Toolbar; import android.widget.ImageButton; public class MainActivity extends AppCompatActivity { - private AppBarConfiguration mAppBarConfiguration; @Override @@ -75,7 +74,6 @@ public class MainActivity extends AppCompatActivity { @Override public boolean onSupportNavigateUp() { NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment); - return NavigationUI.navigateUp(navController, mAppBarConfiguration) - || super.onSupportNavigateUp(); + return NavigationUI.navigateUp(navController, mAppBarConfiguration) || super.onSupportNavigateUp(); } } \ No newline at end of file diff --git a/Listify/app/src/main/java/com/example/listify/ui/LoginPage.java b/Listify/app/src/main/java/com/example/listify/ui/LoginPage.java new file mode 100644 index 0000000..81d8fd9 --- /dev/null +++ b/Listify/app/src/main/java/com/example/listify/ui/LoginPage.java @@ -0,0 +1,30 @@ +package com.example.listify.ui; + +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; + +import com.example.listify.MainActivity; +import com.example.listify.R; + +import androidx.appcompat.app.AppCompatActivity; + +public class LoginPage extends AppCompatActivity { + private Button button; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_login); + + button = (Button) findViewById(R.id.button3); + button.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(LoginPage.this, MainActivity.class); + startActivity(intent); + } + }); + } +} \ No newline at end of file diff --git a/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java b/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java new file mode 100644 index 0000000..a2ff5de --- /dev/null +++ b/Listify/app/src/main/java/com/example/listify/ui/SignupPage.java @@ -0,0 +1,29 @@ +package com.example.listify.ui; + +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; + +import com.example.listify.R; + +import androidx.appcompat.app.AppCompatActivity; + +public class SignupPage extends AppCompatActivity { + private Button button; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_signup); + + button = (Button) findViewById(R.id.button2); + button.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent intent = new Intent(SignupPage.this, com.example.listify.ui.LoginPage.class); + startActivity(intent); + } + }); + } +} \ No newline at end of file diff --git a/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java b/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java index 1937ed3..c530fb9 100644 --- a/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java +++ b/Listify/app/src/main/java/com/example/listify/ui/home/HomeFragment.java @@ -1,11 +1,12 @@ package com.example.listify.ui.home; +import android.content.Intent; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.Button; import android.widget.TextView; - import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; @@ -15,19 +16,16 @@ import androidx.lifecycle.ViewModelProviders; import com.example.listify.R; public class HomeFragment extends Fragment { + private Button toLoginPage; - private HomeViewModel homeViewModel; - - public View onCreateView(@NonNull LayoutInflater inflater, - ViewGroup container, Bundle savedInstanceState) { - homeViewModel = - ViewModelProviders.of(this).get(HomeViewModel.class); + public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View root = inflater.inflate(R.layout.fragment_home, container, false); - final TextView textView = root.findViewById(R.id.text_home); - homeViewModel.getText().observe(getViewLifecycleOwner(), new Observer() { + toLoginPage = (Button) root.findViewById(R.id.button1); + toLoginPage.setOnClickListener(new View.OnClickListener() { @Override - public void onChanged(@Nullable String s) { - textView.setText(s); + public void onClick(View v) { + Intent intent = new Intent(HomeFragment.this.getActivity(), com.example.listify.ui.SignupPage.class); + startActivity(intent); } }); return root; diff --git a/Listify/app/src/main/res/drawable/lisitfy_logo.png b/Listify/app/src/main/res/drawable/lisitfy_logo.png new file mode 100644 index 0000000..4f26616 Binary files /dev/null and b/Listify/app/src/main/res/drawable/lisitfy_logo.png differ diff --git a/Listify/app/src/main/res/layout/activity_login.xml b/Listify/app/src/main/res/layout/activity_login.xml new file mode 100644 index 0000000..91491c2 --- /dev/null +++ b/Listify/app/src/main/res/layout/activity_login.xml @@ -0,0 +1,63 @@ + + + +