Skip to content
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

Pr/1 #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Pr/1 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
708969f
commit
DilerxD Sep 11, 2016
756af51
VERSION FINAL
DilerxD Sep 11, 2016
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
2 changes: 1 addition & 1 deletion .idea/.name
View file
Open in desktop

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

7 changes: 6 additions & 1 deletion .idea/gradle.xml
View file
Open in desktop

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

10 changes: 0 additions & 10 deletions .idea/inspectionProfiles/Project_Default.xml
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/inspectionProfiles/profiles_settings.xml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .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.

2 changes: 1 addition & 1 deletion .idea/modules.xml
View file
Open in desktop

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

6 changes: 0 additions & 6 deletions .idea/vcs.xml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ dependencies {
compile 'com.google.firebase:firebase-core:9.0.0'
compile 'com.squareup.picasso:picasso:2.5.2'
compile 'com.google.firebase:firebase-database:9.0.0'
compile 'de.hdodenhof:circleimageview:1.3.0'
compile 'com.facebook.android:facebook-android-sdk:[4,5)'
compile 'com.android.support:appcompat-v7:24.2.0'
compile 'com.android.support:design:24.2.0'
Expand Down
30 changes: 21 additions & 9 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="ceids.ulima.edu.pe.pokequest"
>
package="ceids.ulima.edu.pe.pokequest">

<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="22" />

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

<uses-feature android:name="android.hardware.camera" />
<uses-feature android:name="android.hardware.camera.autofocus" />
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="22" />

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

<application
tools:replace="android:icon,android:theme"
android:allowBackup="true"
android:icon="@drawable/pokeball"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme"
>
tools:replace="android:icon,android:theme">
<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />
<meta-data
android:name="com.google.android.geo.API_KEY"
android:value="AIzaSyCm1OcgOo5hqJ7K6F-uAC709FW4O1PKaEk" />
android:value="AIzaSyChWCVb7zJv_93jjIlIH5PJQFiu-Dyi2cE" />
<meta-data
android:name="com.facebook.sdk.ApplicationId"
android:value="@string/facebook_app_id" />

<activity android:name=".ui.mapa.MapaActivity" />
<activity android:name=".ui.reto.RetoActivity" />
<activity android:name=".ui.mapa.MapaActivity"
android:screenOrientation="portrait" />
<activity android:name=".ui.reto.RetoActivity"
android:screenOrientation="portrait"/>
<activity
android:name=".Splash.SplashActivity"
android:screenOrientation="portrait"
Expand All @@ -39,11 +48,14 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".DrawerActivity"
android:screenOrientation="portrait" />
<activity
android:name=".Login.LoginActiviry"
android:screenOrientation="portrait"
android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
<activity android:name=".Codigo.CodigoActiviry"></activity>
<activity android:name=".Codigo.CodigoActiviry" />
<activity android:name=".Ranking.RankingActiviity"></activity>
</application>

</manifest>
8 changes: 6 additions & 2 deletions app/src/main/java/ceids/ulima/edu/pe/pokequest/Codigo/CodigoActiviry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package ceids.ulima.edu.pe.pokequest.Codigo;

import android.content.Intent;
import android.net.Uri;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.Log;
Expand All @@ -19,6 +20,7 @@

import java.util.ArrayList;

import ceids.ulima.edu.pe.pokequest.DrawerActivity;
import ceids.ulima.edu.pe.pokequest.FirebaseHelper.FirebaseHelper;
import ceids.ulima.edu.pe.pokequest.Login.LoginActiviry;
import ceids.ulima.edu.pe.pokequest.R;
Expand Down Expand Up @@ -53,6 +55,7 @@ protected void onCreate(Bundle savedInstanceState) {
public void onClick(View v) {
boton.setEnabled(false);
final String correito=getIntent().getStringExtra("correo").toString();
final Uri foto=getIntent().getParcelableExtra("foto");
final Correo correo=new Correo(correito);
final String codigoinput=codigito.getText().toString();
final Codigo codigo=new Codigo(codigoinput+ "=" + correito);
Expand All @@ -79,9 +82,10 @@ public void onDataChange(DataSnapshot dataSnapshot) {
if(helper.saveCodigo(codigo,mAuth.getCurrentUser().getUid() )){
codigito.setText("");
helper.saveCorreo(correo);
Intent mainIntent = new Intent(CodigoActiviry.this,MapaActivity.class);
Intent mainIntent = new Intent(CodigoActiviry.this,DrawerActivity.class);
CodigoActiviry.this.startActivity(mainIntent);
CodigoActiviry.this.finish();
mainIntent.putExtra("foto",foto);
mainIntent.putExtra("correo",correito);
startActivity(mainIntent);
}
Expand All @@ -95,7 +99,7 @@ public void onDataChange(DataSnapshot dataSnapshot) {
if(helper.saveCodigo(codigo, mAuth.getCurrentUser().getUid())){
codigito.setText("");
helper.saveCorreo(correo);
Intent mainIntent = new Intent(CodigoActiviry.this,MapaActivity.class);
Intent mainIntent = new Intent(CodigoActiviry.this,DrawerActivity.class);
CodigoActiviry.this.startActivity(mainIntent);
CodigoActiviry.this.finish();
mainIntent.putExtra("correo",correito);
Expand Down
Loading