Skip to content

Commit dc3b870

Browse files
naman14naman14
committed
migrate to androidx, migrate to firebase crashlytics
1 parent c85d58a commit dc3b870

File tree

100 files changed

+350
-423
lines changed

Some content is hidden

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

100 files changed

+350
-423
lines changed

‎app/build.gradle

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apply plugin: 'com.android.application'
2-
apply plugin: 'io.fabric'
2+
apply plugin: 'com.google.gms.google-services'
3+
apply plugin: 'com.google.firebase.crashlytics'
34

45
android {
56
compileSdkVersion rootProject.compileSdkVersion
6-
buildToolsVersion rootProject.buildToolsVersion
77

88
defaultConfig {
99
applicationId "naman14.timber"
@@ -21,17 +21,12 @@ android {
2121
release {
2222
minifyEnabled false
2323
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
24-
manifestPlaceholders = [ appNameSuffix:""]
2524

2625
}
2726
debug {
28-
ext.enableCrashlytics = false
2927
versionNameSuffix "-debug"
3028
minifyEnabled false
31-
applicationIdSuffix '.dev'
32-
manifestPlaceholders = [ appNameSuffix:" Dev"]
3329

34-
resValue "string", "fabric_api_key", "12345"
3530
resValue "string", "play_billing_license_key", "12345"
3631
resValue "string", "cast_app_id", "12345"
3732

@@ -48,21 +43,20 @@ android {
4843

4944
repositories {
5045
jcenter()
51-
maven { url 'https://maven.fabric.io/public' }
5246
}
5347

5448
dependencies {
5549
implementation fileTree(dir: 'libs', include: ['*.jar'])
56-
implementation "com.android.support:appcompat-v7:$rootProject.supportLibraryVersion"
57-
implementation "com.android.support:design:$rootProject.supportLibraryVersion"
58-
implementation "com.android.support:cardview-v7:$rootProject.supportLibraryVersion"
59-
implementation "com.android.support:recyclerview-v7:$rootProject.supportLibraryVersion"
60-
implementation "com.android.support:palette-v7:$rootProject.supportLibraryVersion"
61-
implementation "com.android.support:percent:$rootProject.supportLibraryVersion"
62-
implementation 'com.android.support:multidex:1.0.1'
50+
implementation "androidx.appcompat:appcompat:1.0.2"
51+
implementation "com.google.android.material:material:1.2.1"
52+
implementation "androidx.cardview:cardview:1.0.0"
53+
implementation "androidx.recyclerview:recyclerview:1.1.0"
54+
implementation "androidx.palette:palette:1.0.0"
55+
implementation "androidx.percentlayout:percentlayout:1.0.0"
56+
implementation 'androidx.multidex:multidex:2.0.1'
6357

64-
implementation "com.android.support:mediarouter-v7:$rootProject.supportLibraryVersion"
65-
implementation 'com.google.android.gms:play-services-cast-framework:11.6.0'
58+
implementation "androidx.mediarouter:mediarouter:1.1.0"
59+
implementation 'com.google.android.gms:play-services-cast-framework:16.1.2'
6660

6761
implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
6862
implementation 'net.steamcrafted:materialiconlib:1.1.4'
@@ -78,9 +72,8 @@ dependencies {
7872
implementation('com.github.naman14:app-theme-engine:0.5.2@aar') {
7973
transitive = true
8074
}
81-
implementation('com.crashlytics.sdk.android:crashlytics:2.6.5@aar') {
82-
transitive = true;
83-
}
75+
implementation 'com.google.firebase:firebase-crashlytics:17.2.2'
76+
8477
implementation 'com.anjlab.android.iab.v3:library:1.0.+'
8578
implementation 'org.nanohttpd:nanohttpd:2.3.1'
8679

‎app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
android:name=".TimberApp"
1919
android:allowBackup="false"
2020
android:icon="@mipmap/ic_launcher"
21-
android:label="Timber${appNameSuffix}"
21+
android:label="Timber"
2222
android:theme="@style/AppTheme.FullScreen.Light"
2323
tools:replace="android:allowBackup, android:label">
2424

2525
<activity
2626
android:name=".activities.MainActivity"
27-
android:label="Timber${appNameSuffix}"
27+
android:label="Timber"
2828
android:screenOrientation="portrait">
2929
<intent-filter>
3030
<action android:name="android.intent.action.MAIN" />
@@ -114,10 +114,6 @@
114114
</intent-filter>
115115
</service>
116116

117-
<!--use your own api key for fabric-->
118-
<meta-data
119-
android:name="io.fabric.ApiKey"
120-
android:value="@string/fabric_api_key" />
121117

122118
<meta-data
123119
android:name=

‎app/src/main/java/com/naman14/timber/MusicPlayer.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
package com.naman14.timber;
1717

18-
import android.Manifest;
1918
import android.app.Activity;
2019
import android.content.ComponentName;
2120
import android.content.ContentResolver;
@@ -25,7 +24,6 @@
2524
import android.content.ContextWrapper;
2625
import android.content.Intent;
2726
import android.content.ServiceConnection;
28-
import android.content.pm.PackageManager;
2927
import android.database.Cursor;
3028
import android.net.Uri;
3129
import android.os.IBinder;
@@ -41,8 +39,6 @@
4139
import java.util.Arrays;
4240
import java.util.WeakHashMap;
4341

44-
import static android.support.v4.content.PermissionChecker.checkSelfPermission;
45-
4642
public class MusicPlayer {
4743

4844
private static final WeakHashMap<Context, ServiceBinder> mConnectionMap;

‎app/src/main/java/com/naman14/timber/MusicService.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,13 @@
5858
import android.provider.MediaStore;
5959
import android.provider.MediaStore.Audio.AlbumColumns;
6060
import android.provider.MediaStore.Audio.AudioColumns;
61-
import android.support.v4.app.NotificationManagerCompat;
61+
import androidx.core.app.NotificationManagerCompat;
6262
import android.support.v4.media.MediaMetadataCompat;
6363
import android.support.v4.media.session.MediaSessionCompat;
6464
import android.support.v4.media.session.PlaybackStateCompat;
65-
import android.support.v7.graphics.Palette;
65+
66+
import androidx.media.app.NotificationCompat;
67+
import androidx.palette.graphics.Palette;
6668
import android.text.TextUtils;
6769
import android.util.Log;
6870

@@ -1270,7 +1272,7 @@ private Notification buildNotification() {
12701272
mNotificationPostTime = System.currentTimeMillis();
12711273
}
12721274

1273-
android.support.v4.app.NotificationCompat.Builder builder = new android.support.v4.app.NotificationCompat.Builder(this, CHANNEL_ID)
1275+
androidx.core.app.NotificationCompat.Builder builder = new androidx.core.app.NotificationCompat.Builder(this, CHANNEL_ID)
12741276
.setSmallIcon(R.drawable.ic_notification)
12751277
.setLargeIcon(artwork)
12761278
.setContentIntent(clickIntent)
@@ -1292,7 +1294,7 @@ private Notification buildNotification() {
12921294

12931295
if (TimberUtils.isLollipop()) {
12941296
builder.setVisibility(Notification.VISIBILITY_PUBLIC);
1295-
android.support.v4.media.app.NotificationCompat.MediaStyle style = new android.support.v4.media.app.NotificationCompat.MediaStyle()
1297+
NotificationCompat.MediaStyle style = new NotificationCompat.MediaStyle()
12961298
.setMediaSession(mSession.getSessionToken())
12971299
.setShowActionsInCompactView(0, 1, 2, 3);
12981300
builder.setStyle(style);

‎app/src/main/java/com/naman14/timber/TimberApp.java

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,9 @@
1414

1515
package com.naman14.timber;
1616

17-
import android.content.Context;
18-
import android.support.multidex.MultiDex;
19-
import android.support.multidex.MultiDexApplication;
17+
import androidx.multidex.MultiDexApplication;
2018

2119
import com.afollestad.appthemeengine.ATE;
22-
import com.crashlytics.android.Crashlytics;
23-
import com.crashlytics.android.core.CrashlyticsCore;
2420
import com.naman14.timber.permissions.Nammu;
2521
import com.naman14.timber.utils.PreferencesUtility;
2622
import com.nostra13.universalimageloader.core.ImageLoader;
@@ -31,11 +27,8 @@
3127
import java.io.IOException;
3228
import java.io.InputStream;
3329

34-
import io.fabric.sdk.android.Fabric;
35-
3630
public class TimberApp extends MultiDexApplication {
3731

38-
3932
private static TimberApp mInstance;
4033

4134
public static synchronized TimberApp getInstance() {
@@ -47,12 +40,6 @@ public void onCreate() {
4740
super.onCreate();
4841
mInstance = this;
4942

50-
//disable crashlytics for debug builds
51-
Crashlytics crashlyticsKit = new Crashlytics.Builder()
52-
.core(new CrashlyticsCore.Builder().disabled(BuildConfig.DEBUG).build())
53-
.build();
54-
Fabric.with(this, crashlyticsKit);
55-
5643
ImageLoaderConfiguration localImageLoaderConfiguration = new ImageLoaderConfiguration.Builder(this).imageDownloader(new BaseImageDownloader(this) {
5744
PreferencesUtility prefs = PreferencesUtility.getInstance(TimberApp.this);
5845

‎app/src/main/java/com/naman14/timber/WearBrowserService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import android.os.AsyncTask;
2525
import android.os.Bundle;
2626
import android.service.media.MediaBrowserService;
27-
import android.support.annotation.Nullable;
27+
import androidx.annotation.Nullable;
2828

2929
import com.naman14.timber.dataloaders.AlbumLoader;
3030
import com.naman14.timber.dataloaders.AlbumSongLoader;

‎app/src/main/java/com/naman14/timber/activities/BaseActivity.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,12 @@
2222
import android.content.IntentFilter;
2323
import android.content.ServiceConnection;
2424
import android.media.AudioManager;
25-
import android.media.session.MediaSessionManager;
2625
import android.os.AsyncTask;
2726
import android.os.Bundle;
2827
import android.os.Handler;
2928
import android.os.IBinder;
30-
import android.support.annotation.Nullable;
31-
import android.support.v4.app.FragmentManager;
29+
import androidx.annotation.Nullable;
30+
import androidx.fragment.app.FragmentManager;
3231
import android.view.Menu;
3332
import android.view.MenuItem;
3433
import android.view.View;
@@ -42,7 +41,6 @@
4241
import com.google.android.gms.cast.framework.Session;
4342
import com.google.android.gms.cast.framework.SessionManager;
4443
import com.google.android.gms.cast.framework.SessionManagerListener;
45-
import com.google.android.gms.cast.framework.media.widget.ExpandedControllerActivity;
4644
import com.google.android.gms.common.ConnectionResult;
4745
import com.google.android.gms.common.GoogleApiAvailability;
4846
import com.naman14.timber.ITimberService;

‎app/src/main/java/com/naman14/timber/activities/BaseThemedActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import android.media.AudioManager;
44
import android.os.Bundle;
5-
import android.support.annotation.Nullable;
5+
import androidx.annotation.Nullable;
66

77
import com.afollestad.appthemeengine.ATEActivity;
88
import com.naman14.timber.utils.Helpers;

‎app/src/main/java/com/naman14/timber/activities/DonateActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import android.content.Intent;
44
import android.os.AsyncTask;
55
import android.os.Bundle;
6-
import android.support.v7.widget.Toolbar;
6+
import androidx.appcompat.widget.Toolbar;
77
import android.view.LayoutInflater;
88
import android.view.MenuItem;
99
import android.view.View;

‎app/src/main/java/com/naman14/timber/activities/MainActivity.java

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,38 +19,28 @@
1919
import android.os.Bundle;
2020
import android.os.Handler;
2121
import android.preference.PreferenceManager;
22-
import android.support.design.widget.NavigationView;
23-
import android.support.design.widget.Snackbar;
24-
import android.support.v4.app.Fragment;
25-
import android.support.v4.app.FragmentManager;
26-
import android.support.v4.app.FragmentTransaction;
27-
import android.support.v4.view.GravityCompat;
28-
import android.support.v4.widget.DrawerLayout;
22+
import com.google.android.material.navigation.NavigationView;
23+
import com.google.android.material.snackbar.Snackbar;
24+
import androidx.fragment.app.Fragment;
25+
import androidx.fragment.app.FragmentManager;
26+
import androidx.fragment.app.FragmentTransaction;
27+
import androidx.core.view.GravityCompat;
28+
import androidx.drawerlayout.widget.DrawerLayout;
2929
import android.view.Gravity;
3030
import android.view.LayoutInflater;
3131
import android.view.Menu;
3232
import android.view.MenuItem;
3333
import android.view.View;
3434
import android.widget.FrameLayout;
3535
import android.widget.ImageView;
36-
import android.widget.RelativeLayout;
3736
import android.widget.TextView;
3837

3938
import com.afollestad.appthemeengine.customizers.ATEActivityThemeCustomizer;
4039
import com.anjlab.android.iab.v3.BillingProcessor;
41-
import com.google.android.gms.cast.framework.CastButtonFactory;
42-
import com.google.android.gms.cast.framework.CastContext;
43-
import com.google.android.gms.cast.framework.CastSession;
44-
import com.google.android.gms.cast.framework.Session;
45-
import com.google.android.gms.cast.framework.SessionManager;
46-
import com.google.android.gms.cast.framework.SessionManagerListener;
4740
import com.google.android.gms.cast.framework.media.widget.ExpandedControllerActivity;
48-
import com.google.android.gms.cast.framework.media.widget.MiniControllerFragment;
4941
import com.naman14.timber.MusicPlayer;
5042
import com.naman14.timber.R;
5143
import com.naman14.timber.cast.ExpandedControlsActivity;
52-
import com.naman14.timber.cast.SimpleSessionManagerListener;
53-
import com.naman14.timber.cast.WebServer;
5444
import com.naman14.timber.fragments.AlbumDetailFragment;
5545
import com.naman14.timber.fragments.ArtistDetailFragment;
5646
import com.naman14.timber.fragments.FoldersFragment;
@@ -68,7 +58,6 @@
6858
import com.nostra13.universalimageloader.core.DisplayImageOptions;
6959
import com.nostra13.universalimageloader.core.ImageLoader;
7060

71-
import java.io.IOException;
7261
import java.util.HashMap;
7362
import java.util.Map;
7463

0 commit comments

Comments
 (0)