* Fix build because of recent changes

* Others
Andr3Carvalh0 · Aug 9, 2018 · 272c962 · 272c962 · mshowsary · Aug 26, 2018
1 parent 9841e64
commit 272c962
Show file tree

Hide file tree

Showing 30 changed files with 313 additions and 292 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/app/build.gradle b/app/build.gradle
@@ -72,11 +72,10 @@ dependencies {
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0-rc01'
     implementation 'androidx.room:room-runtime:2.0.0-rc01'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
     implementation 'io.reactivex.rxjava2:rxjava:2.1.10'
-    implementation('com.github.florent37:glidepalette:2.1.1', {
-        exclude group: 'com.android.support', 'module': 'palette-v7'
-    })
+    implementation('com.github.florent37:glidepalette:2.1.1', { exclude group: 'com.android.support', 'module': 'palette-v7' })
     implementation 'com.github.bumptech.glide:glide:4.8.0-SNAPSHOT'
     implementation 'com.squareup.retrofit2:retrofit:2.4.0'
     implementation 'com.google.dagger:dagger:2.17'
@@ -88,7 +87,7 @@ dependencies {
     implementation 'com.github.apl-devs:appintro:v4.2.3'
     implementation 'com.annimon:stream:1.2.0'
     implementation 'com.trello.rxlifecycle2:rxlifecycle-components:2.2.1'
-    implementation 'com.github.hotchemi:permissionsdispatcher:3.0.1'
+    implementation 'com.github.hotchemi:permissionsdispatcher:4.0.0-alpha1'
     implementation('com.mikepenz:aboutlibraries:6.0.6@aar') { transitive = true }
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
@@ -107,7 +106,7 @@ dependencies {
     kapt 'com.google.dagger:dagger-compiler:2.17'
     kapt 'com.github.bumptech.glide:compiler:4.8.0-SNAPSHOT'
     kapt 'com.google.dagger:dagger-android-processor:2.17'
-    kapt 'com.github.hotchemi:permissionsdispatcher-processor:3.0.1'
+    kapt 'com.github.hotchemi:permissionsdispatcher-processor:4.0.0-alpha1'
 
     //Others
     implementation project(':filepicker')

diff --git a/app/src/main/java/io/mgba/data/database/converters/GameConverter.java b/app/src/main/java/io/mgba/data/database/converters/GameConverter.java
@@ -0,0 +1,19 @@
+package io.mgba.data.database.converters;
+
+import java.io.File;
+
+import androidx.room.TypeConverter;
+
+public class GameConverter {
+    @TypeConverter
+    public static File fromStringToFile(String value) {
+        return value == null ? null : new File(value);
+    }
+
+    @TypeConverter
+    public static String fromFileToString(File value) {
+        return value == null ? null : value.getAbsolutePath();
+    }
+
+}
+
diff --git a/app/src/main/java/io/mgba/data/database/converters/GameConverter.kt b/app/src/main/java/io/mgba/data/database/converters/GameConverter.kt
diff --git a/app/src/main/java/io/mgba/presenter/SettingsPresenter.kt b/app/src/main/java/io/mgba/presenter/SettingsPresenter.kt
@@ -12,7 +12,7 @@ import io.mgba.utilities.IResourcesManager
 import io.reactivex.annotations.NonNull
 
 class SettingsPresenter(@param:NonNull private val view: ISettingsView, @NonNull resourcesManager: IResourcesManager) : ISettingsPresenter {
-    lateinit var settings: LinkedList<Settings>
+    var settings: LinkedList<Settings> = LinkedList()
 
     override fun onClick(settings: Settings): Any {
         val extras = HashMap<String, String>()

diff --git a/app/src/main/java/io/mgba/ui/activities/IntroActivity.java b/app/src/main/java/io/mgba/ui/activities/IntroActivity.java
@@ -0,0 +1,113 @@
+package io.mgba.ui.activities;
+
+import android.Manifest;
+import android.content.Intent;
+import android.os.Bundle;
+import androidx.annotation.NonNull;
+import com.github.paolorotolo.appintro.AppIntro2;
+import com.github.paolorotolo.appintro.AppIntroFragment;
+import java.util.List;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import io.mgba.model.system.PermissionManager;
+import io.mgba.presenter.interfaces.IIntroPresenter;
+import io.mgba.presenter.IntroPresenter;
+import io.mgba.ui.activities.interfaces.IIntroView;
+import io.mgba.utilities.IDependencyInjector;
+import io.mgba.mgba;
+import permissions.dispatcher.NeedsPermission;
+import permissions.dispatcher.OnNeverAskAgain;
+import permissions.dispatcher.OnPermissionDenied;
+import permissions.dispatcher.OnShowRationale;
+import permissions.dispatcher.PermissionRequest;
+import permissions.dispatcher.RuntimePermissions;
+
+@RuntimePermissions
+public class IntroActivity extends AppIntro2 implements IIntroView{
+
+    private IIntroPresenter controller;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        controller = new IntroPresenter(new PermissionManager(this),
+                (IDependencyInjector) getApplication(), this);
+    }
+
+    @NeedsPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)
+    void showFilePicker() {
+        controller.showFilePicker();
+    }
+
+    @OnShowRationale(Manifest.permission.WRITE_EXTERNAL_STORAGE)
+    void showRationaleForStorage(final PermissionRequest request) {
+        controller.showRationaleForStorage(request);
+    }
+
+    @OnNeverAskAgain(Manifest.permission.WRITE_EXTERNAL_STORAGE)
+    @OnPermissionDenied(Manifest.permission.WRITE_EXTERNAL_STORAGE)
+    void onDeniedForStorage(){
+        controller.onDeniedForStorage();
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        IntroActivityPermissionsDispatcher.onRequestPermissionsResult(this, requestCode, grantResults);
+    }
+
+    protected void onActivityResult(int requestCode, int resultCode, Intent intent) {
+        controller.onActivityResult(requestCode, resultCode, intent);
+    }
+
+    @Override
+    public void onDonePressed(Fragment currentFragment) {
+        super.onDonePressed(currentFragment);
+        IntroActivityPermissionsDispatcher.showFilePickerWithPermissionCheck(this);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        controller.onPause();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        controller.onResume();
+    }
+
+    @Override
+    public void addSlides(List<AppIntroFragment> slides) {
+        for (AppIntroFragment frag : slides)
+            this.addSlide(frag);
+
+        this.setProgressButtonEnabled(true);
+        this.setFadeAnimation();
+        this.showSkipButton(false);
+    }
+
+    @Override
+    public void savePreference(String key, String value) {
+        ((mgba)getApplication()).savePreference(key, value);
+    }
+
+    @Override
+    public void savePreference(String key, boolean value) {
+        ((mgba)getApplication()).savePreference(key, value);
+    }
+
+    @Override
+    public void showProgressDialog() {
+        ((mgba)getApplication()).showProgressDialog(this);
+    }
+
+    @Override
+    public void startActivity(Class<? extends AppCompatActivity> activity) {
+        Intent it = new Intent(this, activity);
+        startActivity(it);
+        finish();
+    }
+}
diff --git a/app/src/main/java/io/mgba/ui/activities/IntroActivity.kt b/app/src/main/java/io/mgba/ui/activities/IntroActivity.kt
diff --git a/app/src/main/java/io/mgba/ui/activities/MainActivity.kt b/app/src/main/java/io/mgba/ui/activities/MainActivity.kt
@@ -76,7 +76,8 @@ class MainActivity : AppCompatActivity(), TabLayout.OnTabSelectedListener, io.mg
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) {
-        controller!!.onActivityResult(requestCode, resultCode, intent!!)
+        if(intent != null)
+            controller!!.onActivityResult(requestCode, resultCode, intent)
     }
 
     override fun onStop() {