Skip to content

Commit

Permalink
AndroidX migrate
Browse files Browse the repository at this point in the history
  • Loading branch information
dibakarece committed Dec 26, 2018
1 parent 7af3033 commit a5d2856
Show file tree
Hide file tree
Showing 20 changed files with 91 additions and 3,082 deletions.
Binary file added .idea/caches/build_file_checksums.ser
Binary file not shown.
29 changes: 29 additions & 0 deletions .idea/codeStyles/Project.xml

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

22 changes: 0 additions & 22 deletions .idea/compiler.xml

This file was deleted.

3 changes: 0 additions & 3 deletions .idea/copyright/profiles_settings.xml

This file was deleted.

1 change: 0 additions & 1 deletion .idea/gradle.xml

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

15 changes: 10 additions & 5 deletions .idea/misc.xml

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

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

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

30 changes: 16 additions & 14 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 26
compileSdkVersion 28
defaultConfig {
applicationId "dm.audiostreamerdemo"
minSdkVersion 16
targetSdkVersion 25
versionCode 4
versionName "1.0.3"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
targetSdkVersion 28
versionCode 5
versionName "1.0.5"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
Expand All @@ -19,15 +19,17 @@ android {
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
//compile project(path: ':dmaudiostreamer')
compile 'com.github.dibakarece:dmaudiostreamer:v1.0.4'
compile'com.nineoldandroids:library:2.4.0'
compile 'com.android.support:appcompat-v7:26.1.0'
compile 'com.google.code.gson:gson:2.6.2'

androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation project(path: ':dmaudiostreamer')
// compile 'com.github.dibakarece:dmaudiostreamer:v1.0.4'
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'androidx.mediarouter:mediarouter:1.0.0'
implementation'com.nineoldandroids:library:2.4.0'
implementation 'com.google.code.gson:gson:2.6.2'
implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
implementation 'com.github.hannesa2:AndroidSlidingUpPanel:3.5.0'
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.1', {
exclude group: 'com.android.support', module: 'support-annotations'
})
testCompile 'junit:junit:4.12'
testImplementation 'junit:junit:4.12'
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package dm.audiostreamerdemo;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;
import androidx.test.InstrumentationRegistry;
import androidx.test.runner.AndroidJUnit4;

import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down
34 changes: 17 additions & 17 deletions app/src/main/java/dm/audiostreamerdemo/activity/MusicActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
import android.graphics.Color;
import android.os.Bundle;
import android.support.v4.media.session.PlaybackStateCompat;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.text.format.DateUtils;
import android.view.View;
import android.widget.ImageView;
Expand All @@ -28,12 +26,15 @@
import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
import com.sothree.slidinguppanel.SlidingUpPanelLayout;

import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;

import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import dm.audiostreamer.AudioStreamingManager;
import dm.audiostreamer.CurrentSessionCallback;
import dm.audiostreamer.Logger;
Expand All @@ -42,7 +43,6 @@
import dm.audiostreamerdemo.adapter.AdapterMusic;
import dm.audiostreamerdemo.network.MusicBrowser;
import dm.audiostreamerdemo.network.MusicLoaderListener;
import dm.audiostreamerdemo.slidinguppanel.SlidingUpPanelLayout;
import dm.audiostreamerdemo.widgets.LineProgress;
import dm.audiostreamerdemo.widgets.PlayPauseView;
import dm.audiostreamerdemo.widgets.Slider;
Expand Down Expand Up @@ -341,9 +341,9 @@ public void onClick(View v) {
audioPg.setMax(0);
audioPg.setOnValueChangedListener(this);

mLayout.setPanelSlideListener(new SlidingUpPanelLayout.PanelSlideListener() {
mLayout.addPanelSlideListener(new SlidingUpPanelLayout.PanelSlideListener() {
@Override
public void onPanelSlide(View panel, float slideOffset) {
public void onPanelSlide(View view, float slideOffset) {
if (slideOffset == 0.0f) {
isExpand = false;
slideBottomView.setVisibility(View.VISIBLE);
Expand All @@ -358,22 +358,22 @@ public void onPanelSlide(View panel, float slideOffset) {
}

@Override
public void onPanelExpanded(View panel) {
isExpand = true;
}
public void onPanelStateChanged(View view, SlidingUpPanelLayout.PanelState panelState, SlidingUpPanelLayout.PanelState panelState1) {
switch (panelState) {
case EXPANDED:
isExpand = true;
break;
case COLLAPSED:
isExpand = false;
break;
default:
isExpand = false;
break;
}

@Override
public void onPanelCollapsed(View panel) {
isExpand = false;
}

@Override
public void onPanelAnchored(View panel) {
}

@Override
public void onPanelHidden(View panel) {
}
});

musicList = (ListView) findViewById(R.id.musicList);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
import android.content.Context;
import android.content.Intent;
import android.os.Handler;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;

import androidx.appcompat.app.AppCompatActivity;
import dm.audiostreamerdemo.R;

public class SplashActivity extends AppCompatActivity {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
import android.graphics.Bitmap;
import android.graphics.drawable.AnimationDrawable;
import android.graphics.drawable.Drawable;
import android.support.v4.content.ContextCompat;
import android.support.v4.graphics.drawable.DrawableCompat;
import android.support.v4.media.session.PlaybackStateCompat;
import android.view.LayoutInflater;
import android.view.View;
Expand All @@ -33,6 +31,8 @@
import java.util.LinkedList;
import java.util.List;

import androidx.core.content.ContextCompat;
import androidx.core.graphics.drawable.DrawableCompat;
import dm.audiostreamer.MediaMetaData;
import dm.audiostreamerdemo.R;

Expand Down
Loading

0 comments on commit a5d2856

Please sign in to comment.