Skip to content

svg_android，库不能用了，将库中的文件加到项目中，修改库文件。 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fengyedabao wants to merge 1 commit into
base: master
Choose a base branch
from
Open

svg_android，库不能用了，将库中的文件加到项目中，修改库文件。 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion 23
buildToolsVersion '23.0.1'
buildToolsVersion '26.0.2'

defaultConfig {
applicationId "akiyama.mykeep"
Expand Down Expand Up @@ -53,7 +53,7 @@ dependencies {
compile 'com.android.support:cardview-v7:23.0.+'
compile 'com.android.support:recyclerview-v7:23.0.+'
compile 'akiyama.swipe:library:2.1'
compile 'com.github.japgolly.android:svg-android:2.0.6'
// compile 'com.github.japgolly.android:svg-android:2.0.6'
compile 'com.readystatesoftware.systembartint:systembartint:1.0.3'
compile 'de.hdodenhof:circleimageview:1.3.0'
compile 'com.nineoldandroids:library:2.4.+'
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/akiyama/mykeep/ui/main/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package akiyama.mykeep.ui.main;

import android.annotation.SuppressLint;
import android.app.FragmentManager;
import android.app.FragmentTransaction;
import android.content.Intent;
Expand All @@ -26,16 +27,13 @@
import akiyama.mykeep.adapter.RecordByLabelAdapter;
import akiyama.mykeep.base.BaseObserverActivity;
import akiyama.mykeep.common.StatusMode;
import akiyama.mykeep.dbservice.LabelController;
import akiyama.mykeep.db.model.BaseModel;
import akiyama.mykeep.db.model.LabelModel;
import akiyama.mykeep.db.model.RecordModel;
import akiyama.mykeep.dbservice.LabelController;
import akiyama.mykeep.event.EventType;
import akiyama.mykeep.event.NotifyInfo;

import akiyama.mykeep.event.helper.KeepNotifyCenterHelper;
import akiyama.mykeep.preferences.KeepPreferenceUtil;
import akiyama.mykeep.task.QueryByUserDbTask;
import akiyama.mykeep.ui.LoginRegActivity;
import akiyama.mykeep.ui.RecordDetailFragment;
import akiyama.mykeep.util.LoginHelper;
Expand Down Expand Up @@ -551,6 +549,7 @@ public void refreshUi(List<? extends BaseModel> models) {
}
}

@SuppressLint("ResourceType")
@Override
public void goAddRecordFragment(String recordMode, int recordType){
mCurrentFragment = DETAIL;
Expand All @@ -573,6 +572,7 @@ public void goAddRecordFragment(String recordMode, int recordType){

}

@SuppressLint("ResourceType")
@Override
public void goEditRecordFragment(RecordModel recordModel,View view){
mCurrentFragment = DETAIL;
Expand Down
7 changes: 2 additions & 5 deletions app/src/main/java/akiyama/mykeep/util/SvgHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,13 @@
import android.app.Activity;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.VectorDrawable;
import android.os.Build;
import android.view.View;
import android.widget.ImageView;

import com.larvalabs.svgandroid.SVG;
import com.larvalabs.svgandroid.SVGBuilder;
import com.larvalabs.svgandroid.SVGParseException;

import akiyama.mykeep.AppContext;
import svgandroid.SVG;
import svgandroid.SVGBuilder;

/**
* FIXME
Expand Down
Loading