Skip to content

Commit 5bada31

Browse files
De7vIDDe7vID
authored
Merge pull request #134 from dlyongemallo/master
[MAJOR CHANGE] version 2022.08.12a - migrate to androidx
2 parents 82c6e11 + afe7ede commit 5bada31

21 files changed

+71
-63
lines changed

‎CHANGELOG‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
CHANGELOG
22

3+
2022-08-12: Migrate from support library to androidx. This is a major (and backwards-incompatible) change.
34
2022-06-22: Remove QUERY_ALL_PACKAGES permission. Turn off suggestions in search bar. Add parsing of compound number-forming elements.
45
2021-11-09: Add {Qa} to two-letter verb shortlist. New vocabulary from {QelIS boqHarmey}.
56
2021-10-08: Fix bug with parsing 4-letter complex words containing 2-letter verbs.

‎app/build.gradle‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,16 @@ def keystoreProperties = new Properties()
55
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
66

77
android {
8-
compileSdkVersion 30
9-
buildToolsVersion "30.0.0"
8+
compileSdkVersion 32
9+
buildToolsVersion "32.0.0"
1010
defaultConfig {
1111
applicationId "org.tlhInganHol.android.klingonassistant"
1212
// We are targeting only Marshmallow and above.
1313
minSdkVersion 23
14+
// Can't increase to 32 because security changes will disable KWOTD.
1415
targetSdkVersion 30
15-
versionCode 567
16-
versionName "2022.06.22b"
16+
versionCode 569
17+
versionName "2022.08.12a"
1718
}
1819
buildTypes {
1920
release {
@@ -40,18 +41,17 @@ android {
4041

4142
allprojects {
4243
repositories {
43-
jcenter()
44-
maven {
45-
url "https://maven.google.com"
46-
}
44+
mavenCentral()
45+
google()
4746
}
4847
}
4948

5049
dependencies {
51-
compile fileTree(dir: 'libs', include: ['*.jar'])
52-
compile 'com.android.support:appcompat-v7:28.0.0'
53-
compile 'com.android.support:design:28.0.0'
54-
compile 'com.android.support.constraint:constraint-layout:1.1.3'
50+
implementation fileTree(dir: 'libs', include: ['*.jar'])
51+
implementation 'androidx.appcompat:appcompat:1.5.0'
52+
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
53+
implementation 'androidx.viewpager2:viewpager2:1.0.0'
54+
implementation 'com.google.android.material:material:1.6.1'
5555
}
5656

5757
task updateDatabase(type: Exec) {

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
<activity android:name=".KlingonAssistant"
5252
android:label="@string/app_name"
5353
android:theme="@style/AppTheme.NoActionBar"
54+
android:exported="true"
5455
android:launchMode="standard">
5556

5657
<intent-filter>

‎app/src/main/java/org/tlhInganHol/android/klingonassistant/AppCompatPreferenceActivity.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919
import android.content.res.Configuration;
2020
import android.os.Bundle;
2121
import android.preference.PreferenceActivity;
22-
import android.support.annotation.LayoutRes;
23-
import android.support.annotation.Nullable;
24-
import android.support.v7.app.ActionBar;
25-
import android.support.v7.app.AppCompatDelegate;
26-
import android.support.v7.widget.Toolbar;
2722
import android.view.MenuInflater;
2823
import android.view.View;
2924
import android.view.ViewGroup;
25+
import androidx.annotation.LayoutRes;
26+
import androidx.annotation.Nullable;
27+
import androidx.appcompat.app.ActionBar;
28+
import androidx.appcompat.app.AppCompatDelegate;
29+
import androidx.appcompat.widget.Toolbar;
3030

3131
/**
3232
* A {@link android.preference.PreferenceActivity} which implements and proxies the necessary calls

‎app/src/main/java/org/tlhInganHol/android/klingonassistant/BaseActivity.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,7 @@
3232
import android.os.Bundle;
3333
import android.os.PersistableBundle;
3434
import android.preference.PreferenceManager;
35-
import android.support.constraint.ConstraintLayout;
36-
import android.support.design.widget.NavigationView;
3735
import android.view.Gravity;
38-
import android.support.v4.widget.DrawerLayout;
39-
import android.support.v7.app.ActionBarDrawerToggle;
40-
import android.support.v7.app.AppCompatActivity;
41-
import android.support.v7.widget.Toolbar;
4236
import android.text.Spannable;
4337
import android.text.SpannableString;
4438
import android.text.Spanned;
@@ -55,13 +49,17 @@
5549
import android.view.View;
5650
import android.widget.TextView;
5751
import android.widget.Toast;
52+
import androidx.appcompat.app.AppCompatActivity;
53+
import androidx.appcompat.widget.Toolbar;
54+
import androidx.constraintlayout.widget.ConstraintLayout;
55+
import androidx.drawerlayout.widget.DrawerLayout;
56+
import androidx.appcompat.app.ActionBarDrawerToggle;
57+
import com.google.android.material.navigation.NavigationView;
5858
import java.util.Locale;
5959
import java.util.concurrent.TimeUnit;
6060
import org.tlhInganHol.android.klingonassistant.service.KwotdService;
6161
import org.tlhInganHol.android.klingonassistant.service.UpdateDatabaseService;
6262

63-
// import android.support.design.widget.Snackbar;
64-
6563
public class BaseActivity extends AppCompatActivity
6664
implements NavigationView.OnNavigationItemSelectedListener {
6765
private static final String TAG = "BaseActivity";
@@ -401,7 +399,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
401399
protected void setDrawerContentView(int layoutResId) {
402400
ConstraintLayout constraintLayout = (ConstraintLayout) findViewById(R.id.drawer_content);
403401
constraintLayout.removeAllViews();
404-
LayoutInflater.from(getBaseContext()).inflate(layoutResId, constraintLayout, true);
402+
LayoutInflater.from(BaseActivity.this).inflate(layoutResId, constraintLayout, true);
405403
}
406404

407405
@SuppressWarnings("StatementWithEmptyBody")

‎app/src/main/java/org/tlhInganHol/android/klingonassistant/EntryActivity.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@
2525
import android.os.Bundle;
2626
import android.preference.PreferenceManager;
2727
import android.speech.tts.TextToSpeech;
28-
import android.support.annotation.NonNull;
29-
import android.support.design.widget.BottomNavigationView;
30-
import android.support.design.widget.FloatingActionButton;
31-
import android.support.design.widget.TabLayout;
32-
import android.support.v4.app.Fragment;
33-
import android.support.v4.app.FragmentManager;
34-
import android.support.v4.app.FragmentStatePagerAdapter;
35-
import android.support.v4.view.PagerAdapter;
36-
import android.support.v4.view.ViewPager;
3728
import android.util.Log;
3829
import android.view.Menu;
3930
import android.view.MenuItem;
4031
import android.view.View;
32+
import androidx.annotation.NonNull;
33+
import androidx.fragment.app.Fragment;
34+
import androidx.fragment.app.FragmentManager;
35+
import androidx.fragment.app.FragmentStatePagerAdapter;
36+
import androidx.viewpager.widget.PagerAdapter;
37+
import androidx.viewpager.widget.ViewPager;
38+
import com.google.android.material.bottomnavigation.BottomNavigationView;
39+
import com.google.android.material.floatingactionbutton.FloatingActionButton;
40+
import com.google.android.material.tabs.TabLayout;
4141
import java.io.UnsupportedEncodingException;
4242
import java.net.URLEncoder;
4343
import java.util.ArrayList;

‎app/src/main/java/org/tlhInganHol/android/klingonassistant/EntryFragment.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import android.net.Uri;
2525
import android.os.Bundle;
2626
import android.preference.PreferenceManager;
27-
import android.support.v4.app.Fragment;
2827
import android.text.Html;
2928
import android.text.SpannableStringBuilder;
3029
import android.text.Spanned;
@@ -40,6 +39,7 @@
4039
import android.view.View;
4140
import android.view.ViewGroup;
4241
import android.widget.TextView;
42+
import androidx.fragment.app.Fragment;
4343
import java.util.regex.Matcher;
4444

4545
public class EntryFragment extends Fragment {

‎app/src/main/java/org/tlhInganHol/android/klingonassistant/KlingonContentDatabase.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public class KlingonContentDatabase {
193193

194194
// This should be kept in sync with the version number in the data/VERSION
195195
// file used to generate the database which is bundled into the app.
196-
private static final int BUNDLED_DATABASE_VERSION = 202206221;
196+
private static final int BUNDLED_DATABASE_VERSION = 202208120;
197197

198198
// Metadata about the installed database, and the updated database, if any.
199199
public static final String KEY_INSTALLED_DATABASE_VERSION = "installed_database_version";
@@ -209,7 +209,7 @@ public class KlingonContentDatabase {
209209
// the IDs of the first entry and one past the ID of the last non-hypothetical,
210210
// non-extended-canon entry in the database, respectively.
211211
private static final int ID_OF_FIRST_ENTRY = 10000;
212-
private static final int ID_OF_FIRST_EXTRA_ENTRY = 15109;
212+
private static final int ID_OF_FIRST_EXTRA_ENTRY = 15154;
213213

214214
private final KlingonDatabaseOpenHelper mDatabaseOpenHelper;
215215
private static final HashMap<String, String> mColumnMap = buildColumnMap();

‎app/src/main/java/org/tlhInganHol/android/klingonassistant/Preferences.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import android.preference.ListPreference;
3030
import android.preference.Preference;
3131
import android.preference.PreferenceManager;
32-
import android.support.v7.widget.Toolbar;
3332
import android.text.Spannable;
3433
import android.text.SpannableString;
3534
import android.text.Spanned;
@@ -38,6 +37,7 @@
3837
import android.view.LayoutInflater;
3938
import android.view.MenuItem;
4039
import android.view.ViewGroup;
40+
import androidx.appcompat.widget.Toolbar;
4141
import java.util.Locale;
4242

4343
public class Preferences extends AppCompatPreferenceActivity

‎app/src/main/res/layout-sw600dp-land/activity_base.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
android:orientation="horizontal"
99
android:fitsSystemWindows="true">
1010

11-
<android.support.design.widget.NavigationView
11+
<com.google.android.material.navigation.NavigationView
1212
android:id="@+id/nav_view"
1313
android:layout_width="wrap_content"
1414
android:layout_height="match_parent"

0 commit comments

Comments
 (0)