Skip to content

Commit 60ffd2c

Browse files
andremionandremion
committed
Target sdk version 29 and use Jetpack
1 parent e13f6ba commit 60ffd2c

File tree

10 files changed

+44
-62
lines changed

10 files changed

+44
-62
lines changed

‎build.gradle‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2-
31
buildscript {
42
repositories {
5-
jcenter()
63
google()
4+
jcenter()
75
}
86
dependencies {
97
classpath 'com.android.tools.build:gradle:3.5.0'
@@ -12,14 +10,14 @@ buildscript {
1210

1311
allprojects {
1412
repositories {
15-
jcenter()
1613
google()
14+
jcenter()
1715
}
1816
ext {
19-
compileSdkVersion = 27
17+
compileSdkVersion = 29
2018
minSdkVersion = 21
21-
targetSdkVersion = 27
22-
supportLibraryVersion = '27.0.2'
19+
targetSdkVersion = 29
20+
materialDesignVersion = '1.0.0'
2321
junitVersion = '4.12'
2422
}
2523
}

‎library/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ android {
1919
}
2020

2121
dependencies {
22-
compile fileTree(dir: 'libs', include: ['*.jar'])
23-
compile "com.android.support:design:$supportLibraryVersion"
22+
implementation fileTree(dir: 'libs', include: ['*.jar'])
23+
implementation "com.google.android.material:material:$materialDesignVersion"
2424
}

‎library/src/main/java/com/andremion/floatingnavigationview/FloatingNavigationView.java‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2016. André Mion
2+
* Copyright (c) 2019. André Mion
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -28,20 +28,6 @@
2828
import android.graphics.drawable.AnimatedVectorDrawable;
2929
import android.os.Parcel;
3030
import android.os.Parcelable;
31-
import android.support.annotation.IdRes;
32-
import android.support.annotation.LayoutRes;
33-
import android.support.annotation.MenuRes;
34-
import android.support.annotation.NonNull;
35-
import android.support.annotation.Nullable;
36-
import android.support.design.internal.NavigationMenuView;
37-
import android.support.design.widget.CoordinatorLayout;
38-
import android.support.design.widget.FloatingActionButton;
39-
import android.support.design.widget.NavigationView;
40-
import android.support.v4.content.ContextCompat;
41-
import android.support.v4.os.ParcelableCompat;
42-
import android.support.v4.os.ParcelableCompatCreatorCallbacks;
43-
import android.support.v4.view.AbsSavedState;
44-
import android.support.v4.view.MotionEventCompat;
4531
import android.util.AttributeSet;
4632
import android.util.SparseArray;
4733
import android.view.Gravity;
@@ -55,6 +41,22 @@
5541
import android.widget.FrameLayout;
5642
import android.widget.ImageView;
5743

44+
import com.google.android.material.floatingactionbutton.FloatingActionButton;
45+
import com.google.android.material.internal.NavigationMenuView;
46+
import com.google.android.material.navigation.NavigationView;
47+
48+
import androidx.annotation.IdRes;
49+
import androidx.annotation.LayoutRes;
50+
import androidx.annotation.MenuRes;
51+
import androidx.annotation.NonNull;
52+
import androidx.annotation.Nullable;
53+
import androidx.coordinatorlayout.widget.CoordinatorLayout;
54+
import androidx.core.content.ContextCompat;
55+
import androidx.core.os.ParcelableCompat;
56+
import androidx.core.os.ParcelableCompatCreatorCallbacks;
57+
import androidx.core.view.MotionEventCompat;
58+
import androidx.customview.view.AbsSavedState;
59+
5860
@SuppressWarnings({"FieldCanBeLocal", "InflateParams", "RtlHardcoded", "unused", "WeakerAccess"})
5961
public class FloatingNavigationView extends FloatingActionButton {
6062

‎library/src/main/res/layout/navigation_view.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!-- Copyright (c) 2016. André Mion
2+
<!-- Copyright (c) 2019. André Mion
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
-->
16-
<android.support.design.widget.NavigationView
16+
<com.google.android.material.navigation.NavigationView
1717
xmlns:android="http://schemas.android.com/apk/res/android"
1818
xmlns:tools="http://schemas.android.com/tools"
1919
android:id="@+id/navigation_view"
@@ -30,4 +30,4 @@
3030
android:scaleType="center"
3131
tools:src="@drawable/ic_menu_vector" />
3232

33-
</android.support.design.widget.NavigationView>
33+
</com.google.android.material.navigation.NavigationView>

‎sample/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ android {
1919
}
2020

2121
dependencies {
22-
compile fileTree(dir: 'libs', include: ['*.jar'])
23-
compile project(':library')
24-
compile "com.android.support:design:$supportLibraryVersion"
22+
implementation fileTree(dir: 'libs', include: ['*.jar'])
23+
implementation project(':library')
24+
implementation "com.google.android.material:material:$materialDesignVersion"
2525
}

‎sample/src/main/AndroidManifest.xml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.andremion.floatingnavigationview.sample">
2+
<manifest package="com.andremion.floatingnavigationview.sample"
3+
xmlns:android="http://schemas.android.com/apk/res/android">
44

55
<application
66
android:allowBackup="true"
77
android:icon="@mipmap/ic_launcher"
88
android:label="@string/app_name"
99
android:supportsRtl="true"
1010
android:theme="@style/AppTheme">
11-
<activity
12-
android:name=".MainActivity"
13-
android:label="@string/app_name"
14-
android:theme="@style/AppTheme.NoActionBar">
11+
<activity android:name=".MainActivity">
1512
<intent-filter>
1613
<action android:name="android.intent.action.MAIN" />
1714

‎sample/src/main/java/com/andremion/floatingnavigationview/sample/MainActivity.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package com.andremion.floatingnavigationview.sample;
22

33
import android.os.Bundle;
4-
import android.support.design.widget.NavigationView;
5-
import android.support.design.widget.Snackbar;
6-
import android.support.v7.app.AppCompatActivity;
7-
import android.support.v7.widget.Toolbar;
84
import android.view.MenuItem;
95
import android.view.View;
106

117
import com.andremion.floatingnavigationview.FloatingNavigationView;
8+
import com.google.android.material.navigation.NavigationView;
9+
import com.google.android.material.snackbar.Snackbar;
10+
11+
import androidx.appcompat.app.AppCompatActivity;
12+
import androidx.appcompat.widget.Toolbar;
1213

1314
public class MainActivity extends AppCompatActivity {
1415

‎sample/src/main/res/layout/activity_main.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
66
android:layout_height="match_parent"
77
android:fitsSystemWindows="true"
88
tools:context=".MainActivity">
99

10-
<android.support.design.widget.AppBarLayout
10+
<com.google.android.material.appbar.AppBarLayout
1111
android:layout_width="match_parent"
1212
android:layout_height="wrap_content"
1313
android:theme="@style/AppTheme.AppBarOverlay">
1414

15-
<android.support.v7.widget.Toolbar
15+
<androidx.appcompat.widget.Toolbar
1616
android:id="@+id/toolbar"
1717
android:layout_width="match_parent"
1818
android:layout_height="?attr/actionBarSize"
1919
android:background="?attr/colorPrimary"
2020
app:popupTheme="@style/AppTheme.PopupOverlay" />
2121

22-
</android.support.design.widget.AppBarLayout>
22+
</com.google.android.material.appbar.AppBarLayout>
2323

2424
<include layout="@layout/content_main" />
2525

@@ -34,4 +34,4 @@
3434
app:layout_anchorGravity="bottom|end"
3535
app:menu="@menu/navigation_view" />
3636

37-
</android.support.design.widget.CoordinatorLayout>
37+
</androidx.coordinatorlayout.widget.CoordinatorLayout>

‎sample/src/main/res/values-v21/styles.xml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎sample/src/main/res/values/styles.xml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
<resources>
22

3-
<!-- Base application theme. -->
4-
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
5-
<!-- Customize your theme here. -->
3+
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
64
<item name="colorPrimary">@color/colorPrimary</item>
75
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
86
<item name="colorAccent">@color/colorAccent</item>
97
</style>
108

11-
<style name="AppTheme.NoActionBar">
12-
<item name="windowActionBar">false</item>
13-
<item name="windowNoTitle">true</item>
14-
</style>
15-
169
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
1710

1811
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />

0 commit comments

Comments
 (0)