diff --git a/PayBack - CEN3031 Scrum.xlsx b/PayBack - CEN3031 Scrum.xlsx index 3695ac5..2423bce 100644 Binary files a/PayBack - CEN3031 Scrum.xlsx and b/PayBack - CEN3031 Scrum.xlsx differ diff --git a/PayBack/AndroidManifest.xml b/PayBack/AndroidManifest.xml index 71f45cb..95f2e60 100644 --- a/PayBack/AndroidManifest.xml +++ b/PayBack/AndroidManifest.xml @@ -7,7 +7,7 @@ - + @@ -30,83 +30,109 @@ + android:theme="@style/AppTheme" + android:screenOrientation="portrait" > + android:theme="@style/AppTheme" + android:screenOrientation="portrait"> + android:theme="@style/AppTheme" + android:screenOrientation="portrait"> + android:theme="@style/AppTheme" + android:screenOrientation="portrait"> + android:theme="@style/AppTheme" + android:screenOrientation="portrait"> + android:theme="@style/AppTheme" + android:screenOrientation="portrait"> + android:theme="@style/AppTheme" + android:screenOrientation="portrait"> + android:theme="@style/AppTheme" + android:screenOrientation="portrait" > + android:theme="@style/AppTheme" + android:screenOrientation="portrait"> + android:theme="@style/AppTheme" + android:screenOrientation="portrait" + android:windowSoftInputMode="adjustPan"> + android:theme="@style/AppTheme" + android:screenOrientation="portrait"> + android:theme="@style/AppTheme" + android:screenOrientation="portrait"> + android:theme="@style/DefaultAppTheme" + android:screenOrientation="portrait"> + android:label="@string/title_activity_title" + android:screenOrientation="portrait"> - + android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" + android:screenOrientation="portrait" > + + + + + + + + + + diff --git a/PayBack/libs/achartengine-0.7.0.jar b/PayBack/libs/achartengine-0.7.0.jar new file mode 100644 index 0000000..f9e3b83 Binary files /dev/null and b/PayBack/libs/achartengine-0.7.0.jar differ diff --git a/PayBack/project.properties b/PayBack/project.properties index b9df4ba..85f532c 100644 --- a/PayBack/project.properties +++ b/PayBack/project.properties @@ -11,5 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-13 +target=android-10 android.library.reference.1=../../Test/gridlayout_v7 diff --git a/PayBack/res/layout/activity_contact.xml b/PayBack/res/layout/activity_contact.xml index bc9f73d..f0fab84 100644 --- a/PayBack/res/layout/activity_contact.xml +++ b/PayBack/res/layout/activity_contact.xml @@ -3,23 +3,15 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/activitybackground" - android:gravity="right" + android:gravity="center|bottom" android:orientation="vertical" android:paddingBottom="@dimen/activity_vertical_margin" android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin" android:paddingTop="@dimen/activity_vertical_margin" + android:scrollbars="vertical" tools:context=".ContactActivity" > - - - - + android:text="@string/transaction2_newContact" + android:textSize="32dp" /> - + - - + android:smoothScrollbar="true" /> + android:text="@string/Home" + android:textSize="32dp" /> + diff --git a/PayBack/res/layout/activity_login.xml b/PayBack/res/layout/activity_login.xml index 7311d45..4fd9191 100644 --- a/PayBack/res/layout/activity_login.xml +++ b/PayBack/res/layout/activity_login.xml @@ -1,9 +1,6 @@ - - - -