Sat Apr 25 23:54:54+0200 2020
b5fe414
Switch to AndroidX
app/src/androidTest/java/eu/lepiller/nani/ExampleInstrumentedTest.java
| 1 | 1 | package eu.lepiller.nani; | |
| 2 | 2 | ||
| 3 | 3 | import android.content.Context; | |
| 4 | - | import android.support.test.InstrumentationRegistry; | |
| 5 | - | import android.support.test.runner.AndroidJUnit4; | |
| 4 | + | import androidx.test.platform.app.InstrumentationRegistry; | |
| 5 | + | import androidx.test.ext.junit.runners.AndroidJUnit4; | |
| 6 | 6 | ||
| 7 | 7 | import org.junit.Test; | |
| 8 | 8 | import org.junit.runner.RunWith; |
app/src/main/java/eu/lepiller/nani/AboutActivity.java
| 2 | 2 | ||
| 3 | 3 | import android.content.Intent; | |
| 4 | 4 | import android.net.Uri; | |
| 5 | - | import android.support.v7.app.AppCompatActivity; | |
| 5 | + | import androidx.appcompat.app.AppCompatActivity; | |
| 6 | 6 | import android.os.Bundle; | |
| 7 | 7 | import android.view.View; | |
| 8 | 8 | import android.widget.Button; |
app/src/main/java/eu/lepiller/nani/DictionaryActivity.java
| 2 | 2 | ||
| 3 | 3 | import android.content.Intent; | |
| 4 | 4 | import android.os.Bundle; | |
| 5 | - | import android.support.v7.app.AppCompatActivity; | |
| 6 | - | import android.support.v7.widget.Toolbar; | |
| 5 | + | import androidx.appcompat.app.AppCompatActivity; | |
| 6 | + | import androidx.appcompat.widget.Toolbar; | |
| 7 | 7 | import android.view.View; | |
| 8 | 8 | import android.widget.AdapterView; | |
| 9 | 9 | import android.widget.ListView; |
app/src/main/java/eu/lepiller/nani/DictionaryDownloadActivity.java
| 4 | 4 | import android.graphics.drawable.Drawable; | |
| 5 | 5 | import android.os.AsyncTask; | |
| 6 | 6 | import android.os.Build; | |
| 7 | - | import android.support.graphics.drawable.VectorDrawableCompat; | |
| 8 | - | import android.support.v7.app.AppCompatActivity; | |
| 7 | + | import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat; | |
| 8 | + | import androidx.appcompat.app.AppCompatActivity; | |
| 9 | 9 | import android.os.Bundle; | |
| 10 | 10 | import android.util.Log; | |
| 11 | 11 | import android.view.View; | |
… | |||
| 23 | 23 | import java.net.URL; | |
| 24 | 24 | import java.util.Map; | |
| 25 | 25 | ||
| 26 | - | import eu.lepiller.nani.dictionary.DictionariesAdapter; | |
| 27 | 26 | import eu.lepiller.nani.dictionary.Dictionary; | |
| 28 | 27 | import eu.lepiller.nani.dictionary.DictionaryFactory; | |
| 29 | 28 | ||
app/src/main/java/eu/lepiller/nani/MainActivity.java
| 1 | 1 | package eu.lepiller.nani; | |
| 2 | 2 | ||
| 3 | - | import android.content.Context; | |
| 4 | 3 | import android.content.Intent; | |
| 5 | 4 | import android.os.AsyncTask; | |
| 6 | 5 | import android.os.Bundle; | |
| 7 | - | import android.support.design.widget.Snackbar; | |
| 8 | - | import android.support.v7.app.AppCompatActivity; | |
| 9 | - | import android.support.v7.widget.Toolbar; | |
| 6 | + | import com.google.android.material.snackbar.Snackbar; | |
| 7 | + | import androidx.appcompat.app.AppCompatActivity; | |
| 8 | + | import androidx.appcompat.widget.Toolbar; | |
| 10 | 9 | import android.view.View; | |
| 11 | 10 | import android.view.Menu; | |
| 12 | 11 | import android.view.MenuItem; |
app/src/main/java/eu/lepiller/nani/dictionary/Dictionary.java
| 3 | 3 | import android.content.Context; | |
| 4 | 4 | import android.graphics.drawable.Drawable; | |
| 5 | 5 | import android.os.Build; | |
| 6 | - | import android.support.graphics.drawable.VectorDrawableCompat; | |
| 6 | + | import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat; | |
| 7 | 7 | ||
| 8 | 8 | import java.io.File; | |
| 9 | - | import java.net.MalformedURLException; | |
| 10 | 9 | import java.net.URL; | |
| 11 | 10 | import java.util.Map; | |
| 12 | 11 |
app/src/main/res/layout/activity_dictionary.xml
| 1 | 1 | <?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" | |
| 3 | 3 | xmlns:app="http://schemas.android.com/apk/res-auto" | |
| 4 | 4 | xmlns:tools="http://schemas.android.com/tools" | |
| 5 | 5 | android:layout_width="match_parent" | |
| 6 | 6 | android:layout_height="match_parent" | |
| 7 | 7 | tools:context=".DictionaryActivity"> | |
| 8 | 8 | ||
| 9 | - | <android.support.design.widget.AppBarLayout | |
| 9 | + | <com.google.android.material.appbar.AppBarLayout | |
| 10 | 10 | android:layout_width="match_parent" | |
| 11 | 11 | android:layout_height="wrap_content" | |
| 12 | 12 | android:theme="@style/AppTheme.AppBarOverlay"> | |
| 13 | 13 | ||
| 14 | - | <android.support.v7.widget.Toolbar | |
| 14 | + | <androidx.appcompat.widget.Toolbar | |
| 15 | 15 | android:id="@+id/toolbar" | |
| 16 | 16 | android:layout_width="match_parent" | |
| 17 | 17 | android:layout_height="?attr/actionBarSize" | |
| 18 | 18 | android:background="?attr/colorPrimary" | |
| 19 | 19 | app:popupTheme="@style/AppTheme.PopupOverlay" /> | |
| 20 | 20 | ||
| 21 | - | </android.support.design.widget.AppBarLayout> | |
| 21 | + | </com.google.android.material.appbar.AppBarLayout> | |
| 22 | 22 | ||
| 23 | 23 | <include layout="@layout/content_dictionary" /> | |
| 24 | 24 | ||
| 25 | - | </android.support.design.widget.CoordinatorLayout> | |
| 25 | > | ||
| 26 | 0 | > | \ No newline at end of file |
| 25 | + | </androidx.coordinatorlayout.widget.CoordinatorLayout> | |
| 25 | < | ||
| 0 | 26 | < | \ No newline at end of file |
app/src/main/res/layout/activity_dictionary_download.xml
| 1 | 1 | <?xml version="1.0" encoding="utf-8"?> | |
| 2 | - | <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | |
| 2 | + | <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | |
| 3 | 3 | xmlns:app="http://schemas.android.com/apk/res-auto" | |
| 4 | 4 | xmlns:tools="http://schemas.android.com/tools" | |
| 5 | 5 | android:layout_width="match_parent" | |
… | |||
| 128 | 128 | app:srcCompat="@android:drawable/arrow_down_float" /> | |
| 129 | 129 | </LinearLayout> | |
| 130 | 130 | ||
| 131 | - | </android.support.constraint.ConstraintLayout> | |
| 131 | > | ||
| 132 | 0 | > | \ No newline at end of file |
| 131 | + | </androidx.constraintlayout.widget.ConstraintLayout> | |
| 131 | < | ||
| 0 | 132 | < | \ No newline at end of file |
app/src/main/res/layout/activity_main.xml
| 1 | 1 | <?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" | |
| 3 | 3 | xmlns:app="http://schemas.android.com/apk/res-auto" | |
| 4 | 4 | xmlns:tools="http://schemas.android.com/tools" | |
| 5 | 5 | android:layout_width="match_parent" | |
| 6 | 6 | android:layout_height="match_parent" | |
| 7 | 7 | tools:context=".MainActivity"> | |
| 8 | 8 | ||
| 9 | - | <android.support.design.widget.AppBarLayout | |
| 9 | + | <com.google.android.material.appbar.AppBarLayout | |
| 10 | 10 | android:layout_width="match_parent" | |
| 11 | 11 | android:layout_height="wrap_content" | |
| 12 | 12 | android:theme="@style/AppTheme.AppBarOverlay"> | |
| 13 | 13 | ||
| 14 | - | <android.support.v7.widget.Toolbar | |
| 14 | + | <androidx.appcompat.widget.Toolbar | |
| 15 | 15 | android:id="@+id/toolbar" | |
| 16 | 16 | android:layout_width="match_parent" | |
| 17 | 17 | android:layout_height="?attr/actionBarSize" | |
| 18 | 18 | android:background="?attr/colorPrimary" | |
| 19 | 19 | app:popupTheme="@style/AppTheme.PopupOverlay" /> | |
| 20 | 20 | ||
| 21 | - | </android.support.design.widget.AppBarLayout> | |
| 21 | + | </com.google.android.material.appbar.AppBarLayout> | |
| 22 | 22 | ||
| 23 | 23 | <include layout="@layout/content_main" /> | |
| 24 | 24 | ||
| 25 | - | </android.support.design.widget.CoordinatorLayout> | |
| 25 | > | ||
| 26 | 0 | > | \ No newline at end of file |
| 25 | + | </androidx.coordinatorlayout.widget.CoordinatorLayout> | |
| 25 | < | ||
| 0 | 26 | < | \ No newline at end of file |
furiganatextview/src/androidTest/java/eu/lepiller/furiganatextview/ExampleInstrumentedTest.java
| 1 | 1 | package eu.lepiller.furiganatextview; | |
| 2 | 2 | ||
| 3 | 3 | import android.content.Context; | |
| 4 | - | import android.support.test.InstrumentationRegistry; | |
| 5 | - | import android.support.test.runner.AndroidJUnit4; | |
| 4 | + | import androidx.test.platform.app.InstrumentationRegistry; | |
| 5 | + | import androidx.test.ext.junit.runners.AndroidJUnit4; | |
| 6 | 6 | ||
| 7 | 7 | import org.junit.Test; | |
| 8 | 8 | import org.junit.runner.RunWith; |