diff options
author | Harsh Shandilya <msfjarvis@gmail.com> | 2018-10-12 19:36:04 +0530 |
---|---|---|
committer | حسين <zidhussein@gmail.com> | 2018-10-12 15:06:04 +0100 |
commit | 483e8d9310aea2e8bb88f77b89c0affdb8794427 (patch) | |
tree | 309301ce9b8ed64af37ab4a4c5c1c45bdddb2d78 /app/src/main/res | |
parent | b8c5dd85a6e32c47bee1bbb531846e6aef0dcb30 (diff) |
Migrate to AndroidX (#430)
* Update gradle and external dependencies
- Switch away from deprecated compile directive
- Remove explicit buildToolsVersion, is defined by the gradle plugin now
- Fix build in SelectFolderActivity
Signed-off-by: Harsh Shandilya <harsh@prjkt.io>
* Upgrade gradle plugin and wrapper to latest alpha
Signed-off-by: Harsh Shandilya <harsh@prjkt.io>
* Don't use alpha gradle plugin
Signed-off-by: Harsh Shandilya <harsh@prjkt.io>
* Migrate to AndroidX
https://developer.android.com/jetpack/androidx/
Signed-off-by: Harsh Shandilya <harsh@prjkt.io>
* Upgrade AndroidX dependencies to stable release
Signed-off-by: Harsh Shandilya <harsh@prjkt.io>
* Enable Jetifier
Signed-off-by: Harsh Shandilya <harsh@prjkt.io>
* SelectFolderFragment: Fix build
Signed-off-by: Harsh Shandilya <harsh@prjkt.io>
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/layout/activity_git_config.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/layout/autofill_recycler_view.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/layout/fragment_autofill.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/layout/fragment_ssh_keygen.xml | 8 | ||||
-rw-r--r-- | app/src/main/res/layout/git_passphrase_layout.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/layout/otp_confirm_layout.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/layout/password_recycler_view.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/menu/autofill_preference.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/menu/main_menu.xml | 2 |
9 files changed, 18 insertions, 18 deletions
diff --git a/app/src/main/res/layout/activity_git_config.xml b/app/src/main/res/layout/activity_git_config.xml index 2174ffb6..ec835aab 100644 --- a/app/src/main/res/layout/activity_git_config.xml +++ b/app/src/main/res/layout/activity_git_config.xml @@ -1,4 +1,4 @@ -<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.constraintlayout.widget.ConstraintLayout 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" android:id="@+id/scrollView2" @@ -147,4 +147,4 @@ tools:ignore="HardcodedText" /> -</android.support.constraint.ConstraintLayout> +</androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/autofill_recycler_view.xml b/app/src/main/res/layout/autofill_recycler_view.xml index 6260be08..c947d58a 100644 --- a/app/src/main/res/layout/autofill_recycler_view.xml +++ b/app/src/main/res/layout/autofill_recycler_view.xml @@ -4,7 +4,7 @@ android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto"> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/autofill_recycler" android:layout_width="match_parent" android:layout_height="match_parent" @@ -19,7 +19,7 @@ android:indeterminate="true" android:visibility="gone" /> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/fab" android:src="@drawable/ic_add_white_48dp" android:layout_width="wrap_content" diff --git a/app/src/main/res/layout/fragment_autofill.xml b/app/src/main/res/layout/fragment_autofill.xml index 652ea1db..7f09f0cb 100644 --- a/app/src/main/res/layout/fragment_autofill.xml +++ b/app/src/main/res/layout/fragment_autofill.xml @@ -11,7 +11,7 @@ android:paddingRight="24dp" android:paddingTop="20dp"> - <android.support.design.widget.TextInputLayout + <com.google.android.material.textfield.TextInputLayout android:layout_width="match_parent" android:layout_height="wrap_content" app:hintTextAppearance="@style/TextAppearance.AppCompat"> @@ -23,7 +23,7 @@ android:hint="URL" android:inputType="textUri" tools:ignore="HardcodedText" /> - </android.support.design.widget.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> <RadioGroup android:id="@+id/autofill_radiogroup" diff --git a/app/src/main/res/layout/fragment_ssh_keygen.xml b/app/src/main/res/layout/fragment_ssh_keygen.xml index 7ad3b951..12961292 100644 --- a/app/src/main/res/layout/fragment_ssh_keygen.xml +++ b/app/src/main/res/layout/fragment_ssh_keygen.xml @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:spinnerMode="dropdown" /> - <android.support.design.widget.TextInputLayout + <com.google.android.material.textfield.TextInputLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" @@ -37,7 +37,7 @@ android:hint="@string/ssh_keygen_passphrase" android:importantForAccessibility="no" android:inputType="textPassword" /> - </android.support.design.widget.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> <CheckBox android:id="@+id/show_passphrase" @@ -47,7 +47,7 @@ android:checked="false" android:text="@string/ssh_keygen_show_passphrase" /> - <android.support.design.widget.TextInputLayout + <com.google.android.material.textfield.TextInputLayout android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" @@ -59,7 +59,7 @@ android:layout_height="wrap_content" android:hint="@string/ssh_keygen_comment" android:inputType="text" /> - </android.support.design.widget.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> <Button android:id="@+id/generate_ssh_key" diff --git a/app/src/main/res/layout/git_passphrase_layout.xml b/app/src/main/res/layout/git_passphrase_layout.xml index 6edd3d02..b1bda920 100644 --- a/app/src/main/res/layout/git_passphrase_layout.xml +++ b/app/src/main/res/layout/git_passphrase_layout.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.constraintlayout.widget.ConstraintLayout 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" android:id="@+id/linearLayout" @@ -32,4 +32,4 @@ app:layout_constraintRight_toRightOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/sshkey_passphrase" /> -</android.support.constraint.ConstraintLayout>
\ No newline at end of file +</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/otp_confirm_layout.xml b/app/src/main/res/layout/otp_confirm_layout.xml index d2cb597e..e9bcfbc5 100644 --- a/app/src/main/res/layout/otp_confirm_layout.xml +++ b/app/src/main/res/layout/otp_confirm_layout.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.constraintlayout.widget.ConstraintLayout 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" android:layout_width="match_parent" @@ -18,4 +18,4 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> -</android.support.constraint.ConstraintLayout>
\ No newline at end of file +</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/password_recycler_view.xml b/app/src/main/res/layout/password_recycler_view.xml index 9c56210f..679267d2 100644 --- a/app/src/main/res/layout/password_recycler_view.xml +++ b/app/src/main/res/layout/password_recycler_view.xml @@ -7,13 +7,13 @@ android:orientation="vertical" tools:context="com.zeapo.pwdstore.PasswordFragment"> - <android.support.v7.widget.RecyclerView + <androidx.recyclerview.widget.RecyclerView android:id="@+id/pass_recycler" android:scrollbars="vertical" android:layout_width="match_parent" android:layout_height="match_parent"/> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/fab" android:src="@drawable/ic_add_white_48dp" android:layout_width="wrap_content" diff --git a/app/src/main/res/menu/autofill_preference.xml b/app/src/main/res/menu/autofill_preference.xml index 31f694e0..08736bf9 100644 --- a/app/src/main/res/menu/autofill_preference.xml +++ b/app/src/main/res/menu/autofill_preference.xml @@ -6,7 +6,7 @@ android:id="@+id/action_search" android:icon="@drawable/ic_search_white_24dp" android:title="@string/action_search" - pwstore:actionViewClass="android.support.v7.widget.SearchView" + pwstore:actionViewClass="androidx.appcompat.widget.SearchView" pwstore:showAsAction="ifRoom|collapseActionView"/> </menu>
\ No newline at end of file diff --git a/app/src/main/res/menu/main_menu.xml b/app/src/main/res/menu/main_menu.xml index 730b7533..f099913b 100644 --- a/app/src/main/res/menu/main_menu.xml +++ b/app/src/main/res/menu/main_menu.xml @@ -7,7 +7,7 @@ android:title="@string/action_search" android:icon="@drawable/ic_search_white_24dp" pwstore:showAsAction="ifRoom|collapseActionView" - pwstore:actionViewClass="android.support.v7.widget.SearchView" /> + pwstore:actionViewClass="androidx.appcompat.widget.SearchView" /> <!--<item android:id="@+id/menu_add_category"--> <!--android:title="New category"/>--> |