diff --git a/twidere.component.common/build.gradle b/twidere.component.common/build.gradle index c77d6cda1..a36c8f40f 100644 --- a/twidere.component.common/build.gradle +++ b/twidere.component.common/build.gradle @@ -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 { diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/account/AccountExtras.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/account/AccountExtras.java index 5e8cae2d4..e17181dbb 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/account/AccountExtras.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/account/AccountExtras.java @@ -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)) { diff --git a/twidere.component.nyan/build.gradle b/twidere.component.nyan/build.gradle index 2cfd0efb6..7afdb4343 100644 --- a/twidere.component.nyan/build.gradle +++ b/twidere.component.nyan/build.gradle @@ -37,5 +37,5 @@ android { } dependencies { - api "com.android.support:support-compat:${libVersions['SupportLib']}" + implementation "com.android.support:support-compat:${libVersions['SupportLib']}" } diff --git a/twidere/build.gradle b/twidere/build.gradle index 636fbf780..8e9db2b84 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -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']}" diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/LinkHandlerActivity.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/LinkHandlerActivity.kt index e31f13c3b..543bf7240 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/activity/LinkHandlerActivity.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/activity/LinkHandlerActivity.kt @@ -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) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/AccountDetailsExtensions.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/AccountDetailsExtensions.kt index 75f627427..8a5242024 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/AccountDetailsExtensions.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/AccountDetailsExtensions.kt @@ -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) } diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersImportFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersImportFragment.kt index eccb9d2f6..98f10c8e1 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersImportFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/filter/BaseFiltersImportFragment.kt @@ -184,7 +184,7 @@ abstract class BaseFiltersImportFragment : AbsContentListRecyclerViewFragment + adapter.itemCheckedListener = listener@ { _, _ -> if (!extraFeaturesService.isEnabled(ExtraFeaturesService.FEATURE_FILTERS_IMPORT)) { ExtraFeaturesIntroductionDialogFragment.show(fragmentManager, feature = ExtraFeaturesService.FEATURE_FILTERS_IMPORT, diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ExoPlayerPageFragment.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ExoPlayerPageFragment.kt index 5491dda8f..b4cafe897 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ExoPlayerPageFragment.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/fragment/media/ExoPlayerPageFragment.kt @@ -180,7 +180,7 @@ class ExoPlayerPageFragment : MediaViewerFragment(), IBaseFragment + 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 diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/KeyboardShortcutPreference.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/KeyboardShortcutPreference.kt index 34cbe5669..602522ac5 100644 --- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/KeyboardShortcutPreference.kt +++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/KeyboardShortcutPreference.kt @@ -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() }