Skip to content

Commit

Permalink
updated AGP 8.0.2 to 8.4.0-alpha07
Browse files Browse the repository at this point in the history 
+ some app Gradle fixes and updated dependencies
+ moved some static variables to AppHelper.
+ some code formatting shit.
  • Loading branch information
@AwaisKing
AwaisKing committed Jan 28, 2024
1 parent ff753a6 commit 705aa01
Show file tree
Hide file tree
Showing 15 changed files with 546 additions and 503 deletions.
3 changes: 1 addition & 2 deletions .idea/gradle.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

45 changes: 21 additions & 24 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,35 @@ plugins {

android {
namespace 'awais.backworddictionary'
compileSdk 33
compileSdk 34

defaultConfig {
applicationId 'awais.backworddictionary'

minSdk 19
targetSdk 33
targetSdk 34

versionCode 127
versionName '12.7'
versionCode 128
versionName '12.8'

multiDexEnabled true

vectorDrawables {
useSupportLibrary true
//generatedDensities = []
// generatedDensities = []
}
}

aaptOptions { additionalParameters.add('--no-version-vectors') }

buildFeatures {
buildConfig true
viewBinding true
}

compileOptions {
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_11
sourceCompatibility JavaVersion.VERSION_11
}

buildTypes {
Expand All @@ -48,10 +49,12 @@ android {

packagingOptions {
resources {
excludes += ['**/**.version', '**/**.properties', '**/LGPL2.1',
'**/DEPENDENCIES', '**/DEPENDENCIES.txt', '**/dependencies.txt',
'**/LICENSE', '**/LICENSE.txt', '**/license.txt',
'**/NOTICE', '**/NOTICE.txt', '**/notice.txt']
excludes += [
'**/**.version', '**/**.properties', '**/LGPL2.1',
'**/DEPENDENCIES', '**/DEPENDENCIES.txt', '**/dependencies.txt',
'**/LICENSE', '**/LICENSE.txt', '**/license.txt',
'**/NOTICE', '**/NOTICE.txt', '**/notice.txt',
]
}
}

Expand All @@ -76,23 +79,17 @@ dependencies {
implementation fileTree(dir: 'libs', include: ['.jar', '.so', '*.jar', '*.so'])

implementation('androidx.multidex:multidex:2.0.1@aar') { transitive true }
//implementation('androidx.work:work-runtime:2.7.1@aar') { transitive true }
implementation('androidx.recyclerview:recyclerview:1.3.0@aar') { transitive true }
implementation('androidx.recyclerview:recyclerview:1.3.2@aar') { transitive true }
implementation('androidx.swiperefreshlayout:swiperefreshlayout:1.1.0@aar') { transitive true }
implementation('com.google.android.material:material:1.9.0@aar') {
transitive true
//exclude group: 'androidx.work', module: 'work-runtime'
}
implementation('com.google.android.material:material:1.11.0@aar') { transitive true }

implementation('com.startapp:inapp-sdk:4.11.0@aar') { transitive true }
implementation('com.applovin:applovin-sdk:11.10.1@aar') { transitive true }
implementation('com.startapp:applovin-mediation:1.1.4@aar') { transitive true }
implementation('com.applovin:applovin-sdk:12.1.0@aar') { transitive true }
implementation('com.applovin.mediation:adcolony-adapter:4.8.0.4@aar') { transitive true }
implementation('com.applovin.mediation:facebook-adapter:6.14.0.0@aar') { transitive true }
implementation('com.applovin.mediation:facebook-adapter:6.16.0.2@aar') { transitive true }

implementation('com.applovin.mediation:chartboost-adapter:9.3.1.0@aar') { transitive true }
implementation('com.google.android.gms:play-services-base:18.2.0@aar') { transitive true }
implementation('com.applovin.mediation:chartboost-adapter:9.6.1.0@aar') { transitive true }
implementation('com.google.android.gms:play-services-base:18.3.0@aar') { transitive true }

implementation('com.applovin.mediation:inmobi-adapter:10.1.4.1@aar') { transitive true }
implementation('com.applovin.mediation:inmobi-adapter:10.6.3.0@aar') { transitive true }
implementation('com.squareup.picasso:picasso:2.71828@aar') { transitive true }
}
23 changes: 10 additions & 13 deletions app/src/main/java/awais/backworddictionary/DictionaryFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,14 @@
import awais.backworddictionary.adapters.holders.WordItemViewHolder;
import awais.backworddictionary.asyncs.WordsAsync;
import awais.backworddictionary.databinding.DictionaryViewBinding;
import awais.backworddictionary.helpers.AppHelper;
import awais.backworddictionary.helpers.SettingsHelper;
import awais.backworddictionary.helpers.SmoothScroller;
import awais.backworddictionary.helpers.Utils;
import awais.backworddictionary.interfaces.FragmentCallback;

public final class DictionaryFragment extends Fragment implements FragmentCallback, SwipeRefreshLayout.OnRefreshListener,
View.OnClickListener, TextWatcher {
View.OnClickListener, TextWatcher {
private static final RecyclerView.OnScrollListener VIEWPAGER_SCROLL_HACK = new RecyclerView.OnScrollListener() {
private boolean isVertical = false, isHorizontal = false;

Expand Down Expand Up @@ -90,7 +91,7 @@ public void onAttach(@NonNull final Context context) {
if (Main.tts == null) {
try {
ActivityCompat.startActivityForResult(this.activity, new Intent(TextToSpeech.Engine.ACTION_CHECK_TTS_DATA),
Main.TTS_DATA_CHECK_CODE, null);
Main.TTS_DATA_CHECK_CODE, null);
} catch (final Throwable e) {
// tts check activity not found
Toast.makeText(this.activity, R.string.tts_act_not_found, Toast.LENGTH_SHORT).show();
Expand Down Expand Up @@ -126,15 +127,12 @@ public void onViewCreated(@NonNull final View magicRootView, @Nullable final Bun
final Resources.Theme theme = actNotNull ? activity.getTheme() : null;
cardBackColor = ResourcesCompat.getColor(resources, R.color.cards_back_color, theme);

if (Utils.inputMethodManager == null && actNotNull)
Utils.inputMethodManager = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);

wordList.clear();
wordsAdapter = new DictionaryWordsAdapter(activity, wordList);

dictionaryBinding.swipeRefreshLayout.setEnabled(false);
dictionaryBinding.swipeRefreshLayout.setColorSchemeResources(R.color.progress1, R.color.progress2,
R.color.progress3, R.color.progress4);
R.color.progress3, R.color.progress4);
dictionaryBinding.swipeRefreshLayout.setOnRefreshListener(this);

startOffset = dictionaryBinding.swipeRefreshLayout.getProgressViewStartOffset();
Expand All @@ -143,7 +141,7 @@ public void onViewCreated(@NonNull final View magicRootView, @Nullable final Bun

if (BuildConfig.DEBUG) {
// todo add animator in next release build
//recyclerView.setItemAnimator(new MagicAnimator());
// recyclerView.setItemAnimator(new MagicAnimator());
dictionaryBinding.rvItems.setItemAnimator(null);
}
dictionaryBinding.rvItems.setHasFixedSize(true);
Expand Down Expand Up @@ -305,7 +303,7 @@ boolean showFilter(final boolean showFilter, final FilterMethod method) {

if (method != FilterMethod.DO_NOTHING) {
dictionaryBinding.swipeRefreshLayout.setProgressViewOffset(false, startOffset,
showFilter ? expandedEndOffset : endOffset);
showFilter ? expandedEndOffset : endOffset);
if (isRefrehing) dictionaryBinding.swipeRefreshLayout.setRefreshing(true);
}
}
Expand All @@ -322,10 +320,9 @@ boolean isFilterOpen() {
}

private void toggleKeyboard(final boolean show) {
if (Utils.inputMethodManager != null) {
if (show) Utils.inputMethodManager.showSoftInput(dictionaryBinding.filterSearchEditor, 1);
else Utils.inputMethodManager.hideSoftInputFromWindow(dictionaryBinding.filterSearchEditor.getWindowToken(), 1);
}
final InputMethodManager imm = AppHelper.getInstance(getContext()).getInputMethodManager();
if (show) imm.showSoftInput(dictionaryBinding.filterSearchEditor, 1);
else imm.hideSoftInputFromWindow(dictionaryBinding.filterSearchEditor.getWindowToken(), 1);
}

void scrollRecyclerView(final boolean directionUp) {
Expand Down Expand Up @@ -385,7 +382,7 @@ void closeExpanded() {
}

@Override
public void beforeTextChanged(final CharSequence s, final int start, final int count, final int after) { }
public void beforeTextChanged(final CharSequence s, final int start, final int count, final int after) {}

public enum FilterMethod {
DO_NOTHING, RECYCLER_PADDING, RECYCLER_NO_PADDING,
Expand Down
47 changes: 26 additions & 21 deletions app/src/main/java/awais/backworddictionary/LinkedApp.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,10 @@

import com.applovin.mediation.MaxMediatedNetworkInfo;
import com.applovin.sdk.AppLovinSdk;
import com.inmobi.sdk.InMobiSdk;
import com.startapp.sdk.adsbase.StartAppAd;
import com.startapp.sdk.adsbase.StartAppSDK;

import java.util.List;

import awais.backworddictionary.helpers.AppHelper;
import awais.backworddictionary.helpers.SettingsHelper;
import awais.backworddictionary.helpers.Utils;

Expand All @@ -27,6 +25,7 @@ public void onCreate() {
super.onCreate();

SettingsHelper.setPreferences(this);
AppHelper.getInstance(this);

Typeface fontBold = null;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
Expand All @@ -50,25 +49,31 @@ public void onCreate() {
Utils.setDefaultFont("MONOSPACE", fontMedium);
Utils.setDefaultFont("DEFAULT_BOLD", fontBold);

{
if (SettingsHelper.showAds()) {
InMobiSdk.setLogLevel(BuildConfig.DEBUG ? InMobiSdk.LogLevel.DEBUG : InMobiSdk.LogLevel.NONE);
if (!InMobiSdk.isSDKInitialized())
InMobiSdk.init(this, "56047691bf7041f0a0b29e2497650619", null, null);
final AppLovinSdk instance = AppLovinSdk.getInstance(this);
instance.setMediationProvider("max");
AppLovinSdk.initializeSdk(this, initStatus -> {
if (BuildConfig.DEBUG) instance.showMediationDebugger();
if (BuildConfig.DEBUG) {
Log.d("AWAISKING_APP", "--------------------------------------------");
final List<MaxMediatedNetworkInfo> availableMediatedNetworks = instance.getAvailableMediatedNetworks();

StartAppSDK.init(this, getString(R.string.startio_APP_ID), false);
StartAppSDK.setTestAdsEnabled(BuildConfig.DEBUG);
StartAppSDK.enableReturnAds(!BuildConfig.DEBUG);
StartAppSDK.setUserConsent(this, "pas", System.currentTimeMillis(), false);
StartAppAd.disableSplash();
if (BuildConfig.DEBUG) StartAppAd.disableAutoInterstitial();
else StartAppAd.enableAutoInterstitial();
}
Log.d("AWAISKING_APP", "appLovinInit: " + initStatus
+ " -- " + initStatus.getCountryCode()
+ " -- " + initStatus.getConsentDialogState()
+ " -- " + availableMediatedNetworks
);

final AppLovinSdk instance = AppLovinSdk.getInstance(this);
instance.setMediationProvider("max");
AppLovinSdk.initializeSdk(this, initStatus -> {
});
}
if (availableMediatedNetworks != null) for (final MaxMediatedNetworkInfo availableMediatedNetwork : availableMediatedNetworks) {
Log.d("AWAISKING_APP", "availableMediatedNetwork: " + availableMediatedNetwork
+ " -- " + availableMediatedNetwork.getName()
+ " -- " + availableMediatedNetwork.getSdkVersion()
+ " -- " + availableMediatedNetwork.getAdapterClassName()
+ " -- " + availableMediatedNetwork.getAdapterVersion()
);
}

Log.d("AWAISKING_APP", "--------------------------------------------");
}
});
}
}
Loading

0 comments on commit 705aa01

Please sign in to comment.