devol
/
UntrackMe-app-android-redirect-nitter-invidious-bibliogram
mirror of https://framagit.org/tom79/nitterizeme
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'layout_fixes' into 'develop' 

Layout fixes

See merge request tom79/nitterizeme!59
This commit is contained in:
Thomas 2020-04-04 19:49:45 +02:00
parent e514f57d90 332b6bd80c
commit 16fb1cfb8e
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/app/fedilab/nitterizeme/MainActivity.java
View File

@ -462,6 +462,7 @@ public class MainActivity extends AppCompatActivity {
editor.apply(); editor.apply();
TextView osm_indications = findViewById(R.id.osm_indications); TextView osm_indications = findViewById(R.id.osm_indications);
if (isChecked) { if (isChecked) {
expand_instance_osm.setRotation(0f);
osm_current_group.setVisibility(View.GONE); osm_current_group.setVisibility(View.GONE);
osm_custom_group.setVisibility(View.GONE); osm_custom_group.setVisibility(View.GONE);
osm_indications.setText(R.string.redirect_gm_to_geo_uri); osm_indications.setText(R.string.redirect_gm_to_geo_uri);

31
app/src/main/res/layout/content_main.xml
View File

@ -258,17 +258,6 @@
app:layout_constraintStart_toEndOf="@id/label_instance_invidious" app:layout_constraintStart_toEndOf="@id/label_instance_invidious"
app:layout_constraintTop_toTopOf="@id/guide_invidious" /> app:layout_constraintTop_toTopOf="@id/guide_invidious" />
<CheckBox
android:id="@+id/enable_embed_player"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:text="@string/use_built_in_player"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/barrier_invidious" />
<androidx.constraintlayout.widget.Barrier <androidx.constraintlayout.widget.Barrier
android:id="@+id/barrier_invidious" android:id="@+id/barrier_invidious"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -281,7 +270,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="5dp" android:layout_margin="5dp"
app:layout_constraintBottom_toTopOf="@id/enable_embed_player" app:layout_constraintBottom_toTopOf="@id/barrier_invidious_2"
app:layout_constraintEnd_toStartOf="@id/button_save_instance_invidious" app:layout_constraintEnd_toStartOf="@id/button_save_instance_invidious"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/barrier_invidious"> app:layout_constraintTop_toBottomOf="@id/barrier_invidious">
@ -305,10 +294,26 @@
android:background="@null" android:background="@null"
android:contentDescription="@string/save" android:contentDescription="@string/save"
android:src="@drawable/ic_save" android:src="@drawable/ic_save"
app:layout_constraintBottom_toTopOf="@+id/enable_embed_player" app:layout_constraintBottom_toTopOf="@+id/barrier_invidious_2"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/barrier_invidious" /> app:layout_constraintTop_toTopOf="@id/barrier_invidious" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/barrier_invidious_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="invidious_instance_container,button_save_instance_invidious" />
<CheckBox
android:id="@+id/enable_embed_player"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:text="@string/use_built_in_player"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/barrier_invidious_2" />
<androidx.constraintlayout.widget.Group <androidx.constraintlayout.widget.Group
android:id="@+id/group_current_invidious" android:id="@+id/group_current_invidious"
android:layout_width="wrap_content" android:layout_width="wrap_content"