Skip to content

Master #12

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

Master #12

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
efd0b3e
Merge remote-tracking branch 'refs/remotes/dbakti7/master'
stvalxndr1203 Oct 19, 2015
ca0cbe4
change
stvalxndr1203 Oct 19, 2015
79834ff
change
stvalxndr1203 Oct 20, 2015
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
4 changes: 2 additions & 2 deletions .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.

8 changes: 5 additions & 3 deletions app/app.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
<afterSyncTasks>
<task>generateDebugAndroidTestSources</task>
<task>generateDebugSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
Expand Down Expand Up @@ -88,8 +90,8 @@
</content>
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
<orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
</component>
</module>
6 changes: 5 additions & 1 deletion app/src/main/java/com/example/android/cz2006androidproject/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@


import android.app.Activity;
import android.content.ClipData;
import android.content.Intent;
import android.support.annotation.MainThread;
import android.support.v7.app.ActionBarActivity;
Expand All @@ -20,12 +21,15 @@
import com.example.android.cz2006androidproject.calendar;
import com.example.android.cz2006androidproject.search;

import java.util.ArrayList;
import java.util.TreeSet;


public class MainActivity extends AppCompatActivity{//ActionBarActivity {

ListView listview;
ArrayAdapter<String> listAdapter;
String[] fragmentArray = {"LALALA", "LELELE"};
String[] fragmentArray = {"A", "B", "C", "D", "E"};

@Override
protected void onCreate(Bundle savedInstanceState) {
Expand Down
110 changes: 23 additions & 87 deletions app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"

android:layout_height="match_parent"
<<<<<<< HEAD
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true">



<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
=======
android:orientation="vertical" tools:context=".MainActivity">
<!--android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
Expand Down Expand Up @@ -64,95 +54,41 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="4"/>

<LinearLayout
>>>>>>> 48e82d18e0f463f7e9f700628c7a6b30eb8d1e85
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" tools:context=".MainActivity">
<!--android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"-->

<TextView
android:id="@+id/tvMAINhome"
android:text="Home"
android:textSize="40dp"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>

<TextView
android:id="@+id/tvMAINrecommendedPlan"
android:text="Recommended Plan"
android:gravity="center"
android:textSize="25dp"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
<ImageView
android:id="@+id/ivMAINrecommendedPlanImage"
android:src="@drawable/landscape_540115_1920"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="4"/>
<TextView
android:id="@+id/tvMAINstaffPicks"
android:text="Staff Picks"
android:gravity="center"
android:textSize="25dp"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"/>
<ImageView
android:id="@+id/ivMAINstaffPicksImage"
android:src="@drawable/landscape_540115_1920"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="4"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1.25">


<ImageButton
android:src="@drawable/home_black"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent" />
<ImageButton
android:src = "@drawable/magnify"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
android:onClick="searchPage"/>
<ImageButton
android:layout_width="0dp"
android:layout_weight="1"
android:src="@drawable/calendar_black"
android:layout_height="match_parent"
android:onClick="calendarPageClicked"/>

</LinearLayout>
</LinearLayout>
android:layout_height="0dp"
android:layout_weight="1.25">


<ImageButton
android:src="@drawable/home_black"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent" />
<ImageButton
android:src = "@drawable/magnify"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="match_parent"
android:onClick="searchPage"/>
<ImageButton
android:layout_width="0dp"
android:layout_weight="1"
android:src="@drawable/calendar_black"
android:layout_height="match_parent"
android:onClick="calendarPageClicked"/>

</LinearLayout>
</LinearLayout>


<ListView
android:layout_width="275dp"
android:layout_height="match_parent"
android:layout_gravity="left"
android:id="@+id/listview"
<<<<<<< HEAD
android:background="@color/material_grey_100"
></ListView>
=======
android:background="#5e5555"
></ListView>
>>>>>>> 48e82d18e0f463f7e9f700628c7a6b30eb8d1e85


</android.support.v4.widget.DrawerLayout>

Expand Down
32 changes: 27 additions & 5 deletions app/src/main/res/layout/myplan_layout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/linear_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" tools:context=".MainActivity">

<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Large Text"
android:textColor="#e7df1e"
android:id="@+id/textView1"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:layout_margin="@dimen/abc_text_size_large_material"
></TextView>

<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="#e7df1e"
android:id="@+id/textView2"
android:gravity="center_horizontal"
android:layout_margin="@dimen/abc_text_size_large_material"
></TextView>

<CheckBox
android:layout_width="match_parent"
android:layout_height="match_parent" />

></TextView>
</LinearLayout>