Peertube
/
TubeLab-App-Android
mirror of https://framagit.org/tom79/fedilab-tube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes

This commit is contained in:
Thomas 2020-12-16 10:14:46 +01:00
parent 1f2ecd591d
commit 14cde8e625
3 changed files with 28 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/app/fedilab/fedilabtube/MainActivity.java
View File

@ -345,9 +345,8 @@ public class MainActivity extends AppCompatActivity implements ChromeCastsListen
typeOfConnection = TypeOfConnection.UNKNOWN;
BottomNavigationView navView = findViewById(R.id.nav_view);
navView.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
binding.navView.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
if (getSupportActionBar() != null) {
getSupportActionBar().setDisplayShowTitleEnabled(false);
@ -420,11 +419,11 @@ public class MainActivity extends AppCompatActivity implements ChromeCastsListen
setTitleCustom(R.string.title_discover);
if (Helper.isLoggedIn(MainActivity.this)) {
navView.inflateMenu(R.menu.bottom_nav_menu_connected);
binding.navView.inflateMenu(R.menu.bottom_nav_menu_connected);
refreshToken();
} else {
navView.inflateMenu(R.menu.bottom_nav_menu);
binding.navView.inflateMenu(R.menu.bottom_nav_menu);
}
peertubeInformation = new PeertubeInformation();
peertubeInformation.setCategories(new LinkedHashMap<>());

75
app/src/main/java/app/fedilab/fedilabtube/helper/HelperAcadInstance.java
View File

@ -15,7 +15,7 @@ package app.fedilab.fedilabtube.helper;
* see <http://www.gnu.org/licenses>. */
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
public class HelperAcadInstance {
@ -23,62 +23,7 @@ public class HelperAcadInstance {
public static Map<String, String> instances_themes;
static {
Map<String, String> is = new HashMap<>();
is.put("Normandie", "tube-normandie.beta.education.fr");
is.put("Enseignement professionnel", "tube-enseignement-professionnel.apps.education.fr");
is.put("Action éducative", "tube-action-educative.apps.education.fr");
is.put("Numérique éducatif", "tube-numerique-educatif.apps.education.fr");
is.put("Institutionnel", "tube-institutionnelle.apps.education.fr");
is.put("2d - langues vivantes", "tube-2d-langues-vivantes.apps.education.fr");
is.put("2d - éducation physique et sportive", "tube-2d-education-physique-et-sportive.apps.education.fr");
is.put("2d - arts, lettres et sciences humaines", "tube-2d-arts-lettres-sciences-humaines.apps.education.fr");
is.put("Maternelle", "tube-maternelle.apps.education.fr");
is.put("Cycle 2", "tube-cycle-2.apps.education.fr");
is.put("Cycle 3", "tube-cycle-3.apps.education.fr");
instances_themes = Collections.unmodifiableMap(is);
}
//List of available academies
/*public static String[] openid = {
"ac-normandie.fr",
"education.fr",
"education.gouv.fr"
//TODO: remove this one used for tests
// "ac-orleans-tours.fr"
};
public static String[] academies = {
"ac-aix-marseille.fr",
"ac-amiens.fr",
"ac-besancon.fr",
"ac-bordeaux.fr",
"clermont-ferrand.fr",
"ac-corse.fr",
"ac-creteil.fr",
"ac-dijon.fr",
"ac-grenoble.fr",
"education.fr",
"ac-lille.fr",
"ac-limoges.fr",
"ac-lyon.fr",
"ac-mayotte.fr",
"ac-montpellier.fr",
"ac-nancy.fr",
"ac-nantes.fr",
"ac-normandie.fr",
"ac-orleans-tours.fr",
"ac-paris.fr",
"ac-poitiers.fr",
"outremer.fr",
"ac-rennes.fr",
"ac-strasbourg.fr",
"ac-toulouse.fr",
"ac-versailles.fr"
};*/
//List of available emails
public static String[] valideEmails = {
"ac-aix-marseille.fr",
"ac-amiens.fr",
@ -117,4 +62,20 @@ public class HelperAcadInstance {
"igesr.gouv.fr"
};
static {
Map<String, String> is = new LinkedHashMap<>();
is.put("Normandie", "tube-normandie.beta.education.fr");
is.put("Enseignement professionnel", "tube-enseignement-professionnel.apps.education.fr");
is.put("Action éducative", "tube-action-educative.apps.education.fr");
is.put("Numérique éducatif", "tube-numerique-educatif.apps.education.fr");
is.put("Institutionnel", "tube-institutionnelle.apps.education.fr");
is.put("2d - langues vivantes", "tube-2d-langues-vivantes.apps.education.fr");
is.put("2d - éducation physique et sportive", "tube-2d-education-physique-et-sportive.apps.education.fr");
is.put("2d - arts, lettres et sciences humaines", "tube-2d-arts-lettres-sciences-humaines.apps.education.fr");
is.put("Maternelle", "tube-maternelle.apps.education.fr");
is.put("Cycle 2", "tube-cycle-2.apps.education.fr");
is.put("Cycle 3", "tube-cycle-3.apps.education.fr");
instances_themes = Collections.unmodifiableMap(is);
}
}

13
app/src/main/res/layout/drawer_comment.xml
View File

@ -112,21 +112,22 @@
android:id="@+id/number_of_replies"
app:layout_constraintTop_toBottomOf="@+id/comment_content"
app:layout_constraintStart_toStartOf="@id/comment_account_profile"
android:layout_marginEnd="15dp"
app:layout_constraintEnd_toStartOf="@+id/replyButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="?attr/colorAccent"/>
android:textColor="?attr/colorAccent" />
<TextView
app:layout_constraintTop_toBottomOf="@+id/comment_content"
app:layout_constraintStart_toStartOf="@id/comment_account_profile"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:layout_marginStart="10dp"
app:layout_constraintStart_toEndOf="@id/number_of_replies"
android:id="@+id/replyButton"
app:layout_constraintTop_toTopOf="@+id/number_of_replies"
android:text="@string/reply"
android:textColor="?attr/colorAccent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content" />
<Button
style="@style/Widget.AppCompat.Button.Borderless.Colored"