Skip to content

Commit 32547c2

Browse files
author
Zhaolian Zhou
committed
fix merge
2 parents 6354099 + 8fc5bcc commit 32547c2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+559
-188
lines changed

‎.gitignore

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,45 @@
66
.DS_Store
77
/build
88
/captures
9+
10+
# User-specific stuff:
11+
.idea/workspace.xml
12+
.idea/tasks.xml
13+
.idea/dictionaries
14+
.idea/vcs.xml
15+
.idea/jsLibraryMappings.xml
16+
17+
# Sensitive or high-churn files:
18+
.idea/dataSources.ids
19+
.idea/dataSources.xml
20+
.idea/dataSources.local.xml
21+
.idea/sqlDataSources.xml
22+
.idea/dynamic.xml
23+
.idea/uiDesigner.xml
24+
25+
# Gradle:
26+
.idea/gradle.xml
27+
.idea/libraries
28+
29+
# Mongo Explorer plugin:
30+
.idea/mongoSettings.xml
31+
32+
## File-based project format:
33+
*.iws
34+
35+
## Plugin-specific files:
36+
37+
# IntelliJ
38+
/out/
39+
40+
# mpeltonen/sbt-idea plugin
41+
.idea_modules/
42+
43+
# JIRA plugin
44+
atlassian-ide-plugin.xml
45+
46+
# Crashlytics plugin (for Android Studio and IntelliJ)
47+
com_crashlytics_export_strings.xml
48+
crashlytics.properties
49+
crashlytics-build.properties
50+
fabric.properties

‎.idea/inspectionProfiles/Project_Default.xml

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎.idea/inspectionProfiles/profiles_settings.xml

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎README.md

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,29 @@ Copyright 2016 [Pubudu Dissanayake](https://github.com/pubudu08), [email protected]
44
Licensed under the [Apache License 2.0](https://gitlab.cecs.anu.edu.au/u5857495/comp6442_assignment_two_2016/blob/master/LICENSE) (the "License"); you may not use this software except in compliance with the License.
55

66
## Introduction
7+
CaL™ is a breeze to use for everyday calculations, with all the scientific capability you need for work and school just a swipe away.
8+
And for your most demanding needs, CaL™ allows you to add or remove the functions and constants you need to make the perfect calculator designed by you,for you.
79

10+
### Basic Calculator
811

12+
<p align="center">
13+
<img src="https://gitlab.cecs.anu.edu.au/u5857495/comp6442_assignment_two_2016/raw/3004a463ee3074417415a8358cd85f20808c1ba9/Screens/Basic_Calculator.png" width="250" />
14+
</p>
15+
### Scientific Calculator
16+
17+
<p align="center">
18+
<img src="https://gitlab.cecs.anu.edu.au/u5857495/comp6442_assignment_two_2016/raw/3004a463ee3074417415a8358cd85f20808c1ba9/Screens/Scientific_Calculator.png" width="500" />
19+
</p>
920
## Contents
1021
* [Key Features](https://gitlab.cecs.anu.edu.au/u5857495/comp6442_assignment_two_2016/edit/master/README.md#usage)
22+
* Basic Claculator
23+
* Scientific Calculator
24+
* Expression History
25+
* Logical bit-wise Operators Support ( AND, OR, NOT, XOR )
26+
* Programmer mode to support alternate number formats such as binary, octal, hexadecimal
27+
* More operators such as %, square, square root, reciprocal and Pi
28+
* Orientation Support
29+
1130
* [Documentation](https://gitlab.cecs.anu.edu.au/u5857495/comp6442_assignment_two_2016/edit/master/README.md#documentation)
1231
* Class Diagram
1332
* Test Plan Summary
@@ -18,8 +37,8 @@ Licensed under the [Apache License 2.0](https://gitlab.cecs.anu.edu.au/u5857495/
1837

1938

2039
### Documentation
21-
* [Calculator Class diagram]()
22-
* [Test plan summary]()
40+
* [Calculator Class diagram](https://gitlab.cecs.anu.edu.au/u5857495/comp6442_assignment_two_2016/wikis/calculator-class-disagram)
41+
* [Test plan summary](https://gitlab.cecs.anu.edu.au/u5857495/comp6442_assignment_two_2016/wikis/test-summary)
2342

2443
### Latest Version
2544
* 1.0.0

‎Screens/Basic_Calculator.png

155 KB
Loading

‎Screens/Scientific_Calculator.png

259 KB
Loading

‎app/src/androidTest/java/com/vera/zzl/comp6442_assignment_two_2016/ApplicationTest.java renamed to ‎app/src/androidTest/java/com/vera/zzl/calculator/ApplicationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.vera.zzl.comp6442_assignment_two_2016;
1+
package com.vera.zzl.calculator;
22

33
import android.app.Application;
44
import android.test.ApplicationTestCase;

‎app/src/main/AndroidManifest.xml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.vera.zzl.comp6442_assignment_two_2016">
3+
package="com.vera.zzl.calculator">
44

55
<application
66
android:allowBackup="true"
@@ -15,6 +15,20 @@
1515
<category android:name="android.intent.category.LAUNCHER" />
1616
</intent-filter>
1717
</activity>
18+
<provider
19+
android:name=".ExpressionsProvider"
20+
android:authorities="com.vera.zzl.calculator.core.expressionsprovider"
21+
android:exported="false" />
22+
23+
<activity android:name=".HistoryActivity"
24+
android:parentActivityName=".MainActivity"
25+
android:theme="@style/AppTheme"
26+
android:label="@string/history_name"
27+
>
28+
<meta-data
29+
android:name="android.support.PARENT_ACTIVITY"
30+
android:value="com.vera.zzl.calculator.MainActivity" />
31+
</activity>
1832
</application>
1933

2034
</manifest>

‎app/src/main/java/com/vera/zzl/calculator/Calculate.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package com.vera.zzl.calculator;
2+
3+
/**
4+
* Created by Zhaolian on 24/04/2016.
5+
*/
6+
public class Calculate {
7+
}

‎app/src/main/java/com/vera/zzl/calculator/Constants.java

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
package com.vera.zzl.calculator;
2+
3+
import android.net.Uri;
4+
5+
/**
6+
* <h1>Addition</h1>
7+
* TODO Class Description
8+
*
9+
* @author Pubudu Dissanayake | comp6442_assignment_two_2016
10+
* @version 1.0
11+
* @since 10/05/2016
12+
*/
13+
public final class Constants {
14+
15+
public static final String DATABASE_NAME = "history.db";
16+
public static final int DATABASE_VERSION = 1;
17+
18+
//Constants for identifying table and columns
19+
public static final String TABLE_EXPRESSIONS = "expressions";
20+
public static final String EXPRESSION_ID = "_id";
21+
public static final String EXPRESSION_TEXT = "expression";
22+
public static final String EXPRESSION_CREATED = "expressionCreated";
23+
24+
//SQL to create table
25+
public static final String TABLE_CREATE =
26+
"CREATE TABLE " + TABLE_EXPRESSIONS + " (" +
27+
EXPRESSION_ID + " INTEGER PRIMARY KEY AUTOINCREMENT, " +
28+
EXPRESSION_TEXT + " TEXT, " +
29+
EXPRESSION_CREATED + " TEXT default CURRENT_TIMESTAMP" +
30+
")";
31+
public static final String[] ALL_COLUMNS = {EXPRESSION_ID, EXPRESSION_TEXT, EXPRESSION_CREATED};
32+
33+
public static final String AUTHORITY = "com.vera.zzl.calculator.core.expressionsprovider";
34+
//entire data set
35+
public static final String BASE_PATH = "expressions";
36+
// URI that identify the content provider
37+
public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/" + BASE_PATH);
38+
39+
40+
public static final int HISTORY_REQUEST_CODE = 404;
41+
public static final String CONTENT_ITEM_TYPE = "expression";
42+
}

0 commit comments

Comments
 (0)