Skip to content

Material #55

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.

Sign up for GitHub

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
naishadhparmar wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Material #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ecf671
Applied Material theme to MainActivity and AboutAppActivity
naishadhparmar Dec 19, 2017
571cd87
Used Lazy Singleton design pattern for MappingUtils because initializ…
naishadhparmar Jan 22, 2018
262a0ee
Completed changes for material design
naishadhparmar Jan 24, 2018
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
15 changes: 1 addition & 14 deletions .idea/misc.xml
View file
Open in desktop

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

18 changes: 6 additions & 12 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion "25.0.3"
buildToolsVersion '26.0.2'
defaultConfig {
applicationId "com.studentsearch.xoodle.studentsearch"
minSdkVersion 15
minSdkVersion 19
targetSdkVersion 25
versionCode 5
versionName "1.3"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
}
buildTypes {
release {
Expand All @@ -20,16 +21,16 @@ android {
aaptOptions {
cruncherEnabled = false
}
productFlavors {
}
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile fileTree(include: ['*.jar'], dir: 'libs')
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})

final GOOGLE_VERSION = '25.3.1'

compile "com.android.support:preference-v7:$GOOGLE_VERSION"
compile "com.android.support:design:$GOOGLE_VERSION"
compile "com.android.support:appcompat-v7:$GOOGLE_VERSION"
Expand All @@ -39,16 +40,9 @@ dependencies {
compile "com.android.support:support-annotations:$GOOGLE_VERSION"
compile "com.android.support:customtabs:$GOOGLE_VERSION"
compile "com.android.support:support-v4:$GOOGLE_VERSION"
compile 'com.squareup.retrofit:retrofit:1.9.0'
testCompile 'junit:junit:4.12'
//Retrofit 2, OkHttp and Gson
compile 'com.squareup.retrofit2:retrofit:2.3.0'
compile 'com.squareup.retrofit2:converter-gson:2.3.0'
compile 'com.google.code.gson:gson:2.8.0'
compile 'com.squareup.picasso:picasso:2.5.2'
//Rounded Image View
compile 'com.makeramen:roundedimageview:2.3.0'
compile 'jp.wasabeef:recyclerview-animators:2.2.7@aar'
// Card Slider Android
'com.ramotion.cardslider:card-slider:0.1.0'
}
50 changes: 31 additions & 19 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.studentsearch.xoodle.studentsearch">

<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"
android:icon="@mipmap/ic_launcher"
Expand All @@ -11,30 +14,39 @@
android:supportsRtl="true"
android:screenOrientation="portrait"
android:theme="@style/AppTheme">

<activity
android:name="com.studentsearch.xoodle.studentsearch.SplashActivity"
android:theme="@style/SplashTheme"
android:screenOrientation="portrait">
android:name="com.studentsearch.xoodle.studentsearch.SplashActivity"
android:theme="@style/SplashTheme"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name="com.studentsearch.xoodle.studentsearch.MainActivity"
android:screenOrientation="portrait">

<activity
android:name="com.studentsearch.xoodle.studentsearch.MainActivity"
android:screenOrientation="portrait">
</activity>
<activity android:name=".AboutAppActivity"
android:parentActivityName=".MainActivity"
android:screenOrientation="portrait"
android:label="About App"/>
<activity android:name=".DetailsActivity"
android:screenOrientation="portrait"
android:parentActivityName=".SearchResultActivity" />
<activity android:name="com.studentsearch.xoodle.studentsearch.SearchResultActivity"
android:label="@string/activity_search_result"
android:screenOrientation="portrait"
android:parentActivityName="com.studentsearch.xoodle.studentsearch.MainActivity"/>

<activity
android:name=".AboutAppActivity"
android:parentActivityName=".MainActivity"
android:screenOrientation="portrait"
android:label="About App"/>

<activity
android:name="com.studentsearch.xoodle.studentsearch.SearchResultActivity"
android:label="@string/activity_search_result"
android:screenOrientation="portrait"
android:parentActivityName="com.studentsearch.xoodle.studentsearch.MainActivity"/>

<activity
android:name=".DetailsActivity"
android:screenOrientation="portrait"
android:label="Details"/>

</application>

</manifest>
51 changes: 50 additions & 1 deletion app/src/main/java/com/studentsearch/xoodle/studentsearch/AboutAppActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,68 @@
package com.studentsearch.xoodle.studentsearch;

import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
import android.view.View;

/**
* Created by aryan on 15/7/17.
*/

public class AboutAppActivity extends AppCompatActivity {
public class AboutAppActivity extends AppCompatActivity implements View.OnClickListener{

@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_about_app);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
findViewById(R.id.about_app_btn_app_repo).setOnClickListener(this);
findViewById(R.id.about_app_btn_aryan_email).setOnClickListener(this);
findViewById(R.id.about_app_btn_aryan_github).setOnClickListener(this);
findViewById(R.id.about_app_btn_kaushal_email).setOnClickListener(this);
findViewById(R.id.about_app_btn_kaushal_github).setOnClickListener(this);
findViewById(R.id.about_app_btn_utkarsh_email).setOnClickListener(this);
findViewById(R.id.about_app_btn_utkarsh_github).setOnClickListener(this);
findViewById(R.id.about_app_btn_siddharth_email).setOnClickListener(this);
findViewById(R.id.about_app_btn_siddharth_github).setOnClickListener(this);
findViewById(R.id.about_app_btn_yash_email).setOnClickListener(this);
findViewById(R.id.about_app_btn_yash_github).setOnClickListener(this);
}

@Override
public void onClick(View v) {
Intent intent = null;
switch (v.getId()) {
case R.id.about_app_btn_app_repo: intent = new Intent("android.intent.action.VIEW", Uri.parse("https://github.com/xoodle/frost"));
break;
case R.id.about_app_btn_aryan_email: intent = new Intent(Intent.ACTION_SENDTO, Uri.fromParts(
"mailto","saryan@iitk.ac.in", null));
break;
case R.id.about_app_btn_aryan_github: intent = new Intent("android.intent.action.VIEW", Uri.parse("https://github.com/aryanshar"));
break;
case R.id.about_app_btn_kaushal_email: intent = new Intent(Intent.ACTION_SENDTO, Uri.fromParts(
"mailto","kaushalk@iitk.ac.in", null));
break;
case R.id.about_app_btn_kaushal_github: intent = new Intent("android.intent.action.VIEW", Uri.parse("https://github.com/kaushal-k"));
break;
case R.id.about_app_btn_utkarsh_email: intent = new Intent(Intent.ACTION_SENDTO, Uri.fromParts(
"mailto","butkarsh@iitk.ac.in", null));
break;
case R.id.about_app_btn_utkarsh_github: intent = new Intent("android.intent.action.VIEW", Uri.parse("https://github.com/ubarsaiyan"));
break;
case R.id.about_app_btn_siddharth_email: intent = new Intent(Intent.ACTION_SENDTO, Uri.fromParts(
"mailto","sidgane@iitk.ac.in", null));
break;
case R.id.about_app_btn_siddharth_github: intent = new Intent("android.intent.action.VIEW", Uri.parse("https://github.com/siddharth2610"));
break;
case R.id.about_app_btn_yash_email: intent = new Intent(Intent.ACTION_SENDTO, Uri.fromParts(
"mailto","yashsriv@iitk.ac.in", null));
break;
case R.id.about_app_btn_yash_github: intent = new Intent("android.intent.action.VIEW", Uri.parse("https://github.com/yashsriv"));
break;
}
startActivity(intent);
}
}
Loading