diff --git a/.idea/copyright/Erik_C__Thauvin.xml b/.idea/copyright/Erik_C__Thauvin.xml
new file mode 100644
index 0000000..ed13fe2
--- /dev/null
+++ b/.idea/copyright/Erik_C__Thauvin.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
index e7bedf3..4a1337b 100644
--- a/.idea/copyright/profiles_settings.xml
+++ b/.idea/copyright/profiles_settings.xml
@@ -1,3 +1,11 @@
-
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/scopes/Java_Source.xml b/.idea/scopes/Java_Source.xml
new file mode 100644
index 0000000..582ea35
--- /dev/null
+++ b/.idea/scopes/Java_Source.xml
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 074f329..7432459 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,7 +6,7 @@ android {
defaultConfig {
applicationId "net.thauvin.erik.android.emaily"
- minSdkVersion 11
+ minSdkVersion 14
targetSdkVersion 22
versionCode 2
versionName "1.1b9"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7a79e88..3b71d09 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,10 +1,10 @@
+ package="net.thauvin.erik.android.emaily">
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
diff --git a/app/src/main/java/net/thauvin/erik/android/emaily/BitlyCredsDialog.java b/app/src/main/java/net/thauvin/erik/android/emaily/BitlyCredsDialog.java
index c098b24..58dcc8d 100644
--- a/app/src/main/java/net/thauvin/erik/android/emaily/BitlyCredsDialog.java
+++ b/app/src/main/java/net/thauvin/erik/android/emaily/BitlyCredsDialog.java
@@ -1,7 +1,7 @@
/*
- * @(#)Emaily.java
+ * @(#)BitlyCredsDialog.java
*
- * Copyright (c) 2012 Erik C. Thauvin (http://erik.thauvin.net/)
+ * Copyright (c) 2011-2015 Erik C. Thauvin (http://erik.thauvin.net/)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -30,9 +30,6 @@
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id$
- *
*/
package net.thauvin.erik.android.emaily;
@@ -51,7 +48,6 @@ import android.widget.TextView;
* The BitlyCredsDialog
class implements a bit.ly credential dialog.
*
* @author Erik C. Thauvin
- * @version $Revision$
* @created March 28, 2012
* @since 1.0
*/
diff --git a/app/src/main/java/net/thauvin/erik/android/emaily/Emaily.java b/app/src/main/java/net/thauvin/erik/android/emaily/Emaily.java
index 6f3f71e..efdc884 100644
--- a/app/src/main/java/net/thauvin/erik/android/emaily/Emaily.java
+++ b/app/src/main/java/net/thauvin/erik/android/emaily/Emaily.java
@@ -1,7 +1,7 @@
/*
* @(#)Emaily.java
*
- * Copyright (c) 2011-2012 Erik C. Thauvin (http://erik.thauvin.net/)
+ * Copyright (c) 2011-2015 Erik C. Thauvin (http://erik.thauvin.net/)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -30,9 +30,6 @@
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id$
- *
*/
package net.thauvin.erik.android.emaily;
@@ -84,7 +81,6 @@ import com.google.api.services.urlshortener.model.Url;
* The Emaily
class implements a URL shortener intent.
*
* @author Erik C. Thauvin
- * @version $Revision$
* @created Oct 11, 2011
* @since 1.0
*/
@@ -349,7 +345,7 @@ public class Emaily extends Activity
*/
private class EmailyTask extends AsyncTask
{
- private final ProgressDialog dialog = new ProgressDialog(Emaily.this);
+ private final ProgressDialog dialog = new ProgressDialog(Emaily.this, AlertDialog.THEME_DEVICE_DEFAULT_DARK);
private final String username;
private final String keytoken;
private final boolean isGoogl;
diff --git a/app/src/main/java/net/thauvin/erik/android/emaily/EmailyPrefs.java b/app/src/main/java/net/thauvin/erik/android/emaily/EmailyPrefs.java
index ddbf6e9..c49ea36 100644
--- a/app/src/main/java/net/thauvin/erik/android/emaily/EmailyPrefs.java
+++ b/app/src/main/java/net/thauvin/erik/android/emaily/EmailyPrefs.java
@@ -1,7 +1,7 @@
/*
* @(#)EmailyPrefs.java
*
- * Copyright (c) 2011-2014 Erik C. Thauvin (http://erik.thauvin.net/)
+ * Copyright (c) 2011-2015 Erik C. Thauvin (http://erik.thauvin.net/)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -30,9 +30,6 @@
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id$
- *
*/
package net.thauvin.erik.android.emaily;
@@ -54,7 +51,6 @@ import android.preference.PreferenceScreen;
* The EmailyPrefs
class implements a preferences screen.
*
* @author Erik C. Thauvin
- * @version $Revision$
* @created Oct 11, 2011
* @since 1.0
*/
diff --git a/app/src/main/res/layout/bitlycreds.xml b/app/src/main/res/layout/bitlycreds.xml
index a10e57a..b0bf4e5 100644
--- a/app/src/main/res/layout/bitlycreds.xml
+++ b/app/src/main/res/layout/bitlycreds.xml
@@ -1,8 +1,9 @@
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingTop="20dip">
+ android:textAppearance="?android:attr/textAppearanceSmall"/>
+ android:textAppearance="?android:attr/textAppearanceMedium"/>
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ />
+ android:textAppearance="?android:attr/textAppearanceMedium"/>
+ android:textAppearance="?android:attr/textAppearanceMedium">
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 13085b0..724afb4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,7 +7,7 @@
Sorry. No applications can perform this action.
Sorry. No applications can perform this action. The shortened url has been copied to the clipboard.
Emaily
- Select a Google account
+ Select a Google account to shorten with
About
API Key
Cancel
@@ -19,7 +19,7 @@
http://bitly.com/a/your_api_key/
Username
bit.ly
- © 2012–14 Erik C. Thauvin
+ © 2012–15 Erik C. Thauvin
%1$s %2$s %3$s (%4$s %5$s, %6$s)
Send email, please check Help first…
Feedback
diff --git a/app/src/main/res/xml/prefs.xml b/app/src/main/res/xml/prefs.xml
index 7ce4713..16bffac 100644
--- a/app/src/main/res/xml/prefs.xml
+++ b/app/src/main/res/xml/prefs.xml
@@ -1,13 +1,13 @@
-
+
-
+
+ android:title="@string/prefs_googl_chkbox_title"/>
-
+
+ android:title="@string/prefs_bitly_creds_title">
-
+
+ android:title="@string/prefs_html_chkbox_title"/>
-
+
+ android:title="@string/prefs_version_title"/>
+ android:title="@string/prefs_help_title">
+ android:data="@string/prefs_help_url"/>
+ android:title="@string/prefs_feedback_title">
+ android:data="@string/prefs_feedback_url"/>