Merge pull request #164 from kandrio/kandrio-prune-18+

Prune the `ig-ssi` (18+) module
Tribler · Aug 28, 2023 · 04e21d2 · 04e21d2
2 parents da3ced3 + 289cf0f
commit 04e21d2
Show file tree

Hide file tree

Showing 66 changed files with 5 additions and 3,075 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -115,7 +115,6 @@ dependencies {
     implementation project(':freedomOfComputing')
     implementation project(':peerchat')
     implementation project(':eurotoken')
-    implementation project(':ig-ssi')
     implementation project(':valuetransfer')
     api(project(':common')) {
         exclude group: 'net.java.dev.jna'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -60,11 +60,6 @@
             android:name=".ui.dashboard.DashboardSelectorActivity"
             android:parentActivityName=".ui.dashboard.DashboardActivity" />
 
-        <activity
-            android:name="nl.tudelft.trustchain.ssi.SSIMainActivity"
-            android:parentActivityName=".ui.dashboard.DashboardActivity"
-            android:theme="@style/Theme.SSI" />
-
         <activity
             android:name="nl.tudelft.trustchain.common.ui.QRCodeActivityPortrait"
             android:screenOrientation="portrait"

diff --git a/app/src/main/java/nl/tudelft/trustchain/app/AppDefinition.kt b/app/src/main/java/nl/tudelft/trustchain/app/AppDefinition.kt
@@ -8,7 +8,6 @@ import nl.tudelft.trustchain.FOC.MainActivityFOC
 import nl.tudelft.trustchain.common.R
 import nl.tudelft.trustchain.debug.DebugActivity
 import nl.tudelft.trustchain.eurotoken.EuroTokenMainActivity
-import nl.tudelft.trustchain.ssi.SSIMainActivity
 import nl.tudelft.trustchain.peerchat.PeerChatActivity
 import nl.tudelft.trustchain.valuetransfer.ValueTransferMainActivity
 
@@ -19,13 +18,6 @@ enum class AppDefinition(
     val activity: Class<out Activity>,
     val disableImageTint: Boolean = false,
 ) {
-    EIGHTEEN_PLUS(
-        R.drawable.ic_18_plus,
-        "18+",
-        R.color.red,
-        SSIMainActivity::class.java,
-        true,
-    ),
     PEERCHAT(
         R.drawable.ic_chat_black_24dp,
         "PeerChat",

diff --git a/app/src/main/java/nl/tudelft/trustchain/app/AppLoader.kt b/app/src/main/java/nl/tudelft/trustchain/app/AppLoader.kt
@@ -74,7 +74,8 @@ class AppLoader(
         val DEFAULT_APPS = setOf(
             AppDefinition.VALUETRANSFER.appName,
             AppDefinition.MUSIC_DAO.appName,
-            AppDefinition.EIGHTEEN_PLUS.appName
+            AppDefinition.EUROTOKEN.appName,
+            AppDefinition.FREEDOM_OF_COMPUTING.appName
         )
     }
 }
diff --git a/...rawable/ic_arrow_drop_down_black_16dp.xml → ...rawable/ic_arrow_drop_down_black_16dp.xml b/...rawable/ic_arrow_drop_down_black_16dp.xml → ...rawable/ic_arrow_drop_down_black_16dp.xml
diff --git a/.../drawable/ic_arrow_drop_up_black_16dp.xml → .../drawable/ic_arrow_drop_up_black_16dp.xml b/.../drawable/ic_arrow_drop_up_black_16dp.xml → .../drawable/ic_arrow_drop_up_black_16dp.xml
diff --git a/ig-ssi/.gitignore b/ig-ssi/.gitignore
diff --git a/ig-ssi/build.gradle b/ig-ssi/build.gradle
diff --git a/ig-ssi/consumer-rules.pro b/ig-ssi/consumer-rules.pro
diff --git a/ig-ssi/proguard-rules.pro b/ig-ssi/proguard-rules.pro
diff --git a/ig-ssi/src/main/AndroidManifest.xml b/ig-ssi/src/main/AndroidManifest.xml
diff --git a/ig-ssi/src/main/java/nl/tudelft/trustchain/ssi/SSIMainActivity.kt b/ig-ssi/src/main/java/nl/tudelft/trustchain/ssi/SSIMainActivity.kt