Merge pull request #56 from Doomsdayrs/development

Release v1.0.0

.gitignore

@@ -1,5 +1,6 @@
 *.iml
 .gradle
+/gradle
 /local.properties
 .idea/*
 .DS_Store

app/build.gradle

@@ -1,13 +1,15 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 29
     defaultConfig {
-        applicationId "com.github.doomsdayrs.apps.shosetsu"
+        applicationId 'com.github.doomsdayrs.apps.shosetsu'
         minSdkVersion 22
         targetSdkVersion 29
-        versionCode 21
-        versionName "v0.1.0.1"
+        versionCode 22
+        versionName "v1.0.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
     }
@@ -20,6 +22,11 @@ android {
         debug {
             versionNameSuffix = '-debug'
         }
+        dev {
+            versionNameSuffix = '-dev'
+            applicationIdSuffix '.dev'
+            debuggable true
+        }
     }
     compileOptions {
         targetCompatibility = '1.8'
@@ -30,7 +37,7 @@ android {
 android.applicationVariants.all { variant ->
     variant.outputs.all {
         def appName = "shosetsu"
-        outputFileName = appName+"-${variant.versionName}.apk"
+        outputFileName = appName + "-${variant.versionName}.apk"
     }
 }
 android {
@@ -47,29 +54,56 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.google.android.material:material:1.1.0-alpha10'
-    implementation 'com.graphql-java:graphql-java:2019-08-20T01-08-54-018b57c'
+    implementation 'com.google.android.material:material:1.2.0-alpha03'
+    implementation 'com.graphql-java:graphql-java:2019-12-31T02-25-35-a83995a'
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     //noinspection GradleCompatible
-    implementation 'com.google.android.material:material:1.1.0-alpha10'
-    testImplementation 'junit:junit:4.13-beta-3'
+    implementation 'com.google.android.material:material:1.2.0-alpha03'
+    implementation 'androidx.work:work-runtime:2.2.0'
+    testImplementation 'junit:junit:4.13'
+    testImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
 
-    implementation 'com.github.Doomsdayrs:shosetsu-extensions:0.1.1'
-    implementation 'com.github.Doomsdayrs:shosetsu-services:v0.1.1'
+    // Annotations
+    implementation 'org.jetbrains:annotations:18.0.0'
+    implementation 'androidx.annotation:annotation:1.1.0'
 
-    implementation 'com.github.Doomsdayrs:novelreader-services:1.1.4'
+    // Core libraries
+    implementation 'com.github.doomsdayrs:shosetsu-extensions:0.2.3'
+    implementation 'com.github.doomsdayrs:shosetsu-services:0.2.5'
 
+    // Image loading
     implementation 'com.squareup.picasso:picasso:2.71828'
-    implementation 'org.jetbrains:annotations:17.0.0'
 
     //TODO GITHUB sign in to save backup data to cloud
-    implementation 'com.github.kohsuke:github-api:github-api-1.95'
+    //implementation 'com.github.kohsuke:github-api:github-api-1.95'
+
+    // App updater
     implementation 'com.github.javiersantos:AppUpdater:2.7'
+
+    // Markdown view
     implementation 'us.feras.mdv:markdownview:1.1.0'
-    implementation 'joda-time:joda-time:2.10.3'
-    implementation "org.mozilla.components:feature-readerview:1.0.0"
+
+    // Time control
+    implementation 'joda-time:joda-time:2.10.5'
+
+    // Choosing backup files
+    implementation 'com.vincent.filepicker:MultiTypeFilePicker:1.0.8'
+
+
+    // TODO Implement readerview provided by Mozilla
+    //implementation "org.mozilla.components:feature-readerview:1.0.0"
+    //implementation 'org.mozilla.components:support-base:1.0.0'
+
+    // Cloud flare calculator
+    implementation 'com.zhkrb.cloudflare-scrape-android:scrape-rhino:0.1.1'
+
+    implementation 'androidx.core:core-ktx:1.2.0-rc01'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
+    // Async controller
+    implementation 'com.zsoltsafrany:needle:1.0.0'
 }

app/src/androidTest/java/com/github/doomsdayrs/apps/shosetsu/ExampleInstrumentedTest.java

@@ -1,26 +1,21 @@
 package com.github.doomsdayrs.apps.shosetsu;
 
-import android.content.Context;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
-import static org.junit.Assert.*;
+import static com.github.doomsdayrs.apps.shosetsu.backend.Utilities.cleanString;
 
 /**
  * Instrumented test, which will execute on an Android device.
  *
  * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
  */
-@RunWith(AndroidJUnit4.class)
 public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("com.github.doomsdayrs.apps.shosetsu", appContext.getPackageName());
+    @Test
+    public void test() {
+        String a = "Abc123+++::::/ / `\"";
+        System.out.println(a);
+        a = cleanString(a);
+        System.out.println(a);
     }
 }

app/src/main/AndroidManifest.xml

@@ -8,6 +8,8 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
@@ -16,30 +18,51 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
+        android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.MaterialComponents"
         tools:ignore="GoogleAppIndexingWarning"
-        tools:targetApi="n">
+        tools:targetApi="q">
+
+
         <activity
             android:name="com.github.doomsdayrs.apps.shosetsu.ui.main.MainActivity"
             android:theme="@style/Theme.MaterialComponents.Light.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
         </activity>
 
         <activity
             android:name=".ui.webView.WebViewApp"
             android:theme="@style/Theme.MaterialComponents.Light.NoActionBar" />
+
         <activity
             android:name=".ui.reader.ChapterReader"
             android:theme="@style/Theme.MaterialComponents.Light.NoActionBar" />
+
         <activity
             android:name=".ui.migration.MigrationView"
             android:theme="@style/Theme.MaterialComponents.Light.NoActionBar" />
+
+
+
+        <activity android:name=".ui.search.SearchFragment">
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+                <action android:name="com.google.android.gms.actions.SEARCH_ACTION" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.searchable"
+                android:resource="@xml/searchable" />
+        </activity>
     </application>
 
 </manifest>