简化集成步骤

Author: jenly1314

README.md

@@ -24,18 +24,18 @@ ImageViewer for Android 是一个图片查看器，一般用来查看图片详
 <dependency>
   <groupId>com.king.image</groupId>
   <artifactId>imageviewer</artifactId>
-  <version>1.0.0</version>
+  <version>1.0.1</version>
   <type>pom</type>
 </dependency>
 ```
 ### Gradle:
 ```gradle
-implementation 'com.king.image:imageviewer:1.0.0'
+implementation 'com.king.image:imageviewer:1.0.1'
 ```
 
 ### Lvy:
 ```lvy
-<dependency org='com.king.image' name='imageviewer' rev='1.0.0'>
+<dependency org='com.king.image' name='imageviewer' rev='1.0.1'>
   <artifact name='$AID' ext='pom'></artifact>
 </dependency>
 ```
@@ -52,26 +52,28 @@ allprojects {
 
 ## 示例
 
-### 配置
+### 代码示例
 
-在您的主项目的**AndroidManifest**中注册**ImageViewerActivity**
+```Java
+    //图片查看器 - 简单调用
 
-```Xml
-    <activity android:name="com.king.image.imageviewer.ImageViewerActivity"
-        android:screenOrientation="portrait"
-        android:theme="@style/ImageViewerTheme"/>
-```
+    // data 可以多张图片List或单张图片，支持的类型可以是{@link Uri}, {@code url}, {@code path},{@link File}, {@link DrawableRes resId}…等
+    ImageViewer.load(data)//要加载的图片数据，单张或多张
+            .imageLoader(new GlideImageLoader())//加载器，imageLoader必须配置，目前内置的有GlideImageLoader或PicassoImageLoader，也可以自己实现
+            .start(activity,sharedElement);//activity or fragment, 跳转时的共享元素视图
 
+```
 
-### 代码示例
 ```Java
     //图片查看器
-    // data 可以多张图片List或单张图片，支持的类型可以是{@link Uri}, {@code url}, {@code path},{@link File}, {@link DrawableRes resId}…等
 
+    // data 可以多张图片List或单张图片，支持的类型可以是{@link Uri}, {@code url}, {@code path},{@link File}, {@link DrawableRes resId}…等
     ImageViewer.load(data)//要加载的图片数据，单张或多张
             .selection(position)//当前选中位置，默认：0
             .indicator(true)//是否显示指示器，默认不显示
             .imageLoader(new GlideImageLoader())//加载器，imageLoader必须配置，目前内置的有GlideImageLoader或PicassoImageLoader，也可以自己实现
+            .theme(R.style.ImageViewerTheme)//设置主题风格，默认：R.style.ImageViewerTheme
+            .orientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)//设置屏幕方向,默认：ActivityInfo.SCREEN_ORIENTATION_BEHIND
             .start(activity,sharedElement);//activity or fragment, 跳转时的共享元素视图
 
 ```
@@ -92,6 +94,9 @@ allprojects {
 
 ## 版本记录
 
+#### v1.0.1：2019-11-15
+*  简化集成步骤
+
 #### v1.0.0：2019-11-7
 *  ImageViewer初始版本
 

app/release/app-release.apk

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":2,"versionName":"1.0.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

app/release/output.json

@@ -25,15 +25,13 @@
         </activity>
 
         <activity android:name=".PhotoActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait"/>
 
         <activity android:name=".PhotoListActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="portrait"/>
 
-        <activity android:name="com.king.image.imageviewer.ImageViewerActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/ImageViewerTheme"/>
-
     </application>
 
 </manifest>

app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 package com.king.imageviewer.app;
 
+import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 import android.view.View;
 
@@ -45,12 +46,15 @@ private void init(){
             @Override
             public void onClick(View v, int position) {
                 //图片查看器
+
                 // data 可以多张图片List或单张图片，支持的类型可以是{@link Uri}, {@code url}, {@code path},{@link File}, {@link DrawableRes resId}…等
                 ImageViewer.load(listData)//要加载的图片数据，单张或多张
                         .selection(position)//当前选中位置
                         .indicator(true)//是否显示指示器，默认不显示
                         .imageLoader(new GlideImageLoader())//加载器，*必须配置，目前内置的有GlideImageLoader或PicassoImageLoader，也可以自己实现
 //                      .imageLoader(new PicassoImageLoader())
+                        .theme(R.style.ImageViewerTheme)//设置主题风格，默认：R.style.ImageViewerTheme
+                        .orientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT)//设置屏幕方向,默认：ActivityInfo.SCREEN_ORIENTATION_BEHIND
                         .start(PhotoListActivity.this,v);
             }
         });

app/src/main/java/com/king/imageviewer/app/PhotoListActivity.java

@@ -1,2 +1,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.king.image.imageviewer" />
+    package="com.king.image.imageviewer" >
+
+    <application>
+
+        <activity android:name="com.king.image.imageviewer.ImageViewerActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"/>
+
+    </application>
+</manifest>

imageviewer/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
@@ -17,6 +18,7 @@
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.StyleRes;
 import androidx.core.app.ActivityOptionsCompat;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
@@ -100,6 +102,15 @@ public static ImageViewer load(@NonNull File file){
         return new ImageViewer(file);
     }
 
+    /**
+     * 加载图片
+     * @param data  支持{@link Uri}, {@code url}, {@code path},{@link File}, {@link DrawableRes resId}…等
+     * @return
+     */
+    public static ImageViewer load(@NonNull Object data){
+        return new ImageViewer(data);
+    }
+
     /**
      * 当前选中位置
      * @param position 默认：0
@@ -184,6 +195,26 @@ public ImageViewer activityOptionsCompat(ActivityOptionsCompat optionsCompat){
         return this;
     }
 
+    /**
+     * 设置屏幕方向
+     * @param orientation  默认：{@link ActivityInfo#SCREEN_ORIENTATION_BEHIND}
+     * @return
+     */
+    public ImageViewer orientation(int orientation){
+        this.mViewerSpec.orientation = orientation;
+        return this;
+    }
+
+    /**
+     * 设置主题风格
+     * @param theme  默认：{@link R.style#ImageViewerTheme}
+     * @return
+     */
+    public ImageViewer theme(@StyleRes int theme){
+        this.mViewerSpec.theme = theme;
+        return this;
+    }
+
     /**
      * 初始化资源
      * @param context

imageviewer/src/main/java/com/king/image/imageviewer/ImageViewer.java

@@ -1,6 +1,7 @@
 package com.king.image.imageviewer;
 
 import android.os.Bundle;
+import android.os.PersistableBundle;
 import android.view.View;
 import android.widget.TextView;
 
@@ -26,9 +27,17 @@ public class ImageViewerActivity extends AppCompatActivity {
 
     private boolean isShowIndicator;
 
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState, @Nullable PersistableBundle persistentState) {
+        super.onCreate(savedInstanceState, persistentState);
+    }
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        mViewerSpec = ViewerSpec.INSTANCE;
+        setRequestedOrientation(mViewerSpec.orientation);
+        setTheme(mViewerSpec.theme);
         setContentView(R.layout.image_viewer_activity);
         init();
     }
@@ -57,8 +66,6 @@ public void onPageScrollStateChanged(int state) {
             }
         });
 
-        mViewerSpec = ViewerSpec.INSTANCE;
-
         ViewCompat.setTransitionName(viewPager,SHARED_ELEMENT);
 
         mAdapter = new ImageViewerAdapter(mViewerSpec.listData);

imageviewer/src/main/java/com/king/image/imageviewer/ImageViewerActivity.java

@@ -1,12 +1,14 @@
 package com.king.image.imageviewer;
 
+import android.content.pm.ActivityInfo;
 import android.graphics.drawable.Drawable;
 
 import com.king.image.imageviewer.loader.ImageLoader;
 
 import java.util.List;
 
 import androidx.annotation.Nullable;
+import androidx.annotation.StyleRes;
 
 /**
  * @author <a href="mailto:[email protected]">Jenly</a>
@@ -15,7 +17,7 @@ enum ViewerSpec {
 
     INSTANCE;
 
-    volatile int position;
+    int position;
 
     List<?> listData;
 
@@ -29,13 +31,20 @@ enum ViewerSpec {
     @Nullable
     Drawable errorDrawable;
 
+    @StyleRes
+    int theme = R.style.ImageViewerTheme;
+
+    int orientation = ActivityInfo.SCREEN_ORIENTATION_BEHIND;
+
     void reset(){
         position = 0;
         listData = null;
         imageLoader = null;
         isShowIndicator = false;
         placeholderDrawable = null;
         errorDrawable = null;
+        theme = R.style.ImageViewerTheme;
+        orientation = ActivityInfo.SCREEN_ORIENTATION_BEHIND;
     }
 
 }

imageviewer/src/main/java/com/king/image/imageviewer/ViewerSpec.java

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="ImageViewerTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="colorPrimaryDark">@color/ivColorPrimaryDark</item>
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionBar">false</item>
+        <item name="android:windowBackground">@color/ivWindowBackground</item>
+        <item name="android:textSize">@dimen/ivTextSize</item>
+        <item name="android:textColor">@color/ivTextColor</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+    </style>
+
+</resources>