removing closed source library for f-droid variant

This commit is contained in:
Mariotaku Lee 2016-01-04 22:47:01 +08:00
parent c2f7ecc706
commit 6ff6f38941
4 changed files with 92 additions and 15 deletions

View File

@ -1,18 +1,8 @@
buildscript {
repositories {
maven { url 'https://maven.fabric.io/public' }
}
dependencies {
classpath 'io.fabric.tools:gradle:1.21.2'
}
}
import fr.avianey.androidsvgdrawable.gradle.SvgDrawableTask import fr.avianey.androidsvgdrawable.gradle.SvgDrawableTask
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
apply plugin: 'io.fabric'
apply plugin: 'com.neenbedankt.android-apt' apply plugin: 'com.neenbedankt.android-apt'
apply plugin: 'androidsvgdrawable' apply plugin: 'androidsvgdrawable'
@ -119,6 +109,9 @@ dependencies {
compile 'com.j256.simplemagic:simplemagic:1.6' compile 'com.j256.simplemagic:simplemagic:1.6'
googleCompile 'com.google.android.gms:play-services-maps:8.4.0' googleCompile 'com.google.android.gms:play-services-maps:8.4.0'
googleCompile 'com.google.maps.android:android-maps-utils:0.4' googleCompile 'com.google.maps.android:android-maps-utils:0.4'
googleCompile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') {
transitive = true;
}
googleCompile ':YouTubeAndroidPlayerApi:1.2.2@jar' googleCompile ':YouTubeAndroidPlayerApi:1.2.2@jar'
fdroidCompile 'org.osmdroid:osmdroid-android:5.0.1' fdroidCompile 'org.osmdroid:osmdroid-android:5.0.1'
debugCompile 'com.facebook.stetho:stetho:1.2.0' debugCompile 'com.facebook.stetho:stetho:1.2.0'
@ -130,9 +123,6 @@ dependencies {
compile fileTree(dir: 'libs/main', include: ['*.jar']) compile fileTree(dir: 'libs/main', include: ['*.jar'])
provided 'javax.annotation:jsr250-api:1.0' provided 'javax.annotation:jsr250-api:1.0'
// googleCompile fileTree(dir: 'libs/google', include: ['*.jar']) // googleCompile fileTree(dir: 'libs/google', include: ['*.jar'])
compile('com.crashlytics.sdk.android:crashlytics:2.5.5@aar') {
transitive = true;
}
} }
task svgToDrawable(type: SvgDrawableTask) { task svgToDrawable(type: SvgDrawableTask) {

View File

@ -0,0 +1,61 @@
/*
* Twidere - Twitter client for Android
*
* Copyright (C) 2012-2015 Mariotaku Lee <mariotaku.lee@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.mariotaku.twidere.util;
import android.app.Application;
import android.support.annotation.Nullable;
import android.util.Log;
import org.mariotaku.twidere.BuildConfig;
import org.mariotaku.twidere.Constants;
/**
* Created by mariotaku on 15/7/8.
*/
public class TwidereBugReporter extends BugReporter implements Constants {
@Override
protected void logImpl(@Nullable String message, @Nullable Throwable throwable) {
if (BuildConfig.DEBUG) {
Log.d(LOGTAG, message, throwable);
}
}
@Override
protected void errorImpl(@Nullable String message, @Nullable Throwable throwable) {
if (throwable == null && message == null) {
throw new NullPointerException("Message and Throwable can't be both null");
}
if (message != null) {
if (BuildConfig.DEBUG) {
Log.w(LOGTAG, message, throwable);
}
return;
}
if (BuildConfig.DEBUG) {
Log.w(LOGTAG, throwable);
}
}
@Override
protected void initImpl(final Application application) {
}
}

View File

@ -1361,10 +1361,17 @@ public class StatusFragment extends BaseSupportFragment implements LoaderCallbac
private static final int ITEM_IDX_REPLY_ERROR = 6; private static final int ITEM_IDX_REPLY_ERROR = 6;
private static final int ITEM_IDX_SPACE = 7; private static final int ITEM_IDX_SPACE = 7;
private static final int ITEM_TYPES_SUM = 8; private static final int ITEM_TYPES_SUM = 8;
private final StatusFragment mFragment; private final StatusFragment mFragment;
private final LayoutInflater mInflater; private final LayoutInflater mInflater;
private final MediaLoadingHandler mMediaLoadingHandler; private final MediaLoadingHandler mMediaLoadingHandler;
private final TwidereLinkify mTwidereLinkify; private final TwidereLinkify mTwidereLinkify;
private StatusAdapterListener mStatusAdapterListener;
private RecyclerView mRecyclerView;
private DetailStatusViewHolder mStatusViewHolder;
private final int[] mItemCounts; private final int[] mItemCounts;
private final boolean mNameFirst; private final boolean mNameFirst;
@ -1388,9 +1395,8 @@ public class StatusFragment extends BaseSupportFragment implements LoaderCallbac
private TranslationResult mTranslationResult; private TranslationResult mTranslationResult;
private StatusActivity mStatusActivity; private StatusActivity mStatusActivity;
private ParcelableCredentials mStatusAccount; private ParcelableCredentials mStatusAccount;
private List<ParcelableStatus> mData; private List<ParcelableStatus> mData;
private StatusAdapterListener mStatusAdapterListener;
private RecyclerView mRecyclerView;
private CharSequence mReplyError, mConversationError; private CharSequence mReplyError, mConversationError;
private boolean mRepliesLoading, mConversationsLoading; private boolean mRepliesLoading, mConversationsLoading;
@ -1650,6 +1656,9 @@ public class StatusFragment extends BaseSupportFragment implements LoaderCallbac
public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
switch (viewType) { switch (viewType) {
case VIEW_TYPE_DETAIL_STATUS: { case VIEW_TYPE_DETAIL_STATUS: {
if (mStatusViewHolder != null) {
return mStatusViewHolder;
}
final View view; final View view;
if (mIsCompact) { if (mIsCompact) {
view = mInflater.inflate(R.layout.header_status_compact, parent, false); view = mInflater.inflate(R.layout.header_status_compact, parent, false);
@ -1736,6 +1745,23 @@ public class StatusFragment extends BaseSupportFragment implements LoaderCallbac
} }
} }
@Override
public void onViewDetachedFromWindow(ViewHolder holder) {
if (holder instanceof DetailStatusViewHolder) {
mStatusViewHolder = (DetailStatusViewHolder) holder;
}
super.onViewDetachedFromWindow(holder);
}
@Override
public void onViewAttachedToWindow(ViewHolder holder) {
if (holder == mStatusViewHolder) {
mStatusViewHolder = null;
}
super.onViewAttachedToWindow(holder);
}
private TranslationResult getTranslationResult() { private TranslationResult getTranslationResult() {
return mTranslationResult; return mTranslationResult;
} }