Skip to content

Commit a493eb9

Browse files
BreezeDustBreezeDust
committed
refactor
1 parent ce8bda9 commit a493eb9

18 files changed

+161
-725
lines changed

‎.project

+33-33
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<projectDescription>
3-
<name>ClockDemo</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>LookMeAndroid</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>

‎AndroidManifest.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
android:label="@string/app_name"
1515
android:theme="@style/AppTheme" >
1616
<activity
17-
android:name="com.clockdemo.activity.MainActivity"
17+
android:name="com.LookMe.activity.MainActivity"
1818
android:label="@string/app_name" >
1919
<intent-filter>
2020
<action android:name="android.intent.action.MAIN" />
@@ -23,19 +23,19 @@
2323
</intent-filter>
2424
</activity>
2525
<activity
26-
android:name="com.clockdemo.activity.SetClockActivity"
26+
android:name="com.LookMe.activity.SetClockActivity"
2727
android:label="@string/title_activity_set_clock" >
2828
</activity>
2929

30-
<receiver android:name="com.clockdemo.receiver.ClockReceiver" >
30+
<receiver android:name="com.LookMe.receiver.ClockReceiver" >
3131
<intent-filter>
3232
<action android:name="android.intent.action.TEST" />
3333
<category android:name="android.intent.category.DEFAULT" />
3434
</intent-filter>
3535
</receiver>
3636

3737
<activity
38-
android:name="com.clockdemo.activity.VideoActivity"
38+
android:name="com.LookMe.activity.VideoActivity"
3939
android:label="@string/title_activity_video" >
4040
</activity>
4141
</application>

‎bin/AndroidManifest.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
android:label="@string/app_name"
1515
android:theme="@style/AppTheme" >
1616
<activity
17-
android:name="com.clockdemo.activity.MainActivity"
17+
android:name="com.LookMe.activity.MainActivity"
1818
android:label="@string/app_name" >
1919
<intent-filter>
2020
<action android:name="android.intent.action.MAIN" />
@@ -23,19 +23,19 @@
2323
</intent-filter>
2424
</activity>
2525
<activity
26-
android:name="com.clockdemo.activity.SetClockActivity"
26+
android:name="com.LookMe.activity.SetClockActivity"
2727
android:label="@string/title_activity_set_clock" >
2828
</activity>
2929

30-
<receiver android:name="com.clockdemo.receiver.ClockReceiver" >
30+
<receiver android:name="com.LookMe.receiver.ClockReceiver" >
3131
<intent-filter>
3232
<action android:name="android.intent.action.TEST" />
3333
<category android:name="android.intent.category.DEFAULT" />
3434
</intent-filter>
3535
</receiver>
3636

3737
<activity
38-
android:name="com.clockdemo.activity.VideoActivity"
38+
android:name="com.LookMe.activity.VideoActivity"
3939
android:label="@string/title_activity_video" >
4040
</activity>
4141
</application>

‎gen/com/example/clockdemo/R.java

+96-96
Original file line numberDiff line numberDiff line change
@@ -1,96 +1,96 @@
1-
/* AUTO-GENERATED FILE. DO NOT MODIFY.
2-
*
3-
* This class was automatically generated by the
4-
* aapt tool from the resource data it found. It
5-
* should not be modified by hand.
6-
*/
7-
8-
package com.example.clockdemo;
9-
10-
public final class R {
11-
public static final class attr {
12-
}
13-
public static final class dimen {
14-
/** Default screen margins, per the Android Design guidelines.
15-
16-
Customize dimensions originally defined in res/values/dimens.xml (such as
17-
screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
18-
19-
*/
20-
public static final int activity_horizontal_margin=0x7f060000;
21-
public static final int activity_vertical_margin=0x7f060001;
22-
}
23-
public static final class drawable {
24-
public static final int btn_again=0x7f020000;
25-
public static final int btn_sure=0x7f020001;
26-
public static final int ic_launcher=0x7f020002;
27-
public static final int menu_background=0x7f020003;
28-
public static final int shadow=0x7f020004;
29-
}
30-
public static final class id {
31-
public static final int action_settings=0x7f0a000c;
32-
public static final int add_clock_btn=0x7f0a0000;
33-
public static final int button1=0x7f0a0003;
34-
public static final int button2=0x7f0a0004;
35-
public static final int button3=0x7f0a0005;
36-
public static final int clock_listview=0x7f0a0001;
37-
public static final int iv_background=0x7f0a0007;
38-
public static final int iv_shadow=0x7f0a0008;
39-
public static final int layout_bottom=0x7f0a0002;
40-
public static final int layout_menu=0x7f0a000a;
41-
public static final int my_video=0x7f0a0006;
42-
public static final int sv_menu=0x7f0a0009;
43-
public static final int tv_title=0x7f0a000b;
44-
}
45-
public static final class layout {
46-
public static final int activity_main=0x7f030000;
47-
public static final int activity_set_clock=0x7f030001;
48-
public static final int activity_video=0x7f030002;
49-
public static final int residemenu=0x7f030003;
50-
public static final int residemenu_item=0x7f030004;
51-
}
52-
public static final class menu {
53-
public static final int main=0x7f090000;
54-
public static final int set_clock=0x7f090001;
55-
public static final int video=0x7f090002;
56-
}
57-
public static final class raw {
58-
public static final int china=0x7f050000;
59-
public static final int test=0x7f050001;
60-
}
61-
public static final class string {
62-
public static final int action_settings=0x7f070001;
63-
public static final int app_name=0x7f070000;
64-
public static final int cancle=0x7f070003;
65-
public static final int complete=0x7f070002;
66-
public static final int delete_clock=0x7f070004;
67-
public static final int enable_alarm=0x7f070005;
68-
public static final int hello_world=0x7f07000c;
69-
public static final int label=0x7f070009;
70-
public static final int repeat=0x7f070007;
71-
public static final int time=0x7f070006;
72-
public static final int title_activity_set_clock=0x7f07000a;
73-
public static final int title_activity_video=0x7f07000b;
74-
public static final int vibrate=0x7f070008;
75-
}
76-
public static final class style {
77-
/**
78-
Base application theme, dependent on API level. This theme is replaced
79-
by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
80-
81-
82-
Theme customizations available in newer API levels can go in
83-
res/values-vXX/styles.xml, while customizations related to
84-
backward-compatibility can go here.
85-
86-
*/
87-
public static final int AppBaseTheme=0x7f080000;
88-
/** Application theme.
89-
All customizations that are NOT specific to a particular API-level can go here.
90-
*/
91-
public static final int AppTheme=0x7f080001;
92-
}
93-
public static final class xml {
94-
public static final int clock_setting=0x7f040000;
95-
}
96-
}
1+
/* AUTO-GENERATED FILE. DO NOT MODIFY.
2+
*
3+
* This class was automatically generated by the
4+
* aapt tool from the resource data it found. It
5+
* should not be modified by hand.
6+
*/
7+
8+
package com.example.clockdemo;
9+
10+
public final class R {
11+
public static final class attr {
12+
}
13+
public static final class dimen {
14+
/** Default screen margins, per the Android Design guidelines.
15+
16+
Customize dimensions originally defined in res/values/dimens.xml (such as
17+
screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here.
18+
19+
*/
20+
public static final int activity_horizontal_margin=0x7f060000;
21+
public static final int activity_vertical_margin=0x7f060001;
22+
}
23+
public static final class drawable {
24+
public static final int btn_again=0x7f020000;
25+
public static final int btn_sure=0x7f020001;
26+
public static final int ic_launcher=0x7f020002;
27+
public static final int menu_background=0x7f020003;
28+
public static final int shadow=0x7f020004;
29+
}
30+
public static final class id {
31+
public static final int action_settings=0x7f0a000c;
32+
public static final int add_clock_btn=0x7f0a0000;
33+
public static final int button1=0x7f0a0003;
34+
public static final int button2=0x7f0a0004;
35+
public static final int button3=0x7f0a0005;
36+
public static final int clock_listview=0x7f0a0001;
37+
public static final int iv_background=0x7f0a0007;
38+
public static final int iv_shadow=0x7f0a0008;
39+
public static final int layout_bottom=0x7f0a0002;
40+
public static final int layout_menu=0x7f0a000a;
41+
public static final int my_video=0x7f0a0006;
42+
public static final int sv_menu=0x7f0a0009;
43+
public static final int tv_title=0x7f0a000b;
44+
}
45+
public static final class layout {
46+
public static final int activity_main=0x7f030000;
47+
public static final int activity_set_clock=0x7f030001;
48+
public static final int activity_video=0x7f030002;
49+
public static final int residemenu=0x7f030003;
50+
public static final int residemenu_item=0x7f030004;
51+
}
52+
public static final class menu {
53+
public static final int main=0x7f090000;
54+
public static final int set_clock=0x7f090001;
55+
public static final int video=0x7f090002;
56+
}
57+
public static final class raw {
58+
public static final int china=0x7f050000;
59+
public static final int test=0x7f050001;
60+
}
61+
public static final class string {
62+
public static final int action_settings=0x7f070001;
63+
public static final int app_name=0x7f070000;
64+
public static final int cancle=0x7f070003;
65+
public static final int complete=0x7f070002;
66+
public static final int delete_clock=0x7f070004;
67+
public static final int enable_alarm=0x7f070005;
68+
public static final int hello_world=0x7f07000c;
69+
public static final int label=0x7f070009;
70+
public static final int repeat=0x7f070007;
71+
public static final int time=0x7f070006;
72+
public static final int title_activity_set_clock=0x7f07000a;
73+
public static final int title_activity_video=0x7f07000b;
74+
public static final int vibrate=0x7f070008;
75+
}
76+
public static final class style {
77+
/**
78+
Base application theme, dependent on API level. This theme is replaced
79+
by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
80+
81+
82+
Theme customizations available in newer API levels can go in
83+
res/values-vXX/styles.xml, while customizations related to
84+
backward-compatibility can go here.
85+
86+
*/
87+
public static final int AppBaseTheme=0x7f080000;
88+
/** Application theme.
89+
All customizations that are NOT specific to a particular API-level can go here.
90+
*/
91+
public static final int AppTheme=0x7f080001;
92+
}
93+
public static final class xml {
94+
public static final int clock_setting=0x7f040000;
95+
}
96+
}

‎src/com/clockdemo/activity/MainActivity.java ‎src/com/LookMe/activity/MainActivity.java

+4-16
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
package com.clockdemo.activity;
1+
package com.LookMe.activity;
22

33
import com.example.clockdemo.R;
4-
import com.special.ResideMenu.menu.ResideMenu;
5-
import com.special.ResideMenu.menu.ResideMenuItem;
4+
65

76
import android.os.Bundle;
87
import android.app.Activity;
@@ -27,19 +26,11 @@ public class MainActivity extends Activity {
2726
private SharedPreferences pre = null;
2827
private Cursor preCursor = null;
2928

30-
private ResideMenu menu = null;
29+
3130
private String[] titles = {"home","1","2","3"};
3231

3332
// 初始化视图
3433
private void initView() {
35-
menu = new ResideMenu(this);
36-
menu.setBackground(R.drawable.menu_background);
37-
menu.attachToActivity(this);
38-
39-
for (int i = 0 ; i < titles.length ; i++){
40-
ResideMenuItem item = new ResideMenuItem(this,titles[i]);
41-
menu.addMenuItem(item);
42-
}
4334
setContentView(R.layout.activity_main);
4435
addClock = (Button) this.findViewById(R.id.add_clock_btn);
4536
clockListView = (ListView) this.findViewById(R.id.clock_listview);
@@ -74,9 +65,6 @@ public boolean onCreateOptionsMenu(Menu menu) {
7465
return true;
7566
}
7667

77-
@Override
78-
public boolean dispatchTouchEvent(MotionEvent ev) {
79-
return menu.onInterceptTouchEvent(ev) || super.dispatchTouchEvent(ev);
80-
}
68+
8169

8270
}

‎src/com/clockdemo/activity/SetClockActivity.java ‎src/com/LookMe/activity/SetClockActivity.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package com.clockdemo.activity;
1+
package com.LookMe.activity;
22

33
import java.util.Calendar;
44
import java.util.prefs.PreferenceChangeEvent;
55
import java.util.prefs.PreferenceChangeListener;
66

7-
import com.clockdemo.alarm.AlarmManagers;
8-
import com.clockdemo.ui.RepeatPreference;
9-
import com.clockdemo.ui.ShowTimeAlertLog;
10-
import com.clockdemo.utils.ClockIconManager;
7+
import com.LookMe.alarm.AlarmManagers;
8+
import com.LookMe.ui.RepeatPreference;
9+
import com.LookMe.ui.ShowTimeAlertLog;
10+
import com.LookMe.utils.ClockIconManager;
1111
import com.example.clockdemo.R;
1212
import com.example.clockdemo.R.layout;
1313
import com.example.clockdemo.R.menu;

‎src/com/clockdemo/activity/VideoActivity.java ‎src/com/LookMe/activity/VideoActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.clockdemo.activity;
1+
package com.LookMe.activity;
22

33
import com.example.clockdemo.R;
44

0 commit comments

Comments
 (0)