Skip to content

Commit

Permalink
fix : replace with new library module
Browse files Browse the repository at this point in the history
  • Loading branch information
FenilInfy0m authored and FenilInfy0m committed Jan 3, 2024
1 parent 9677b7b commit 276e3bc
Show file tree
Hide file tree
Showing 55 changed files with 87 additions and 67 deletions.
Binary file modified .DS_Store
Binary file not shown.
Binary file modified .gradle/8.2/executionHistory/executionHistory.bin
Binary file not shown.
Binary file modified .gradle/8.2/executionHistory/executionHistory.lock
Binary file not shown.
Binary file modified .gradle/8.2/fileHashes/fileHashes.bin
Binary file not shown.
Binary file modified .gradle/8.2/fileHashes/fileHashes.lock
Binary file not shown.
Binary file modified .gradle/8.2/fileHashes/resourceHashesCache.bin
Binary file not shown.
Binary file modified .gradle/buildOutputCleanup/buildOutputCleanup.lock
Binary file not shown.
Binary file modified .gradle/buildOutputCleanup/outputFiles.bin
Binary file not shown.
Binary file modified .gradle/file-system.probe
Binary file not shown.
2 changes: 1 addition & 1 deletion .idea/.name

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

2 changes: 1 addition & 1 deletion .idea/gradle.xml

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

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

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

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

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

6 changes: 6 additions & 0 deletions .idea/modules/adsSdk/AdsManager.adssdk.unitTest.iml

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

6 changes: 0 additions & 6 deletions .idea/modules/adsSdk/Infyom_AdsSdk.adsSdk.unitTest.iml

This file was deleted.

6 changes: 6 additions & 0 deletions .idea/modules/app/AdsManager.app.androidTest.iml

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

6 changes: 6 additions & 0 deletions .idea/modules/app/AdsManager.app.iml

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

6 changes: 6 additions & 0 deletions .idea/modules/app/AdsManager.app.main.iml

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

6 changes: 6 additions & 0 deletions .idea/modules/app/AdsManager.app.unitTest.iml

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

6 changes: 0 additions & 6 deletions .idea/modules/app/Infyom_AdsSdk.app.androidTest.iml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/modules/app/Infyom_AdsSdk.app.iml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/modules/app/Infyom_AdsSdk.app.main.iml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/modules/app/Infyom_AdsSdk.app.unitTest.iml

This file was deleted.

Empty file.

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

Empty file.

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

10 changes: 9 additions & 1 deletion .idea/sonarlint/issuestore/index.pb

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

Empty file.
Empty file.
Empty file.
Empty file.
10 changes: 9 additions & 1 deletion .idea/sonarlint/securityhotspotstore/index.pb

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

2 changes: 0 additions & 2 deletions adsSdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ android {

defaultConfig {
minSdk 24
targetSdk 34

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
Expand All @@ -30,7 +29,6 @@ dependencies {

implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.11.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
Expand Down
6 changes: 1 addition & 5 deletions adsSdk/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,4 @@

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile

-keep class com.infyom.adssdk.AdsAccountProvider.** {*;}
-keep class com.infyom.adssdk.adModel.** {*;}
-keep class com.infyom.adssdk.**{*;}
#-renamesourcefileattribute SourceFile
2 changes: 0 additions & 2 deletions adsSdk/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="com.google.android.gms.permission.AD_ID" />


</manifest>
1 change: 0 additions & 1 deletion adsSdk/src/main/java/com/infyom/adssdk/InfyOmAds.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import android.os.Handler;
import android.view.View;
import android.widget.RelativeLayout;
import android.widget.Toast;

import com.facebook.ads.AdSettings;
import com.facebook.ads.AudienceNetworkAds;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import android.widget.TextView;

import androidx.annotation.NonNull;

import com.google.android.gms.ads.AdListener;
import com.google.android.gms.ads.AdLoader;
import com.google.android.gms.ads.AdRequest;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import android.widget.TextView;

import androidx.annotation.NonNull;

import com.google.android.gms.ads.AdListener;
import com.google.android.gms.ads.AdLoader;
import com.google.android.gms.ads.AdRequest;
Expand Down
Binary file removed adsSdk/src/main/res/.DS_Store
Binary file not shown.
8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ plugins {
}

android {
namespace 'com.infyOm.adssdk'
namespace 'com.infyom.adsmanager'
compileSdk 34

defaultConfig {
applicationId "com.infyOm.adssdk"
applicationId "com.infyom.adsmanager"
minSdk 24
targetSdk 34
versionCode 1
versionName "1.0"
versionName "1.0.0"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand All @@ -29,7 +29,7 @@ android {
}

dependencies {
implementation project(path: ':adsSdk')
implementation project(path: ':adssdk')

implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.11.0'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.infyOm.adssdk;
package com.infyom.adsmanager;

import android.os.Bundle;
import android.os.Handler;
Expand All @@ -9,6 +9,7 @@

import com.infyom.adssdk.adUtils.nativeAd.NativeUtilsBig;


public class FullNativeActivity extends AppCompatActivity {
boolean isLoaded = false;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.infyOm.adssdk;
package com.infyom.adsmanager;

import android.content.Intent;
import android.os.Bundle;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.infyOm.adssdk;
package com.infyom.adsmanager;

import android.content.Intent;
import android.os.Bundle;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.infyOm.adssdk;
package com.infyom.adsmanager;

import android.content.Intent;
import android.os.Bundle;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.infyOm.adssdk;
package com.infyom.adsmanager;

import android.content.Intent;
import android.os.Bundle;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.infyOm.adssdk;
package com.infyom.adsmanager;

import android.app.Activity;
import android.app.Application;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.infyOm.adssdk;
package com.infyom.adsmanager;

import android.animation.Animator;
import android.animation.ObjectAnimator;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
android:layout_height="56dp"
android:gravity="center"/>

<com.infyOm.adssdk.ShimmerLayout
<com.infyom.adsmanager.ShimmerLayout
android:id="@+id/shimmer_space"
android:layout_width="match_parent"
android:layout_height="56dp"
Expand All @@ -51,7 +51,7 @@
android:background="@color/white"/>
</RelativeLayout>

</com.infyOm.adssdk.ShimmerLayout>
</com.infyom.adsmanager.ShimmerLayout>
</RelativeLayout>

</LinearLayout>
4 changes: 2 additions & 2 deletions app/src/main/res/layout/activity_main_2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
android:layout_height="56dp"
android:gravity="center"/>

<com.infyOm.adssdk.ShimmerLayout
<com.infyom.adsmanager.ShimmerLayout
android:id="@+id/shimmer_space"
android:layout_width="match_parent"
android:layout_height="56dp"
Expand All @@ -49,7 +49,7 @@
android:background="@color/white"/>
</RelativeLayout>

</com.infyOm.adssdk.ShimmerLayout>
</com.infyom.adsmanager.ShimmerLayout>
</RelativeLayout>


Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '8.2.0' apply false
id 'com.android.library' version '8.2.0' apply false
id 'com.android.library' version '8.2.0' apply false
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Wed Jan 03 12:33:21 IST 2024
#Wed Jan 03 15:50:08 IST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
Expand Down
4 changes: 2 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ dependencyResolutionManagement {
}
}

rootProject.name = "Infyom AdsSdk"
rootProject.name = "AdsManager"
include ':app'
include ':adsSdk'
include ':adssdk'

0 comments on commit 276e3bc

Please sign in to comment.