Skip to content

Commit d7cb601

Browse files
authored
Merge pull request #373 from AppDevNext/packagename
Sample packagename
2 parents 56e6528 + 2bae059 commit d7cb601

5 files changed

Lines changed: 8 additions & 7 deletions

File tree

LogcatCountlyLib/src/main/java/info/hannes/logging/LoggingApplication.kt renamed to LogcatCountlyLib/src/main/java/info/hannes/logging/LoggingCountlyApplication.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import info.hannes.timber.CountlyTree
66
import info.hannes.timber.DebugFormatTree
77
import timber.log.Timber
88

9-
abstract class LoggingApplication(
9+
abstract class LoggingCountlyApplication(
1010
private val countlyHost: String,
1111
private val countlyKey: String,
1212
private val debugBuildType: Boolean,

sample/src/androidTest/java/info/hannes/logcat/MainActivityTest.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
1010
import androidx.test.filters.SdkSuppress
1111
import androidx.test.rule.GrantPermissionRule
1212
import com.moka.utils.Screenshot
13+
import info.hannes.logcat.sample.MainActivity
1314
import org.hamcrest.Matchers.allOf
1415
import org.junit.Before
1516
import org.junit.Rule

sample/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
package="info.hannes.logcat.sample">
55

66
<application
7-
android:name="info.hannes.logcat.CrashlyticApplication"
7+
android:name=".CrashlyticApplication"
88
android:allowBackup="true"
99
android:icon="@mipmap/ic_launcher"
1010
android:label="@string/app_name"
1111
android:theme="@style/AppTheme"
1212
tools:ignore="AllowBackup,GoogleAppIndexingWarning">
1313

1414
<activity
15-
android:name="info.hannes.logcat.MainActivity"
15+
android:name="info.hannes.logcat.sample.MainActivity"
1616
android:exported="true">
1717
<intent-filter>
1818
<action android:name="android.intent.action.MAIN" />

sample/src/main/java/info/hannes/logcat/CrashlyticApplication.kt renamed to sample/src/main/java/info/hannes/logcat/sample/CrashlyticApplication.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
package info.hannes.logcat
1+
package info.hannes.logcat.sample
22

33
import android.annotation.SuppressLint
44
import android.os.Handler
55
import android.os.Looper
66
import android.provider.Settings
77
import com.google.firebase.crashlytics.FirebaseCrashlytics
88
import info.hannes.crashlytic.CrashlyticsTree
9+
import info.hannes.logcat.LoggingApplication
910
import info.hannes.timber.FileLoggingTree
1011
import timber.log.Timber
1112

@@ -20,7 +21,7 @@ class CrashlyticApplication : LoggingApplication() {
2021
Timber.plant(FileLoggingTree(it, this))
2122
}
2223

23-
FirebaseCrashlytics.getInstance().setCustomKey("VERSION_NAME", BuildConfig.VERSIONNAME)
24+
FirebaseCrashlytics.getInstance().setCustomKey("VERSION_NAME", info.hannes.logcat.ui.BuildConfig.VERSIONNAME)
2425
Timber.plant(CrashlyticsTree(Settings.Secure.getString(applicationContext.contentResolver, Settings.Secure.ANDROID_ID)))
2526

2627
Timber.d("Debug test")

sample/src/main/java/info/hannes/logcat/MainActivity.kt renamed to sample/src/main/java/info/hannes/logcat/sample/MainActivity.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package info.hannes.logcat
1+
package info.hannes.logcat.sample
22

33
import android.content.Intent
44
import android.net.Uri
@@ -10,7 +10,6 @@ import androidx.appcompat.widget.Toolbar
1010
import androidx.core.view.GravityCompat
1111
import androidx.drawerlayout.widget.DrawerLayout
1212
import com.google.android.material.navigation.NavigationView
13-
import info.hannes.logcat.sample.R
1413
import info.hannes.logcat.ui.BothLogActivity
1514
import info.hannes.logcat.ui.LogcatActivity
1615
import info.hannes.logcat.ui.LogfileActivity

0 commit comments

Comments
 (0)