devol/UntrackMe-app-android-redirect-nitter-invidious-bibliogram
1
0
Fork 0
mirror of https://framagit.org/tom79/nitterizeme synced 2025-02-26 08:27:41 +01:00
Code Issues Releases Wiki Activity

Merge branch 'layout_fixes' into 'develop'

Browse Source 
Layout changes

See merge request tom79/nitterizeme!63
This commit is contained in:
Thomas 2020-04-10 17:25:57 +02:00
commit d892634ad6
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,6 +235,7 @@ public class MainActivity extends AppCompatActivity {
bibliogram_current_group.setVisibility(bibliogram_enabled ? View.VISIBLE : View.GONE); bibliogram_current_group.setVisibility(bibliogram_enabled ? View.VISIBLE : View.GONE);
osm_current_group.setVisibility((osm_enabled && geouri_enabled) ? View.VISIBLE : View.GONE); osm_current_group.setVisibility((osm_enabled && geouri_enabled) ? View.VISIBLE : View.GONE);
enable_geo_uris.setVisibility(osm_enabled ? View.VISIBLE : View.GONE); enable_geo_uris.setVisibility(osm_enabled ? View.VISIBLE : View.GONE);
enable_embed_player.setVisibility(invidious_enabled ? View.VISIBLE : View.GONE);
enable_invidious.setOnCheckedChangeListener((buttonView, isChecked) -> { enable_invidious.setOnCheckedChangeListener((buttonView, isChecked) -> {
SharedPreferences.Editor editor = sharedpreferences.edit(); SharedPreferences.Editor editor = sharedpreferences.edit();
@ -242,6 +243,7 @@ public class MainActivity extends AppCompatActivity {
editor.apply(); editor.apply();
invidious_current_group.setVisibility(isChecked ? View.VISIBLE : View.GONE); invidious_current_group.setVisibility(isChecked ? View.VISIBLE : View.GONE);
invidious_custom_group.setVisibility(View.GONE); invidious_custom_group.setVisibility(View.GONE);
enable_embed_player.setVisibility(isChecked ? View.VISIBLE : View.GONE);
expand_instance_invidious.setRotation(0); expand_instance_invidious.setRotation(0);
}); });
enable_nitter.setOnCheckedChangeListener((buttonView, isChecked) -> { enable_nitter.setOnCheckedChangeListener((buttonView, isChecked) -> {

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

@ -309,9 +309,10 @@
android:id="@+id/enable_embed_player" android:id="@+id/enable_embed_player"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="5dp" android:layout_marginTop="5dp"
android:text="@string/use_built_in_player" android:text="@string/use_built_in_player"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/barrier_invidious_2" /> app:layout_constraintTop_toBottomOf="@+id/barrier_invidious_2" />
<androidx.constraintlayout.widget.Group <androidx.constraintlayout.widget.Group
@ -609,9 +610,10 @@
android:id="@+id/enable_geo_uris" android:id="@+id/enable_geo_uris"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="5dp" android:layout_marginTop="5dp"
android:text="@string/use_geo_uri" android:text="@string/use_geo_uri"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/barrier_osm_2" /> app:layout_constraintTop_toBottomOf="@+id/barrier_osm_2" />
<androidx.constraintlayout.widget.Group <androidx.constraintlayout.widget.Group