Skip to content

Commit 8c6b98f

Browse files
author
Vladimir Slatvinski
committed
Merge branch 'development'
2 parents cd4b8ed + a66b436 commit 8c6b98f

File tree

78 files changed

+129
-147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+129
-147
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ android {
99
buildToolsVersion "30.0.3"
1010

1111
defaultConfig {
12-
applicationId "com.apphud.app"
12+
applicationId "com.apphud.demo"
1313
minSdkVersion 23
1414
targetSdkVersion 31
1515
versionCode 21
File renamed without changes.

demo/build.gradle

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
apply plugin: 'com.android.application'
2+
apply plugin: 'kotlin-android'
3+
apply plugin: 'kotlin-kapt'
4+
apply plugin: 'androidx.navigation.safeargs'
5+
6+
android {
7+
8+
compileSdkVersion 32
9+
buildToolsVersion "30.0.3"
10+
11+
defaultConfig {
12+
applicationId "com.apphud.demo"
13+
minSdkVersion 23
14+
targetSdkVersion 32
15+
versionCode 1
16+
versionName "1.0.0"
17+
18+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
19+
}
20+
21+
buildTypes {
22+
release {
23+
minifyEnabled false
24+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
25+
}
26+
}
27+
28+
compileOptions {
29+
targetCompatibility JavaVersion.VERSION_1_8
30+
sourceCompatibility JavaVersion.VERSION_1_8
31+
}
32+
33+
buildFeatures {
34+
viewBinding true
35+
}
36+
kotlinOptions {
37+
jvmTarget = '1.8'
38+
}
39+
}
40+
41+
dependencies {
42+
implementation 'androidx.core:core-ktx:1.7.0'
43+
implementation 'androidx.appcompat:appcompat:1.4.1'
44+
implementation 'com.google.android.material:material:1.6.0'
45+
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
46+
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1'
47+
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
48+
implementation 'androidx.navigation:navigation-fragment-ktx:2.4.2'
49+
implementation 'androidx.navigation:navigation-ui-ktx:2.4.2'
50+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
51+
52+
53+
implementation project(path: ':sdk')
54+
55+
//To use from maven central
56+
//implementation "com.apphud:ApphudSDK-Android:1.6.0"
57+
58+
//To use from jitpack
59+
//implementation "com.github.apphud:ApphudSDK-Android:1.6.0"
60+
61+
implementation 'com.android.billingclient:billing:3.0.0'
62+
63+
testImplementation 'junit:junit:4.13.2'
64+
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
65+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
66+
}
File renamed without changes.

app/src/androidTest/java/com/apphud/app/myapplication/ExampleInstrumentedTest.kt renamed to demo/src/androidTest/java/com/apphud/demo/myapplication/ExampleInstrumentedTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.apphud.app.myapplication
1+
package com.apphud.demo.myapplication
22

33
import androidx.test.platform.app.InstrumentationRegistry
44
import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -19,6 +19,6 @@ class ExampleInstrumentedTest {
1919
fun useAppContext() {
2020
// Context of the app under test.
2121
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
22-
assertEquals("com.apphud.app.myapplication", appContext.packageName)
22+
assertEquals("com.apphud.demo.myapplication", appContext.packageName)
2323
}
2424
}

app/src/main/AndroidManifest.xml renamed to demo/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.apphud.app">
3+
package="com.apphud.demo">
44

55
<application
66
android:name=".ApphudApplication"
File renamed without changes.

app/src/main/java/com/apphud/app/ApphudApplication.kt renamed to demo/src/main/java/com/apphud/demo/ApphudApplication.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.apphud.app
1+
package com.apphud.demo
22

33
import android.app.Application
44
import android.content.Context

app/src/main/java/com/apphud/app/MainActivity.kt renamed to demo/src/main/java/com/apphud/demo/MainActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.apphud.app
1+
package com.apphud.demo
22

33
import android.os.Bundle
44
import android.widget.Toast
@@ -11,7 +11,7 @@ import androidx.navigation.ui.navigateUp
1111
import androidx.navigation.ui.setupActionBarWithNavController
1212
import androidx.drawerlayout.widget.DrawerLayout
1313
import androidx.core.view.GravityCompat
14-
import com.apphud.app.databinding.ActivityMainBinding
14+
import com.apphud.demo.databinding.ActivityMainBinding
1515

1616
class MainActivity : AppCompatActivity() {
1717

app/src/main/java/com/apphud/app/ui/customer/CustomerFragment.kt renamed to demo/src/main/java/com/apphud/demo/ui/customer/CustomerFragment.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.apphud.app.ui.customer
1+
package com.apphud.demo.ui.customer
22

33
import android.os.Bundle
44
import android.view.LayoutInflater
@@ -12,9 +12,9 @@ import androidx.navigation.fragment.findNavController
1212
import androidx.recyclerview.widget.DividerItemDecoration
1313
import androidx.recyclerview.widget.RecyclerView
1414
import com.android.billingclient.api.SkuDetails
15-
import com.apphud.app.BuildConfig
16-
import com.apphud.app.R
17-
import com.apphud.app.databinding.FragmentCustomerBinding
15+
import com.apphud.demo.BuildConfig
16+
import com.apphud.demo.R
17+
import com.apphud.demo.databinding.FragmentCustomerBinding
1818
import com.apphud.sdk.Apphud
1919
import com.apphud.sdk.ApphudError
2020
import com.apphud.sdk.ApphudListener

0 commit comments

Comments
 (0)