activities and fragments are converted to Kotlin

OpenArchive · May 4, 2021 · ac17095 · ac17095
1 parent af20dad
commit ac17095
Show file tree

Hide file tree

Showing 29 changed files with 1,476 additions and 2,135 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -70,6 +70,10 @@ android {
         jvmTarget = '1.8'
     }
 
+    buildFeatures {
+        viewBinding true
+    }
+
 }
 
 dependencies {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -24,10 +24,6 @@
             android:name=".publish.UploadManagerActivity"
             android:label="@string/title_activity_upload_manager"
             android:theme="@style/AppTheme.NoActionBar" />
-        <activity
-            android:name=".media.PreviewMediaListActivity"
-            android:label="@string/title_activity_batch_media_review"
-            android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".projects.AddProjectActivity"
             android:label="@string/title_activity_new_project"
@@ -69,16 +65,6 @@
             android:name=".onboarding.SpaceSetupActivity"
             android:label="@string/title_activity_first_start"
             android:screenOrientation="portrait" />
-        <activity
-            android:name=".media.ReviewMediaActivity"
-            android:label="@string/title_activity_view_media"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden" />
-        <activity
-            android:name=".media.BatchReviewMediaActivity"
-            android:label="@string/title_activity_batch_view_media"
-            android:screenOrientation="portrait"
-            android:windowSoftInputMode="stateHidden" />
         <activity
             android:name=".services.archivedotorg.ArchiveSettingsActivity"
             android:label="@string/title_activity_archive_metadata"
@@ -94,22 +80,11 @@
                 android:value="net.opendasharchive.openarchive.onboarding.SpaceSetupActivity" />
         </activity>
 
-        <activity
-            android:name=".core.AboutActivity"
-            android:label="@string/title_activity_about"
-            android:parentActivityName=".MainActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="net.opendasharchive.openarchive.MainActivity" />
-        </activity>
         <activity
             android:name=".onboarding.OAAppIntro"
             android:label="App Intro"
 	        android:screenOrientation="portrait"
             />
-        <activity
-            android:name=".core.SettingsActivity"
-            android:label="App Intro" />
         <activity
             android:name=".services.webdav.WebDAVLoginActivity"
             android:label="@string/title_activity_login" />
@@ -119,20 +94,6 @@
         <activity
             android:name=".services.dropbox.DropboxLoginActivity"
             android:label="@string/title_activity_login" />
-        <activity
-            android:name=".core.SpaceSettingsActivity"
-            android:label="@string/title_activity_space_settings" >
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:scheme="nc" />
-            </intent-filter>
-        </activity>
 
         <meta-data
             android:name="DOMAIN_PACKAGE_NAME"

diff --git a/app/src/main/java/net/opendasharchive/openarchive/MainActivity.java b/app/src/main/java/net/opendasharchive/openarchive/MainActivity.java
@@ -36,15 +36,15 @@
 import com.zhihu.matisse.internal.entity.CaptureStrategy;
 
 import net.i2p.android.ext.floatingactionbutton.FloatingActionButton;
-import net.opendasharchive.openarchive.core.SpaceSettingsActivity;
 import net.opendasharchive.openarchive.db.Collection;
 import net.opendasharchive.openarchive.db.Media;
 import net.opendasharchive.openarchive.db.Project;
 import net.opendasharchive.openarchive.db.ProjectAdapter;
 import net.opendasharchive.openarchive.db.Space;
+import net.opendasharchive.openarchive.features.core.SpaceSettingsActivity;
+import net.opendasharchive.openarchive.features.media.PreviewMediaListActivity;
+import net.opendasharchive.openarchive.features.media.ReviewMediaActivity;
 import net.opendasharchive.openarchive.fragments.MediaListFragment;
-import net.opendasharchive.openarchive.media.PreviewMediaListActivity;
-import net.opendasharchive.openarchive.media.ReviewMediaActivity;
 import net.opendasharchive.openarchive.onboarding.OAAppIntro;
 import net.opendasharchive.openarchive.projects.AddProjectActivity;
 import net.opendasharchive.openarchive.publish.UploadManagerActivity;

diff --git a/app/src/main/java/net/opendasharchive/openarchive/core/AboutActivity.java b/app/src/main/java/net/opendasharchive/openarchive/core/AboutActivity.java
diff --git a/app/src/main/java/net/opendasharchive/openarchive/core/SettingsActivity.java b/app/src/main/java/net/opendasharchive/openarchive/core/SettingsActivity.java