[2.0] Major Update

Author: jeffshee

.idea/caches/build_file_checksums.ser

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
     defaultConfig {
         applicationId "io.github.jeffshee.linestickerkeyboard"
         minSdkVersion 15
-        targetSdkVersion 28
-        versionCode 3
-        versionName "1.3.4"
+        targetSdkVersion 30
+        versionCode 4
+        versionName "2.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -26,13 +26,17 @@ repositories {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    //noinspection GradleCompatible
     implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'com.android.support.constraint:constraint-layout:2.0.1'
+    //noinspection GradleCompatible
     implementation 'com.android.support:support-v4:28.0.0'
+    //noinspection GradleCompatible
     implementation 'com.android.support:support-vector-drawable:28.0.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    //noinspection GradleCompatible
     implementation 'com.android.support:design:28.0.0'
     implementation 'com.github.bumptech.glide:glide:4.8.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0'

.idea/gradle.xml

@@ -19,6 +19,7 @@
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.Target;
+import com.bumptech.glide.signature.ObjectKey;
 
 import java.io.File;
 
@@ -50,9 +51,9 @@ public void onBindViewHolder(@NonNull final RecyclerView.ViewHolder holder, int
         stickerViewHolder.itemView.setTag(getSticker(position));
         stickerViewHolder.textView.setText(R.string.loading);
         stickerViewHolder.textView.setTextColor(context.getResources().getColor(R.color.colorLoading));
-
-        RequestOptions requestOptions = new RequestOptions().error(R.drawable.error);
-        RequestBuilder<Drawable> requestBuilder = Glide.with(context).load(getStickerPng(context, position));
+        File png = getFile(context, position);
+        RequestOptions requestOptions = new RequestOptions().error(R.drawable.error).signature(new ObjectKey(png.lastModified()));
+        RequestBuilder<Drawable> requestBuilder = Glide.with(context).load(png);
         requestBuilder.listener(new RequestListener<Drawable>() {
             @Override
             public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
@@ -89,7 +90,7 @@ public boolean onLongClick(View v) {
     }
 
 
-    protected abstract File getStickerPng(Context context, int position);
+    protected abstract File getFile(Context context, int position);
 
     protected abstract Sticker getSticker(int position);
 

.idea/jarRepositories.xml

@@ -17,8 +17,8 @@ public HistoryAdapter(Context context, HistoryPack historyPack) {
     }
 
     @Override
-    protected File getStickerPng(Context context, int position) {
-        return FileHelper.getPngFile(context, historyPack.getId(position));
+    protected File getFile(Context context, int position) {
+        return FileHelper.getFile(context, historyPack.getSticker(position));
     }
 
     @Override

.idea/misc.xml

@@ -18,6 +18,8 @@
 import android.widget.ToggleButton;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
+import com.bumptech.glide.signature.ObjectKey;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -52,8 +54,9 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int i)
         final ListViewHolder stickerViewHolder = (ListViewHolder) viewHolder;
         stickerViewHolder.itemView.setTag(stickerPacks.get(i));
         stickerViewHolder.textView.setText(stickerPacks.get(i).getTitle());
-        File png = FileHelper.getPngFile(context, stickerPacks.get(i).getFirstId());
-        Glide.with(context).load(png).into(stickerViewHolder.imageView);
+        File png = FileHelper.getPngFile(context, stickerPacks.get(i).getId(0));
+        RequestOptions requestOptions = new RequestOptions().signature(new ObjectKey(png.lastModified()));
+        Glide.with(context).load(png).apply(requestOptions).into(stickerViewHolder.imageView);
         stickerViewHolder.button.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

app/build.gradle

@@ -24,8 +24,8 @@ public int getItemCount() {
     }
 
     @Override
-    protected File getStickerPng(Context context, int position) {
-        return FileHelper.getPngFile(context, stickerPack.getId(position));
+    protected File getFile(Context context, int position) {
+        return FileHelper.getFile(context, new Sticker(stickerPack.getType(), stickerPack.getId(position)));
     }
 
     @Override

app/src/main/java/io/github/jeffshee/linestickerkeyboard/Adapter/BasePackAdapter.java

@@ -21,6 +21,7 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.EditText;
+import android.widget.Switch;
 import android.widget.Toast;
 
 import java.util.ArrayList;
@@ -93,11 +94,12 @@ private void manualAdd() {
         final AlertDialog.Builder builder = new AlertDialog.Builder(this);
         View view = getLayoutInflater().inflate(R.layout.dialog_editor, null);
         final EditText editText = view.findViewById(R.id.etId);
+        final Switch fallback = view.findViewById(R.id.switch_fallback);
         builder.setView(view)
                 .setPositiveButton(getString(R.string.positive_confirm), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        FetchService.startActionFetchManual(activity, Integer.parseInt(editText.getText().toString()));
+                        FetchService.startActionFetchManual(activity, Integer.parseInt(editText.getText().toString()), fallback.isChecked());
                         Toast.makeText(activity, getString(R.string.fetch_activity_toast), Toast.LENGTH_SHORT).show();
                     }
                 })