UI tweaks, edge-to-edge adjustment (e37e50a8) · Commits · Android-smartphones / Ulogger Android

app/src/main/java/net/fabiszewski/ulogger/ui/MainActivity.java

+10 −2

Original line number	Diff line number	Diff line
		@@ -86,8 +86,16 @@ public class MainActivity extends AppCompatActivity
		super.onCreate(savedInstanceState);
		updatePreferences();
		setContentView(R.layout.activity_main);
		Toolbar myToolbar = findViewById(R.id.toolbar);
		setSupportActionBar(myToolbar);
		Toolbar toolbar = findViewById(R.id.toolbar);
		setSupportActionBar(toolbar);
		final int toolbarHeight = toolbar.getLayoutParams().height;
		ViewCompat.setOnApplyWindowInsetsListener(getWindow().getDecorView().getRootView(), (view, insets) -> {
		Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
		view.setPadding(systemBars.left, 0, systemBars.right, systemBars.bottom);
		toolbar.setPadding(0, systemBars.top, 0, 0);
		toolbar.getLayoutParams().height = toolbarHeight + systemBars.top;
		return WindowInsetsCompat.CONSUMED;
		});
		if (savedInstanceState == null) {
		MainFragment fragment = MainFragment.newInstance();
		getSupportFragmentManager().beginTransaction()

+8 −4

Original line number	Diff line number	Diff line
		@@ -9,6 +9,8 @@

		package net.fabiszewski.ulogger.ui;

		import static android.view.View.GONE;
		import static android.view.View.VISIBLE;
		import static net.fabiszewski.ulogger.ui.Alert.showAlert;
		import static net.fabiszewski.ulogger.ui.Alert.showConfirm;

		@@ -533,9 +535,9 @@ public class MainFragment extends Fragment implements PermissionHelper.Permissio
		return;
		}
		if (DbAccess.getTrackId(context) > 0) {
		buttonShare.setVisibility(View.VISIBLE);
		buttonShare.setVisibility(VISIBLE);
		} else {
		buttonShare.setVisibility(View.GONE);
		buttonShare.setVisibility(GONE);
		}
		}

		@@ -586,6 +588,7 @@ public class MainFragment extends Fragment implements PermissionHelper.Permissio
		private void setSyncError(String message) {
		syncError = true;
		syncErrorLabel.setText(message);
		syncErrorLabel.setVisibility(VISIBLE);
		}

		/**
		@@ -595,6 +598,7 @@ public class MainFragment extends Fragment implements PermissionHelper.Permissio
		if (syncError) {
		syncErrorLabel.setText(null);
		syncError = false;
		syncErrorLabel.setVisibility(GONE);
		}
		}

		@@ -676,8 +680,8 @@ public class MainFragment extends Fragment implements PermissionHelper.Permissio
		showToast(getString(R.string.uploading_done));
		isUploading = false;
		}
		if (buttonShare.getVisibility() == View.GONE) {
		buttonShare.setVisibility(View.VISIBLE);
		if (buttonShare.getVisibility() == GONE) {
		buttonShare.setVisibility(VISIBLE);
		}
		}
		case (WebSyncService.BROADCAST_SYNC_FAILED) -> {

+8 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,9 @@ package net.fabiszewski.ulogger.ui;
		import android.os.Bundle;

		import androidx.appcompat.app.AppCompatActivity;
		import androidx.core.graphics.Insets;
		import androidx.core.view.ViewCompat;
		import androidx.core.view.WindowInsetsCompat;

		/**
		* Adds preferences from xml resource
		@@ -40,6 +43,11 @@ public class SettingsActivity extends AppCompatActivity {
		@Override
		protected void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		ViewCompat.setOnApplyWindowInsetsListener(getWindow().getDecorView().getRootView(), (v, insets) -> {
		Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
		v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
		return WindowInsetsCompat.CONSUMED;
		});
		if (savedInstanceState == null) {
		getSupportFragmentManager().beginTransaction()
		.replace(android.R.id.content, new SettingsFragment())

+4 −1

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import android.util.Log;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.view.ViewGroup;
		import android.view.ViewOutlineProvider;
		import android.widget.Button;
		import android.widget.EditText;
		import android.widget.ImageView;
		@@ -143,6 +144,8 @@ public class WaypointFragment extends Fragment implements LoggerTask.LoggerTaskC
		commentEditText = layout.findViewById(R.id.waypointComment);
		saveButton = layout.findViewById(R.id.waypointButton);
		thumbnailImageView = layout.findViewById(R.id.waypointThumbnail);
		thumbnailImageView.setClipToOutline(true);
		thumbnailImageView.setOutlineProvider(ViewOutlineProvider.BACKGROUND);
		swipe = (SwipeRefreshLayout) layout;
		swipe.setOnRefreshListener(this::reloadTask);

		@@ -384,7 +387,7 @@ public class WaypointFragment extends Fragment implements LoggerTask.LoggerTaskC
		*/
		private void setThumbnail(@Nullable Bitmap thumbnail) {
		if (thumbnail == null) {
		thumbnailImageView.setImageResource(R.drawable.ic_photo_camera_gray_24dp);
		thumbnailImageView.setImageResource(R.drawable.ic_photo_camera_gray_200dp);
		} else {
		thumbnailImageView.setImageBitmap(thumbnail);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -206,7 +206,7 @@ public class ImageHelper {
		* @return Size in pixels
		*/
		private static int getThumbnailSize(@NonNull Context context) {
		int sizeDp = (int) context.getResources().getDimension(R.dimen.thumbnail_size);
		int sizeDp = (int) context.getResources().getDimension(R.dimen.waypoint_thumbnail_size);
		int sizePx = sizeDp * (int) Resources.getSystem().getDisplayMetrics().density;
		if (Logger.DEBUG) { Log.d(TAG, "[getThumbnailSize: " + sizePx + "]" ); }
		return sizePx;