add attachment & password to post a thread

kidozh · May 12, 2020 · aaf5045 · aaf5045
1 parent 6dfc490
commit aaf5045
Show file tree

Hide file tree

Showing 38 changed files with 1,603 additions and 129 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.kidozh.discuzhub"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 4
-        versionName "1.3"
+        versionCode 5
+        versionName "1.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -111,6 +111,10 @@ dependencies {
     implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
 
     implementation "org.jsoup:jsoup:1.12.1"
+    // for guava
+    implementation "com.google.guava:guava:28.0-jre"
+
+    api "com.google.guava:guava:28.0-android"
 
 
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -39,7 +39,10 @@
             android:name=".activities.bbsShowPortalActivity"
             android:label="@string/title_activity_bbs_show_portal" />
         <activity android:name=".activities.loginBBSActivity" />
-        <activity android:name=".activities.showImageFullscreenActivity" />
+        <activity
+            android:name=".activities.showImageFullscreenActivity"
+            android:colorMode="wideColorGamut"
+            tools:targetApi="o" />
         <activity android:name=".activities.ui.bbsDetailedInformation.bbsShowInformationActivity" />
         <activity
             android:name=".activities.SettingsActivity"
@@ -50,15 +53,17 @@
         <activity
             android:name=".activities.SplashScreenActivity"
             android:theme="@style/AppTheme.NoActionBar">
+
+        </activity>
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".MainActivity"
-            android:label="@string/app_name" />
         <activity android:name=".activities.bbsPostThreadActivity" />
 
         <meta-data

diff --git a/app/src/main/java/com/kidozh/discuzhub/MainActivity.java b/app/src/main/java/com/kidozh/discuzhub/MainActivity.java
@@ -10,6 +10,7 @@
 import android.os.Bundle;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.kidozh.discuzhub.activities.SettingsActivity;
+import com.kidozh.discuzhub.activities.SplashScreenActivity;
 import com.kidozh.discuzhub.activities.aboutAppActivity;
 import com.kidozh.discuzhub.adapter.forumInformationAdapter;
 import com.kidozh.discuzhub.callback.forumSwipeToDeleteCallback;
@@ -96,7 +97,14 @@ protected void onCreate(Bundle savedInstanceState) {
         bindForumData();
         configureFab();
         configureSwipeRefreshLayout();
+        checkTermOfUse();
 
+
+    }
+
+    private void checkTermOfUse(){
+        Intent intent = new Intent(this, SplashScreenActivity.class);
+        startActivity(intent);
     }
 
 

diff --git a/app/src/main/java/com/kidozh/discuzhub/activities/SplashScreenActivity.java b/app/src/main/java/com/kidozh/discuzhub/activities/SplashScreenActivity.java
@@ -164,8 +164,9 @@ private void configureDarkMode(){
 
     private void enterMainActivity(){
 
-        Intent intent = new Intent(this, MainActivity.class);
-        startActivity(intent);
+        //Intent intent = new Intent(this, MainActivity.class);
+        //startActivity(intent);
+        finish();
     }
 
     private void renderPage(){