diff --git a/.gitignore b/.gitignore index 753b81a..7493bfa 100644 --- a/.gitignore +++ b/.gitignore @@ -51,7 +51,7 @@ captures/ .cxx/ # Google Services (e.g. APIs or Firebase) -# google-services.json +google-services.json # Freeline freeline.py diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 4edb71e..f9f3e9b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -26,6 +26,7 @@ properties.load(project.rootProject.file("local.properties").inputStream()) plugins { id("com.android.application") + id("com.google.gms.google-services") kotlin("android") } @@ -254,7 +255,10 @@ dependencies { implementation("com.squareup.okhttp3:okhttp:5.0.0-alpha.2") implementation("androidx.appcompat:appcompat:1.3.1") implementation("androidx.preference:preference-ktx:1.1.1") - implementation("androidx.fragment:fragment-ktx:1.4.0-alpha09") + implementation("androidx.fragment:fragment-ktx:1.4.0-alpha10") + implementation("androidx.work:work-runtime-ktx:2.7.0-rc01") + implementation("com.google.android.gms:play-services-ads:20.4.0") + implementation("com.google.firebase:firebase-analytics-ktx:19.0.2") compileOnly("de.robv.android.xposed:api:82") compileOnly("de.robv.android.xposed:api:82:sources") diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6894a85..36a5e3f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -54,7 +54,6 @@ @@ -64,15 +63,18 @@ + android:targetActivity=".app.ui.activities.MainActivity"> + diff --git a/app/src/main/java/com/tsng/hidemyapplist/app/ui/activities/MainActivity.kt b/app/src/main/java/com/tsng/hidemyapplist/app/ui/activities/MainActivity.kt index bd1c1a6..2ed1e69 100644 --- a/app/src/main/java/com/tsng/hidemyapplist/app/ui/activities/MainActivity.kt +++ b/app/src/main/java/com/tsng/hidemyapplist/app/ui/activities/MainActivity.kt @@ -9,10 +9,13 @@ import android.view.View import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.content.res.AppCompatResources import androidx.preference.PreferenceManager +import com.google.android.gms.ads.AdRequest +import com.google.android.gms.ads.MobileAds import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.tsng.hidemyapplist.BuildConfig import com.tsng.hidemyapplist.R import com.tsng.hidemyapplist.app.MyApplication +import com.tsng.hidemyapplist.app.MyApplication.Companion.appContext import com.tsng.hidemyapplist.app.helpers.ServiceHelper import com.tsng.hidemyapplist.app.makeToast import com.tsng.hidemyapplist.databinding.ActivityMainBinding @@ -33,6 +36,8 @@ class MainActivity : AppCompatActivity(), View.OnClickListener { binding = ActivityMainBinding.inflate(layoutInflater) setContentView(binding.root) setSupportActionBar(findViewById(R.id.toolbar)) + MobileAds.initialize(appContext) + binding.adBanner.loadAd(AdRequest.Builder().build()) makeUpdateAlert() } diff --git a/app/src/main/java/com/tsng/hidemyapplist/app/ui/fragments/AppSelectFragment.kt b/app/src/main/java/com/tsng/hidemyapplist/app/ui/fragments/AppSelectFragment.kt index d0da3fe..6ce3104 100644 --- a/app/src/main/java/com/tsng/hidemyapplist/app/ui/fragments/AppSelectFragment.kt +++ b/app/src/main/java/com/tsng/hidemyapplist/app/ui/fragments/AppSelectFragment.kt @@ -8,6 +8,7 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.setFragmentResult import androidx.recyclerview.widget.LinearLayoutManager import com.github.kyuubiran.ezxhelper.utils.runOnMainThread +import com.google.android.gms.ads.AdRequest import com.tsng.hidemyapplist.R import com.tsng.hidemyapplist.app.helpers.AppInfoHelper import com.tsng.hidemyapplist.app.ui.adapters.AppSelectAdapter @@ -47,6 +48,7 @@ class AppSelectFragment : Fragment() { savedInstanceState: Bundle? ): View { binding = FragmentAppSelectBinding.inflate(inflater, container, false) + binding.adBanner.loadAd(AdRequest.Builder().build()) binding.refreshLayout.setOnRefreshListener { refresh() }.autoRefresh() return binding.root } diff --git a/app/src/main/java/com/tsng/hidemyapplist/app/ui/fragments/ScopeManageFragment.kt b/app/src/main/java/com/tsng/hidemyapplist/app/ui/fragments/ScopeManageFragment.kt index a81e9fe..7ccfda7 100644 --- a/app/src/main/java/com/tsng/hidemyapplist/app/ui/fragments/ScopeManageFragment.kt +++ b/app/src/main/java/com/tsng/hidemyapplist/app/ui/fragments/ScopeManageFragment.kt @@ -6,6 +6,7 @@ import androidx.appcompat.widget.SearchView import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager import com.github.kyuubiran.ezxhelper.utils.runOnMainThread +import com.google.android.gms.ads.AdRequest import com.tsng.hidemyapplist.BuildConfig import com.tsng.hidemyapplist.R import com.tsng.hidemyapplist.app.JsonConfigManager.globalConfig @@ -34,6 +35,7 @@ class ScopeManageFragment : Fragment() { savedInstanceState: Bundle? ): View { binding = FragmentAppSelectBinding.inflate(inflater, container, false) + binding.adBanner.loadAd(AdRequest.Builder().build()) binding.refreshLayout.setOnRefreshListener { refresh() }.autoRefresh() return binding.root } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 16e6cee..6f9a588 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/toolbar"> + android:scrollbars="none" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/module_status_card"> - \ No newline at end of file + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_app_select.xml b/app/src/main/res/layout/fragment_app_select.xml index 11418ad..0b7c572 100644 --- a/app/src/main/res/layout/fragment_app_select.xml +++ b/app/src/main/res/layout/fragment_app_select.xml @@ -1,13 +1,28 @@ - + + + android:layout_height="0dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/ad_banner"> - \ No newline at end of file + \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index a34b321..28138a1 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -22,6 +22,16 @@ dependencyResolutionManagement { } } +buildscript { + repositories { + google() + mavenCentral() + } + dependencies { + classpath("com.google.gms:google-services:4.3.10") + } +} + rootProject.name = "Hide My Applist" include(":app")