norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

migrate to androidx

Browse Source
This commit is contained in:
Adrian Ulrich 2019-02-09 11:59:55 +01:00
parent 9f65fb3f84
commit 9ce0975d41
12 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@ -28,8 +28,8 @@ android {
}
dependencies {
implementation 'com.android.support:support-core-ui:28.0.0'
implementation 'com.android.support:design:28.0.0'
compileOnly 'com.android.support:support-annotations:28.0.0'
implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
implementation 'com.google.android.material:material:1.0.0'
compileOnly 'androidx.annotation:annotation:1.0.0'
compileOnly 'junit:junit:4.12'
}

2
app/src/main/AndroidManifest.xml
View File

@ -45,7 +45,7 @@ THE SOFTWARE.
android:value="true" />
<provider
android:name="android.support.v4.content.FileProvider"
android:name="androidx.core.content.FileProvider"
android:authorities="ch.blinkenlights.android.vanilla.fileprovider"
android:exported="false"
android:grantUriPermissions="true">

5
app/src/main/java/android/support/iosched/tabs/SlidingTabLayout.java
View File

@ -19,8 +19,6 @@ package android.support.iosched.tabs;
import android.content.Context;
import android.graphics.Typeface;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.util.AttributeSet;
import android.util.SparseArray;
import android.util.TypedValue;
@ -32,6 +30,9 @@ import android.widget.HorizontalScrollView;
import android.widget.LinearLayout;
import android.widget.TextView;
import androidx.viewpager.widget.PagerAdapter;
import androidx.viewpager.widget.ViewPager;
/**
* To be used with ViewPager to provide a tab indicator component which give constant feedback as to
* the user's scroll progress.

3
app/src/main/java/ch/blinkenlights/android/vanilla/LibraryActivity.java
View File

@ -40,7 +40,6 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.support.iosched.tabs.VanillaTabLayout;
import android.support.v4.view.ViewPager;
import android.text.TextUtils;
import android.view.KeyEvent;
import android.view.Menu;
@ -55,6 +54,8 @@ import android.widget.TextView;
import android.widget.SearchView;
import android.widget.Toast;
import androidx.viewpager.widget.ViewPager;
import java.io.File;
import junit.framework.Assert;

6
app/src/main/java/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java
View File

@ -32,8 +32,6 @@ import android.os.Handler;
import android.os.Looper;
import android.os.Message;
import android.os.Parcelable;
import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@ -43,6 +41,10 @@ import android.widget.ListView;
import java.util.Arrays;
import java.util.ArrayList;
import androidx.viewpager.widget.PagerAdapter;
import androidx.viewpager.widget.ViewPager;
/**
* PagerAdapter that manages the library media ListViews.
*/

3
app/src/main/java/ch/blinkenlights/android/vanilla/MediaUtils.java
View File

@ -43,10 +43,11 @@ import android.database.Cursor;
import android.net.Uri;
import android.os.Environment;
import android.provider.MediaStore;
import android.support.v4.content.FileProvider;
import android.database.MatrixCursor;
import android.widget.Toast;
import androidx.core.content.FileProvider;
/**
* Provides some static Song/MediaStore-related utility functions.

3
app/src/main/java/ch/blinkenlights/android/vanilla/Playlist.java
View File

@ -28,10 +28,11 @@ import ch.blinkenlights.android.medialibrary.MediaLibrary;
import android.content.Context;
import android.content.ContentValues;
import android.database.Cursor;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import java.util.ArrayList;
import androidx.annotation.Nullable;
/**
* Provides various playlist-related utility functions.
*/

2
app/src/main/java/ch/blinkenlights/android/vanilla/VanillaImageButton.java
View File

@ -28,7 +28,7 @@ import android.graphics.Color;
import android.graphics.ColorFilter;
import android.graphics.Paint;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
public class VanillaImageButton extends ImageButton {

3
app/src/main/java/ch/blinkenlights/android/vanilla/ui/FancyMenu.java
View File

@ -26,7 +26,6 @@ import ch.blinkenlights.android.vanilla.R;
import ch.blinkenlights.android.vanilla.ThemeHelper;
import android.content.Context;
import android.support.design.widget.BottomSheetDialog;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@ -36,6 +35,8 @@ import android.widget.ListView;
import android.widget.TextView;
import android.widget.ImageView;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import java.util.ArrayList;

2
app/src/main/res/layout-w600dp/library_content.xml
View File

@ -39,7 +39,7 @@ THE SOFTWARE.
android:layout_height="@dimen/row_normal_height"
android:elevation="4dp"
android:background="?tabs_background" />
<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
android:id="@+id/pager"
android:layout_width="fill_parent"
android:layout_height="0px"

2
app/src/main/res/layout/library_content.xml
View File

@ -34,7 +34,7 @@ THE SOFTWARE.
android:layout_height="wrap_content"
android:elevation="4dp"
android:background="?tabs_background" />
<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
android:id="@+id/pager"
android:layout_width="fill_parent"
android:layout_height="0px"

2
gradle.properties Normal file
View File

@ -0,0 +1,2 @@
android.useAndroidX=true
android.enableJetifier=true