Merge pull request #1390 from dedis/work-fe2-jpluss-single_activity

Single Lao Activity
dedis · Feb 21, 2023 · a332107 · a332107
2 parents ff42d63 + d4eac43
commit a332107
Show file tree

Hide file tree

Showing 158 changed files with 3,224 additions and 3,098 deletions.
diff --git a/fe2-android/app/src/main/AndroidManifest.xml b/fe2-android/app/src/main/AndroidManifest.xml
@@ -28,11 +28,7 @@
         <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
     </activity>
-    <activity
-      android:name=".ui.detail.LaoDetailActivity"
-      android:windowSoftInputMode="adjustPan" />
-      <activity android:name=".ui.socialmedia.SocialMediaActivity" />
-    <activity android:name=".ui.digitalcash.DigitalCashActivity" />
+    <activity android:name=".ui.lao.LaoActivity" />
 
     <uses-library
       android:name="android.test.runner"

diff --git a/fe2-android/app/src/main/java/com/github/dedis/popstellar/model/objects/Wallet.java b/fe2-android/app/src/main/java/com/github/dedis/popstellar/model/objects/Wallet.java
@@ -7,7 +7,7 @@
 import com.github.dedis.popstellar.di.KeysetModule.WalletKeyset;
 import com.github.dedis.popstellar.model.objects.security.PoPToken;
 import com.github.dedis.popstellar.model.objects.security.PublicKey;
-import com.github.dedis.popstellar.ui.wallet.stellar.SLIP10;
+import com.github.dedis.popstellar.ui.home.wallet.stellar.SLIP10;
 import com.github.dedis.popstellar.utility.error.keys.*;
 import com.google.crypto.tink.Aead;
 import com.google.crypto.tink.integration.android.AndroidKeysetManager;

diff --git a/fe2-android/app/src/main/java/com/github/dedis/popstellar/repository/ElectionRepository.java b/fe2-android/app/src/main/java/com/github/dedis/popstellar/repository/ElectionRepository.java
@@ -89,7 +89,7 @@ public Observable<Election> getElectionObservable(
    * @return an observable that will be updated with the set of all election's ids
    */
   @NonNull
-  public Observable<Set<Election>> getElectionsObservable(@NonNull String laoId) {
+  public Observable<Set<Election>> getElectionsObservableInLao(@NonNull String laoId) {
     return getLaoElections(laoId).getElectionsSubject();
   }
 

diff --git a/fe2-android/app/src/main/java/com/github/dedis/popstellar/ui/PopViewModel.java b/fe2-android/app/src/main/java/com/github/dedis/popstellar/ui/PopViewModel.java
@@ -0,0 +1,9 @@
+package com.github.dedis.popstellar.ui;
+
+import androidx.annotation.StringRes;
+
+public interface PopViewModel {
+  void setPageTitle(@StringRes int title);
+
+  String getLaoId();
+}
diff --git a/fe2-android/app/src/main/java/com/github/dedis/popstellar/ui/detail/LaoDetailActivity.java b/fe2-android/app/src/main/java/com/github/dedis/popstellar/ui/detail/LaoDetailActivity.java