Reformat code

sujatagiri · Jul 13, 2015 · d37f65e · d37f65e
1 parent 8de0cfa
commit d37f65e
Show file tree

Hide file tree

Showing 25 changed files with 150 additions and 160 deletions.
diff --git a/build.gradle b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
 allprojects {
   repositories {
     jcenter()
-    maven{
+    maven {
       url 'https://oss.sonatype.org/content/repositories/snapshots/'
     }
 

diff --git a/core-dagger1/src/main/AndroidManifest.xml b/core-dagger1/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.hannesdorfmann.mosby.dagger1">
 
-  <application />
+  <application/>
 
 </manifest>
diff --git a/core/build.gradle b/core/build.gradle
@@ -26,10 +26,8 @@ android {
 
 dependencies {
 
-  compile 'com.android.support:appcompat-v7:'+rootProject.ext.appcompat7Version
-  compile 'frankiesardo:icepick:'+rootProject.ext.icepickVersion
-  compile 'com.jakewharton:butterknife:'+rootProject.ext.butterknifeVersion
-  compile 'com.hannesdorfmann.fragmentargs:annotation:'+rootProject.ext.fragmentargsVersion
-
-
+  compile 'com.android.support:appcompat-v7:' + rootProject.ext.appcompat7Version
+  compile 'frankiesardo:icepick:' + rootProject.ext.icepickVersion
+  compile 'com.jakewharton:butterknife:' + rootProject.ext.butterknifeVersion
+  compile 'com.hannesdorfmann.fragmentargs:annotation:' + rootProject.ext.fragmentargsVersion
 }
diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.hannesdorfmann.mosby">
 
-  <application />
+  <application/>
 
 </manifest>
diff --git a/maven-push-java-lib.gradle b/maven-push-java-lib.gradle
@@ -22,13 +22,13 @@ def isReleaseBuild() {
 }
 
 def getReleaseRepositoryUrl() {
-  return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL
-      : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+  return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL :
+      "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
 }
 
 def getSnapshotRepositoryUrl() {
-  return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL
-      : "https://oss.sonatype.org/content/repositories/snapshots/"
+  return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL :
+      "https://oss.sonatype.org/content/repositories/snapshots/"
 }
 
 def getRepositoryUsername() {

diff --git a/maven-push.gradle b/maven-push.gradle
@@ -39,21 +39,20 @@ def getRepositoryPassword() {
   return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : ""
 }
 
-
 afterEvaluate { project ->
   uploadArchives {
     repositories {
       mavenDeployer {
         beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-/*
-        pom.withXml {
-          asNode().children().first().parent()
-              .appendNode('repositories')
-                .appendNode('repository')
-                  .appendNode('id', 'clojars').parent()
-                  .appendNode('url', 'https://clojars.org/repo/')
-        }
-*/
+        /*
+                pom.withXml {
+                  asNode().children().first().parent()
+                      .appendNode('repositories')
+                        .appendNode('repository')
+                          .appendNode('id', 'clojars').parent()
+                          .appendNode('url', 'https://clojars.org/repo/')
+                }
+        */
 
         pom.groupId = GROUP
         pom.artifactId = POM_ARTIFACT_ID

diff --git a/mvp-common/build.gradle b/mvp-common/build.gradle
@@ -8,5 +8,5 @@ targetCompatibility = rootProject.ext.javaTargetCompatibility
 dependencies {
 
   testCompile 'junit:junit:' + rootProject.ext.junitVersion
-  testCompile 'org.mockito:mockito-core:'+rootProject.ext.mockitoVersion
+  testCompile 'org.mockito:mockito-core:' + rootProject.ext.mockitoVersion
 }
diff --git a/mvp/build.gradle b/mvp/build.gradle
@@ -33,8 +33,6 @@ android {
     unitTests.returnDefaultValues = true
   }
   */
-
-
 }
 
 dependencies {
@@ -43,5 +41,5 @@ dependencies {
   compile project(':mvp-common')
 
   testCompile 'junit:junit:' + rootProject.ext.junitVersion
-  testCompile 'org.mockito:mockito-core:'+rootProject.ext.mockitoVersion
+  testCompile 'org.mockito:mockito-core:' + rootProject.ext.mockitoVersion
 }
diff --git a/mvp/src/main/AndroidManifest.xml b/mvp/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.hannesdorfmann.mosby.mvp">
 
-  <application />
+  <application/>
 
 </manifest>
diff --git a/retrofit/build.gradle b/retrofit/build.gradle
@@ -22,8 +22,6 @@ android {
       proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
     }
   }
-
-
 }
 
 dependencies {

diff --git a/retrofit/src/main/AndroidManifest.xml b/retrofit/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.hannesdorfmann.mosby.retrofit">
 
-  <application />
+  <application/>
 
 
 </manifest>
diff --git a/rx/src/main/AndroidManifest.xml b/rx/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.hannesdorfmann.mosby.mvp.rx">
 
-  <application />
+  <application/>
 
 </manifest>
diff --git a/sample-dagger1/build.gradle b/sample-dagger1/build.gradle
@@ -41,7 +41,7 @@ android {
 }
 
 def annotatedAdapter = '1.0.0'
-def parcelablePlease ='1.0.1'
+def parcelablePlease = '1.0.1'
 
 dependencies {
   compile project(':viewstate-dagger1')
@@ -50,14 +50,14 @@ dependencies {
 
 
   compile 'com.android.support:recyclerview-v7:22.0.+'
-  compile 'com.android.support:appcompat-v7:'+rootProject.ext.appcompat7Version
+  compile 'com.android.support:appcompat-v7:' + rootProject.ext.appcompat7Version
 
-  apt 'com.hannesdorfmann.annotatedadapter:processor:'+annotatedAdapter
-  compile 'com.hannesdorfmann.annotatedadapter:annotation:'+annotatedAdapter
-  compile 'com.hannesdorfmann.annotatedadapter:support-recyclerview:'+annotatedAdapter
+  apt 'com.hannesdorfmann.annotatedadapter:processor:' + annotatedAdapter
+  compile 'com.hannesdorfmann.annotatedadapter:annotation:' + annotatedAdapter
+  compile 'com.hannesdorfmann.annotatedadapter:support-recyclerview:' + annotatedAdapter
 
-  compile 'com.hannesdorfmann.parcelableplease:annotation:'+parcelablePlease
-  apt 'com.hannesdorfmann.parcelableplease:processor:'+parcelablePlease
+  compile 'com.hannesdorfmann.parcelableplease:annotation:' + parcelablePlease
+  apt 'com.hannesdorfmann.parcelableplease:processor:' + parcelablePlease
 
 
   compile 'com.squareup.dagger:dagger:1.2.2'
@@ -66,5 +66,4 @@ dependencies {
   compile 'com.squareup.okhttp:okhttp:2.3.0'
   compile 'com.squareup.picasso:picasso:2.5.2'
   compile 'com.makeramen:roundedimageview:2.0.1'
-
 }
diff --git a/sample-dagger1/src/main/AndroidManifest.xml b/sample-dagger1/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.hannesdorfmann.mosby.sample.dagger1">
 
-  <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.INTERNET"/>
 
   <application android:allowBackup="true"
       android:label="@string/app_name"
@@ -28,8 +28,8 @@
     <activity android:name=".members.MembersActivity">
 
       <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
+        <action android:name="android.intent.action.MAIN"/>
+        <category android:name="android.intent.category.LAUNCHER"/>
       </intent-filter>
 
     </activity>

diff --git a/sample-dagger2-rx/build.gradle b/sample-dagger2-rx/build.gradle
@@ -43,7 +43,6 @@ android {
   lintOptions {
     warning 'InvalidPackage' // okhttp uses nio which is not part of android
   }
-
 }
 
 def annotatedAdapter = '1.0.0'

diff --git a/sample-dagger2-rx/src/main/AndroidManifest.xml b/sample-dagger2-rx/src/main/AndroidManifest.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.hannesdorfmann.mosby.sample.dagger2" >
+    package="com.hannesdorfmann.mosby.sample.dagger2">
 
 
-    <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.INTERNET"/>
 
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
-        <activity
-            android:name=".MainActivity"
-            android:label="@string/title_activity_main" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+  <application
+      android:allowBackup="true"
+      android:icon="@mipmap/ic_launcher"
+      android:label="@string/app_name"
+      android:theme="@style/AppTheme">
+    <activity
+        android:name=".MainActivity"
+        android:label="@string/title_activity_main">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
+        <category android:name="android.intent.category.LAUNCHER"/>
+      </intent-filter>
+    </activity>
+  </application>
 
 </manifest>
diff --git a/sample-mail/build.gradle b/sample-mail/build.gradle
@@ -35,7 +35,7 @@ dependencies {
   compile fileTree(dir: 'libs', include: ['*.jar'])
   compile 'com.android.support:appcompat-v7:' + rootProject.ext.appcompat7Version
   compile 'com.android.support:recyclerview-v7:22.1.1'
-  
+
   compile project(':viewstate')
   compile project(':rx')
 
@@ -71,5 +71,5 @@ dependencies {
 
 
   testCompile 'junit:junit:4.12'
-  testCompile 'org.robolectric:robolectric:'+rootProject.ext.robolectricVersion
+  testCompile 'org.robolectric:robolectric:' + rootProject.ext.robolectricVersion
 }
diff --git a/sample-mail/src/main/AndroidManifest.xml b/sample-mail/src/main/AndroidManifest.xml
@@ -1,59 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.hannesdorfmann.mosby.sample.mail" >
-
-    <uses-permission android:name="android.permission.VIBRATE" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
+    package="com.hannesdorfmann.mosby.sample.mail">
+
+  <uses-permission android:name="android.permission.VIBRATE"/>
+
+  <application
+      android:allowBackup="true"
+      android:icon="@drawable/ic_launcher"
+      android:label="@string/app_name"
+      android:theme="@style/AppTheme"
+      android:name=".MailApplication">
+    <activity
+        android:name=".MainActivity"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme"
-        android:name=".MailApplication">
-        <activity
-            android:name=".MainActivity"
-            android:label="@string/app_name"
-            android:launchMode="singleTop"
-            >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-
-        <activity
-            android:name=".login.LoginActivity"
-            android:label="@string/title_activity_login"
-            android:theme="@style/LoginTheme"
-            android:windowSoftInputMode="adjustResize">
-        </activity>
-
-        <activity android:name=".details.DetailsActivity"
-            android:label=""/>
-
-        <activity android:name=".write.WriteActivity"
-            android:theme="@style/WriteTheme"
-            android:label=""
-            android:windowSoftInputMode="adjustResize" />
-
-        <activity android:name=".search.SearchActivity"
-            android:label=""
-            android:windowSoftInputMode="adjustResize" />
-
-        <activity android:name=".profile.ProfileActivity"
-            />
-
-        <service android:name=".model.mail.service.SendMailService"
-            android:exported="false" />
-
-        <service android:name=".model.mail.service.GcmFakeIntentService"
-            android:exported="false" />
-
-        <receiver android:name=".model.mail.receiver.MailReceiver" android:exported="false">
-            <intent-filter>
-                <action android:name="com.hannesdorfmann.mosby.sample.mail.RECEIVE" />
-            </intent-filter>
-        </receiver>
-    </application>
+        android:launchMode="singleTop"
+        >
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+        <category android:name="android.intent.category.LAUNCHER"/>
+      </intent-filter>
+    </activity>
+
+    <activity
+        android:name=".login.LoginActivity"
+        android:label="@string/title_activity_login"
+        android:theme="@style/LoginTheme"
+        android:windowSoftInputMode="adjustResize">
+    </activity>
+
+    <activity android:name=".details.DetailsActivity"
+        android:label=""/>
+
+    <activity android:name=".write.WriteActivity"
+        android:theme="@style/WriteTheme"
+        android:label=""
+        android:windowSoftInputMode="adjustResize"/>
+
+    <activity android:name=".search.SearchActivity"
+        android:label=""
+        android:windowSoftInputMode="adjustResize"/>
+
+    <activity android:name=".profile.ProfileActivity"
+        />
+
+    <service android:name=".model.mail.service.SendMailService"
+        android:exported="false"/>
+
+    <service android:name=".model.mail.service.GcmFakeIntentService"
+        android:exported="false"/>
+
+    <receiver android:name=".model.mail.receiver.MailReceiver" android:exported="false">
+      <intent-filter>
+        <action android:name="com.hannesdorfmann.mosby.sample.mail.RECEIVE"/>
+      </intent-filter>
+    </receiver>
+  </application>
 
 </manifest>
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,8 +22,6 @@ android { @@
           proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
       }
     }
     dependencies {
@@ Expand Down @@