wallabag/android-app
1
0
Fork 0
mirror of https://github.com/wallabag/android-app.git synced 2026-05-19 15:10:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrate to AndroidX

Browse Source 
Signed-off-by: Harsh Shandilya <msfjarvis@gmail.com>
This commit is contained in:
Harsh Shandilya
2019-08-15 15:40:13 +05:30
committed by Thomas Citharel
parent 25cbff88a5
commit f833ecf75b
38 changed files with 125 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/build.gradle
+4 -4
View File
@@ -54,10 +54,10 @@ greendao {
}
dependencies {
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:support-v4:28.0.0'
implementation 'com.android.support:recyclerview-v7:28.0.0'
implementation 'com.android.support:design:28.0.0'
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'androidx.recyclerview:recyclerview:1.0.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'org.greenrobot:eventbus:3.0.0'
implementation 'org.greenrobot:greendao:3.2.2'
annotationProcessor 'org.greenrobot:eventbus-annotation-processor:3.1.1'
app/src/main/AndroidManifest.xml
+2 -2
View File
@@ -93,7 +93,7 @@
</intent-filter>
</activity>
<receiver android:name="android.support.v4.media.session.MediaButtonReceiver">
<receiver android:name="androidx.media.session.MediaButtonReceiver">
<intent-filter>
<action android:name="android.intent.action.MEDIA_BUTTON" />
</intent-filter>
@@ -149,7 +149,7 @@
android:exported="false" />
<provider
android:name="android.support.v4.content.FileProvider"
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
app/src/main/java/fr/gaulupeau/apps/Poche/data/ListAdapter.java
+1 -1
View File
@@ -1,7 +1,7 @@
package fr.gaulupeau.apps.Poche.data;
import android.content.Context;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
app/src/main/java/fr/gaulupeau/apps/Poche/data/StorageHelper.java
+1 -1
View File
@@ -1,6 +1,6 @@
package fr.gaulupeau.apps.Poche.data;
import android.support.v4.content.ContextCompat;
import androidx.core.content.ContextCompat;
import android.util.Log;
import java.io.File;
app/src/main/java/fr/gaulupeau/apps/Poche/data/TagListAdapter.java
+2 -2
View File
@@ -1,7 +1,7 @@
package fr.gaulupeau.apps.Poche.data;
import android.support.annotation.LayoutRes;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.LayoutRes;
import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
app/src/main/java/fr/gaulupeau/apps/Poche/events/EventProcessor.java
+2 -2
View File
@@ -8,8 +8,8 @@ import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.os.Handler;
import android.support.v4.app.NotificationCompat;
import android.support.v4.content.FileProvider;
import androidx.core.app.NotificationCompat;
import androidx.core.content.FileProvider;
import android.util.Log;
import android.webkit.MimeTypeMap;
import android.widget.Toast;
app/src/main/java/fr/gaulupeau/apps/Poche/service/WallabagJobService.java
+1 -1
View File
@@ -7,7 +7,7 @@ import android.app.job.JobService;
import android.content.ComponentName;
import android.content.Context;
import android.os.Build;
import android.support.annotation.RequiresApi;
import androidx.annotation.RequiresApi;
import android.util.Log;
import org.greenrobot.eventbus.EventBus;
app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsFragment.java
+3 -3
View File
@@ -17,9 +17,9 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
import android.speech.tts.TextToSpeech;
import android.support.annotation.NonNull;
import android.support.annotation.StringRes;
import android.support.v4.app.Fragment;
import androidx.annotation.NonNull;
import androidx.annotation.StringRes;
import androidx.fragment.app.Fragment;
import android.support.v4.media.session.MediaControllerCompat;
import android.support.v4.media.session.PlaybackStateCompat;
import android.util.Log;
app/src/main/java/fr/gaulupeau/apps/Poche/tts/TtsService.java
+7 -6
View File
@@ -19,16 +19,17 @@ import android.os.Handler;
import android.os.IBinder;
import android.os.SystemClock;
import android.speech.tts.TextToSpeech;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v4.app.NotificationManagerCompat;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.app.NotificationCompat;
import androidx.core.app.NotificationManagerCompat;
import android.support.v4.media.MediaDescriptionCompat;
import android.support.v4.media.MediaMetadataCompat;
import android.support.v4.media.session.MediaButtonReceiver;
import androidx.media.session.MediaButtonReceiver;
import android.support.v4.media.session.MediaControllerCompat;
import android.support.v4.media.session.MediaSessionCompat;
import android.support.v4.media.session.PlaybackStateCompat;
import android.support.v4.app.NotificationCompat;
import android.util.Log;
import android.view.KeyEvent;
@@ -814,7 +815,7 @@ public class TtsService
}
builder.addAction(generateAction(android.R.drawable.ic_media_ff, "Fast Forward", KeyEvent.KEYCODE_MEDIA_FAST_FORWARD));
builder.addAction(generateAction(android.R.drawable.ic_media_next, "Next", KeyEvent.KEYCODE_MEDIA_NEXT));
builder.setStyle(new android.support.v4.media.app.NotificationCompat.MediaStyle()
builder.setStyle(new androidx.media.app.NotificationCompat.MediaStyle()
.setShowActionsInCompactView(0, 1, 2, 3)
//FIXME: max number of setShowActionsInCompactView depends on Android VERSION
.setMediaSession(mediaSession.getSessionToken())
app/src/main/java/fr/gaulupeau/apps/Poche/ui/AddUrlProxyActivity.java
+2 -2
View File
@@ -3,8 +3,8 @@ package fr.gaulupeau.apps.Poche.ui;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import android.util.Log;
import android.util.Patterns;
import android.widget.Toast;
app/src/main/java/fr/gaulupeau/apps/Poche/ui/ArticleListFragment.java
+2 -2
View File
@@ -4,8 +4,8 @@ import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.util.DiffUtil;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.DiffUtil;
import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.util.Log;
import android.view.Menu;
app/src/main/java/fr/gaulupeau/apps/Poche/ui/ArticleListsFragment.java
+7 -7
View File
@@ -1,13 +1,13 @@
package fr.gaulupeau.apps.Poche.ui;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.view.ViewPager;
import android.support.v7.widget.LinearLayoutManager;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.google.android.material.tabs.TabLayout;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.viewpager.widget.ViewPager;
import androidx.recyclerview.widget.LinearLayoutManager;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
app/src/main/java/fr/gaulupeau/apps/Poche/ui/ArticleListsPagerAdapter.java
+2 -2
View File
@@ -1,7 +1,7 @@
package fr.gaulupeau.apps.Poche.ui;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import fr.gaulupeau.apps.InThePoche.R;
import fr.gaulupeau.apps.Poche.App;
app/src/main/java/fr/gaulupeau/apps/Poche/ui/BaseActionBarActivity.java
+2 -2
View File
@@ -1,8 +1,8 @@
package fr.gaulupeau.apps.Poche.ui;
import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatActivity;
import android.view.MenuItem;
public abstract class BaseActionBarActivity extends AppCompatActivity {
app/src/main/java/fr/gaulupeau/apps/Poche/ui/CachingPagerAdapter.java
+3 -3
View File
@@ -1,8 +1,8 @@
package fr.gaulupeau.apps.Poche.ui;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;
import android.util.Log;
import android.view.ViewGroup;
app/src/main/java/fr/gaulupeau/apps/Poche/ui/EndlessRecyclerViewScrollListener.java
+4 -4
View File
@@ -1,9 +1,9 @@
package fr.gaulupeau.apps.Poche.ui;
import android.support.v7.widget.GridLayoutManager;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.StaggeredGridLayoutManager;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.StaggeredGridLayoutManager;
/**
* Sources:
app/src/main/java/fr/gaulupeau/apps/Poche/ui/HttpSchemeHandlerActivity.java
+1 -1
View File
@@ -3,7 +3,7 @@ package fr.gaulupeau.apps.Poche.ui;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatActivity;
import android.util.Log;
public class HttpSchemeHandlerActivity extends AppCompatActivity {
app/src/main/java/fr/gaulupeau/apps/Poche/ui/MainActivity.java
+12 -12
View File
@@ -9,18 +9,18 @@ import android.content.res.ColorStateList;
import android.content.res.XmlResourceParser;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.IdRes;
import android.support.annotation.NonNull;
import android.support.design.widget.NavigationView;
import android.support.v4.app.Fragment;
import android.support.v4.view.GravityCompat;
import android.support.v4.view.MenuItemCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.SearchView;
import android.support.v7.widget.Toolbar;
import androidx.annotation.IdRes;
import androidx.annotation.NonNull;
import com.google.android.material.navigation.NavigationView;
import androidx.fragment.app.Fragment;
import androidx.core.view.GravityCompat;
import androidx.core.view.MenuItemCompat;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.SearchView;
import androidx.appcompat.widget.Toolbar;
import android.text.TextUtils;
import android.text.format.DateUtils;
import android.util.Log;
app/src/main/java/fr/gaulupeau/apps/Poche/ui/ManageArticleTagsActivity.java
+4 -4
View File
@@ -2,10 +2,10 @@ package fr.gaulupeau.apps.Poche.ui;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v7.util.DiffUtil;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.Nullable;
import androidx.recyclerview.widget.DiffUtil;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
app/src/main/java/fr/gaulupeau/apps/Poche/ui/ReadArticleActivity.java
+2 -2
View File
@@ -11,8 +11,8 @@ import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AlertDialog;
import android.text.TextUtils;
import android.util.Log;
import android.view.GestureDetector;
app/src/main/java/fr/gaulupeau/apps/Poche/ui/RecyclerViewListFragment.java
+7 -7
View File
@@ -1,13 +1,13 @@
package fr.gaulupeau.apps.Poche.ui;
import android.os.Bundle;
import android.support.annotation.IdRes;
import android.support.annotation.LayoutRes;
import android.support.v4.app.Fragment;
import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.util.DiffUtil;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import androidx.annotation.IdRes;
import androidx.annotation.LayoutRes;
import androidx.fragment.app.Fragment;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import androidx.recyclerview.widget.DiffUtil;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
app/src/main/java/fr/gaulupeau/apps/Poche/ui/TagListFragment.java
+2 -2
View File
@@ -2,8 +2,8 @@ package fr.gaulupeau.apps.Poche.ui;
import android.content.Context;
import android.os.Bundle;
import android.support.v7.util.DiffUtil;
import android.support.v7.widget.RecyclerView;
import androidx.recyclerview.widget.DiffUtil;
import androidx.recyclerview.widget.RecyclerView;
import android.text.TextUtils;
import android.util.Log;
app/src/main/java/fr/gaulupeau/apps/Poche/ui/Themes.java
+2 -2
View File
@@ -1,8 +1,8 @@
package fr.gaulupeau.apps.Poche.ui;
import android.app.Activity;
import android.support.annotation.StringRes;
import android.support.annotation.StyleRes;
import androidx.annotation.StringRes;
import androidx.annotation.StyleRes;
import java.util.Map;
import java.util.WeakHashMap;
app/src/main/java/fr/gaulupeau/apps/Poche/ui/preferences/ConfigurationTestHelper.java
+1 -1
View File
@@ -6,7 +6,7 @@ import android.app.ProgressDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.os.AsyncTask;
import android.support.v7.app.AlertDialog;
import androidx.appcompat.app.AlertDialog;
import android.util.Log;
import android.widget.Toast;
app/src/main/java/fr/gaulupeau/apps/Poche/ui/preferences/ConnectionWizardActivity.java
+3 -3
View File
@@ -4,9 +4,9 @@ import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentTransaction;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentTransaction;
import android.text.TextUtils;
import android.util.Log;
import android.view.LayoutInflater;
app/src/main/java/fr/gaulupeau/apps/Poche/ui/preferences/SettingsActivity.java
+1 -1
View File
@@ -9,7 +9,7 @@ import android.preference.EditTextPreference;
import android.preference.ListPreference;
import android.preference.Preference;
import android.preference.PreferenceFragment;
import android.support.v7.app.AlertDialog;
import androidx.appcompat.app.AlertDialog;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
app/src/main/res/layout/activity_main.xml
+3 -3
View File
@@ -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"
@@ -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"
@@ -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>
app/src/main/res/layout/activity_main_appbar.xml
+5 -5
View File
@@ -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"
@@ -8,7 +8,7 @@
android:fitsSystemWindows="true"
tools:context="fr.gaulupeau.apps.Poche.ui.MainActivity">
<android.support.design.widget.AppBarLayout
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/appBarOverlayTheme">
@@ -17,7 +17,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
@@ -34,7 +34,7 @@
</FrameLayout>
</android.support.design.widget.AppBarLayout>
</com.google.android.material.appbar.AppBarLayout>
<FrameLayout
android:id="@+id/main_content_frame"
@@ -42,4 +42,4 @@
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
</android.support.design.widget.CoordinatorLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
app/src/main/res/layout/activity_manage_article_tags.xml
+4 -4
View File
@@ -20,7 +20,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal">
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="0dp"
android:layout_weight="1"
@@ -31,7 +31,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/manageTags_textField_hint"/>
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<Button
android:id="@+id/tag_add_button"
@@ -40,7 +40,7 @@
android:text="@string/manageTags_addNew"/>
</LinearLayout>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/manageTags_suggestionList"
android:scrollbars="vertical"
android:layout_width="match_parent"
@@ -56,7 +56,7 @@
android:text="@string/manageTags_currentTags"
android:visibility="gone"/>
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/manageTags_currentList"
android:scrollbars="vertical"
android:layout_width="match_parent"
app/src/main/res/layout/connection_wizard_framabag_config_fragment.xml
+6 -6
View File
@@ -37,32 +37,32 @@
android:textColor="?android:attr/textColorPrimary"
android:text="@string/connectionWizard_provider_framabag_titleMessage"/>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.design.widget.TextInputEditText
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:hint="@string/pref_name_connection_username"
android:inputType="text" />
</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"
app:passwordToggleEnabled="true">
<android.support.design.widget.TextInputEditText
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:hint="@string/pref_name_connection_password"
android:inputType="textPassword" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</ScrollView>
app/src/main/res/layout/connection_wizard_generic_config_fragment.xml
+9 -9
View File
@@ -37,11 +37,11 @@
android:textColor="?android:attr/textColorPrimary"
android:text="@string/connectionWizard_provider_general_titleMessage"/>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.design.widget.TextInputEditText
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/wallabag_url"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -54,34 +54,34 @@
android:text="https://"
tools:ignore="HardcodedText"/>
</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">
<android.support.design.widget.TextInputEditText
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:hint="@string/pref_name_connection_username"
android:inputType="text" />
</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"
app:passwordToggleEnabled="true">
<android.support.design.widget.TextInputEditText
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:hint="@string/pref_name_connection_password"
android:inputType="textPassword" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</ScrollView>
app/src/main/res/layout/connection_wizard_wallabagit_config_fragment.xml
+6 -6
View File
@@ -37,32 +37,32 @@
android:textColor="?android:attr/textColorPrimary"
android:text="@string/connectionWizard_provider_wallabagit_titleMessage"/>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.design.widget.TextInputEditText
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/username"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:hint="@string/pref_name_connection_username"
android:inputType="text" />
</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"
app:passwordToggleEnabled="true">
<android.support.design.widget.TextInputEditText
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ems="10"
android:hint="@string/pref_name_connection_password"
android:inputType="textPassword" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
</ScrollView>
app/src/main/res/layout/dialog_add.xml
+2 -2
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android"
<com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:padding="16dp"
android:layout_height="wrap_content">
@@ -11,4 +11,4 @@
android:hint="@string/page_url"
android:inputType="textUri" />
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
app/src/main/res/layout/fragment_article_lists.xml
+2 -2
View File
@@ -7,12 +7,12 @@
android:orientation="vertical"
tools:context="fr.gaulupeau.apps.Poche.ui.MainActivity">
<android.support.design.widget.TabLayout
<com.google.android.material.tabs.TabLayout
android:id="@+id/articles_list_tab_layout"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" />
<android.support.v4.view.ViewPager
<androidx.viewpager.widget.ViewPager
android:id="@+id/articles_list_pager"
android:layout_width="match_parent"
android:layout_height="match_parent" />
app/src/main/res/layout/list.xml
+3 -3
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.SwipeRefreshLayout
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/list_swipeContainer"
@@ -8,10 +8,10 @@
android:orientation="vertical"
tools:context="fr.gaulupeau.apps.Poche.ui.ArticleListFragment" >
<android.support.v7.widget.RecyclerView
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/list_recyclerView"
android:scrollbars="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</android.support.v4.widget.SwipeRefreshLayout>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
app/src/main/res/menu/main.xml
+1 -1
View File
@@ -7,7 +7,7 @@
android:icon="?attr/icon_search"
android:orderInCategory="5"
app:showAsAction="collapseActionView|ifRoom"
app:actionViewClass="android.support.v7.widget.SearchView"/>
app:actionViewClass="androidx.appcompat.widget.SearchView"/>
<item
android:id="@+id/menu_main_changeSortOrder"
android:title="@string/menu_lists_changeSortOrder"
build.gradle
+2 -2
View File
@@ -13,9 +13,9 @@ buildscript {
allprojects {
repositories {
maven { url "https://jitpack.io" }
maven { url 'https://maven.google.com' }
google()
jcenter()
maven { url "https://jitpack.io" }
}
}
gradle.properties
+2
View File
@@ -0,0 +1,2 @@
android.enableJetifier=true
android.useAndroidX=true