Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2622bcaf authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '169-Fix_popup_view_alignment' into 'master' 

169-Fix_popup_view_alignment

See merge request !27
parents d1442731 9ed83b02

app/src/main/java/net/sourceforge/opencamera/ui/MainUI.java

+3 −3
Original line number Diff line number Diff line
@@ -616,13 +616,13 @@ public class MainUI { 
                layoutParams.addRule(above, 0);

                layoutParams.addRule(below, 0);

                layoutParams.addRule(left_of, 0);

                layoutParams.addRule(right_of, R.id.popup);

                layoutParams.addRule(right_of, R.id.top_bg);

                layoutParams.addRule(align_parent_top, RelativeLayout.TRUE);

                layoutParams.addRule(align_parent_bottom, RelativeLayout.TRUE);

            } else {

                layoutParams.addRule(align_right, R.id.popup);

                layoutParams.addRule(align_right, R.id.top_bg);

                layoutParams.addRule(above, 0);

                layoutParams.addRule(below, R.id.popup);

                layoutParams.addRule(below, R.id.top_bg);

                layoutParams.addRule(left_of, 0);

                layoutParams.addRule(right_of, 0);

                layoutParams.addRule(align_parent_top, 0);

app/src/main/res/layout/activity_main.xml

+2 −2
Original line number Diff line number Diff line
@@ -595,8 +595,8 @@ 
        android:id="@+id/popup_container"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_below="@+id/popup"

        android:layout_alignRight="@+id/popup"

        android:layout_below="@+id/top_bg"

        android:layout_alignRight="@+id/top_bg"

        android:fadeScrollbars="false" />



    <ScrollView