Skip to content

Commit 909e63a

Browse files
zhujiyuzhujiyu
committed
Merge branch 'master' of https://github.com/zhujiyu/TurtleTrade
Conflicts: AndroidManifest.xml
2 parents 655aab0 + d875108 commit 909e63a

19 files changed

+499
-502
lines changed

‎.classpath

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<classpath>
3-
<classpathentry kind="src" path="src"/>
4-
<classpathentry kind="src" path="gen"/>
5-
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
6-
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
7-
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
8-
<classpathentry kind="output" path="bin/classes"/>
9-
</classpath>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="src" path="src"/>
4+
<classpathentry kind="src" path="gen"/>
5+
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
6+
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
7+
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
8+
<classpathentry kind="output" path="bin/classes"/>
9+
</classpath>

‎.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
/bin/
2-
/libs/
3-
/gen/
1+
/bin/
2+
/libs/
3+
/gen/

‎.project

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<projectDescription>
3-
<name>TurtleTrade</name>
4-
<comment></comment>
5-
<projects>
6-
</projects>
7-
<buildSpec>
8-
<buildCommand>
9-
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
10-
<arguments>
11-
</arguments>
12-
</buildCommand>
13-
<buildCommand>
14-
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
15-
<arguments>
16-
</arguments>
17-
</buildCommand>
18-
<buildCommand>
19-
<name>org.eclipse.jdt.core.javabuilder</name>
20-
<arguments>
21-
</arguments>
22-
</buildCommand>
23-
<buildCommand>
24-
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
25-
<arguments>
26-
</arguments>
27-
</buildCommand>
28-
</buildSpec>
29-
<natures>
30-
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
31-
<nature>org.eclipse.jdt.core.javanature</nature>
32-
</natures>
33-
</projectDescription>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>TurtleTrade</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
<buildCommand>
19+
<name>org.eclipse.jdt.core.javabuilder</name>
20+
<arguments>
21+
</arguments>
22+
</buildCommand>
23+
<buildCommand>
24+
<name>com.android.ide.eclipse.adt.ApkBuilder</name>
25+
<arguments>
26+
</arguments>
27+
</buildCommand>
28+
</buildSpec>
29+
<natures>
30+
<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
31+
<nature>org.eclipse.jdt.core.javanature</nature>
32+
</natures>
33+
</projectDescription>

‎.settings/org.eclipse.jdt.core.prefs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
eclipse.preferences.version=1
2-
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
4-
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
5-
org.eclipse.jdt.core.compiler.compliance=1.7
6-
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
7-
org.eclipse.jdt.core.compiler.debug.localVariable=generate
8-
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
9-
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
10-
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
11-
org.eclipse.jdt.core.compiler.source=1.7
1+
eclipse.preferences.version=1
2+
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
4+
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
5+
org.eclipse.jdt.core.compiler.compliance=1.6
6+
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
7+
org.eclipse.jdt.core.compiler.debug.localVariable=generate
8+
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
9+
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
10+
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
11+
org.eclipse.jdt.core.compiler.source=1.6

‎AndroidManifest.xml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/2002/xmlspec/dtd/2.10/xmlspec.dtd">
3-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
4-
package="com.stock.view"
5-
android:versionCode="1"
6-
android:versionName="1.0" >
7-
8-
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="21" />
9-
10-
<uses-permission android:name="android.permission.INTERNET" />
11-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
12-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
13-
14-
<application
15-
android:allowBackup="true"
16-
android:icon="@drawable/ic_launcher"
17-
android:label="@string/app_name"
18-
android:theme="@style/AppTheme" >
19-
<activity
20-
android:name=".MainActivity"
21-
android:label="@string/app_name" >
22-
<intent-filter>
23-
<action android:name="android.intent.action.MAIN" />
24-
25-
<category android:name="android.intent.category.LAUNCHER" />
26-
</intent-filter>
27-
</activity>
28-
</application>
29-
30-
</manifest>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/2002/xmlspec/dtd/2.10/xmlspec.dtd">
3+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
4+
package="com.stock.turtle"
5+
android:versionCode="1"
6+
android:versionName="1.0" >
7+
8+
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="17" />
9+
10+
<uses-permission android:name="android.permission.INTERNET" />
11+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
12+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
13+
14+
<application
15+
android:allowBackup="true"
16+
android:icon="@drawable/ic_launcher"
17+
android:label="@string/app_name"
18+
android:theme="@style/AppTheme" >
19+
<activity
20+
android:name=".MainActivity"
21+
android:label="@string/app_name" >
22+
<intent-filter>
23+
<action android:name="android.intent.action.MAIN" />
24+
25+
<category android:name="android.intent.category.LAUNCHER" />
26+
</intent-filter>
27+
</activity>
28+
</application>
29+
30+
</manifest>

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
# turtletrade
2-
海龟交易 手机应用
1+
# turtletrade
2+
海龟交易 手机应用

‎proguard-project.txt

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
# To enable ProGuard in your project, edit project.properties
2-
# to define the proguard.config property as described in that file.
3-
#
4-
# Add project specific ProGuard rules here.
5-
# By default, the flags in this file are appended to flags specified
6-
# in ${sdk.dir}/tools/proguard/proguard-android.txt
7-
# You can edit the include path and order by changing the ProGuard
8-
# include property in project.properties.
9-
#
10-
# For more details, see
11-
# http://developer.android.com/guide/developing/tools/proguard.html
12-
13-
# Add any project specific keep options here:
14-
15-
# If your project uses WebView with JS, uncomment the following
16-
# and specify the fully qualified class name to the JavaScript interface
17-
# class:
18-
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
19-
# public *;
20-
#}
1+
# To enable ProGuard in your project, edit project.properties
2+
# to define the proguard.config property as described in that file.
3+
#
4+
# Add project specific ProGuard rules here.
5+
# By default, the flags in this file are appended to flags specified
6+
# in ${sdk.dir}/tools/proguard/proguard-android.txt
7+
# You can edit the include path and order by changing the ProGuard
8+
# include property in project.properties.
9+
#
10+
# For more details, see
11+
# http://developer.android.com/guide/developing/tools/proguard.html
12+
13+
# Add any project specific keep options here:
14+
15+
# If your project uses WebView with JS, uncomment the following
16+
# and specify the fully qualified class name to the JavaScript interface
17+
# class:
18+
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
19+
# public *;
20+
#}

‎project.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-20
15-
android.library.reference.1=../appcompat_v7
14+
target=android-17

‎res/layout/activity_main.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2-
xmlns:tools="http://schemas.android.com/tools"
3-
android:layout_width="match_parent"
4-
android:layout_height="match_parent"
5-
android:orientation="vertical"
6-
tools:context="com.turtletrade.MainActivity" >
7-
8-
<ListView
9-
android:id="@+id/listView1"
10-
android:layout_width="match_parent"
11-
android:layout_height="wrap_content" >
12-
13-
</ListView>
14-
1+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:tools="http://schemas.android.com/tools"
3+
android:layout_width="match_parent"
4+
android:layout_height="match_parent"
5+
android:orientation="vertical"
6+
tools:context="com.turtletrade.MainActivity" >
7+
8+
<ListView
9+
android:id="@+id/listView1"
10+
android:layout_width="match_parent"
11+
android:layout_height="wrap_content" >
12+
13+
</ListView>
14+
1515
</LinearLayout>

‎res/layout/row.xml

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:layout_width="match_parent"
4-
android:layout_height="wrap_content"
5-
android:orientation="horizontal" >
6-
7-
<LinearLayout
8-
android:layout_width="wrap_content"
9-
android:layout_height="wrap_content"
10-
android:orientation="vertical" >
11-
12-
<TextView
13-
android:id="@+id/stock_name"
14-
android:layout_width="wrap_content"
15-
android:layout_height="wrap_content"
16-
android:text="@string/stock_name"
17-
android:textSize="16sp" />
18-
19-
<TextView
20-
android:id="@+id/stock_code"
21-
android:layout_width="wrap_content"
22-
android:layout_height="wrap_content"
23-
android:text="@string/stock_code"
24-
android:textSize="14sp" />
25-
26-
</LinearLayout>
27-
28-
<TextView
29-
android:id="@+id/current_price"
30-
android:layout_width="wrap_content"
31-
android:layout_height="match_parent"
32-
android:paddingLeft="10dp"
33-
android:paddingRight="10dp"
34-
android:text="@string/curr_price"
35-
android:textSize="16sp" />
36-
37-
<TextView
38-
android:id="@+id/high_20days"
39-
android:layout_width="wrap_content"
40-
android:layout_height="match_parent"
41-
android:paddingLeft="10dp"
42-
android:paddingRight="10dp"
43-
android:text="@string/high_price"
44-
android:textSize="16sp" />
45-
46-
<TextView
47-
android:id="@+id/low_10days"
48-
android:layout_width="wrap_content"
49-
android:layout_height="match_parent"
50-
android:paddingLeft="10dp"
51-
android:paddingRight="10dp"
52-
android:text="@string/low_price"
53-
android:textSize="16sp" />
54-
55-
</LinearLayout>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:layout_width="match_parent"
4+
android:layout_height="wrap_content"
5+
android:orientation="horizontal" >
6+
7+
<LinearLayout
8+
android:layout_width="wrap_content"
9+
android:layout_height="wrap_content"
10+
android:orientation="vertical" >
11+
12+
<TextView
13+
android:id="@+id/stock_name"
14+
android:layout_width="wrap_content"
15+
android:layout_height="wrap_content"
16+
android:text="@string/stock_name"
17+
android:textSize="16sp" />
18+
19+
<TextView
20+
android:id="@+id/stock_code"
21+
android:layout_width="wrap_content"
22+
android:layout_height="wrap_content"
23+
android:text="@string/stock_code"
24+
android:textSize="14sp" />
25+
26+
</LinearLayout>
27+
28+
<TextView
29+
android:id="@+id/current_price"
30+
android:layout_width="wrap_content"
31+
android:layout_height="match_parent"
32+
android:paddingLeft="10dp"
33+
android:paddingRight="10dp"
34+
android:text="@string/curr_price"
35+
android:textSize="16sp" />
36+
37+
<TextView
38+
android:id="@+id/high_20days"
39+
android:layout_width="wrap_content"
40+
android:layout_height="match_parent"
41+
android:paddingLeft="10dp"
42+
android:paddingRight="10dp"
43+
android:text="@string/high_price"
44+
android:textSize="16sp" />
45+
46+
<TextView
47+
android:id="@+id/low_10days"
48+
android:layout_width="wrap_content"
49+
android:layout_height="match_parent"
50+
android:paddingLeft="10dp"
51+
android:paddingRight="10dp"
52+
android:text="@string/low_price"
53+
android:textSize="16sp" />
54+
55+
</LinearLayout>

‎res/menu/main.xml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
<menu xmlns:android="http://schemas.android.com/apk/res/android"
2-
xmlns:app="http://schemas.android.com/apk/res-auto"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
tools:context="com.turtletrade.MainActivity" >
5-
6-
<item
7-
android:id="@+id/action_settings"
8-
android:orderInCategory="100"
9-
android:title="@string/action_settings"
10-
app:showAsAction="never"/>
11-
12-
</menu>
1+
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
2+
3+
<item
4+
android:id="@+id/menu_settings"
5+
android:orderInCategory="100"
6+
android:showAsAction="never"
7+
android:title="@string/action_settings"/>
8+
9+
</menu>

0 commit comments

Comments
 (0)