Skip to content

Commit b403ab5

Browse files
adgadadgad
committed
Linting fixes
1 parent f2d9793 commit b403ab5

20 files changed

+128
-160
lines changed

‎.idea/caches/build_file_checksums.ser‎

0 Bytes
Binary file not shown.

‎.idea/caches/gradle_models.ser‎

-17.3 KB
Binary file not shown.

‎app/app.iml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -87,38 +87,26 @@
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
8989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
90-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
91-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
9290
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundle_manifest" />
9391
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check_manifest_result" />
9492
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
9593
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
97-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
98-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
9994
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_app_manifest" />
100-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_app_info_output_file" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_main_apk_resources" />
10295
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
103-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
10496
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
10597
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
106-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
10798
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
10899
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
109100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/metadata_feature_manifest" />
110101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
111102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
112103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-files" />
113104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-rules" />
114-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
115105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
116-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
117106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
118107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
119108
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
120109
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/signing_config" />
121-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
122110
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
123111
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
124112
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
@@ -127,7 +115,6 @@
127115
</content>
128116
<orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
129117
<orderEntry type="sourceFolder" forTests="false" />
130-
<orderEntry type="library" name="Gradle: org.json:json:20140107@jar" level="project" />
131118
<orderEntry type="library" name="Gradle: com.android.support:design:28.0.0@aar" level="project" />
132119
<orderEntry type="library" name="Gradle: com.android.support:support-fragment:28.0.0@aar" level="project" />
133120
<orderEntry type="library" name="Gradle: com.android.support:localbroadcastmanager:28.0.0@aar" level="project" />

‎app/build.gradle‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ android {
55
buildToolsVersion "28.0.3"
66
defaultConfig {
77
applicationId "com.adgad.kboard"
8-
minSdkVersion 24
8+
minSdkVersion 19
99
targetSdkVersion 28
10-
versionCode 30
11-
versionName "4.1.1"
10+
versionCode 31
11+
versionName "4.1.2"
1212
}
1313
buildTypes {
1414
release {
@@ -17,6 +17,12 @@ android {
1717
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1818
}
1919
}
20+
21+
configurations {
22+
all {
23+
exclude group: 'org.json', module: 'json'
24+
}
25+
}
2026
}
2127

2228
dependencies {

‎app/src/androidTest/java/com/adgad/kboard/ApplicationTest.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
package com.adgad.kboard;
22

33
import android.app.Application;
4-
import android.test.ApplicationTestCase;
54

65
/**
76
* <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
87
*/
9-
public class ApplicationTest extends ApplicationTestCase<Application> {
10-
public ApplicationTest() {
11-
super(Application.class);
12-
}
8+
class ApplicationTest extends ApplicationTestCase<Application> {
139
}

‎app/src/main/java/com/adgad/kboard/AddWordDialogFragment.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ public class AddWordDialogFragment extends DialogFragment {
1919
public interface AddWordDialogListener {
2020
void onDialogPositiveClick(DialogFragment dialog, int index);
2121
void onDialogNegativeClick(DialogFragment dialog, int index);
22-
void onDialogNeutralClick(DialogFragment dialog, int index);
22+
void onDialogNeutralClick(int index);
2323

2424

2525
}
2626

2727

2828
// Use this instance of the interface to deliver action events
29-
AddWordDialogListener mListener;
29+
private AddWordDialogListener mListener;
3030

3131
//Override the Fragment.onAttach() method to instantiate the NoticeDialogListener
3232
@Override
@@ -63,7 +63,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
6363
.setNeutralButton("Move up", new DialogInterface.OnClickListener() {
6464
@Override
6565
public void onClick(DialogInterface dialog, int id) {
66-
mListener.onDialogNeutralClick(AddWordDialogFragment.this, index);
66+
mListener.onDialogNeutralClick(index);
6767
}
6868
})
6969
.setPositiveButton(index > -1 ? "OK" : "Add", new DialogInterface.OnClickListener() {

‎app/src/main/java/com/adgad/kboard/ConvertUnicode.java‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
package com.adgad.kboard;
22

3+
import android.os.Build;
4+
35
import java.util.HashMap;
46
import java.util.Map;
7+
import java.util.Objects;
58

69
/**
710
* Created by arjun on 19/12/18.
811
*/
912
class ConvertUnicode {
1013

11-
private static String normal = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
12-
1314

1415
static String convert(String src, String type) {
15-
Map<String, String> conversions = new HashMap<String, String>();
16+
Map<String, String> conversions = new HashMap<>();
1617
conversions.put("circle", "⓪①②③④⑤⑥⑦⑧⑨ⓐⓑⓒⓓⓔⓕⓖⓗⓘⓙⓚⓛⓜⓝⓞⓟⓠⓡⓢⓣⓤⓥⓦⓧⓨⓩⒶⒷⒸⒹⒺⒻⒼⒽⒾⒿⓀⓁⓂⓃⓄⓅⓆⓇⓈⓉⓊⓋⓌⓍⓎⓏ");
1718
conversions.put("darkcircle", "⓿❶❷❸❹❺❻❼❽❾🅐🅑🅒🅓🅔🅕🅖🅗🅘🅙🅚🅛🅜🅝🅞🅟🅠🅡🅢🅣🅤🅥🅦🅧🅨🅩🅐🅑🅒🅓🅔🅕🅖🅗🅘🅙🅚🅛🅜🅝🅞🅟🅠🅡🅢🅣🅤🅥🅦🅧🅨🅩");
1819
conversions.put("monospace", "𝟶𝟷𝟸𝟹𝟺𝟻𝟼𝟽𝟾𝟿𝚊𝚋𝚌𝚍𝚎𝚏𝚐𝚑𝚒𝚓𝚔𝚕𝚖𝚗𝚘𝚙𝚚𝚛𝚜𝚝𝚞𝚟𝚠𝚡𝚢𝚣𝙰𝙱𝙲𝙳𝙴𝙵𝙶𝙷𝙸𝙹𝙺𝙻𝙼𝙽𝙾𝙿𝚀𝚁𝚂𝚃𝚄𝚅𝚆𝚇𝚈𝚉");
@@ -25,19 +26,24 @@ static String convert(String src, String type) {
2526
if(!conversions.containsKey(type)) {
2627
return src;
2728
}
28-
int[] convert = conversions.get(type).codePoints().toArray();
29-
int[] normalCodePoints = normal.codePoints().toArray();
30-
System.out.println(normalCodePoints);
31-
StringBuilder destination = new StringBuilder();
32-
for(int c : src.toCharArray()) {
33-
int match = normal.indexOf(c);
34-
if(match >= 0) {
35-
destination.appendCodePoint(convert[match]);
36-
} else {
37-
destination.appendCodePoint(c);
29+
30+
if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
31+
32+
int[] convert = Objects.requireNonNull(conversions.get(type)).codePoints().toArray();
33+
String normal = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
34+
StringBuilder destination = new StringBuilder();
35+
for (int c : src.toCharArray()) {
36+
int match = normal.indexOf(c);
37+
if (match >= 0) {
38+
destination.appendCodePoint(convert[match]);
39+
} else {
40+
destination.appendCodePoint(c);
41+
}
3842
}
43+
return destination.toString();
44+
} else {
45+
return src;
3946
}
40-
return destination.toString();
4147
}
4248
}
4349

‎app/src/main/java/com/adgad/kboard/CustomKeysActivity.java‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import android.app.Activity;
44
import android.app.DialogFragment;
5-
import android.app.ListActivity;
65
import android.content.SharedPreferences;
76
import android.os.Bundle;
87
import android.preference.PreferenceManager;
8+
import android.support.annotation.NonNull;
99
import android.support.design.widget.FloatingActionButton;
1010
import android.support.v7.widget.LinearLayoutManager;
1111
import android.support.v7.widget.RecyclerView;
@@ -14,8 +14,6 @@
1414
import android.view.MenuInflater;
1515
import android.view.MenuItem;
1616
import android.view.View;
17-
import android.widget.ArrayAdapter;
18-
import android.widget.ListView;
1917
import android.widget.TextView;
2018
import android.widget.Toast;
2119

@@ -26,7 +24,6 @@
2624
public class CustomKeysActivity extends Activity implements AddWordDialogFragment.AddWordDialogListener {
2725

2826

29-
private SharedPreferences sharedPref;
3027
private final Gson gson = new Gson();
3128
private RecyclerListAdapter adapter;
3229

@@ -44,7 +41,7 @@ public void onCreate(Bundle savedInstanceState) {
4441
super.onCreate(savedInstanceState);
4542

4643
setContentView(R.layout.list_view);
47-
sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
44+
SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
4845
String defaultJson = gson.toJson(KboardIME.Keys.getDefault());
4946
String keysAsString = sharedPref.getString(KboardIME.Keys.STORAGE_KEY, defaultJson);
5047
ArrayList<String> keys = gson.fromJson(keysAsString, ArrayList.class);
@@ -55,22 +52,22 @@ public void onCreate(Bundle savedInstanceState) {
5552

5653
adapter = new RecyclerListAdapter(keys, sharedPref, new ItemViewHolder.ItemClickListener() {
5754
@Override
58-
public void onItemClick(View caller, int position) {
55+
public void onItemClick(int position) {
5956
showAddDialog(position, adapter.get(position));
6057
}
6158
});
6259

6360
ItemTouchHelper mIth = new ItemTouchHelper(
6461
new ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP | ItemTouchHelper.DOWN, ItemTouchHelper.LEFT) {
65-
public boolean onMove(RecyclerView recyclerView,
66-
RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
62+
public boolean onMove(@NonNull RecyclerView recyclerView,
63+
@NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) {
6764
final int fromPos = viewHolder.getAdapterPosition();
6865
final int toPos = target.getAdapterPosition();
6966

7067
adapter.swap(fromPos, toPos);
7168
return true;// true if moved, false otherwise
7269
}
73-
public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
70+
public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction) {
7471
final int fromPos = viewHolder.getAdapterPosition();
7572
adapter.remove(fromPos);
7673
}
@@ -123,7 +120,7 @@ public void onDialogNegativeClick(DialogFragment dialog, int index) {
123120
}
124121

125122
@Override
126-
public void onDialogNeutralClick(DialogFragment dialog, int index) {
123+
public void onDialogNeutralClick(int index) {
127124
if(index > 0) {
128125
adapter.swap(index, index-1);
129126
}

‎app/src/main/java/com/adgad/kboard/ItemViewHolder.java‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public class ItemViewHolder extends RecyclerView.ViewHolder implements View.OnCl
88

99
public final TextView textView;
1010

11-
public ItemClickListener mListener;
11+
private ItemClickListener mListener;
1212

1313
public ItemViewHolder(View itemView, ItemClickListener clickListener) {
1414
super(itemView);
@@ -20,15 +20,11 @@ public ItemViewHolder(View itemView, ItemClickListener clickListener) {
2020

2121
@Override
2222
public void onClick(View v) {
23-
mListener.onItemClick(v, this.getAdapterPosition());
24-
}
25-
26-
public void setOnItemClickListener(ItemClickListener listener) {
27-
mListener = listener;
23+
mListener.onItemClick(this.getAdapterPosition());
2824
}
2925

3026

31-
public static interface ItemClickListener {
32-
public void onItemClick(View caller, int position);
27+
public interface ItemClickListener {
28+
void onItemClick(int position);
3329
}
3430
}

‎app/src/main/java/com/adgad/kboard/KBoard.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,13 @@
99
/**
1010
* Created by arjun on 14/03/15.
1111
*/
12-
public class KBoard extends Keyboard {
12+
class KBoard extends Keyboard {
1313
private Key mEnterKey;
1414

1515
public KBoard(Context context, int xmlLayoutResId) {
1616
super(context, xmlLayoutResId);
1717
}
1818

19-
public KBoard(Context context, int layoutTemplateResId, CharSequence characters, int columns, int horizontalPadding) {
20-
super(context, layoutTemplateResId, characters, columns, horizontalPadding);
21-
}
22-
2319

2420
@Override
2521
protected Key createKeyFromXml(Resources res, Row parent, int x, int y, XmlResourceParser parser) {

0 commit comments

Comments
 (0)