handle orientation changes manually -> screen rotate is ~instantaneous (

fixes #1217)
streetcomplete · Sep 27, 2018 · d327930 · d327930
1 parent 784b798
commit d327930
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 9 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -25,7 +25,8 @@
         <activity
             android:windowSoftInputMode="adjustResize"
             android:name="de.westnordost.streetcomplete.MainActivity"
-            android:label="@string/app_name" >
+            android:label="@string/app_name"
+            android:configChanges="orientation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

diff --git a/app/src/main/java/de/westnordost/streetcomplete/MainActivity.java b/app/src/main/java/de/westnordost/streetcomplete/MainActivity.java
@@ -1,6 +1,7 @@
 package de.westnordost.streetcomplete;
 
 import android.animation.ObjectAnimator;
+import android.content.res.Configuration;
 import android.graphics.Point;
 import android.graphics.PointF;
 import android.support.annotation.DrawableRes;
@@ -236,13 +237,8 @@ public void onServiceDisconnected(ComponentName className)
 		downloadProgressBar.setMax(1000);
 
 		mapFragment = (QuestsMapFragment) getSupportFragmentManager().findFragmentById(R.id.map_fragment);
-		mapFragment.setQuestOffsets(new Rect(
-				getResources().getDimensionPixelSize(R.dimen.quest_form_leftOffset),
-				0,
-				getResources().getDimensionPixelSize(R.dimen.quest_form_rightOffset),
-				getResources().getDimensionPixelSize(R.dimen.quest_form_bottomOffset)));
-
 		mapFragment.getMapAsync(BuildConfig.MAPZEN_API_KEY);
+		updateMapQuestOffsets();
 	}
 
 	@Override public void onStart()
@@ -331,6 +327,21 @@ public void onServiceDisconnected(ComponentName className)
 		questController.onDestroy();
 	}
 
+	@Override public void onConfigurationChanged(Configuration newConfig) {
+		super.onConfigurationChanged(newConfig);
+		findViewById(R.id.main).requestLayout();
+		updateMapQuestOffsets();
+	}
+
+	private void updateMapQuestOffsets()
+	{
+		mapFragment.setQuestOffsets(new Rect(
+			getResources().getDimensionPixelSize(R.dimen.quest_form_leftOffset),
+			0,
+			getResources().getDimensionPixelSize(R.dimen.quest_form_rightOffset),
+			getResources().getDimensionPixelSize(R.dimen.quest_form_bottomOffset)));
+	}
+
 	@Override public boolean onCreateOptionsMenu(Menu menu)
 	{
 		getMenuInflater().inflate(R.menu.menu_main, menu);

diff --git a/app/src/main/java/de/westnordost/streetcomplete/data/osmnotes/CreateNoteFragment.java b/app/src/main/java/de/westnordost/streetcomplete/data/osmnotes/CreateNoteFragment.java
@@ -1,6 +1,7 @@
 package de.westnordost.streetcomplete.data.osmnotes;
 
 import android.content.Context;
+import android.content.res.Configuration;
 import android.graphics.Point;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -24,7 +25,8 @@
 public class CreateNoteFragment extends AbstractCreateNoteFragment
 {
 	private EditText noteInput;
-	private View markerLayout;
+	private ViewGroup markerLayout;
+	private ViewGroup centeredMarkerLayout;
 	private View marker;
 
 	private CreateNoteListener callbackListener;
@@ -39,6 +41,7 @@ public class CreateNoteFragment extends AbstractCreateNoteFragment
 		{
 			markerLayout.startAnimation(createFallDownAnimation());
 		}
+		centeredMarkerLayout = view.findViewById(R.id.centered_marker_layout_create_note);
 
 		marker = view.findViewById(R.id.marker_create_note);
 
@@ -50,6 +53,17 @@ public class CreateNoteFragment extends AbstractCreateNoteFragment
 		return view;
 	}
 
+	@Override public void onConfigurationChanged(Configuration newConfig)
+	{
+		super.onConfigurationChanged(newConfig);
+		centeredMarkerLayout.setPadding(
+			getResources().getDimensionPixelSize(R.dimen.quest_form_leftOffset),
+			getResources().getDimensionPixelSize(R.dimen.quest_form_topOffset),
+			getResources().getDimensionPixelSize(R.dimen.quest_form_rightOffset),
+			getResources().getDimensionPixelSize(R.dimen.quest_form_bottomOffset)
+		);
+	}
+
 	private Animation createFallDownAnimation()
 	{
 		AnimationSet a = new AnimationSet(false);

diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractBottomSheetFragment.java b/app/src/main/java/de/westnordost/streetcomplete/quests/AbstractBottomSheetFragment.java
@@ -9,7 +9,9 @@
 import android.support.design.widget.BottomSheetBehavior;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.AlertDialog;
+import android.util.DisplayMetrics;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.animation.AnimationUtils;
 import android.widget.LinearLayout;
 
@@ -22,6 +24,7 @@
 public abstract class AbstractBottomSheetFragment extends Fragment
 {
 	private LinearLayout bottomSheet;
+	private BottomSheetBehavior bottomSheetBehavior;
 	private View buttonClose;
 
 	@Override public void onViewCreated(View view, @Nullable Bundle savedInstanceState)
@@ -39,7 +42,7 @@ public abstract class AbstractBottomSheetFragment extends Fragment
 		buttonClose = view.findViewById(R.id.close_btn);
 		buttonClose.setOnClickListener(v -> getActivity().onBackPressed());
 
-		BottomSheetBehavior bottomSheetBehavior = BottomSheetBehavior.from(bottomSheet);
+		bottomSheetBehavior = BottomSheetBehavior.from(bottomSheet);
 
 		View titleSpeechBubble = view.findViewById(R.id.titleSpeechBubble);
 		titleSpeechBubble.setOnClickListener(v -> {
@@ -74,6 +77,24 @@ else if(bottomSheetBehavior.getState() == STATE_COLLAPSED)
 		}
 	}
 
+	@Override public void onConfigurationChanged(Configuration newConfig)
+	{
+		super.onConfigurationChanged(newConfig);
+		// I need to do everything myself... (AppCompactActivity only does this after calling this
+		// method. Genius!)
+		getResources().updateConfiguration(newConfig, getResources().getDisplayMetrics());
+
+		bottomSheetBehavior.setPeekHeight(
+			getResources().getDimensionPixelSize(R.dimen.quest_form_peekHeight));
+		View root = getView();
+		if(root != null)
+		{
+			ViewGroup.LayoutParams params = root.getLayoutParams();
+			params.width = getResources().getDimensionPixelSize(R.dimen.quest_form_width);
+			root.setLayoutParams(params);
+		}
+	}
+
 	private void updateCloseButtonVisibility()
 	{
 		// this is called asynchronously. It may happen that the activity is already gone when this

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,6 +1,7 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"

diff --git a/app/src/main/res/layout/marker_create_note.xml b/app/src/main/res/layout/marker_create_note.xml
@@ -8,6 +8,7 @@
     >
 
     <RelativeLayout
+        android:id="@+id/centered_marker_layout_create_note"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/quest_form_topOffset"