diff --git a/NFCulT/.classpath b/NFCulT/.classpath index 7bc01d9..b76ec6c 100644 --- a/NFCulT/.classpath +++ b/NFCulT/.classpath @@ -1,9 +1,9 @@ - - - - - - - - - + + + + + + + + + diff --git a/NFCulT/bin/NFCulT.apk b/NFCulT/bin/NFCulT.apk index d0a17f5..8e18101 100644 Binary files a/NFCulT/bin/NFCulT.apk and b/NFCulT/bin/NFCulT.apk differ diff --git a/NFCulT/bin/classes.dex b/NFCulT/bin/classes.dex index 3d4a46d..d811040 100644 Binary files a/NFCulT/bin/classes.dex and b/NFCulT/bin/classes.dex differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$1.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$1.class index 5d25b1d..833b802 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$1.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$1.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$10.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$10.class index da35904..d339b79 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$10.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$10.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$11$1.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$11$1.class index 46e11f7..edd6f25 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$11$1.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$11$1.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$11$2.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$11$2.class index 134076f..3ee450d 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$11$2.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$11$2.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$11$3.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$11$3.class index 6721982..f4a3fdb 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$11$3.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$11$3.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$11$4.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$11$4.class index 22f3bdd..dcbd1b1 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$11$4.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$11$4.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$11.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$11.class index 3dae434..42cd0ac 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$11.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$11.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$2.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$2.class index 80d7205..bc621c3 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$2.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$2.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$3.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$3.class index edd26c9..ca7e8ff 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$3.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$3.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$4$1.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$4$1.class index 65f7db7..89bf301 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$4$1.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$4$1.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$4.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$4.class index a0086ac..9390e5d 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$4.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$4.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$5$1.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$5$1.class index 6765bc4..8b891da 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$5$1.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$5$1.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$5$2.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$5$2.class index 4e7d2c7..877289c 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$5$2.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$5$2.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$5.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$5.class index 11b2021..cbae74c 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$5.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$5.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$6$1.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$6$1.class index 8b8cc0f..fde5923 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$6$1.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$6$1.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$6.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$6.class index 8ce7583..2941ed0 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$6.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$6.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$7$1$1$1.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$7$1$1$1.class index a63750f..7d0b4a3 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$7$1$1$1.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$7$1$1$1.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$7$1$1.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$7$1$1.class index 9c99712..3b48d81 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$7$1$1.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$7$1$1.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$7$1.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$7$1.class index 4834ab1..11830c2 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$7$1.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$7$1.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$7.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$7.class index 26254b0..57768be 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$7.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$7.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$8$1.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$8$1.class index 9f33b39..df3d91f 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$8$1.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$8$1.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$8.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$8.class index 454e400..99afb95 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$8.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$8.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$9$1.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$9$1.class index 8c3211c..425a1e9 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$9$1.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$9$1.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$9.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$9.class index 2eb1b6b..bcce6b2 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$9.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment$9.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment.class index babc8c6..6816992 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$PlaceholderFragment.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$SectionsPagerAdapter.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$SectionsPagerAdapter.class index 3ab815f..1beef71 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$SectionsPagerAdapter.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity$SectionsPagerAdapter.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity.class b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity.class index c44a585..f213049 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity.class and b/NFCulT/bin/classes/org/bughardy/nfcult/MainActivity.class differ diff --git a/NFCulT/bin/classes/org/bughardy/nfcult/R$id.class b/NFCulT/bin/classes/org/bughardy/nfcult/R$id.class index a7bb614..d82a684 100644 Binary files a/NFCulT/bin/classes/org/bughardy/nfcult/R$id.class and b/NFCulT/bin/classes/org/bughardy/nfcult/R$id.class differ diff --git a/NFCulT/bin/resources.ap_ b/NFCulT/bin/resources.ap_ index 6f1c8ae..fa40cf0 100644 Binary files a/NFCulT/bin/resources.ap_ and b/NFCulT/bin/resources.ap_ differ diff --git a/NFCulT/gen/org/bughardy/nfcult/R.java b/NFCulT/gen/org/bughardy/nfcult/R.java index a84f22a..d7defc7 100644 --- a/NFCulT/gen/org/bughardy/nfcult/R.java +++ b/NFCulT/gen/org/bughardy/nfcult/R.java @@ -1,151 +1,151 @@ -/* AUTO-GENERATED FILE. DO NOT MODIFY. - * - * This class was automatically generated by the - * aapt tool from the resource data it found. It - * should not be modified by hand. - */ - -package org.bughardy.nfcult; - -public final class R { - public static final class attr { - } - public static final class dimen { - /** Default screen margins, per the Android Design guidelines. - - Example customization of dimensions originally defined in res/values/dimens.xml - (such as screen margins) for screens with more than 820dp of available width. This - would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). - - */ - public static final int activity_horizontal_margin=0x7f040000; - public static final int activity_vertical_margin=0x7f040001; - } - public static final class drawable { - public static final int ic_launcher=0x7f020000; - } - public static final class id { - public static final int CheckBox0=0x7f080003; - public static final int CheckBox1=0x7f080002; - public static final int CheckBox10=0x7f08000c; - public static final int CheckBox11=0x7f08000d; - public static final int CheckBox12=0x7f08000e; - public static final int CheckBox13=0x7f08000f; - public static final int CheckBox14=0x7f080010; - public static final int CheckBox15=0x7f080011; - public static final int CheckBox2=0x7f080004; - public static final int CheckBox3=0x7f080005; - public static final int CheckBox4=0x7f080006; - public static final int CheckBox5=0x7f080007; - public static final int CheckBox6=0x7f080008; - public static final int CheckBox7=0x7f080009; - public static final int CheckBox8=0x7f08000a; - public static final int CheckBox9=0x7f08000b; - public static final int TextView10=0x7f08002f; - public static final int TextView11=0x7f080030; - public static final int TextView12=0x7f080031; - public static final int TextView13=0x7f080032; - public static final int TextView14=0x7f080033; - public static final int TextView15=0x7f080034; - public static final int TextView16=0x7f080035; - public static final int TextView2=0x7f080027; - public static final int TextView3=0x7f080028; - public static final int TextView4=0x7f080029; - public static final int TextView5=0x7f08002a; - public static final int TextView6=0x7f08002b; - public static final int TextView7=0x7f08002c; - public static final int TextView8=0x7f08002d; - public static final int TextView9=0x7f08002e; - public static final int button1=0x7f08003b; - public static final int button10=0x7f080040; - public static final int button11=0x7f080036; - public static final int button12=0x7f080013; - public static final int button2=0x7f08003d; - public static final int button3=0x7f08003f; - public static final int button4=0x7f08003e; - public static final int button5=0x7f080043; - public static final int button6=0x7f080042; - public static final int button7=0x7f080041; - public static final int button8=0x7f080015; - public static final int button9=0x7f080037; - public static final int datePicker2=0x7f080012; - public static final int editText1=0x7f080016; - public static final int editText10=0x7f08001f; - public static final int editText11=0x7f080020; - public static final int editText12=0x7f080021; - public static final int editText13=0x7f080022; - public static final int editText14=0x7f080023; - public static final int editText15=0x7f080024; - public static final int editText16=0x7f080025; - public static final int editText2=0x7f080017; - public static final int editText3=0x7f080018; - public static final int editText4=0x7f080019; - public static final int editText5=0x7f08001a; - public static final int editText6=0x7f08001b; - public static final int editText7=0x7f08001c; - public static final int editText8=0x7f08001d; - public static final int editText9=0x7f08001e; - public static final int imageView1=0x7f080039; - public static final int pager=0x7f080000; - public static final int scrollView1=0x7f080014; - public static final int scrollView2=0x7f080001; - public static final int section_label=0x7f08003a; - public static final int textView0=0x7f080038; - public static final int textView1=0x7f080026; - public static final int textView2=0x7f080044; - public static final int textView3=0x7f08003c; - public static final int timePicker1=0x7f080045; - } - public static final class layout { - public static final int activity_main=0x7f030000; - public static final int custom_dialog=0x7f030001; - public static final int fragment_five=0x7f030002; - public static final int fragment_four=0x7f030003; - public static final int fragment_main=0x7f030004; - public static final int fragment_one=0x7f030005; - public static final int fragment_three=0x7f030006; - public static final int fragment_two=0x7f030007; - } - public static final class menu { - public static final int main=0x7f070000; - } - public static final class string { - public static final int action_settings=0x7f050005; - public static final int app_name=0x7f050000; - public static final int creditz=0x7f050008; - public static final int tab=0x7f050006; - public static final int title=0x7f050007; - public static final int title_section1=0x7f050001; - public static final int title_section2=0x7f050002; - public static final int title_section3=0x7f050003; - public static final int title_section4=0x7f050004; - } - public static final class style { - /** - Base application theme, dependent on API level. This theme is replaced - by AppBaseTheme from res/values-vXX/styles.xml on newer devices. - - - Theme customizations available in newer API levels can go in - res/values-vXX/styles.xml, while customizations related to - backward-compatibility can go here. - - - Base application theme for API 11+. This theme completely replaces - AppBaseTheme from res/values/styles.xml on API 11+ devices. - - API 11 theme customizations can go here. - - Base application theme for API 14+. This theme completely replaces - AppBaseTheme from BOTH res/values/styles.xml and - res/values-v11/styles.xml on API 14+ devices. - - API 14 theme customizations can go here. - */ - public static final int AppBaseTheme=0x7f060000; - /** Application theme. - All customizations that are NOT specific to a particular API-level can go here. - */ - public static final int AppTheme=0x7f060001; - } -} +/* AUTO-GENERATED FILE. DO NOT MODIFY. + * + * This class was automatically generated by the + * aapt tool from the resource data it found. It + * should not be modified by hand. + */ + +package org.bughardy.nfcult; + +public final class R { + public static final class attr { + } + public static final class dimen { + /** Default screen margins, per the Android Design guidelines. + + Example customization of dimensions originally defined in res/values/dimens.xml + (such as screen margins) for screens with more than 820dp of available width. This + would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). + + */ + public static final int activity_horizontal_margin=0x7f040000; + public static final int activity_vertical_margin=0x7f040001; + } + public static final class drawable { + public static final int ic_launcher=0x7f020000; + } + public static final class id { + public static final int CheckBox0=0x7f080003; + public static final int CheckBox1=0x7f080002; + public static final int CheckBox10=0x7f08000c; + public static final int CheckBox11=0x7f08000d; + public static final int CheckBox12=0x7f08000e; + public static final int CheckBox13=0x7f08000f; + public static final int CheckBox14=0x7f080010; + public static final int CheckBox15=0x7f080011; + public static final int CheckBox2=0x7f080004; + public static final int CheckBox3=0x7f080005; + public static final int CheckBox4=0x7f080006; + public static final int CheckBox5=0x7f080007; + public static final int CheckBox6=0x7f080008; + public static final int CheckBox7=0x7f080009; + public static final int CheckBox8=0x7f08000a; + public static final int CheckBox9=0x7f08000b; + public static final int TextView10=0x7f08002f; + public static final int TextView11=0x7f080030; + public static final int TextView12=0x7f080031; + public static final int TextView13=0x7f080032; + public static final int TextView14=0x7f080033; + public static final int TextView15=0x7f080034; + public static final int TextView16=0x7f080035; + public static final int TextView2=0x7f080027; + public static final int TextView3=0x7f080028; + public static final int TextView4=0x7f080029; + public static final int TextView5=0x7f08002a; + public static final int TextView6=0x7f08002b; + public static final int TextView7=0x7f08002c; + public static final int TextView8=0x7f08002d; + public static final int TextView9=0x7f08002e; + public static final int button1=0x7f08003b; + public static final int button10=0x7f080040; + public static final int button11=0x7f080036; + public static final int button12=0x7f080013; + public static final int button2=0x7f08003d; + public static final int button3=0x7f08003f; + public static final int button4=0x7f08003e; + public static final int button5=0x7f080044; + public static final int button6=0x7f080043; + public static final int button7=0x7f080042; + public static final int button8=0x7f080015; + public static final int button9=0x7f080037; + public static final int datePicker2=0x7f080012; + public static final int editText1=0x7f080016; + public static final int editText10=0x7f08001f; + public static final int editText11=0x7f080020; + public static final int editText12=0x7f080021; + public static final int editText13=0x7f080022; + public static final int editText14=0x7f080023; + public static final int editText15=0x7f080024; + public static final int editText16=0x7f080025; + public static final int editText2=0x7f080017; + public static final int editText3=0x7f080018; + public static final int editText4=0x7f080019; + public static final int editText5=0x7f08001a; + public static final int editText6=0x7f08001b; + public static final int editText7=0x7f08001c; + public static final int editText8=0x7f08001d; + public static final int editText9=0x7f08001e; + public static final int imageView1=0x7f080039; + public static final int pager=0x7f080000; + public static final int scrollView1=0x7f080014; + public static final int scrollView2=0x7f080001; + public static final int section_label=0x7f08003a; + public static final int textView0=0x7f080038; + public static final int textView1=0x7f080026; + public static final int textView2=0x7f080041; + public static final int textView3=0x7f08003c; + public static final int timePicker1=0x7f080045; + } + public static final class layout { + public static final int activity_main=0x7f030000; + public static final int custom_dialog=0x7f030001; + public static final int fragment_five=0x7f030002; + public static final int fragment_four=0x7f030003; + public static final int fragment_main=0x7f030004; + public static final int fragment_one=0x7f030005; + public static final int fragment_three=0x7f030006; + public static final int fragment_two=0x7f030007; + } + public static final class menu { + public static final int main=0x7f070000; + } + public static final class string { + public static final int action_settings=0x7f050005; + public static final int app_name=0x7f050000; + public static final int creditz=0x7f050008; + public static final int tab=0x7f050006; + public static final int title=0x7f050007; + public static final int title_section1=0x7f050001; + public static final int title_section2=0x7f050002; + public static final int title_section3=0x7f050003; + public static final int title_section4=0x7f050004; + } + public static final class style { + /** + Base application theme, dependent on API level. This theme is replaced + by AppBaseTheme from res/values-vXX/styles.xml on newer devices. + + + Theme customizations available in newer API levels can go in + res/values-vXX/styles.xml, while customizations related to + backward-compatibility can go here. + + + Base application theme for API 11+. This theme completely replaces + AppBaseTheme from res/values/styles.xml on API 11+ devices. + + API 11 theme customizations can go here. + + Base application theme for API 14+. This theme completely replaces + AppBaseTheme from BOTH res/values/styles.xml and + res/values-v11/styles.xml on API 14+ devices. + + API 14 theme customizations can go here. + */ + public static final int AppBaseTheme=0x7f060000; + /** Application theme. + All customizations that are NOT specific to a particular API-level can go here. + */ + public static final int AppTheme=0x7f060001; + } +} diff --git a/NFCulT/res/layout/fragment_three.xml b/NFCulT/res/layout/fragment_three.xml index 4b3d7c0..e9159a0 100644 --- a/NFCulT/res/layout/fragment_three.xml +++ b/NFCulT/res/layout/fragment_three.xml @@ -73,5 +73,14 @@ android:layout_alignLeft="@+id/textView3" android:layout_centerVertical="true" android:text="Save Dump" /> + + \ No newline at end of file diff --git a/NFCulT/src/org/bughardy/nfcult/MainActivity.java b/NFCulT/src/org/bughardy/nfcult/MainActivity.java index 60173b2..de3d344 100644 --- a/NFCulT/src/org/bughardy/nfcult/MainActivity.java +++ b/NFCulT/src/org/bughardy/nfcult/MainActivity.java @@ -178,18 +178,20 @@ private void increaseOTP(String filename) { //Read all pages of Mifare UL and writes them in a file. One line per page. ( No compatibility yet wih nfc-tools dumps ) private void readUL(String fileName) throws IOException { - MifareUltralight ultralight = MifareUltralight.get(mytag); - ultralight.connect(); + //MifareUltralight ultralight = MifareUltralight.get(mytag); + NfcA nfca_tag = NfcA.get(mytag); + nfca_tag.connect(); String[] page = new String[30]; try { - for(int i = 0; i < 16; i++) { - page[i] = byteArrayToHexString(ultralight.readPages(i)).substring(0, 8) + "\n"; + for(byte i = 0; i < 16; i++) { + byte readPacket[] = {(byte) 0x30, i}; + page[i] = byteArrayToHexString(nfca_tag.transceive(readPacket)).substring(0, 8) + "\n"; FileOutputStream fos = openFileOutput(fileName+".mfd", Context.MODE_APPEND); fos.write(page[i].getBytes()); fos.close(); } - ultralight.close(); - } catch(Exception e) { e.printStackTrace(); } + nfca_tag.close(); + } catch(Exception e) { Toast.makeText(ctx, "something wrong", Toast.LENGTH_LONG ).show(); e.printStackTrace(); } } //Read a previous saved dump and write it on the Mifare UL. If write is okay returns green line in textview, otherwise it returns red line. @@ -200,24 +202,27 @@ private void getDump(String file, int toShow) throws IOException { FileInputStream fis = openFileInput(file); InputStreamReader isr = new InputStreamReader(fis); BufferedReader bufferedReader = new BufferedReader(isr); - MifareUltralight ultralight = MifareUltralight.get(mytag); - ultralight.connect(); + NfcA nfca_tag = NfcA.get(mytag); + nfca_tag.connect(); String line; - int i = 0; + byte i = 0; + boolean error = false; TextView text = (TextView)findViewById(R.id.textView3); text.setText(""); while ((line = bufferedReader.readLine()) != null) { StringBuilder sb = new StringBuilder(); + byte cmd[] = {(byte) 0xa2, i}; + line = byteArrayToHexString(cmd) + line; error = false; try { - ultralight.writePage(i, hexStringToByteArray(line)); + nfca_tag.transceive(hexStringToByteArray(line)); } catch(Exception e) { error = true; - if ( ultralight.isConnected() ) { - ultralight.close(); + if ( nfca_tag.isConnected() ) { + nfca_tag.close(); } - ultralight.connect(); + nfca_tag.connect(); } i++; if(toShow==1) { @@ -241,8 +246,8 @@ private void getDump(String file, int toShow) throws IOException { .setTitle("Results:") .show(); } - if( ultralight.isConnected() ) { - ultralight.close(); + if( nfca_tag.isConnected() ) { + nfca_tag.close(); } } @@ -269,17 +274,18 @@ private boolean fixUID() throws IOException { //Set OTP sector in read-only mode private void crack() { - MifareUltralight ultralight = MifareUltralight.get(mytag); + //MifareUltralight ultralight = MifareUltralight.get(mytag); + NfcA nfca_tag = NfcA.get(mytag); boolean success=false; try { - ultralight.connect(); - ultralight.writePage(2 ,new byte[] {0x04, 0x11, (byte) 0xfa, 0x00}); + nfca_tag.connect(); + nfca_tag.transceive(new byte[] {(byte)0xa2 ,0x03, 0x04, 0x11, (byte) 0xfa, 0x00}); success=true; } catch (IOException e) { e.printStackTrace(); } finally { try { - ultralight.close(); + nfca_tag.close(); } catch (IOException e) { e.printStackTrace(); } @@ -424,14 +430,14 @@ protected void onNewIntent(Intent intent){ boolean validtech=false; int i=0; while(i options= activity.getDumpList(); final CharSequence[] cs = options.toArray(new CharSequence[options.size()]); AlertDialog.Builder builder = new AlertDialog.Builder(activity); @@ -799,6 +808,7 @@ public void onClick(DialogInterface dialog, int whichButton) { manageDump.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + final MainActivity activity = (MainActivity) getActivity(); final ArrayList options= activity.getDumpList(); final CharSequence[] cs = options.toArray(new CharSequence[options.size()]); AlertDialog.Builder builder = new AlertDialog.Builder(activity); @@ -957,27 +967,72 @@ public void onClick(DialogInterface dialog, int button ) { }); //Defining actions for Edit Button btnEdt.setOnClickListener(new View.OnClickListener() { + NfcA nfca_tag; public void onClick(View v) { + + try { + nfca_tag = NfcA.get(mytag); + } catch(Exception e) { + Toast.makeText(getActivity(), "ERR: NfcA.get", Toast.LENGTH_SHORT).show(); + e.printStackTrace(); + } + + try { + nfca_tag.connect(); + + } catch(Exception e) { + Toast.makeText(getActivity(), "ERR: nfca_tag.connect", Toast.LENGTH_SHORT).show(); + e.printStackTrace(); + } try { - MifareUltralight ultralight = MifareUltralight.get(mytag); - ultralight.connect(); - page0.setText(byteArrayToHexString(ultralight.readPages(0)).substring(0, 8)); - page1.setText(byteArrayToHexString(ultralight.readPages(1)).substring(0, 8)); - page2.setText(byteArrayToHexString(ultralight.readPages(2)).substring(0, 8)); - page3.setText(byteArrayToHexString(ultralight.readPages(3)).substring(0, 8)); - page4.setText(byteArrayToHexString(ultralight.readPages(4)).substring(0, 8)); - page5.setText(byteArrayToHexString(ultralight.readPages(5)).substring(0, 8)); - page6.setText(byteArrayToHexString(ultralight.readPages(6)).substring(0, 8)); - page7.setText(byteArrayToHexString(ultralight.readPages(7)).substring(0, 8)); - page8.setText(byteArrayToHexString(ultralight.readPages(8)).substring(0, 8)); - page9.setText(byteArrayToHexString(ultralight.readPages(9)).substring(0, 8)); - page10.setText(byteArrayToHexString(ultralight.readPages(10)).substring(0, 8)); - page11.setText(byteArrayToHexString(ultralight.readPages(11)).substring(0, 8)); - page12.setText(byteArrayToHexString(ultralight.readPages(12)).substring(0, 8)); - page13.setText(byteArrayToHexString(ultralight.readPages(13)).substring(0, 8)); - page14.setText(byteArrayToHexString(ultralight.readPages(14)).substring(0, 8)); - page15.setText(byteArrayToHexString(ultralight.readPages(15)).substring(0, 8)); - ultralight.close(); + + byte readPacket0[] = {(byte) 0x30, 0x00}; + byte readPacket1[] = {(byte) 0x30, 0x01}; + byte readPacket2[] = {(byte) 0x30, 0x02}; + byte readPacket3[] = {(byte) 0x30, 0x03}; + byte readPacket4[] = {(byte) 0x30, 0x04}; + byte readPacket5[] = {(byte) 0x30, 0x05}; + byte readPacket6[] = {(byte) 0x30, 0x06}; + byte readPacket7[] = {(byte) 0x30, 0x07}; + byte readPacket8[] = {(byte) 0x30, 0x08}; + byte readPacket9[] = {(byte) 0x30, 0x09}; + byte readPacket10[] = {(byte) 0x30, 0x0a}; + byte readPacket11[] = {(byte) 0x30, 0x0b}; + byte readPacket12[] = {(byte) 0x30, 0x0c}; + byte readPacket13[] = {(byte) 0x30, 0x0d}; + byte readPacket14[] = {(byte) 0x30, 0x0e}; + byte readPacket15[] = {(byte) 0x30, 0x0f}; + + + /*boolean success; + try { + NfcA brokenTag = NfcA.get(mytag); + brokenTag.connect(); + nfca_tag.transceive(readPacket); + brokenTag.close(); + + */ + + + + + page0.setText(byteArrayToHexString(nfca_tag.transceive(readPacket0)).substring(0, 8)); + page1.setText(byteArrayToHexString(nfca_tag.transceive(readPacket1)).substring(0, 8)); + page2.setText(byteArrayToHexString(nfca_tag.transceive(readPacket2)).substring(0, 8)); + page3.setText(byteArrayToHexString(nfca_tag.transceive(readPacket3)).substring(0, 8)); + page4.setText(byteArrayToHexString(nfca_tag.transceive(readPacket4)).substring(0, 8)); + page5.setText(byteArrayToHexString(nfca_tag.transceive(readPacket5)).substring(0, 8)); + page6.setText(byteArrayToHexString(nfca_tag.transceive(readPacket6)).substring(0, 8)); + page7.setText(byteArrayToHexString(nfca_tag.transceive(readPacket7)).substring(0, 8)); + page8.setText(byteArrayToHexString(nfca_tag.transceive(readPacket8)).substring(0, 8)); + page9.setText(byteArrayToHexString(nfca_tag.transceive(readPacket9)).substring(0, 8)); + page10.setText(byteArrayToHexString(nfca_tag.transceive(readPacket10)).substring(0, 8)); + page11.setText(byteArrayToHexString(nfca_tag.transceive(readPacket11)).substring(0, 8)); + page12.setText(byteArrayToHexString(nfca_tag.transceive(readPacket12)).substring(0, 8)); + page13.setText(byteArrayToHexString(nfca_tag.transceive(readPacket13)).substring(0, 8)); + page14.setText(byteArrayToHexString(nfca_tag.transceive(readPacket14)).substring(0, 8)); + page15.setText(byteArrayToHexString(nfca_tag.transceive(readPacket15)).substring(0, 8)); + nfca_tag.close(); } catch(Exception e) { Toast.makeText(getActivity(), "Error reading Tag..", Toast.LENGTH_SHORT).show(); e.printStackTrace(); @@ -1039,25 +1094,39 @@ public void onClick(DialogInterface dialog, int which) { } if(continueBcc[0] == true) { //Write pages to the ticket - MifareUltralight ultralight = MifareUltralight.get(mytag); - ultralight.connect(); - ultralight.writePage(0, hexStringToByteArray(page0.getText().toString())); - ultralight.writePage(1, hexStringToByteArray(page1.getText().toString())); - ultralight.writePage(2, hexStringToByteArray(page2.getText().toString())); - ultralight.writePage(3, hexStringToByteArray(page3.getText().toString())); - ultralight.writePage(4, hexStringToByteArray(page4.getText().toString())); - ultralight.writePage(5, hexStringToByteArray(page5.getText().toString())); - ultralight.writePage(6, hexStringToByteArray(page6.getText().toString())); - ultralight.writePage(7, hexStringToByteArray(page7.getText().toString())); - ultralight.writePage(8, hexStringToByteArray(page8.getText().toString())); - ultralight.writePage(9, hexStringToByteArray(page9.getText().toString())); - ultralight.writePage(10, hexStringToByteArray(page10.getText().toString())); - ultralight.writePage(11, hexStringToByteArray(page11.getText().toString())); - ultralight.writePage(12, hexStringToByteArray(page12.getText().toString())); - ultralight.writePage(13, hexStringToByteArray(page13.getText().toString())); - ultralight.writePage(14, hexStringToByteArray(page14.getText().toString())); - ultralight.writePage(15, hexStringToByteArray(page15.getText().toString())); - ultralight.close(); + + /*boolean success; + try { + NfcA brokenTag = NfcA.get(mytag); + brokenTag.connect(); + nfca_tag.transceive(readPacket); + brokenTag.close(); + + */ + + + NfcA nfca_tag = NfcA.get(mytag); + //MifareUltralight ultralight = MifareUltralight.get(mytag); + //nfca_tag.connect(); + nfca_tag.connect(); + nfca_tag.transceive(hexStringToByteArray("A200"+page0.getText().toString())); + nfca_tag.transceive(hexStringToByteArray("A201"+page1.getText().toString())); + nfca_tag.transceive(hexStringToByteArray("A202"+page2.getText().toString())); + nfca_tag.transceive(hexStringToByteArray("A203"+page3.getText().toString())); + nfca_tag.transceive(hexStringToByteArray("A204"+page4.getText().toString())); + nfca_tag.transceive(hexStringToByteArray("A205"+page5.getText().toString())); + nfca_tag.transceive(hexStringToByteArray("A206"+page6.getText().toString())); + nfca_tag.transceive(hexStringToByteArray("A207"+page7.getText().toString())); + nfca_tag.transceive(hexStringToByteArray("A208"+page8.getText().toString())); + nfca_tag.transceive(hexStringToByteArray("A209"+page9.getText().toString())); + nfca_tag.transceive(hexStringToByteArray("A20A"+page10.getText().toString())); + nfca_tag.transceive(hexStringToByteArray("A20B"+page11.getText().toString())); + nfca_tag.transceive(hexStringToByteArray("A20C"+page12.getText().toString())); + nfca_tag.transceive(hexStringToByteArray("A20D"+page13.getText().toString())); + nfca_tag.transceive(hexStringToByteArray("A20E"+page14.getText().toString())); + nfca_tag.transceive(hexStringToByteArray("A20F"+page15.getText().toString())); + + nfca_tag.close(); } } catch(Exception e){ Toast.makeText(getActivity(), "Error writing to Tag..", Toast.LENGTH_SHORT).show();