Skip to content

Commit 4ea76a2

Browse files
twu15twu15
committed
CameraActivity implemented(yet integrated)
1 parent d277fd5 commit 4ea76a2

17 files changed

Lines changed: 401 additions & 35 deletions

File tree

‎SimpleScan/AndroidManifest.xml‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
android:allowBackup="true"
2222
android:icon="@drawable/ic_launcher"
2323
android:label="@string/app_name"
24-
android:theme="@style/AppTheme" >
24+
android:theme="@style/AppTheme" >
25+
2526
<activity
2627
android:name=".SplashWelcome"
2728
android:label="@string/app_name" >
@@ -31,7 +32,17 @@
3132
<category android:name="android.intent.category.LAUNCHER" />
3233
</intent-filter>
3334
</activity>
34-
35+
<!--
36+
<activity
37+
android:name=".CameraActivity"
38+
android:label="@string/app_name" >
39+
<intent-filter>
40+
<action android:name="android.intent.action.MAIN" />
41+
42+
<category android:name="android.intent.category.LAUNCHER" />
43+
</intent-filter>
44+
</activity>
45+
-->
3546
<!-- lock the screenOrientation for now. May implement this if we have more time on the UI design -->
3647
<activity
3748
android:name=".Main"

‎SimpleScan/bin/AndroidManifest.xml‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
android:allowBackup="true"
2222
android:icon="@drawable/ic_launcher"
2323
android:label="@string/app_name"
24-
android:theme="@style/AppTheme" >
24+
android:theme="@style/AppTheme" >
25+
2526
<activity
2627
android:name=".SplashWelcome"
2728
android:label="@string/app_name" >
@@ -31,7 +32,17 @@
3132
<category android:name="android.intent.category.LAUNCHER" />
3233
</intent-filter>
3334
</activity>
34-
35+
<!--
36+
<activity
37+
android:name=".CameraActivity"
38+
android:label="@string/app_name" >
39+
<intent-filter>
40+
<action android:name="android.intent.action.MAIN" />
41+
42+
<category android:name="android.intent.category.LAUNCHER" />
43+
</intent-filter>
44+
</activity>
45+
-->
3546
<!-- lock the screenOrientation for now. May implement this if we have more time on the UI design -->
3647
<activity
3748
android:name=".Main"

‎SimpleScan/bin/classes/com/SimpleScan/simplescan/R$drawable.class‎

74 Bytes
Binary file not shown.

‎SimpleScan/bin/classes/com/SimpleScan/simplescan/R$id.class‎

110 Bytes
Binary file not shown.

‎SimpleScan/bin/classes/com/SimpleScan/simplescan/R$layout.class‎

39 Bytes
Binary file not shown.

‎SimpleScan/bin/classes/com/SimpleScan/simplescan/R$menu.class‎

0 Bytes
Binary file not shown.

‎SimpleScan/bin/classes/com/SimpleScan/simplescan/R$string.class‎

0 Bytes
Binary file not shown.

‎SimpleScan/bin/classes/com/SimpleScan/simplescan/R$style.class‎

0 Bytes
Binary file not shown.

‎SimpleScan/gen/android/support/v7/appcompat/R.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ public static final class layout {
444444
public static final int abc_search_dropdown_item_icons_2line = 0x7f030014;
445445
public static final int abc_search_view = 0x7f030015;
446446
public static final int abc_simple_dropdown_hint = 0x7f030016;
447-
public static final int support_simple_spinner_dropdown_item = 0x7f03001e;
447+
public static final int support_simple_spinner_dropdown_item = 0x7f03001f;
448448
}
449449
public static final class string {
450450
public static final int abc_action_bar_home_description = 0x7f0a0001;

‎SimpleScan/gen/com/SimpleScan/simplescan/R.java‎

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1635,21 +1635,23 @@ public static final class drawable {
16351635
public static final int abc_textfield_search_activated_mtrl_alpha=0x7f020030;
16361636
public static final int abc_textfield_search_default_mtrl_alpha=0x7f020031;
16371637
public static final int abc_textfield_search_material=0x7f020032;
1638-
public static final int ic_launcher=0x7f020033;
1639-
public static final int scan_anime=0x7f020034;
1638+
public static final int focus_layout=0x7f020033;
1639+
public static final int ic_launcher=0x7f020034;
1640+
public static final int scan_anime=0x7f020035;
1641+
public static final int shutter_layout=0x7f020036;
16401642
}
16411643
public static final class id {
1642-
public static final int SE_btnDel=0x7f090050;
1643-
public static final int SE_btnShare=0x7f09004f;
1644-
public static final int SE_editAmount=0x7f09004d;
1645-
public static final int SE_editCate=0x7f09004e;
1646-
public static final int SE_editDate=0x7f09004c;
1647-
public static final int SE_editName=0x7f09004b;
1648-
public static final int SE_im=0x7f090047;
1649-
public static final int SE_txtAmount=0x7f090049;
1650-
public static final int SE_txtCate=0x7f09004a;
1651-
public static final int SE_txtDate=0x7f090048;
1652-
public static final int SE_txtName=0x7f090046;
1644+
public static final int SE_btnDel=0x7f090053;
1645+
public static final int SE_btnShare=0x7f090052;
1646+
public static final int SE_editAmount=0x7f090050;
1647+
public static final int SE_editCate=0x7f090051;
1648+
public static final int SE_editDate=0x7f09004f;
1649+
public static final int SE_editName=0x7f09004e;
1650+
public static final int SE_im=0x7f09004a;
1651+
public static final int SE_txtAmount=0x7f09004c;
1652+
public static final int SE_txtCate=0x7f09004d;
1653+
public static final int SE_txtDate=0x7f09004b;
1654+
public static final int SE_txtName=0x7f090049;
16531655
public static final int action_bar=0x7f090031;
16541656
public static final int action_bar_activity_content=0x7f090003;
16551657
public static final int action_bar_container=0x7f090030;
@@ -1663,31 +1665,33 @@ public static final class id {
16631665
public static final int action_mode_bar=0x7f09002e;
16641666
public static final int action_mode_bar_stub=0x7f09002d;
16651667
public static final int action_mode_close_button=0x7f090020;
1666-
public static final int action_settings=0x7f090051;
1668+
public static final int action_settings=0x7f090054;
16671669
public static final int activity_chooser_view_content=0x7f090021;
16681670
public static final int always=0x7f090014;
16691671
public static final int beginning=0x7f09001b;
1672+
public static final int camera_frame=0x7f09003f;
16701673
public static final int checkbox=0x7f090029;
16711674
public static final int collapseActionView=0x7f090015;
16721675
public static final int decor_content_parent=0x7f09002f;
16731676
public static final int default_activity_button=0x7f090024;
16741677
public static final int dialog=0x7f090019;
16751678
public static final int disableHome=0x7f09000d;
1676-
public static final int drawerLayout=0x7f09003f;
1677-
public static final int drawerList=0x7f090041;
1679+
public static final int drawerLayout=0x7f090042;
1680+
public static final int drawerList=0x7f090044;
16781681
public static final int dropdown=0x7f09001a;
16791682
public static final int edit_query=0x7f090033;
16801683
public static final int end=0x7f09001c;
16811684
public static final int expand_activities_button=0x7f090022;
16821685
public static final int expanded_menu=0x7f090028;
1686+
public static final int focus_button=0x7f090041;
16831687
public static final int home=0x7f090000;
16841688
public static final int homeAsUp=0x7f09000e;
16851689
public static final int icon=0x7f090026;
16861690
public static final int ifRoom=0x7f090016;
16871691
public static final int image=0x7f090023;
16881692
public static final int listMode=0x7f09000a;
16891693
public static final int list_item=0x7f090025;
1690-
public static final int mainContent=0x7f090040;
1694+
public static final int mainContent=0x7f090043;
16911695
public static final int middle=0x7f09001d;
16921696
public static final int never=0x7f090017;
16931697
public static final int none=0x7f09000f;
@@ -1709,14 +1713,15 @@ public static final class id {
17091713
public static final int showCustom=0x7f090010;
17101714
public static final int showHome=0x7f090011;
17111715
public static final int showTitle=0x7f090012;
1716+
public static final int shutter_button=0x7f090040;
17121717
public static final int split_action_bar=0x7f090004;
17131718
public static final int submit_area=0x7f09003c;
17141719
public static final int tabMode=0x7f09000c;
1715-
public static final int text1=0x7f090042;
1716-
public static final int textView1=0x7f090045;
1720+
public static final int text1=0x7f090045;
1721+
public static final int textView1=0x7f090048;
17171722
public static final int title=0x7f090027;
1718-
public static final int txtContact=0x7f090043;
1719-
public static final int txtExpense=0x7f090044;
1723+
public static final int txtContact=0x7f090046;
1724+
public static final int txtExpense=0x7f090047;
17201725
public static final int up=0x7f090001;
17211726
public static final int useLogo=0x7f090013;
17221727
public static final int withText=0x7f090018;
@@ -1771,14 +1776,15 @@ public static final class layout {
17711776
public static final int abc_search_dropdown_item_icons_2line=0x7f030014;
17721777
public static final int abc_search_view=0x7f030015;
17731778
public static final int abc_simple_dropdown_hint=0x7f030016;
1774-
public static final int activity_main=0x7f030017;
1775-
public static final int activity_welcome=0x7f030018;
1776-
public static final int custom_list_item=0x7f030019;
1777-
public static final int fragment_contacts=0x7f03001a;
1778-
public static final int fragment_expenses=0x7f03001b;
1779-
public static final int fragment_overall=0x7f03001c;
1780-
public static final int fragment_share_expense=0x7f03001d;
1781-
public static final int support_simple_spinner_dropdown_item=0x7f03001e;
1779+
public static final int activity_camera=0x7f030017;
1780+
public static final int activity_main=0x7f030018;
1781+
public static final int activity_welcome=0x7f030019;
1782+
public static final int custom_list_item=0x7f03001a;
1783+
public static final int fragment_contacts=0x7f03001b;
1784+
public static final int fragment_expenses=0x7f03001c;
1785+
public static final int fragment_overall=0x7f03001d;
1786+
public static final int fragment_share_expense=0x7f03001e;
1787+
public static final int support_simple_spinner_dropdown_item=0x7f03001f;
17821788
}
17831789
public static final class menu {
17841790
public static final int main=0x7f0d0000;

0 commit comments

Comments
 (0)