From fca6a8d5aa62fe9bd5ed5e069342d358948d8cbc Mon Sep 17 00:00:00 2001
From: "de@itstall.de" <de@itstall.de>
Date: Wed, 1 Apr 2020 23:05:42 +0200
Subject: [PATCH] Minor layout changes on router list
---
.../controller/NextApAdapter.java | 4 ++--
.../freifunkfranken/view/NextApFragment.java | 4 ----
app/src/main/res/layout/nextap_fragment.xml | 10 +---------
app/src/main/res/layout/nextap_item.xml | 16 ++++++++--------
4 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/app/src/main/java/de/itstall/freifunkfranken/controller/NextApAdapter.java b/app/src/main/java/de/itstall/freifunkfranken/controller/NextApAdapter.java
index 43f6409..83e297b 100644
--- a/app/src/main/java/de/itstall/freifunkfranken/controller/NextApAdapter.java
+++ b/app/src/main/java/de/itstall/freifunkfranken/controller/NextApAdapter.java
@@ -56,9 +56,9 @@ public class NextApAdapter extends RecyclerView.Adapter<NextApAdapter.ViewHolder
ViewHolder(View itemView) {
super(itemView);
- tvAp = itemView.findViewById(R.id.nextApSsid);
+ tvAp = itemView.findViewById(R.id.nextApTvSsid);
tvStatus = itemView.findViewById(R.id.nextApTvStatus);
- tvDistance = itemView.findViewById(R.id.nextApDistance);
+ tvDistance = itemView.findViewById(R.id.nextApTvDistance);
}
}
}
diff --git a/app/src/main/java/de/itstall/freifunkfranken/view/NextApFragment.java b/app/src/main/java/de/itstall/freifunkfranken/view/NextApFragment.java
index dea4f5a..a013afb 100644
--- a/app/src/main/java/de/itstall/freifunkfranken/view/NextApFragment.java
+++ b/app/src/main/java/de/itstall/freifunkfranken/view/NextApFragment.java
@@ -11,7 +11,6 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.TextView;
import androidx.core.app.ActivityCompat;
import androidx.fragment.app.Fragment;
@@ -37,7 +36,6 @@ import de.itstall.freifunkfranken.model.AccessPoint;
public class NextApFragment extends Fragment {
private RecyclerView rvAps;
private View rootView;
- private TextView tvTemp;
private SharedPreferences sharedPreferences;
public static Location location;
private LocationManager locationManager;
@@ -55,7 +53,6 @@ public class NextApFragment extends Fragment {
rvAps = rootView.findViewById(R.id.rvAps);
rvAps.setLayoutManager(new LinearLayoutManager(getActivity()));
- tvTemp = rootView.findViewById(R.id.tvTemp);
locationManager = (LocationManager) rootView.getContext().getApplicationContext().getSystemService(Context.LOCATION_SERVICE);
Dexter.withActivity((Activity) rootView.getContext()).withPermission(Manifest.permission.ACCESS_FINE_LOCATION).withListener(new PermissionListener() {
@@ -87,6 +84,5 @@ public class NextApFragment extends Fragment {
NextApAdapter nextApAdapter = new NextApAdapter(accessPointList);
rvAps.setAdapter(nextApAdapter);
rvAps.setItemAnimator(new DefaultItemAnimator());
- tvTemp.setText(String.valueOf(accessPointList.size()));
}
}
diff --git a/app/src/main/res/layout/nextap_fragment.xml b/app/src/main/res/layout/nextap_fragment.xml
index e8e2182..2049797 100644
--- a/app/src/main/res/layout/nextap_fragment.xml
+++ b/app/src/main/res/layout/nextap_fragment.xml
@@ -8,19 +8,11 @@
android:id="@+id/rvAps"
android:layout_width="match_parent"
android:layout_height="0dp"
- app:layout_constraintBottom_toTopOf="@+id/tvTemp"
+ app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
</androidx.recyclerview.widget.RecyclerView>
- <TextView
- android:id="@+id/tvTemp"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
-
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/nextap_item.xml b/app/src/main/res/layout/nextap_item.xml
index cb81b1e..d44161b 100644
--- a/app/src/main/res/layout/nextap_item.xml
+++ b/app/src/main/res/layout/nextap_item.xml
@@ -7,21 +7,21 @@
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
+ android:layout_marginTop="5dp"
android:layout_marginRight="5dp"
- android:layout_weight="1">
+ android:orientation="horizontal">
<TextView
- android:id="@+id/nextApSsid"
+ android:id="@+id/nextApTvSsid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginEnd="5dp"
android:layout_weight="4"
- android:text="@string/tabSsids" />
+ android:textColor="@android:color/primary_text_light" />
<TextView
- android:id="@+id/nextApDistance"
+ android:id="@+id/nextApTvDistance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
@@ -30,11 +30,11 @@
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginBottom="5dp"
- android:layout_weight="1">
+ android:orientation="horizontal">
<TextView
android:id="@+id/nextApTvStatusLabel"
--
GitLab