Skip to content

Commit

Permalink
Revert "past events fixed"
Browse files Browse the repository at this point in the history
This reverts commit 9211bd8.
  • Loading branch information
leninbooter committed Jul 29, 2014
1 parent 9211bd8 commit 01e3b69
Show file tree
Hide file tree
Showing 30 changed files with 314 additions and 1,219 deletions.
7 changes: 0 additions & 7 deletions WhatsUp.iml
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:0.12.1'
classpath 'com.android.tools.build:gradle:0.10.+'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
11 changes: 0 additions & 11 deletions build/intermediates/dex-cache/cache.xml

This file was deleted.

Binary file removed build/intermediates/model_data.bin
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Jul 24 11:56:31 VET 2014
#Wed Apr 10 15:27:10 PDT 2013
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
distributionUrl=http\://services.gradle.org/distributions/gradle-1.10-all.zip
2 changes: 1 addition & 1 deletion whatsup/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'android'

android {
compileSdkVersion 19
buildToolsVersion '19.1.0'
buildToolsVersion "19.0.3"

defaultConfig {
packageName "com.whatsup.whatsup"
Expand Down
41 changes: 0 additions & 41 deletions whatsup/src/main/java/com/whatsup/whatsup/GVImageLoader.java

This file was deleted.

122 changes: 0 additions & 122 deletions whatsup/src/main/java/com/whatsup/whatsup/ImageLoader.java

This file was deleted.

50 changes: 17 additions & 33 deletions whatsup/src/main/java/com/whatsup/whatsup/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,19 @@
import android.view.ViewGroup;
import android.support.v4.widget.DrawerLayout;
import android.widget.Switch;
import android.widget.TextView;
import android.widget.Toast;

import org.json.JSONObject;

import java.util.Calendar;

public class MainActivity extends Activity
implements NavigationDrawerFragment.NavigationDrawerCallbacks,
WhatItIsHotFragment.OnFragmentWhatItIsHotFragmentListener,
SpecialsFragment.OnFragmentSpecialsFragmentListener,
WhatWasHereFragment.OnFragmentWwhFragmentListener,
WhatWasHereFragmentGV.OnWwhGvsFragmentListener {
SpecialsFragment.OnFragmentSpecialsFragmentListener {

private static String NO_CONNECTION = "noconnection";
private static String HOT_PLACES = "hotplaces";
private static String WHAT_IS_HERE = "whatishere";
private static String EVENTS = "events";
private static String EVENTS_PICTURES = "events_pictures";
private static String EVENTS = "EVENTS";
private static String FOR_TODAY = "fortoday";

/**
Expand Down Expand Up @@ -135,25 +129,6 @@ public void loadEventsFragment(String place_id, String place_name) {
previousFragmentTag = null;
}

public void LoadEventsPicturesFragment( String event_id, String event_name, String event_date ) {
if( event_id == null && event_name == null && event_date == null ) {
event_id = getFragmentManager().findFragmentByTag( currentFragmentTag ).getArguments().getString( "event_id" );
event_name = getFragmentManager().findFragmentByTag( currentFragmentTag ).getArguments().getString( "event_name" );
event_date = getFragmentManager().findFragmentByTag( currentFragmentTag ).getArguments().getString( "event_date" );
FragmentManager fragmentManager = getFragmentManager();
FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
fragmentTransaction.remove( getFragmentManager().findFragmentByTag(currentFragmentTag) );
fragmentTransaction.commit();
}
FragmentManager fragmentManager = getFragmentManager();
FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
fragmentTransaction.replace(R.id.container, WhatWasHereFragmentGV.newInstance( event_id, event_name, event_date ), EVENTS_PICTURES);
if( !currentFragmentTag.equals(NO_CONNECTION) && !currentFragmentTag.equals(EVENTS_PICTURES))
fragmentTransaction.addToBackStack(null);
fragmentTransaction.commit();
previousFragmentTag = null;
}

public void loadWhatItIsUpTodayFragment() {
if( currentFragmentTag.equals(FOR_TODAY)) {
FragmentManager fragmentManager = getFragmentManager();
Expand All @@ -172,10 +147,20 @@ public void loadWhatItIsUpTodayFragment() {
}

private void refreshFragment(String fragmentTag) {
if( fragmentTag.equals(HOT_PLACES) ) { loadWhatItIsHotFragment(); return; }
if( fragmentTag.equals(WHAT_IS_HERE) ) { loadSpecialsFragment(null, null); return; }
if( fragmentTag.equals(FOR_TODAY) ) { loadWhatItIsUpTodayFragment(); return; }
if( fragmentTag.equals(EVENTS) ) { loadEventsFragment(null, null); return; }
if( fragmentTag.equals(HOT_PLACES) )
loadWhatItIsHotFragment();
else {
if( fragmentTag.equals(WHAT_IS_HERE) )
loadSpecialsFragment(null, null);
else {
if( fragmentTag.equals(FOR_TODAY) )
loadWhatItIsUpTodayFragment();
else {
return;
}
}
}
Toast.makeText(getBaseContext(), currentFragmentTag, Toast.LENGTH_LONG).show();
}

@Override
Expand Down Expand Up @@ -212,6 +197,7 @@ public void onNavigationDrawerItemSelected(int position) {

break;
}

}

public void onSectionAttached(int number) {
Expand Down Expand Up @@ -288,8 +274,6 @@ public boolean isOnline() {

public void setmTitle(String title) {
mTitle = title;
ActionBar actionBar = getActionBar();
actionBar.setTitle(mTitle);
}

/**
Expand Down
16 changes: 0 additions & 16 deletions whatsup/src/main/java/com/whatsup/whatsup/Utilis.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,20 +67,4 @@ public static String downloadUrl( String strURL ) throws IOException {
}
return data;
}

static String getMonthName(Context c, String number) {
if( number.equals( "01" ) ) return c.getString( R.string.january );
if( number.equals( "02" ) ) return c.getString( R.string.february );
if( number.equals( "03" ) ) return c.getString( R.string.march );
if( number.equals( "04" ) ) return c.getString( R.string.april );
if( number.equals( "05" ) ) return c.getString( R.string.may );
if( number.equals( "06" ) ) return c.getString( R.string.june );
if( number.equals( "07" ) ) return c.getString( R.string.july );
if( number.equals( "08" ) ) return c.getString( R.string.august );
if( number.equals( "09" ) ) return c.getString( R.string.septembter );
if( number.equals( "10" ) ) return c.getString( R.string.october );
if( number.equals( "11" ) ) return c.getString( R.string.november );
if( number.equals( "12" ) ) return c.getString( R.string.december );
return null;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
public void onResume() {
super.onResume();
mCallBack.setCurrentFragmentTag("hotplaces");
mCallBack.setmTitle( getString( R.string.whats_hot ) );
}

@Override
Expand Down
Loading

0 comments on commit 01e3b69

Please sign in to comment.