Mastodon/Twidere-App-Android-Twitter-Mastodon
1
0
Fork 0
mirror of https://github.com/TwidereProject/Twidere-Android synced 2025-02-02 09:46:51 +01:00
Code Issues Releases Wiki Activity

fixed some compile warnings

Browse Source 
speed up builds
fixed fanfou image limit
This commit is contained in:
Mariotaku Lee 2017-08-14 14:31:07 +08:00
parent 042b39f3bd
commit b4f70ce173
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
9 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
twidere.component.common/build.gradle
View File

@ -69,16 +69,16 @@ dependencies {
annotationProcessor "com.github.mariotaku.ObjectCursor:processor:${libVersions['ObjectCursor']}"
annotationProcessor "com.github.mariotaku.ExportablePreferences:processor:${libVersions['ExportablePreferences']}"
api "com.android.support:support-annotations:${libVersions['SupportLib']}"
api "com.bluelinelabs:logansquare:${libVersions['LoganSquare']}"
api "com.github.mariotaku.RestFu:library:${libVersions['RestFu']}"
api "com.github.mariotaku.RestFu:oauth:${libVersions['RestFu']}"
api "com.github.mariotaku.RestFu:oauth2:${libVersions['RestFu']}"
api "com.hannesdorfmann.parcelableplease:annotation:${libVersions['ParcelablePlease']}"
api "com.github.mariotaku.ObjectCursor:core:${libVersions['ObjectCursor']}"
api "com.github.mariotaku.ExportablePreferences:core:${libVersions['ExportablePreferences']}"
api "com.github.mariotaku.CommonsLibrary:objectcursor:${libVersions['MariotakuCommons']}"
api "com.github.mariotaku.CommonsLibrary:logansquare:${libVersions['MariotakuCommons']}"
implementation "com.android.support:support-annotations:${libVersions['SupportLib']}"
implementation "com.bluelinelabs:logansquare:${libVersions['LoganSquare']}"
implementation "com.github.mariotaku.RestFu:library:${libVersions['RestFu']}"
implementation "com.github.mariotaku.RestFu:oauth:${libVersions['RestFu']}"
implementation "com.github.mariotaku.RestFu:oauth2:${libVersions['RestFu']}"
implementation "com.hannesdorfmann.parcelableplease:annotation:${libVersions['ParcelablePlease']}"
implementation "com.github.mariotaku.ObjectCursor:core:${libVersions['ObjectCursor']}"
implementation "com.github.mariotaku.ExportablePreferences:core:${libVersions['ExportablePreferences']}"
implementation "com.github.mariotaku.CommonsLibrary:objectcursor:${libVersions['MariotakuCommons']}"
implementation "com.github.mariotaku.CommonsLibrary:logansquare:${libVersions['MariotakuCommons']}"
}
install {

10
twidere.component.common/src/main/java/org/mariotaku/twidere/model/account/AccountExtras.java
View File

@ -94,13 +94,21 @@ public interface AccountExtras extends Parcelable {
}
@NonNull
public static ImageLimit ofSize(int width, int height) {
public static ImageLimit ofGeometry(int width, int height) {
final ImageLimit limit = new ImageLimit();
limit.setMaxWidth(width);
limit.setMaxHeight(height);
return limit;
}
@NonNull
public static ImageLimit ofSize(int size) {
final ImageLimit limit = new ImageLimit();
limit.setMaxSizeSync(size);
limit.setMaxSizeAsync(size);
return limit;
}
@NonNull
public static ImageLimit twitterDefault(@Nullable @MediaCategory String category) {
if (MediaCategory.DM_IMAGE.equals(category)) {

2
twidere.component.nyan/build.gradle
View File

@ -37,5 +37,5 @@ android {
}
dependencies {
api "com.android.support:support-compat:${libVersions['SupportLib']}"
implementation "com.android.support:support-compat:${libVersions['SupportLib']}"
}

4
twidere/build.gradle
View File

@ -170,6 +170,8 @@ dependencies {
implementation "com.hannesdorfmann.parcelableplease:annotation:${libVersions['ParcelablePlease']}"
implementation "com.github.mariotaku:PickNCrop:${libVersions['PickNCrop']}"
implementation "com.github.mariotaku.RestFu:library:${libVersions['RestFu']}"
implementation "com.github.mariotaku.RestFu:oauth:${libVersions['RestFu']}"
implementation "com.github.mariotaku.RestFu:oauth2:${libVersions['RestFu']}"
implementation "com.github.mariotaku.RestFu:okhttp3:${libVersions['RestFu']}"
implementation "com.github.mariotaku.RestFu:logansquare:${libVersions['RestFu']}"
implementation "com.squareup.okhttp3:okhttp:${libVersions['OkHttp']}"
@ -196,6 +198,8 @@ dependencies {
implementation "com.github.mariotaku.CommonsLibrary:text:${libVersions['MariotakuCommons']}"
implementation "com.github.mariotaku.CommonsLibrary:text-kotlin:${libVersions['MariotakuCommons']}"
implementation "com.github.mariotaku.CommonsLibrary:emojione:${libVersions['MariotakuCommons']}"
implementation "com.github.mariotaku.CommonsLibrary:objectcursor:${libVersions['MariotakuCommons']}"
implementation "com.github.mariotaku.CommonsLibrary:logansquare:${libVersions['MariotakuCommons']}"
implementation "com.github.mariotaku:KPreferences:${libVersions['KPreferences']}"
implementation "com.github.mariotaku:Chameleon:${libVersions['Chameleon']}"
implementation "com.github.mariotaku.UniqR:android:${libVersions['UniqR']}"

2
twidere/src/main/kotlin/org/mariotaku/twidere/activity/LinkHandlerActivity.kt
View File

@ -97,7 +97,7 @@ class LinkHandlerActivity : BaseActivity(), SystemWindowInsetsCallback, IControl
multiSelectHandler.dispatchOnCreate()
fragmentLifecycleCallbacks = object : FragmentManager.FragmentLifecycleCallbacks() {
override fun onFragmentViewCreated(fm: FragmentManager, f: Fragment, v: View, savedInstanceState: Bundle?) {
override fun onFragmentViewCreated(fm: FragmentManager, f: Fragment, v: View, savedState: Bundle?) {
if (f is IToolBarSupportFragment) {
setSupportActionBar(f.toolbar)
}

2
twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/AccountDetailsExtensions.kt
View File

@ -50,7 +50,7 @@ fun AccountDetails.getMediaSizeLimit(@MediaCategory mediaCategory: String? = nul
return UpdateStatusTask.SizeLimit(imageLimit, videoLimit)
}
AccountType.FANFOU -> {
val imageLimit = AccountExtras.ImageLimit.ofSize(2048, 1536)
val imageLimit = AccountExtras.ImageLimit.ofSize(5 * 1024 * 1024)
val videoLimit = AccountExtras.VideoLimit.unsupported()
return UpdateStatusTask.SizeLimit(imageLimit, videoLimit)
}

2
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersImportFragment.kt
View File

@ -184,7 +184,7 @@ abstract class BaseFiltersImportFragment : AbsContentListRecyclerViewFragment<Se
override fun onCreateAdapter(context: Context): SelectableUsersAdapter {
val adapter = SelectableUsersAdapter(context, Glide.with(this))
adapter.itemCheckedListener = listener@ { position, value ->
adapter.itemCheckedListener = listener@ { _, _ ->
if (!extraFeaturesService.isEnabled(ExtraFeaturesService.FEATURE_FILTERS_IMPORT)) {
ExtraFeaturesIntroductionDialogFragment.show(fragmentManager,
feature = ExtraFeaturesService.FEATURE_FILTERS_IMPORT,

2
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ExoPlayerPageFragment.kt
View File

@ -180,7 +180,7 @@ class ExoPlayerPageFragment : MediaViewerFragment(), IBaseFragment<ExoPlayerPage
}
playerView.useController = !isControlDisabled
playerView.controllerShowTimeoutMs = 0
playerView.setOnSystemUiVisibilityChangeListener { visibility ->
playerView.setOnSystemUiVisibilityChangeListener {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) return@setOnSystemUiVisibilityChangeListener
val visible = MediaViewerActivity.FLAG_SYSTEM_UI_HIDE_BARS !in
activity.window.decorView.systemUiVisibility

2
twidere/src/main/kotlin/org/mariotaku/twidere/preference/KeyboardShortcutPreference.kt
View File

@ -50,7 +50,7 @@ class KeyboardShortcutPreference(context: Context, attrs: AttributeSet? = null)
isPersistent = false
dialogTitle = KeyboardShortcutsHandler.getActionLabel(context, action)
title = KeyboardShortcutsHandler.getActionLabel(context, action)
preferencesChangeListener = SharedPreferences.OnSharedPreferenceChangeListener { preferences, key -> updateSummary() }
preferencesChangeListener = SharedPreferences.OnSharedPreferenceChangeListener { _, _ -> updateSummary() }
updateSummary()
}