Skip to content
This repository has been archived by the owner on Apr 6, 2022. It is now read-only.

Commit

Permalink
AndroidX migration
Browse files Browse the repository at this point in the history
  • Loading branch information
@tkhho
tkhho committed Apr 12, 2019
1 parent 7b82ebe commit 800f7cb
Show file tree
Hide file tree
Showing 11 changed files with 33 additions and 30 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,6 @@ dependencies {


implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation group: 'com.android.support', name: 'appcompat-v7', version: '28.0.0'
implementation group: 'com.android.support', name: 'design', version: '28.0.0'
implementation group: 'androidx.appcompat', name: 'appcompat', version: '1.0.2'
implementation group: 'com.google.android.material', name: 'material', version: '1.0.0'
}
4 changes: 2 additions & 2 deletions app/src/main/java/net/tpky/demoapp/AboutActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
package net.tpky.demoapp;

import android.content.res.AssetManager;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/net/tpky/demoapp/KeyItemAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
import android.app.Activity;
import android.content.Context;
import android.graphics.Color;
import android.support.annotation.NonNull;
import android.support.v7.widget.AppCompatButton;
import androidx.annotation.NonNull;
import androidx.appcompat.widget.AppCompatButton;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/net/tpky/demoapp/KeyListFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
import android.net.Uri;
import android.os.Bundle;
import android.provider.Settings;
import android.support.design.widget.Snackbar;
import android.support.v4.app.ListFragment;
import android.support.v4.content.ContextCompat;
import com.google.android.material.snackbar.Snackbar;
import androidx.fragment.app.ListFragment;
import androidx.core.content.ContextCompat;
import android.util.Log;
import android.widget.ArrayAdapter;
import android.widget.Toast;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/net/tpky/demoapp/LoginActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
Expand Down
14 changes: 7 additions & 7 deletions app/src/main/java/net/tpky/demoapp/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.design.widget.NavigationView;
import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import androidx.annotation.NonNull;
import com.google.android.material.navigation.NavigationView;
import androidx.core.view.GravityCompat;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import android.util.Log;
import android.view.MenuItem;
import android.view.View;
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/layout/activity_login.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
android:layout_height="wrap_content"
android:orientation="vertical">

<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

Expand All @@ -43,9 +43,9 @@
android:maxLines="1"
android:singleLine="true"/>

</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>

<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

Expand All @@ -61,7 +61,7 @@
android:maxLines="1"
android:singleLine="true"/>

</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>

<Button
android:id="@+id/email_sign_in_button"
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout/activity_main.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.DrawerLayout
<androidx.drawerlayout.widget.DrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
Expand All @@ -14,7 +14,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"/>

<android.support.design.widget.NavigationView
<com.google.android.material.navigation.NavigationView
android:id="@+id/nav_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"
Expand All @@ -23,4 +23,4 @@
app:headerLayout="@layout/nav_header_main"
app:menu="@menu/activity_main_drawer"/>

</android.support.v4.widget.DrawerLayout>
</androidx.drawerlayout.widget.DrawerLayout>
10 changes: 5 additions & 5 deletions app/src/main/res/layout/app_bar_main.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
Expand All @@ -8,20 +8,20 @@
android:fitsSystemWindows="true"
tools:context="net.tpky.demoapp.MainActivity">

<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">

<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"/>

</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>

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

</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/key_item.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@

</LinearLayout>

<android.support.v7.widget.AppCompatButton
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/key_item__trigger_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
Expand Down
3 changes: 3 additions & 0 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ org.gradle.jvmargs=-Xmx1536m
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true

android.enableJetifier=true
android.useAndroidX=true

1 comment on commit 800f7cb

@herrys-rm
Copy link

@herrys-rm herrys-rm commented on 800f7cb Jan 30, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewpager"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<android.support.design.widget.TabLayout
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>

Please sign in to comment.