diff --git a/app/ARDrawSketch.jks b/app/ARDrawSketch.jks new file mode 100644 index 0000000..fcc3e01 Binary files /dev/null and b/app/ARDrawSketch.jks differ diff --git a/app/build.gradle.kts b/app/build.gradle.kts index cade6a8..00b9d91 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -4,15 +4,15 @@ import java.text.SimpleDateFormat plugins { id("com.android.application") id("org.jetbrains.kotlin.android") - id("com.google.gms.google-services") - id("com.google.firebase.crashlytics") - id("applovin-quality-service") +// id("com.google.gms.google-services") +// id("com.google.firebase.crashlytics") +// id("applovin-quality-service") } -applovin { - apiKey = - "0pn_nPmNSunNT9Oq6nyqrUVTGfbFsZUoU47_B5ydJsLCvMPzZ8VdNFvemW1bfJfLlQ4WEgrD_fu3M4ep7hS9Ng" -} +//applovin { +// apiKey = +// "0pn_nPmNSunNT9Oq6nyqrUVTGfbFsZUoU47_B5ydJsLCvMPzZ8VdNFvemW1bfJfLlQ4WEgrD_fu3M4ep7hS9Ng" +//} val timestamp = SimpleDateFormat("MM_dd_HH_mm").format(Date()) android { @@ -20,15 +20,15 @@ android { compileSdk = 34 defaultConfig { - //com.draw.painting.helper - applicationId = "com.draw.painting.helper" + //com.draw.ar.drawsketch + applicationId = "com.draw.ar.drawsketch" minSdk = 23 targetSdk = 34 - versionCode = 2 - versionName = "1.0.1" + versionCode = 1 + versionName = "1.0.0" setProperty( "archivesBaseName", - "Painting Helper_V" + versionName + "(${versionCode})_$timestamp" + "AR Draw Sketch_V" + versionName + "(${versionCode})_$timestamp" ) testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } @@ -78,14 +78,14 @@ dependencies { implementation("androidx.camera:camera-extensions:${camerax_version}") - implementation("com.applovin:applovin-sdk:+") - implementation("com.applovin.mediation:vungle-adapter:+") - implementation("com.applovin.mediation:mintegral-adapter:+") - implementation("com.applovin.mediation:bytedance-adapter:+") - implementation("com.applovin.mediation:unityads-adapter:+") - implementation(platform("com.google.firebase:firebase-bom:33.1.1")) - implementation("com.google.firebase:firebase-crashlytics") - implementation("com.google.firebase:firebase-analytics") +// implementation("com.applovin:applovin-sdk:+") +// implementation("com.applovin.mediation:vungle-adapter:+") +// implementation("com.applovin.mediation:mintegral-adapter:+") +// implementation("com.applovin.mediation:bytedance-adapter:+") +// implementation("com.applovin.mediation:unityads-adapter:+") +// implementation(platform("com.google.firebase:firebase-bom:33.1.1")) +// implementation("com.google.firebase:firebase-crashlytics") +// implementation("com.google.firebase:firebase-analytics") } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 10bc323..42f3781 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,7 +13,8 @@ android:maxSdkVersion="32" /> + android:maxSdkVersion="32" + tools:ignore="ScopedStorage" /> adArrayList; - private static final String one_AD = "fd0f2d1eca71b3a1"; - private static final String two_Ad = "f129bbb52cd84647"; - private static final String three_ad = "b42153354e619004"; - - - public static void setCallBcak(MaxInterstitialAd ad, Adcallback adcallback) { - ad.setListener(new MaxAdListener() { - @Override - public void onAdLoaded(@NonNull MaxAd maxAd) { - - } - - @Override - public void onAdDisplayed(@NonNull MaxAd maxAd) { - - } - - @Override - public void onAdHidden(@NonNull MaxAd maxAd) { - adcallback.onAdHidden(); - } - - @Override - public void onAdClicked(@NonNull MaxAd maxAd) { - - } - - @Override - public void onAdLoadFailed(@NonNull String s, @NonNull MaxError maxError) { - - } - - @Override - public void onAdDisplayFailed(@NonNull MaxAd maxAd, @NonNull MaxError maxError) { - adcallback.onShowFail(maxAd); - } - }); - } - - public static MaxInterstitialAd onCache(List list) { - Collections.shuffle(list); - for (MaxInterstitialAd ad : list) { - if (ad.isReady()) { - return ad; - } - } - return null; - } - - public static List getAllAd() { - if (adArrayList == null) { - adArrayList = new ArrayList<>(); - adArrayList.add(createAd(one_AD, PaintingApp.app)); - adArrayList.add(createAd(two_Ad, PaintingApp.app)); - adArrayList.add(createAd(three_ad, PaintingApp.app)); - } - for (MaxInterstitialAd ad : adArrayList) { - if (!ad.isReady()) { - ad.loadAd(); - } - } - return adArrayList; - } - - private static MaxInterstitialAd createAd(String adUnitId, Context context) { - MaxInterstitialAd ad = new MaxInterstitialAd(adUnitId, context); - return ad; - } - public static int getRange(Camera camera) { Range exposureCompensationRange = camera.getCameraInfo().getExposureState().getExposureCompensationRange(); diff --git a/app/src/main/java/com/draw/painting/test/ui/ALaucherActivity.java b/app/src/main/java/com/draw/painting/test/ui/ALaucherActivity.java index 4f970a6..184e37e 100644 --- a/app/src/main/java/com/draw/painting/test/ui/ALaucherActivity.java +++ b/app/src/main/java/com/draw/painting/test/ui/ALaucherActivity.java @@ -1,32 +1,21 @@ package com.draw.painting.test.ui; -import androidx.appcompat.app.AppCompatActivity; -import androidx.localbroadcastmanager.content.LocalBroadcastManager; - -import android.content.BroadcastReceiver; -import android.content.Context; import android.content.Intent; -import android.content.IntentFilter; import android.os.Bundle; import android.os.CountDownTimer; -import android.util.Log; -import com.applovin.mediation.MaxAd; -import com.applovin.mediation.ads.MaxInterstitialAd; -import com.draw.painting.test.Adcallback; -import com.draw.painting.test.PaintingApp; +import androidx.appcompat.app.AppCompatActivity; + import com.draw.painting.test.databinding.ActivityAlaucherBinding; import com.draw.painting.test.manager.Utils; -import java.util.List; - public class ALaucherActivity extends AppCompatActivity { private ActivityAlaucherBinding binding; - private long time = 11000; + private long time = 2000; private CountDownTimer countDownTimer; - private static List adsList; - public static boolean isAlreadyShow = false; + + @Override protected void onCreate(Bundle savedInstanceState) { @@ -39,69 +28,21 @@ public class ALaucherActivity extends AppCompatActivity { countDownTimer = new CountDownTimer(time, 200) { @Override public void onTick(long millisUntilFinished) { - if (!isAlreadyShow) { - showAdOrStartView(false); - } + } @Override public void onFinish() { - if (!isAlreadyShow) { - showAdOrStartView(true); - } + enterMain(); } }; - registerBroadcastReceiver(); - } - - private void showAdOrStartView(boolean go) { - MaxInterstitialAd cachedAd = Utils.onCache(adsList); - if (cachedAd == null) { - isAlreadyShow = false; - if (go) { - enterMain(); - } - } else { - isAlreadyShow = true; - Utils.setCallBcak(cachedAd, new Adcallback() { - @Override - public void onShowFail(MaxAd ad) { - isAlreadyShow = false; - - } - - @Override - public void onAdHidden() { - isAlreadyShow = true; - enterMain(); - } - }); - cachedAd.showAd(); - } - } - - private void registerBroadcastReceiver() { - if (!PaintingApp.initSDK) { - BroadcastReceiver receiver = new BroadcastReceiver() { - @Override - public void onReceive(Context context, Intent intent) { - loadAndStartAd(); - } - }; - - LocalBroadcastManager.getInstance(this).registerReceiver(receiver, new IntentFilter(PaintingApp.AD_BROADCAST)); - } else { - loadAndStartAd(); - } - } - - private void loadAndStartAd() { - adsList = Utils.getAllAd(); countDownTimer.start(); } + + private void enterMain() { Intent intent = new Intent(ALaucherActivity.this, HomeActivity.class); startActivity(intent); diff --git a/app/src/main/java/com/draw/painting/test/ui/CameraActivity.java b/app/src/main/java/com/draw/painting/test/ui/CameraActivity.java index e80562a..10f58da 100644 --- a/app/src/main/java/com/draw/painting/test/ui/CameraActivity.java +++ b/app/src/main/java/com/draw/painting/test/ui/CameraActivity.java @@ -1,18 +1,5 @@ package com.draw.painting.test.ui; -import androidx.activity.result.ActivityResultLauncher; -import androidx.activity.result.contract.ActivityResultContracts; -import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; -import androidx.camera.core.Camera; -import androidx.camera.core.CameraSelector; -import androidx.camera.core.ImageCapture; -import androidx.camera.core.Preview; -import androidx.camera.lifecycle.ProcessCameraProvider; -import androidx.camera.view.PreviewView; -import androidx.core.app.ActivityCompat; -import androidx.core.content.ContextCompat; - import android.Manifest; import android.app.Activity; import android.content.Intent; @@ -32,13 +19,24 @@ import android.widget.ImageView; import android.widget.SeekBar; import android.widget.Toast; -import com.applovin.mediation.MaxAd; -import com.applovin.mediation.ads.MaxInterstitialAd; -import com.draw.painting.test.Adcallback; -import com.google.common.util.concurrent.ListenableFuture; +import androidx.activity.result.ActivityResultLauncher; +import androidx.activity.result.contract.ActivityResultContracts; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; +import androidx.camera.core.Camera; +import androidx.camera.core.CameraSelector; +import androidx.camera.core.ImageCapture; +import androidx.camera.core.Preview; +import androidx.camera.lifecycle.ProcessCameraProvider; +import androidx.camera.view.PreviewView; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; + + import com.draw.painting.test.PaintingApp; import com.draw.painting.test.R; import com.draw.painting.test.manager.Utils; +import com.google.common.util.concurrent.ListenableFuture; import java.util.List; @@ -73,7 +71,7 @@ public class CameraActivity extends AppCompatActivity implements View.OnTouchLis private boolean hasPermission = false; private boolean isMain; private String ismain; - private static List adsList; + private ActivityResultLauncher intentActivityResultLauncher; @Override @@ -82,7 +80,7 @@ public class CameraActivity extends AppCompatActivity implements View.OnTouchLis setContentView(R.layout.activity_camera); Utils.setStatusBarTextColor(this, true); - adsList = Utils.getAllAd(); + Intent intent = getIntent(); isMain = intent.getBooleanExtra(PaintingApp.Key_ISMAIN, false); @@ -115,23 +113,7 @@ public class CameraActivity extends AppCompatActivity implements View.OnTouchLis } private void showAd() { - MaxInterstitialAd cachedAd = Utils.onCache(adsList); - if (cachedAd == null) { - } else { - Utils.setCallBcak(cachedAd, new Adcallback() { - @Override - public void onShowFail(MaxAd ad) { - - } - - @Override - public void onAdHidden() { - - } - }); - cachedAd.showAd(this); - } } private void onInitIm(float imW, float imH) { @@ -297,7 +279,6 @@ public class CameraActivity extends AppCompatActivity implements View.OnTouchLis int height = bitmap.getHeight(); onInitIm(width, height); - } } catch (Exception e) { @@ -339,14 +320,5 @@ public class CameraActivity extends AppCompatActivity implements View.OnTouchLis Toast.makeText(this, getString(R.string.permission_fail), Toast.LENGTH_SHORT).show(); } - @Override - public void onBackPressed() { - super.onBackPressed(); - if (isMain) { - showAd(); - finish(); - } else { - finish(); - } - } + } \ No newline at end of file diff --git a/app/src/main/java/com/draw/painting/test/ui/PreViewActivity.java b/app/src/main/java/com/draw/painting/test/ui/PreViewActivity.java index 63c47d2..481b631 100644 --- a/app/src/main/java/com/draw/painting/test/ui/PreViewActivity.java +++ b/app/src/main/java/com/draw/painting/test/ui/PreViewActivity.java @@ -1,14 +1,12 @@ package com.draw.painting.test.ui; -import androidx.appcompat.app.AppCompatActivity; -import androidx.recyclerview.widget.GridLayoutManager; - import android.os.Bundle; import android.view.View; -import com.applovin.mediation.MaxAd; -import com.applovin.mediation.ads.MaxInterstitialAd; -import com.draw.painting.test.Adcallback; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.GridLayoutManager; + + import com.draw.painting.test.PaintingApp; import com.draw.painting.test.adapter.PreViewAdapter; import com.draw.painting.test.databinding.ActivityPreViewBinding; @@ -21,7 +19,7 @@ public class PreViewActivity extends AppCompatActivity { private ActivityPreViewBinding preViewBinding; private String dirStr; - private static List adsList; + @Override protected void onCreate(Bundle savedInstanceState) { @@ -32,7 +30,7 @@ public class PreViewActivity extends AppCompatActivity { dirStr = getIntent().getStringExtra(PaintingApp.Key_ViewDir); preViewBinding.categoryName.setText(dirStr.substring(dirStr.lastIndexOf("_") + 1)); - adsList = Utils.getAllAd(); + onInitList(); onInitClick(); @@ -51,34 +49,15 @@ public class PreViewActivity extends AppCompatActivity { preViewBinding.back.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - showAd(); + finish(); } }); } - private void showAd() { - MaxInterstitialAd cachedAd = Utils.onCache(adsList); - if (cachedAd == null) { - finish(); - } else { - Utils.setCallBcak(cachedAd, new Adcallback() { - @Override - public void onShowFail(MaxAd ad) { - finish(); - } - - @Override - public void onAdHidden() { - finish(); - } - }); - cachedAd.showAd(this); - } - } @Override public void onBackPressed() { super.onBackPressed(); - showAd(); + } } \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0eea267..3948294 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - Painting Helper + AR Draw Sketch See All Trace&Draw @@ -10,5 +10,5 @@ Version V%s Please grant the relevant permissions and try again. - https://sites.google.com/view/httpprivates + https://sites.google.com/view/privacy-policy-view-page \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 6257ead..efa22b0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,8 +5,8 @@ plugins { id("com.google.gms.google-services") version "4.3.15" apply false id ("com.google.firebase.crashlytics") version "2.9.2" apply false } -buildscript{ - dependencies{ - classpath("com.applovin.quality:AppLovinQualityServiceGradlePlugin:+") - } -} \ No newline at end of file +//buildscript{ +// dependencies{ +// classpath("com.applovin.quality:AppLovinQualityServiceGradlePlugin:+") +// } +//} \ No newline at end of file diff --git a/keystore.properties b/keystore.properties index 9358bc2..876ea75 100644 --- a/keystore.properties +++ b/keystore.properties @@ -1,6 +1,6 @@ -app_name=Photography Wallpapers -package_name= com.wall.photography -keystoreFile=app/PhotographyWallpapers.jks -key_alias=PhotographyWallpaperskey0 -key_store_password=PhotographyWallpapers -key_password=PhotographyWallpapers +app_name=AR Draw Sketch +package_name=com.draw.ar.drawsketch +keystoreFile=app/ARDrawSketch.jks +key_alias=ARDrawSketchkey0 +key_store_password=ARDrawSketch +key_password=ARDrawSketch diff --git a/settings.gradle.kts b/settings.gradle.kts index 1d82dcc..f71be8e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -4,7 +4,7 @@ pluginManagement { mavenCentral() gradlePluginPortal() - maven { url = uri("https://artifacts.applovin.com/android") } +// maven { url = uri("https://artifacts.applovin.com/android") } } } dependencyResolutionManagement { @@ -13,12 +13,12 @@ dependencyResolutionManagement { google() mavenCentral() - maven { url = uri("https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea") } - maven { url = uri("https://artifact.bytedance.com/repository/pangle") } +// maven { url = uri("https://dl-maven-android.mintegral.com/repository/mbridge_android_sdk_oversea") } +// maven { url = uri("https://artifact.bytedance.com/repository/pangle") } } } -rootProject.name = "Painting_Helper" +rootProject.name = "AR Draw Sketch" include(":app") \ No newline at end of file