Merge pull request #7 from jeffshee/1.3.2

1.3.2

Author: jeffshee

.idea/caches/build_file_checksums.ser

@@ -7,7 +7,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 28
         versionCode 3
-        versionName "1.3.1"
+        versionName "1.3.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -39,5 +39,4 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'org.jsoup:jsoup:1.11.3'
     implementation 'io.github.jeffshee.apng2gif:apng2gif:1.2'
-    implementation "com.github.nekocode:Badge:2.0"
 }

app/build.gradle

@@ -1,10 +1,12 @@
 package io.github.jeffshee.linestickerkeyboard;
 
 import android.app.IntentService;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationManagerCompat;
 import android.support.v4.content.LocalBroadcastManager;
 import android.util.Log;
 
@@ -33,7 +35,7 @@ public class FetchService extends IntentService {
     private static final String ACTION_FETCH = "io.github.jeffshee.linestickerkeyboard.action.FETCH";
     private static final String EXTRA_PARAM1 = "io.github.jeffshee.linestickerkeyboard.extra.PARAM1";
 
-    private static final String CHANNEL_ID = "DOWNLOAD";
+    private static final String CHANNEL_ID = "io.github.jeffshee.linestickerkeyboard.DOWNLOAD";
     private static final int NOTIFICATION_ID = 0;
 
     private static final String URL_COMMON = "https://stickershop.line-scdn.net/stickershop/v1/sticker/";
@@ -46,8 +48,8 @@ public class FetchService extends IntentService {
     int firstId = 0, count = 0, storeId = 0;
     String title = "";
     Sticker.Type type;
+    NotificationManager notificationManager;
     NotificationCompat.Builder builder;
-    NotificationManagerCompat notificationManager;
     File pngDir;
     File gifDir;
     Apng2GifCustom apng2GifCustom;
@@ -73,8 +75,15 @@ public static void startActionFetchManual(Context context, int storeId) {
 
     @Override
     protected void onHandleIntent(Intent intent) {
+        notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
         builder = new NotificationCompat.Builder(this, CHANNEL_ID);
-        notificationManager = NotificationManagerCompat.from(this);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            NotificationChannel notificationChannel = new NotificationChannel(CHANNEL_ID,
+                    getString(R.string.channel_name), NotificationManager.IMPORTANCE_LOW);
+
+            notificationManager.createNotificationChannel(notificationChannel);
+        }
         pngDir = new File(getFilesDir(), "png");
         gifDir = new File(getFilesDir(), "gif");
         apng2GifCustom = new Apng2GifCustom();
@@ -260,4 +269,4 @@ private void send() {
         LocalBroadcastManager.getInstance(this).sendBroadcast(intent);
     }
 
-}
+}

app/src/main/java/io/github/jeffshee/linestickerkeyboard/FetchService.java

@@ -200,6 +200,20 @@ public void onClick(DialogInterface dialogInterface, int i) {
         //
     }
 
+    public void launchMainMenu(){
+        Intent intent = new Intent(IMService.this, MainActivity.class);
+        // Flag needed by older Android
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        IMService.this.startActivity(intent);
+    }
+
+    public void showIMPicker(){
+        InputMethodManager im = (InputMethodManager) IMService.this.getSystemService(INPUT_METHOD_SERVICE);
+        if (im != null) {
+            im.showInputMethodPicker();
+        }
+    }
+
     @Override
     public void onCreate() {
         super.onCreate();

app/src/main/java/io/github/jeffshee/linestickerkeyboard/IMService.java

@@ -13,13 +13,11 @@
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.Toast;
 
 import java.util.ArrayList;
 
-import cn.nekocode.badge.BadgeDrawable;
 import io.github.jeffshee.linestickerkeyboard.Model.HistoryPack;
 import io.github.jeffshee.linestickerkeyboard.Model.Sticker;
 import io.github.jeffshee.linestickerkeyboard.Util.SharedPrefHelper;
@@ -43,14 +41,6 @@ protected void onCreate(Bundle savedInstanceState) {
         listView.setAdapter(new ArrayAdapter<>(this,
                 android.R.layout.simple_list_item_1, getResources().getStringArray(R.array.main_activity_list)));
         listView.setOnItemClickListener(this);
-        ImageView footer = findViewById(R.id.footer);
-        footer.setImageDrawable(new
-                BadgeDrawable.Builder()
-                .type(BadgeDrawable.TYPE_WITH_TWO_TEXT_COMPLEMENTARY)
-                .badgeColor(getResources().getColor(R.color.md_deep_purple_900))
-                .text1(getString(R.string.app_name))
-                .text2(BuildConfig.VERSION_NAME)
-                .build());
     }
 
     @Override