From 3d161aecf48400fee4ab4b6510eeb5e2acf28c0c Mon Sep 17 00:00:00 2001 From: erik Date: Wed, 15 Apr 2015 23:55:59 -0700 Subject: [PATCH] Moved to Android Studio --- .gitignore | 17 +- .idea/.name | 1 + .idea/compiler.xml | 22 +++ .idea/copyright/profiles_settings.xml | 3 + .idea/gradle.xml | 18 ++ .idea/inspectionProfiles/Project_Default.xml | 37 ++++ .../inspectionProfiles/profiles_settings.xml | 7 + .idea/misc.xml | 37 ++++ .idea/modules.xml | 9 + .idea/vcs.xml | 6 + Emprunt.iml | 19 ++ app/.gitignore | 8 + app/app.iml | 90 ++++++++++ app/build.gradle | 30 ++++ app/src/main/AndroidManifest.xml | 11 +- .../android/emprunt/AboutDialogBuilder.java | 2 +- app/src/main/res/layout/main.xml | 45 ++--- app/src/main/res/values/themes.xml | 2 + build.gradle | 16 ++ gen/net/thauvin/erik/android/emprunt/R.java | 59 ------- gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 49896 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 164 ++++++++++++++++++ gradlew.bat | 90 ++++++++++ screenshots/loan.gif | Bin 20029 -> 19040 bytes settings.gradle | 1 + 26 files changed, 597 insertions(+), 103 deletions(-) create mode 100644 .idea/.name create mode 100644 .idea/compiler.xml create mode 100644 .idea/copyright/profiles_settings.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/inspectionProfiles/profiles_settings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 Emprunt.iml create mode 100644 app/.gitignore create mode 100644 app/app.iml create mode 100644 app/build.gradle create mode 100644 build.gradle delete mode 100644 gen/net/thauvin/erik/android/emprunt/R.java create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle diff --git a/.gitignore b/.gitignore index be56dd1..66eaa51 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,9 @@ -/.svn -/dist -/bin -/project.properties -/.classpath -/proguard.cfg -/.project -/.pmd +.DS_Store +.gradle +/.idea/libraries +/.idea/workspace.xml +/build +/captures +/local.properties +/versions.properties +Thumbs.db \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..406f9ae --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +Emprunt \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..9a8b7e5 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..8d2df47 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..ccc2a99 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,37 @@ + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..3b31283 --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6fbf4e8 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..daaf552 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Emprunt.iml b/Emprunt.iml new file mode 100644 index 0000000..0e6a178 --- /dev/null +++ b/Emprunt.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..0eefeca --- /dev/null +++ b/app/.gitignore @@ -0,0 +1,8 @@ +.DS_Store +.gradle +/.idea/libraries +/.idea/workspace.xml +/build +/captures +/local.properties +Thumbs.db \ No newline at end of file diff --git a/app/app.iml b/app/app.iml new file mode 100644 index 0000000..11cde66 --- /dev/null +++ b/app/app.iml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..e8f9675 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,30 @@ +apply plugin: 'com.android.application' +apply plugin: 'versionPlugin' + +android { + compileSdkVersion 11 + buildToolsVersion "21.1.2" + + defaultConfig { + applicationId "net.thauvin.erik.android.emprunt" + minSdkVersion 9 + targetSdkVersion 9 + versionCode 4 + versionName "1.0.1" + + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + } + + versionPlugin { + buildTypesMatcher = 'release' + supportBuildNumber = false + + fileNameFormat = '$projectName' + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 20ec878..2a5c2a1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,20 +1,17 @@ - - + package="net.thauvin.erik.android.emprunt"> + android:theme="@style/Emprunt" + android:allowBackup="true"> + android:screenOrientation="sensorPortait"> diff --git a/app/src/main/java/net/thauvin/erik/android/emprunt/AboutDialogBuilder.java b/app/src/main/java/net/thauvin/erik/android/emprunt/AboutDialogBuilder.java index cfd251a..eaecb99 100644 --- a/app/src/main/java/net/thauvin/erik/android/emprunt/AboutDialogBuilder.java +++ b/app/src/main/java/net/thauvin/erik/android/emprunt/AboutDialogBuilder.java @@ -27,7 +27,7 @@ import android.widget.TextView; * @created October 14, 2011 * @since 1.0 */ -public class AboutDialogBuilder +class AboutDialogBuilder { public static AlertDialog create(Context context) throws NameNotFoundException { diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml index ff2ffbe..46610f8 100644 --- a/app/src/main/res/layout/main.xml +++ b/app/src/main/res/layout/main.xml @@ -3,7 +3,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:gravity="center_vertical" - android:orientation="vertical" > + android:orientation="vertical"> - + android:paddingTop="10dp"> - + android:textAppearance="?android:attr/textAppearanceMedium"/> + android:textColorHint="#FFCCCCCC"> @@ -53,8 +51,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/label_interest" - android:textAppearance="?android:attr/textAppearanceMedium" > - + android:textAppearance="?android:attr/textAppearanceMedium"/> - + android:textColorHint="#FFCCCCCC"/> - + android:textAppearance="?android:attr/textAppearanceMedium"/> - + android:textColorHint="#FFCCCCCC"/> + android:textStyle="bold"/> + android:background="@drawable/border"> + android:layout_height="wrap_content"> - + android:textAppearance="?android:attr/textAppearanceMedium"/> - + android:textColor="#FFCCCCCC"/> + android:layout_height="wrap_content"> - + android:textAppearance="?android:attr/textAppearanceMedium"/> - + android:textColor="#FFCCCCCC"/> diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 08848c5..7893825 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,4 +1,6 @@ +