Skip to content

Login #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

84 changes: 83 additions & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

54 changes: 40 additions & 14 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
plugins {
id 'com.android.application'
}
apply plugin: 'kotlin-android'

android {
compileSdk 31
Expand All @@ -25,39 +26,64 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
viewBinding{
enabled = true
}
}

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.+'
implementation 'androidx.appcompat:appcompat:1.4.2'
implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
testImplementation 'junit:junit:'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'


implementation "com.squareup.retrofit2:retrofit:2.6.2"
implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
implementation "com.squareup.retrofit2:retrofit:2.9.0"
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'

// ViewModel and LiveData

// ViewModel and LiveData
// ViewModel and LiveData
def lifecycle_version = "2.1.0"
implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
implementation "android.arch.lifecycle:extensions:1.1.0"
implementation "android.arch.lifecycle:viewmodel:1.1.0"
implementation "android.arch.lifecycle:extensions:1.1.1"
implementation "android.arch.lifecycle:viewmodel:1.1.1"

//recyclerview
//recyclerview
implementation 'com.android.support:recyclerview-v7:31.0.0'

//cardview
//cardview
implementation 'com.android.support:cardview-v7:31.0.0'

//picasso
implementation 'com.squareup.picasso:picasso:2.71828'

//material design
implementation 'com.google.android.material:material:1.3.0'
implementation 'com.google.android.material:material:1.6.1'

//sdp ssp unit dependency
implementation 'com.intuit.sdp:sdp-android:1.1.0'
implementation 'com.intuit.ssp:ssp-android:1.1.0'

//kotlin
implementation "androidx.core:core-ktx:1.7.0"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

//lottie
def lottieVersion = "3.4.0"
implementation "com.airbnb.android:lottie:$lottieVersion"


}
// Glide
implementation 'com.github.bumptech.glide:glide:4.13.0'

//Auto image slider
implementation 'com.github.smarteist:autoimageslider:1.4.0'

//staggered grid view
implementation 'com.etsy.android.grid:library:1.0.5'

}
10 changes: 8 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package="com.example.msp_app">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

<application
android:allowBackup="true"
Expand All @@ -12,6 +12,12 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.MSP_APP">
<activity
android:name=".Login"
android:exported="false" />
<activity
android:name=".ui.login.LoginActivity"
android:exported="true" />
<activity
android:name=".ui.event.EventDescription"
android:exported="true" />
Expand All @@ -28,7 +34,7 @@
android:name=".ui.crew.CrewAcivity"
android:exported="true" />
<activity
android:name=".ui.home.HomeAcivity"
android:name=".ui.home.HomeActivity"
android:exported="true" />
<activity
android:name=".ui.intro.IntroActivity"
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/com/example/msp_app/model/Events_Model.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package com.example.msp_app.model

class Events_Model(var imageUrl: String, var eventDate: String, var eventDescription: String)
40 changes: 40 additions & 0 deletions app/src/main/java/com/example/msp_app/ui/MSPViewModel.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package com.example.msp_app.ui

import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel

class MSPViewModel :ViewModel(){

val committeesMutableLiveData : MutableLiveData<ArrayList<String>>by lazy {
MutableLiveData()
}
fun getCommittees(){
val arr:ArrayList<String> = ArrayList()
val url = "https://images.unsplash.com/photo-1453728013993-6d66e9c9123a?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1170&q=80"
arr.add(url)
arr.add(url)
arr.add(url)
arr.add(url)
arr.add(url)
arr.add(url)
arr.add(url)
committeesMutableLiveData.value = arr
}

val trendsMutableLiveData : MutableLiveData<ArrayList<String>>by lazy {
MutableLiveData()
}
fun getTrends(){
val arr:ArrayList<String> = ArrayList()
val url = "https://images.unsplash.com/photo-1453728013993-6d66e9c9123a?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1170&q=80"
arr.add(url)
arr.add(url)
arr.add(url)
arr.add(url)
arr.add(url)
arr.add(url)
arr.add(url)
trendsMutableLiveData.value = arr
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import android.widget.ImageView;

import com.example.msp_app.R;
import com.example.msp_app.ui.home.HomeAcivity;
import com.example.msp_app.ui.home.HomeActivity;

public class AboutUs extends AppCompatActivity {

Expand Down Expand Up @@ -59,7 +59,7 @@ public void onClick(View view) {
back.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Intent i=new Intent(getApplicationContext(), HomeAcivity.class);
Intent i=new Intent(getApplicationContext(), HomeActivity.class);
startActivity(i);
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.view.View;
import android.view.animation.AnimationUtils;
Expand All @@ -19,7 +18,7 @@

import com.example.msp_app.R;
import com.example.msp_app.model.CrewModel;
import com.example.msp_app.ui.home.HomeAcivity;
import com.example.msp_app.ui.home.HomeActivity;
import com.example.msp_app.ui.main.DataViewModel;

import java.util.ArrayList;
Expand Down Expand Up @@ -78,7 +77,7 @@ public void onChanged(ArrayList<CrewModel> crewModels) {
back.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Intent i=new Intent(getApplicationContext(),HomeAcivity.class);
Intent i=new Intent(getApplicationContext(), HomeActivity.class);
startActivity(i);
}
});
Expand Down
Loading