Skip to content

Commit

Permalink
Merge pull request #35 from prajjwaldimri/beta
Browse files Browse the repository at this point in the history
Merging beta and master
  • Loading branch information
prajjwaldimri committed Mar 13, 2016
2 parents 56afe83 + 4157d2a commit 6d0faff
Show file tree
Hide file tree
Showing 578 changed files with 10,500 additions and 5,370 deletions.
46 changes: 44 additions & 2 deletions .gitignore
Expand Up @@ -26,8 +26,6 @@ bld/
# Visual Studio 2015 cache/options directory
.vs/

#Android Studio IntelliJ Files
.idea/

# MSTest test Results
[Tt]est[Rr]esult*/
Expand Down Expand Up @@ -213,3 +211,47 @@ FakesAssemblies/
GeneratedArtifacts/
_Pvt_Extensions/
ModelManifest.xml

##AndroidStudio Configurations

# Built application files
*.apk
*.ap_

# Files for the Dalvik VM
*.dex

# Java class files
*.class

# Generated files
bin/
gen/
out/

# Gradle files
gradle.properties
.gradle/
build/
gradle.properties

# Local configuration file (sdk path, etc)
local.properties

# Proguard folder generated by Eclipse
proguard/

# Log Files
*.log

# Android Studio Navigation editor temp files
.navigation/

# Android Studio captures folder
captures/

# Intellij
*.iml

#Keystore files
*.jks
19 changes: 0 additions & 19 deletions Android/Friend/Friend.iml

This file was deleted.

99 changes: 0 additions & 99 deletions Android/Friend/app/app.iml

This file was deleted.

6 changes: 3 additions & 3 deletions Android/Friend/app/build.gradle
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion 23
buildToolsVersion "23.0.1"
buildToolsVersion "23.0.2"

defaultConfig {
applicationId "com.example.admin.friend"
Expand All @@ -20,9 +20,9 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile fileTree(include: ['*.jar'], dir: 'libs')
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:23.0.1'
compile 'com.android.support:design:23.0.1'

compile files('libs/twitter4j-core-4.0.4.jar')
}
Binary file added Android/Friend/app/libs/twitter4j-core-4.0.4.jar
Binary file not shown.
10 changes: 7 additions & 3 deletions Android/Friend/app/src/main/AndroidManifest.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.admin.friend" >
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_CONTACTS"/>

<uses-permission android:name="android.permission.CALL_PHONE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_CONTACTS" />


<application
android:allowBackup="true"
Expand All @@ -21,6 +24,7 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

</application>

</manifest>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,16 @@
package com.example.admin.friend;

import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.widget.Toast;

/**
* Created by ayush on 13/3/16.
*/
public class AlarmReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
Toast.makeText(context,"Alarm received",Toast.LENGTH_LONG).show();
}
}
@@ -0,0 +1,43 @@
package com.example.admin.friend;

import android.content.Intent;
import android.net.Uri;
import android.os.AsyncTask;
import android.telephony.SmsManager;
import android.widget.Toast;

/**
* Created by ayush on 13/3/16.
*/
public class BackgroundTask extends AsyncTask{
private long time;
@Override
protected Object doInBackground(Object[] params) {
try {
Thread.sleep(200000);
} catch (InterruptedException e) {
e.printStackTrace();
}
return null;
}

@Override
protected void onPostExecute(Object o) {
super.onPostExecute(o);

Intent intent=new Intent();
}


@Override
protected void onProgressUpdate(Object[] values) {
super.onProgressUpdate(values);
}

@Override
protected void onPreExecute() {

super.onPreExecute();
time=System.currentTimeMillis();
}
}

0 comments on commit 6d0faff

Please sign in to comment.