From 2074206d3df55613812d9af0778fd16226a134a0 Mon Sep 17 00:00:00 2001
From: oupson <oupson1er@gmail.com>
Date: Sun, 7 Oct 2018 22:54:29 +0200
Subject: [PATCH] Add apng viewer activity (Main2Activity)

---
 .idea/caches/build_file_checksums.ser         | Bin 596 -> 596 bytes
 app-test/build.gradle                         |   5 +-
 app-test/src/main/AndroidManifest.xml         |  18 ++++-
 .../java/oupson/apngcreator/Main2Activity.kt  |  63 ++++++++++++++++++
 .../java/oupson/apngcreator/MainActivity.kt   |   2 +-
 .../src/main/res/layout/activity_main2.xml    |  22 ++++++
 6 files changed, 105 insertions(+), 5 deletions(-)
 create mode 100644 app-test/src/main/java/oupson/apngcreator/Main2Activity.kt
 create mode 100644 app-test/src/main/res/layout/activity_main2.xml

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index b28f89c03b6282a90ed442fb55e9c6a8755fa08d..2c865a6a7693ffb03a6f41383cf0c2906668ea34 100644
GIT binary patch
delta 36
ucmV+<0Nel61k?nOm;_KxUYoI;c>xgR@s2R?%aH|hg@IJQT7&76B?2!ooDgaN

delta 36
scmcb@a)o8W3>LN93!ZJ9Q^_dM`*@1HGNXKlySCDOfn0Bf$*N5H02+4<O#lD@

diff --git a/app-test/build.gradle b/app-test/build.gradle
index 6a629b5..8e7d56c 100644
--- a/app-test/build.gradle
+++ b/app-test/build.gradle
@@ -8,7 +8,7 @@ android {
     compileSdkVersion 27
     defaultConfig {
         applicationId "oupson.apngcreator"
-        minSdkVersion 25
+        minSdkVersion 24
         targetSdkVersion 26
         versionCode 1
         versionName "1.0"
@@ -30,9 +30,10 @@ android {
     productFlavors {
     }
 }
-ext.anko_version='0.10.6'
+ext.anko_version = '0.10.6'
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    //noinspection GradleCompatible
     implementation 'com.android.support:appcompat-v7:27.1.1'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     testImplementation 'junit:junit:4.12'
diff --git a/app-test/src/main/AndroidManifest.xml b/app-test/src/main/AndroidManifest.xml
index 9667448..4369a79 100644
--- a/app-test/src/main/AndroidManifest.xml
+++ b/app-test/src/main/AndroidManifest.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="oupson.apngcreator">
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.INTERNET"/>
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -17,6 +20,17 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".Main2Activity"
+            android:label="APNG Viewer">
+            <intent-filter tools:ignore="AppLinkUrlError">
+                <action android:name="android.intent.action.VIEW"/>
+
+                <category android:name="android.intent.category.BROWSABLE"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+
+                <data android:mimeType="image/png"/>
+            </intent-filter>
+        </activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app-test/src/main/java/oupson/apngcreator/Main2Activity.kt b/app-test/src/main/java/oupson/apngcreator/Main2Activity.kt
new file mode 100644
index 0000000..bf2a872
--- /dev/null
+++ b/app-test/src/main/java/oupson/apngcreator/Main2Activity.kt
@@ -0,0 +1,63 @@
+package oupson.apngcreator
+
+import android.content.ContentResolver
+import android.net.Uri
+import android.os.Bundle
+import android.provider.MediaStore
+import android.support.v7.app.AppCompatActivity
+import android.util.Log
+import kotlinx.android.synthetic.main.activity_main2.*
+import oupson.apng.ApngAnimator
+
+class Main2Activity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main2)
+
+    }
+
+    override fun onResume() {
+        super.onResume()
+        val animator = ApngAnimator(imageView3)
+        val uri = intent.data
+        if (uri.toString().contains("file:///")) {
+            animator.load(uri.path)
+        }
+        Log.e("TAG", intent.data.toString())
+
+        animator.load(getImageRealPath(contentResolver, uri, null))
+    }
+
+    private fun getImageRealPath(contentResolver: ContentResolver, uri: Uri, whereClause: String?): String {
+        var ret = ""
+
+        // Query the uri with condition.
+        val cursor = contentResolver.query(uri, null, whereClause, null, null)
+
+        if (cursor != null) {
+            val moveToFirst = cursor.moveToFirst()
+            if (moveToFirst) {
+
+                // Get columns name by uri type.
+                var columnName = MediaStore.Images.Media.DATA
+
+                if (uri === MediaStore.Images.Media.EXTERNAL_CONTENT_URI) {
+                    columnName = MediaStore.Images.Media.DATA
+                } else if (uri === MediaStore.Audio.Media.EXTERNAL_CONTENT_URI) {
+                    columnName = MediaStore.Audio.Media.DATA
+                } else if (uri === MediaStore.Video.Media.EXTERNAL_CONTENT_URI) {
+                    columnName = MediaStore.Video.Media.DATA
+                }
+
+                // Get column index.
+                val imageColumnIndex = cursor.getColumnIndex(columnName)
+
+                // Get column value which is the uri related file local path.
+                ret = cursor.getString(imageColumnIndex)
+            }
+        }
+
+        return ret
+    }
+}
diff --git a/app-test/src/main/java/oupson/apngcreator/MainActivity.kt b/app-test/src/main/java/oupson/apngcreator/MainActivity.kt
index 74ec105..a941106 100644
--- a/app-test/src/main/java/oupson/apngcreator/MainActivity.kt
+++ b/app-test/src/main/java/oupson/apngcreator/MainActivity.kt
@@ -26,7 +26,7 @@ import java.net.URL
 class MainActivity : AppCompatActivity() {
     lateinit var animator : ApngAnimator
 
-    val imageUrl = "https://cloud.githubusercontent.com/assets/13003036/24979875/e658e7c8-1fa3-11e7-908a-f1a201d38d52.png"
+    val imageUrl = "https://raw.githubusercontent.com/tinify/iMessage-Panda-sticker/master/Source/panda-original.png"
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app-test/src/main/res/layout/activity_main2.xml b/app-test/src/main/res/layout/activity_main2.xml
new file mode 100644
index 0000000..a31de56
--- /dev/null
+++ b/app-test/src/main/res/layout/activity_main2.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Main2Activity">
+
+    <ImageView
+        android:id="@+id/imageView3"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@android:color/transparent" />
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file