diff --git a/app/build.gradle b/app/build.gradle
index 7f7dd733e..3f1172854 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,7 +26,6 @@ android {
dependencies {
compile 'com.android.support:support-v4:22.2.0'
compile 'com.android.support:appcompat-v7:22.2.0'
- compile 'com.github.japgolly.android:svg-android:2.0.6'
compile 'com.facebook.fresco:fresco:0.5.1'
compile 'com.facebook.fresco:imagepipeline-okhttp:0.5.1'
compile 'com.squareup.okhttp:okhttp:2.4.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 05bcf332e..9e0c04611 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,23 +26,18 @@
android:label="@string/app_name"
android:theme="@style/AppTheme">
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/StartActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/StartActivity.java
deleted file mode 100644
index e59af5498..000000000
--- a/app/src/main/java/com/hippo/ehviewer/ui/StartActivity.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2015 Hippo Seven
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.hippo.ehviewer.ui;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.hippo.app.StatsActivity;
-import com.hippo.ehviewer.R;
-import com.hippo.ehviewer.util.Config;
-import com.hippo.util.ViewUtils;
-import com.larvalabs.svgandroid.SVG;
-import com.larvalabs.svgandroid.SVGBuilder;
-import com.larvalabs.svgandroid.SVGParseException;
-
-public class StartActivity extends StatsActivity {
-
- private static final String TAG = StartActivity.class.getSimpleName();
-
- @Override
- protected boolean isShowStats() {
- return Config.getShowApplicationStats();
- }
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_start);
-
- TextView text = (TextView) findViewById(R.id.text_welcome);
-
- try {
- SVG svg = new SVGBuilder().readFromResource(getResources(), R.raw.sad_pandroid).build();
- ImageView image = (ImageView) findViewById(R.id.image_mascot);
- ViewUtils.removeHardwareAccelerationSupport(image);
- image.setImageDrawable(svg.getDrawable());
- } catch (SVGParseException e) {
- // Empty, I think this exception will never be caught.
- }
-
- finish();
- Intent intent = new Intent(StartActivity.this, ContentActivity.class);
- startActivity(intent);
- }
-}
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SelectSearchImageLayout.java b/app/src/main/java/com/hippo/ehviewer/widget/SelectSearchImageLayout.java
index 83818df2c..7bfed1907 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/SelectSearchImageLayout.java
+++ b/app/src/main/java/com/hippo/ehviewer/widget/SelectSearchImageLayout.java
@@ -34,8 +34,6 @@ import android.widget.TextView;
import com.hippo.effect.ripple.RippleSalon;
import com.hippo.ehviewer.R;
import com.hippo.util.ViewUtils;
-import com.larvalabs.svgandroid.SVG;
-import com.larvalabs.svgandroid.SVGBuilder;
public class SelectSearchImageLayout extends LinearLayout implements View.OnClickListener{
@@ -93,9 +91,9 @@ public class SelectSearchImageLayout extends LinearLayout implements View.OnClic
RippleSalon.addRipple(mButtonSelect, false);
mButtonSelect.setOnClickListener(this);
- ViewUtils.removeHardwareAccelerationSupport(mImagePreview);
- SVG svg = new SVGBuilder().readFromResource(getResources(), R.raw.file_image).build();
- mImagePreview.setImageDrawable(svg.getDrawable());
+ //ViewUtils.removeHardwareAccelerationSupport(mImagePreview);
+ //SVG svg = new SVGBuilder().readFromResource(getResources(), R.raw.file_image).build();
+ //mImagePreview.setImageDrawable(svg.getDrawable());
}
public void setHelper(SelectSearchImageLayoutHelper helper) {
@@ -110,8 +108,8 @@ public class SelectSearchImageLayout extends LinearLayout implements View.OnClic
if (mSelectedImage != null) {
mImagePreview.setImageBitmap(mSelectedImage);
} else {
- SVG svg = new SVGBuilder().readFromResource(getResources(), R.raw.file_image_off).build();
- mImagePreview.setImageDrawable(svg.getDrawable());
+ //SVG svg = new SVGBuilder().readFromResource(getResources(), R.raw.file_image_off).build();
+ //mImagePreview.setImageDrawable(svg.getDrawable());
}
}
@@ -130,6 +128,8 @@ public class SelectSearchImageLayout extends LinearLayout implements View.OnClic
@Override
protected void onAttachedToWindow() {
+ super.onAttachedToWindow();
+
if (mSelectedPath != null) {
setImagePreview(mSelectedPath);
}
@@ -137,6 +137,8 @@ public class SelectSearchImageLayout extends LinearLayout implements View.OnClic
@Override
protected void onDetachedFromWindow() {
+ super.onDetachedFromWindow();
+
if (mSelectedImage != null && !mSelectedImage.isRecycled()) {
mSelectedImage.isRecycled();
}
diff --git a/app/src/main/res/raw/sad_pandroid.svg b/app/src/main/res/raw/sad_pandroid.svg
deleted file mode 100644
index e251b136b..000000000
--- a/app/src/main/res/raw/sad_pandroid.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-