Namespace the resources, and bump the getting started version to 1.0.

jasonwyatt · May 10, 2016 · 7f56527 · 7f56527
1 parent 9468f1c
commit 7f56527
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -22,9 +22,9 @@ allprojects {
 In your application's `build.gradle` file, add a dependency for Android DebugPort:
 
 ```groovy
-debugCompile 'com.github.jasonwyatt:Android-DebugPort:0.5'
-testCompile 'com.github.jasonwyatt:Android-DebugPort:0.5'
-releaseCompile 'com.github.jasonwyatt:Android-DebugPort-NOOP:0.5'
+debugCompile 'com.github.jasonwyatt:Android-DebugPort:1.0'
+testCompile 'com.github.jasonwyatt:Android-DebugPort:1.0'
+releaseCompile 'com.github.jasonwyatt:Android-DebugPort-NOOP:1.0'
 ```
 
 **Note:** The final line above will use a [no-op version of the DebugPort library](https://github.com/jasonwyatt/Android-DebugPort-NOOP) in production builds. This makes it impossible for people to run the DebugPort server on a production build.

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
+        android:label="@string/debugport_app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:name=".App">

diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
 
     <application
         android:allowBackup="true"
-        android:label="@string/app_name"
+        android:label="@string/debugport_app_name"
         android:supportsRtl="true">
 
         <service android:name=".DebugPortService" android:exported="false"/>

diff --git a/library/src/main/java/jwf/debugport/DebugPortService.java b/library/src/main/java/jwf/debugport/DebugPortService.java
@@ -75,10 +75,10 @@ protected void onPostExecute(Params params) {
                     Context context = DebugPortService.this;
                     Notification.Builder builder = new Notification.Builder(DebugPortService.this);
                     builder.setSmallIcon(R.drawable.debugport_ic_notification);
-                    builder.setContentTitle(getString(R.string.notification_title));
+                    builder.setContentTitle(getString(R.string.debugport_notification_title));
                     String ip = Utils.getIpAddress(context);
-                    String message = getString(R.string.notification_subtitle, ip, params.getDebugPort(), params.getSQLitePort());
-                    String summary = getString(R.string.notification_summary, ip, params.getDebugPort(), params.getSQLitePort());
+                    String message = getString(R.string.debugport_notification_subtitle, ip, params.getDebugPort(), params.getSQLitePort());
+                    String summary = getString(R.string.debugport_notification_summary, ip, params.getDebugPort(), params.getSQLitePort());
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
                         builder.setStyle(new Notification.BigTextStyle().bigText(message).setSummaryText(summary));
                         builder.setContentText(message);

diff --git a/library/src/main/res/values/strings.xml b/library/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <resources>
-    <string name="app_name">Android DebugPort</string>
-    <string name="notification_title">Android DebugPort Running</string>
-    <string name="notification_subtitle">Debug Running at %1$s:%2$d\nSQLite Running at %1$s:%3$d</string>
-    <string name="notification_summary">Debug: %1$s:%2$d, SQLite: %1$s:%3$d</string>
+    <string name="debugport_app_name">Android DebugPort</string>
+    <string name="debugport_notification_title">Android DebugPort Running</string>
+    <string name="debugport_notification_subtitle">Debug Running at %1$s:%2$d\nSQLite Running at %1$s:%3$d</string>
+    <string name="debugport_notification_summary">Debug: %1$s:%2$d, SQLite: %1$s:%3$d</string>
 </resources>