Skip to content

GitLab

Commit c153baf6 authored by Jessica Suszek's avatar Jessica Suszek
Browse files

Merged branch master into master

parents 5859adda 426ba20e
Hide whitespace changes
Inline Side-by-side
MINUTES.docx
View file @ c153baf6
No preview for this file type
TravelPals/.idea/vcs.xml 0 → 100644
View file @ c153baf6
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
</component>
</project>
\ No newline at end of file
TravelPals/.idea/workspace.xml
View file @ c153baf6
......@@ -33,18 +33,22 @@
</file>
</leaf>
</component>
<component name="Git.Settings">
<option name="ROOT_SYNC" value="DONT_SYNC" />
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
</component>
<component name="GradleLocalSettings">
<option name="externalProjectsViewState">
<projects_view />
</option>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="10" />
<option name="y" value="43" />
<option name="width" value="1260" />
<option name="height" value="664" />
<option name="x" value="-9" />
<option name="y" value="-9" />
<option name="width" value="1938" />
<option name="height" value="1048" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkout" />
......@@ -116,7 +120,9 @@
</component>
<component name="PropertiesComponent">
<property name="android.sdk.path" value="$USER_HOME$/Library/Android/sdk" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/.idea/vcs.xml" />
<property name="settings.editor.selected.configurable" value="project.propVCSSupport.Mappings" />
<property name="settings.editor.splitter.proportion" value="0.2" />
</component>
<component name="RunManager">
<configuration default="true" type="Application" factoryName="Application">
......@@ -207,6 +213,9 @@
<component name="ShelveChangesManager" show_recycled="false">
<option name="remove_strategy" value="false" />
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="f8035d5b-0cdb-4e1c-83ea-a93f00e38579" name="Default" comment="" />
......@@ -227,8 +236,8 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="10" y="43" width="1260" height="664" extended-state="0" />
<editor active="true" />
<frame x="-9" y="-9" width="1938" height="1048" extended-state="6" />
<editor active="false" />
<layout>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32967034" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
......@@ -243,7 +252,6 @@
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24939467" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24939467" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
......@@ -255,8 +263,17 @@
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout>
</component>
<component name="Vcs.Log.UiProperties">
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
</option>
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
<collection />
</option>
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
......@@ -265,7 +282,7 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/Login.php">
<entry file="file://$PROJECT_DIR$/TravelPals/settings.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
......@@ -273,7 +290,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Register.php">
<entry file="file://$PROJECT_DIR$/TravelPals/settings.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
......@@ -285,7 +302,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
......@@ -293,36 +309,38 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/TravelPals/build.gradle">
<entry file="file://$PROJECT_DIR$/Login.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/TravelPals/app/build.gradle">
<entry file="file://$PROJECT_DIR$/Register.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/TravelPals/app/build/generated/source/buildConfig/androidTest/debug/travelpals/travelpals/test/BuildConfig.java">
<entry file="file://$PROJECT_DIR$/TravelPals/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/TravelPals/app/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#0#54#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/TravelPals/app/build/generated/source/buildConfig/androidTest/debug/travelpals/travelpals/test/BuildConfig.java" />
<entry file="file://$PROJECT_DIR$/TravelPals/settings.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
......
TravelPals/TravelPals/app/build.gradle
View file @ c153baf6
......@@ -25,6 +25,7 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:25.1.0'
testCompile 'junit:junit:4.12'
compile 'com.android.volley:volley:1.0.0'
compile 'com.android.support:design:25.1.0'
testCompile 'junit:junit:4.12'
}
TravelPals/TravelPals/app/src/main/AndroidManifest.xml
View file @ c153baf6
......@@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="travelpals.travelpals">
<uses-permission android:name="android.permission.INTERNET"></uses-permission>
<uses-permission android:name="android.permission.INTERNET" />
<application
android:allowBackup="true"
......@@ -18,7 +18,13 @@
</intent-filter>
</activity>
<activity android:name=".RegisterActivity" />
<activity android:name=".UserAreaActivity"></activity>
<activity android:name=".UserAreaActivity" />
<activity android:name=".MainMenuActivity">
android:exported="true"
</activity>
<activity android:name=".SearchActivity" />
<activity android:name=".MyPlanActivity" />
<activity android:name=".MessageActivity"></activity>
</application>
</manifest>
\ No newline at end of file
TravelPals/TravelPals/app/src/main/java/travelpals/travelpals/MainMenuActivity.java 0 → 100644
View file @ c153baf6
package travelpals.travelpals;
import android.content.Intent;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.widget.ImageButton;
import com.android.volley.Response;
import org.json.JSONException;
import org.json.JSONObject;
public class MainMenuActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main_menu);
final ImageButton ibMyPlanImageButton = (ImageButton) findViewById(R.id.ibMyPlanImageButton);
final ImageButton ibSearchImageButton = (ImageButton) findViewById(R.id.ibSearchImageButton);
final ImageButton ibMessageImageButton = (ImageButton) findViewById(R.id.ibMessageImageButton);
final ImageButton ibUserImageButton = (ImageButton) findViewById(R.id.ibUserImageButton);
ibUserImageButton.setOnClickListener(new View.OnClickListener(){
@Override
public void onClick(View v) {
Intent userIntent = new Intent(MainMenuActivity.this, UserAreaActivity.class);
MainMenuActivity.this.startActivity(userIntent);
}
});
ibSearchImageButton.setOnClickListener(new View.OnClickListener(){
@Override
public void onClick(View v) {
Intent searchIntent = new Intent(MainMenuActivity.this, SearchActivity.class);
MainMenuActivity.this.startActivity(searchIntent);
}
});
ibMessageImageButton.setOnClickListener(new View.OnClickListener(){
@Override
public void onClick(View v) {
Intent messageIntent = new Intent(MainMenuActivity.this, MessageActivity.class);
MainMenuActivity.this.startActivity(messageIntent);
}
});
ibMyPlanImageButton.setOnClickListener(new View.OnClickListener(){
@Override
public void onClick(View v) {
Intent myPlanIntent = new Intent(MainMenuActivity.this, MyPlanActivity.class);
MainMenuActivity.this.startActivity(myPlanIntent);
}
});
}
}
TravelPals/TravelPals/app/src/main/java/travelpals/travelpals/MessageActivity.java 0 → 100644
View file @ c153baf6
package travelpals.travelpals;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
public class MessageActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_message);
}
}
TravelPals/TravelPals/app/src/main/java/travelpals/travelpals/MyPlanActivity.java 0 → 100644
View file @ c153baf6
package travelpals.travelpals;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
public class MyPlanActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_my_plan);
}
}
TravelPals/TravelPals/app/src/main/java/travelpals/travelpals/SearchActivity.java 0 → 100644
View file @ c153baf6
package travelpals.travelpals;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
public class SearchActivity extends AppCompatActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_search);
}
}
TravelPals/TravelPals/app/src/main/java/travelpals/travelpals/loginActivity.java
View file @ c153baf6
......@@ -60,9 +60,10 @@ public class loginActivity extends AppCompatActivity {
intent.putExtra("age", age);
intent.putExtra("username", username);
loginActivity.this.startActivity(intent);
Intent intent1 = new Intent(loginActivity.this, MainMenuActivity.class);
//loginActivity.this.startActivity(intent);
loginActivity.this.startActivity(intent1); //Start main menu activity
}else{
AlertDialog.Builder builder = new AlertDialog.Builder(loginActivity.this);
......
TravelPals/TravelPals/app/src/main/res/drawable/ic_menu_camera.xml 0 → 100644
View file @ c153baf6
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0" />
<path
android:fillColor="#FF000000"
android:pathData="M9,2L7.17,4H4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2H9zm3,15c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z" />
</vector>
TravelPals/TravelPals/app/src/main/res/drawable/ic_menu_gallery.xml 0 → 100644
View file @ c153baf6
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M22,16V4c0,-1.1 -0.9,-2 -2,-2H8c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2zm-11,-4l2.03,2.71L16,11l4,5H8l3,-4zM2,6v14c0,1.1 0.9,2 2,2h14v-2H4V6H2z" />
</vector>
TravelPals/TravelPals/app/src/main/res/drawable/ic_menu_manage.xml 0 → 100644
View file @ c153baf6
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M22.7,19l-9.1,-9.1c0.9,-2.3 0.4,-5 -1.5,-6.9 -2,-2 -5,-2.4 -7.4,-1.3L9,6 6,9 1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1,0.4 1.4,0l2.3,-2.3c0.5,-0.4 0.5,-1.1 0.1,-1.4z" />
</vector>
\ No newline at end of file
TravelPals/TravelPals/app/src/main/res/drawable/ic_menu_send.xml 0 → 100644
View file @ c153baf6
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z" />
</vector>
TravelPals/TravelPals/app/src/main/res/drawable/ic_menu_share.xml 0 → 100644
View file @ c153baf6
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z" />
</vector>
TravelPals/TravelPals/app/src/main/res/drawable/ic_menu_slideshow.xml 0 → 100644
View file @ c153baf6
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M4,6H2v14c0,1.1 0.9,2 2,2h14v-2H4V6zm16,-4H8c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2zm-8,12.5v-9l6,4.5 -6,4.5z" />
</vector>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment