prepare for release

claha · Mar 1, 2015 · d1b6875 · d1b6875
1 parent 7858891
commit d1b6875
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 24 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -12,9 +12,9 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -25,7 +25,7 @@
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -34,12 +34,12 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -81,6 +81,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />

diff --git a/app/src/main/java/com/claha/movianremote/SettingsScreen.java b/app/src/main/java/com/claha/movianremote/SettingsScreen.java
@@ -19,9 +19,7 @@ public class SettingsScreen extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
         getFragmentManager().beginTransaction().replace(android.R.id.content, new SettingsFragment()).commit();
     }
 
@@ -38,7 +36,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
     public static class SettingsFragment extends PreferenceFragment implements Preference.OnPreferenceChangeListener, Preference.OnPreferenceClickListener {
 
-        private final static String PACKAGE_NAME = "com.claha.showtimeremote"; // TODO: Change to correct one once published
+        private final static String PACKAGE_NAME = "com.claha.movianremote";
 
         private final static int PROFILES = 0;
         private final static int PROFILES_CHOOSE = 0;
@@ -51,7 +49,7 @@ public static class SettingsFragment extends PreferenceFragment implements Prefe
         private final static int ABOUT = 2;
         //private final static int ABOUT_VERSION = 0;
         private final static int ABOUT_RATE = 1;
-        Preference aboutRate;
+        private Preference aboutRate;
         private EditTextPreference profilesAdd;
         private ListPreference profilesChoose;
         private ListPreference profilesDelete;

diff --git a/app/src/main/java/com/claha/movianremote/base/BaseViewPagerIndicator.java b/app/src/main/java/com/claha/movianremote/base/BaseViewPagerIndicator.java
@@ -4,7 +4,6 @@
 import android.database.DataSetObserver;
 import android.support.v4.view.ViewPager;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.RadioGroup;
@@ -26,7 +25,6 @@ public BaseViewPagerIndicator(Context context, AttributeSet attrs) {
     }
 
     private void createIndicators() {
-        Log.d("DEBUG", "createIndicators: " + viewPager.getAdapter().getCount());
         removeAllViews();
         for (int i = 0; i < viewPager.getAdapter().getCount(); i++) {
             View indicator = inflate(getContext(), R.layout.indicator, null);

diff --git a/app/src/main/java/com/claha/movianremote/core/MovianRemoteSettings.java b/app/src/main/java/com/claha/movianremote/core/MovianRemoteSettings.java
@@ -1,7 +1,6 @@
 package com.claha.movianremote.core;
 
 import android.content.Context;
-import android.util.Log;
 
 import com.claha.movianremote.R;
 import com.claha.movianremote.base.BaseSettings;
@@ -42,7 +41,6 @@ private void loadProfiles() {
 
     private void loadCurrentProfile() {
         currentProfile = profiles.getByName(getString(R.string.settings_profiles_choose_key));
-        Log.d("ShowtimeDebug", "loadCurrentProfile: " + currentProfile);
     }
 
     private void saveProfile() {
@@ -62,14 +60,12 @@ public int getNumProfiles() {
     }
 
     public void addProfile(String name, String ipAddress) {
-        Log.d("ShowtimeDebug", "addProfile: " + name + " " + ipAddress);
         Profile profileToAdd = new Profile(name, ipAddress);
         profiles.add(profileToAdd);
         chooseProfile(profileToAdd);
     }
 
     public void chooseProfile(Profile profile) {
-        Log.d("ShowtimeDebug", "chooseProfile: " + profile);
         currentProfile = profile;
         saveProfile();
         setIPAddress(profile.getIPAddress());
@@ -80,7 +76,6 @@ public void chooseProfile(String name) {
     }
 
     public void deleteProfile(String name) {
-        Log.d("ShowtimeDebug", "deleteProfile: " + name);
         Profile profileToDelete = profiles.getByName(name);
 
         if (profileToDelete.equals(currentProfile)) {
@@ -107,7 +102,6 @@ public Profile getCurrentProfile() {
     }
 
     public int getCurrentProfileIndex() {
-        Log.d("ShowtimeDebug", "getCurrentProfileIndex: " + currentProfile);
         return profiles.indexOf(currentProfile);
     }
 
@@ -116,7 +110,6 @@ public String getIPAddress() {
     }
 
     private void setIPAddress(String ipAddress) {
-        Log.d("ShowtimeDebug", "setIPAddress: " + ipAddress);
         putString(R.string.settings_ipAddress_key, ipAddress);
     }
 

diff --git a/app/src/main/java/com/claha/movianremote/widget/MovianRemoteToggleButton.java b/app/src/main/java/com/claha/movianremote/widget/MovianRemoteToggleButton.java
@@ -70,7 +70,6 @@ protected void onRestoreInstanceState(Parcelable state) {
     private static class SavedState extends BaseSavedState {
 
         public static final Creator<SavedState> CREATOR = new Creator<SavedState>() {
-
             @Override
             public SavedState createFromParcel(Parcel in) {
                 return new SavedState(in);

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.1'
+        classpath 'com.android.tools.build:gradle:1.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/icons/feature_graphic.svg b/icons/feature_graphic.svg