Merge branch 'master' into bintray_upload

AliAsadi · Sep 10, 2019 · 62573e3 · 62573e3
2 parents 746630d + fe985e4
commit 62573e3
Show file tree

Hide file tree

Showing 31 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,4 +20,4 @@ before_install:
   - chmod +x gradlew
 
 script:
-  - ./gradlew power-preference-lib:test
+  - ./gradlew power-preference:test
diff --git a/power-preference-lib/.gitignore → power-preference/.gitignore b/power-preference-lib/.gitignore → power-preference/.gitignore
diff --git a/power-preference-lib/build.gradle → power-preference/build.gradle b/power-preference-lib/build.gradle → power-preference/build.gradle
diff --git a/...reference-lib/consumer-proguard-rules.pro → power-preference/consumer-proguard-rules.pro b/...reference-lib/consumer-proguard-rules.pro → power-preference/consumer-proguard-rules.pro
diff --git a/...a/com/preference/PowerPreferenceTest.java → ...a/com/preference/PowerPreferenceTest.java b/...a/com/preference/PowerPreferenceTest.java → ...a/com/preference/PowerPreferenceTest.java
diff --git a/...est/java/com/preference/SampleObject.java → ...est/java/com/preference/SampleObject.java b/...est/java/com/preference/SampleObject.java → ...est/java/com/preference/SampleObject.java
diff --git a/...eference-lib/src/main/AndroidManifest.xml → ...r-preference/src/main/AndroidManifest.xml b/...eference-lib/src/main/AndroidManifest.xml → ...r-preference/src/main/AndroidManifest.xml
diff --git a/...ain/java/com/preference/MapStructure.java → ...ain/java/com/preference/MapStructure.java b/...ain/java/com/preference/MapStructure.java → ...ain/java/com/preference/MapStructure.java
diff --git a/.../java/com/preference/PowerPreference.java → .../java/com/preference/PowerPreference.java b/.../java/com/preference/PowerPreference.java → .../java/com/preference/PowerPreference.java
diff --git a/.../main/java/com/preference/Preference.java → .../main/java/com/preference/Preference.java b/.../main/java/com/preference/Preference.java → .../main/java/com/preference/Preference.java
diff --git a/...ava/com/preference/PreferenceCreator.java → ...ava/com/preference/PreferenceCreator.java b/...ava/com/preference/PreferenceCreator.java → ...ava/com/preference/PreferenceCreator.java
diff --git a/...ava/com/preference/PreferenceManager.java → ...ava/com/preference/PreferenceManager.java b/...ava/com/preference/PreferenceManager.java → ...ava/com/preference/PreferenceManager.java
diff --git a/.../com/preference/model/PreferenceFile.java → .../com/preference/model/PreferenceFile.java b/.../com/preference/model/PreferenceFile.java → .../com/preference/model/PreferenceFile.java
diff --git a/.../com/preference/model/PreferenceItem.java → .../com/preference/model/PreferenceItem.java b/.../com/preference/model/PreferenceItem.java → .../com/preference/model/PreferenceItem.java
diff --git a/.../com/preference/model/PreferenceType.java → .../com/preference/model/PreferenceType.java b/.../com/preference/model/PreferenceType.java → .../com/preference/model/PreferenceType.java
diff --git a/...eference/provider/PreferenceProvider.java → ...eference/provider/PreferenceProvider.java b/...eference/provider/PreferenceProvider.java → ...eference/provider/PreferenceProvider.java
diff --git a/...om/preference/ui/debug/DebugActivity.java → ...om/preference/ui/debug/DebugActivity.java b/...om/preference/ui/debug/DebugActivity.java → ...om/preference/ui/debug/DebugActivity.java
diff --git a/...com/preference/ui/debug/DebugAdapter.java → ...com/preference/ui/debug/DebugAdapter.java b/...com/preference/ui/debug/DebugAdapter.java → ...com/preference/ui/debug/DebugAdapter.java
diff --git a/...om/preference/ui/debug/DebugContract.java → ...om/preference/ui/debug/DebugContract.java b/...om/preference/ui/debug/DebugContract.java → ...om/preference/ui/debug/DebugContract.java
diff --git a/...m/preference/ui/debug/DebugPresenter.java → ...m/preference/ui/debug/DebugPresenter.java b/...m/preference/ui/debug/DebugPresenter.java → ...m/preference/ui/debug/DebugPresenter.java
diff --git a/...a/com/preference/ui/util/DialogUtils.java → ...a/com/preference/ui/util/DialogUtils.java b/...a/com/preference/ui/util/DialogUtils.java → ...a/com/preference/ui/util/DialogUtils.java
diff --git a/...c/main/res/layout/activity_preference.xml → ...c/main/res/layout/activity_preference.xml b/...c/main/res/layout/activity_preference.xml → ...c/main/res/layout/activity_preference.xml
diff --git a/...src/main/res/layout/dialog_edit_value.xml → ...src/main/res/layout/dialog_edit_value.xml b/...src/main/res/layout/dialog_edit_value.xml → ...src/main/res/layout/dialog_edit_value.xml
diff --git a/...ain/res/layout/row_preference_boolean.xml → ...ain/res/layout/row_preference_boolean.xml b/...ain/res/layout/row_preference_boolean.xml → ...ain/res/layout/row_preference_boolean.xml
diff --git a/...ain/res/layout/row_preference_default.xml → ...ain/res/layout/row_preference_default.xml b/...ain/res/layout/row_preference_default.xml → ...ain/res/layout/row_preference_default.xml
diff --git a/.../main/res/layout/row_preference_title.xml → .../main/res/layout/row_preference_title.xml b/.../main/res/layout/row_preference_title.xml → .../main/res/layout/row_preference_title.xml
diff --git a/...lib/src/main/res/menu/preference_menu.xml → ...nce/src/main/res/menu/preference_menu.xml b/...lib/src/main/res/menu/preference_menu.xml → ...nce/src/main/res/menu/preference_menu.xml
diff --git a/...erence-lib/src/main/res/values/styles.xml → ...preference/src/main/res/values/styles.xml b/...erence-lib/src/main/res/values/styles.xml → ...preference/src/main/res/values/styles.xml
diff --git a/...m/preference/PowerPreferenceUnitTest.java → ...m/preference/PowerPreferenceUnitTest.java b/...m/preference/PowerPreferenceUnitTest.java → ...m/preference/PowerPreferenceUnitTest.java
diff --git a/sample-app/build.gradle b/sample-app/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     //implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 
-    implementation project(':power-preference-lib')
+    implementation project(':power-preference')
 
     androidTestImplementation 'org.mockito:mockito-android:2.7.22'
     testImplementation 'org.mockito:mockito-core:2.23.0'

diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':sample-app', ':power-preference-lib'
+include ':sample-app', ':power-preference'