diff --git a/.bzrignore b/.bzrignore index 6994efb..15d7031 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1,12 +1,34 @@ -gen -bin -assets -libs -.settings +# Built application files +*.apk +*.ap_ + +# Files for the dex VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ + +# Local configuration file (SDK path, etc) local.properties + +# Eclipse project files +.classpath +.project + +# Android Studio +*.iml +.idea +#.idea/workspace.xml - remove # and delete .idea if it better suit your needs. .gradle -.idea/workspace.xml -.idea/libraries -build -.idea/codeStyleSettings.xml -.idea/runConfigurations.xml +build/ + +#NDK +obj/ + +# I don't want to see this shit. +Thumbs.db +.DS_Store diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 9a8b7e5..96cc43e 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,22 +1,22 @@ - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml index c7d1c5a..e7bedf3 100644 --- a/.idea/copyright/profiles_settings.xml +++ b/.idea/copyright/profiles_settings.xml @@ -1,3 +1,3 @@ - - + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 747f24e..288ea0b 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -1,17 +1,18 @@ \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 6a1e020..1a3eaff 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,46 +1,46 @@ - + \ No newline at end of file diff --git a/ic_launcher-web.png b/ic_launcher-web.png deleted file mode 100644 index f760c08..0000000 Binary files a/ic_launcher-web.png and /dev/null differ diff --git a/ic_launcher-web.png b/ic_launcher-web.png new file mode 120000 index 0000000..69597d4 --- /dev/null +++ b/ic_launcher-web.png @@ -0,0 +1 @@ +res/drawable-xxxhdpi/ic_launcher.png \ No newline at end of file diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml index a613004..d467b02 100644 --- a/res/layout/activity_main.xml +++ b/res/layout/activity_main.xml @@ -1,193 +1,193 @@