Peertube/TubeLab-App-Android
1
0
Fork 0
mirror of https://framagit.org/tom79/fedilab-tube synced 2025-02-20 05:50:38 +01:00
Code Issues Releases Wiki Activity

picker layout

Browse Source
This commit is contained in:
Thomas 2020-09-17 07:28:52 +02:00
parent 7f4c6faa1d
commit b23686ab64
4 changed files with 67 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/acad/res/values/strings.xml
View File

@ -228,4 +228,5 @@
<string name="followers_instance">%1$s followers instances</string> <string name="followers_instance">%1$s followers instances</string>
<string name="help">Help</string> <string name="help">Help</string>
<string name="sensitive_video"> Sensitive videos</string> <string name="sensitive_video"> Sensitive videos</string>
<string name="pickup_categories">Pickup categories</string>
</resources> </resources>

2
app/src/full/res/values/strings.xml
View File

@ -245,4 +245,6 @@
<string name="sensitive_content">Sensitive content: %1$s</string> <string name="sensitive_content">Sensitive content: %1$s</string>
<string name="followers_instance">%1$s followers instances</string> <string name="followers_instance">%1$s followers instances</string>
<string name="help">Help</string> <string name="help">Help</string>
<string name="pickup_categories">Pickup categories</string>
</resources> </resources>

4
app/src/main/java/app/fedilab/fedilabtube/InstancePickerActivity.java
View File

@ -66,7 +66,7 @@ public class InstancePickerActivity extends AppCompatActivity {
textviewNoAction = findViewById(R.id.no_action); textviewNoAction = findViewById(R.id.no_action);
mainLoader.setVisibility(View.VISIBLE); mainLoader.setVisibility(View.VISIBLE);
RelativeLayout checkbox_container = findViewById(R.id.checkbox_container); /*RelativeLayout checkbox_container = findViewById(R.id.checkbox_container);
LinkedHashMap<Integer, String> categories = peertubeInformation.getCategories(); LinkedHashMap<Integer, String> categories = peertubeInformation.getCategories();
if (categories != null && categories.size() > 0) { if (categories != null && categories.size() > 0) {
Iterator<Map.Entry<Integer, String>> it = categories.entrySet().iterator(); Iterator<Map.Entry<Integer, String>> it = categories.entrySet().iterator();
@ -77,7 +77,7 @@ public class InstancePickerActivity extends AppCompatActivity {
checkbox_container.addView(cb); checkbox_container.addView(cb);
it.remove(); it.remove();
} }
} }*/
mainLoader.setVisibility(View.VISIBLE); mainLoader.setVisibility(View.VISIBLE);

25
app/src/main/res/layout/activity_instance_picker.xml
View File

@ -18,6 +18,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_margin="@dimen/fab_margin"
android:fitsSystemWindows="true"> android:fitsSystemWindows="true">
<androidx.coordinatorlayout.widget.CoordinatorLayout <androidx.coordinatorlayout.widget.CoordinatorLayout
@ -30,15 +31,24 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <Button
android:id="@+id/checkbox_container" android:id="@+id/pickup_categories"
style="@style/Base.Widget.AppCompat.Button.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/pickup_categories" />
<TextView
android:id="@+id/categories"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal"
android:showDividers="end">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -52,11 +62,10 @@
android:layout_marginStart="10dp" /> android:layout_marginStart="10dp" />
</LinearLayout> </LinearLayout>
</LinearLayout> <LinearLayout
<RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"
android:padding="@dimen/fab_margin"> android:padding="@dimen/fab_margin">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
@ -98,7 +107,6 @@
android:id="@+id/loading_next_status" android:id="@+id/loading_next_status"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="20dp" android:layout_height="20dp"
android:layout_alignParentBottom="true"
android:layout_gravity="bottom|center_horizontal" android:layout_gravity="bottom|center_horizontal"
android:gravity="bottom|center_horizontal" android:gravity="bottom|center_horizontal"
android:visibility="gone"> android:visibility="gone">
@ -108,6 +116,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:indeterminate="true" /> android:indeterminate="true" />
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </LinearLayout>
</LinearLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>
</androidx.drawerlayout.widget.DrawerLayout> </androidx.drawerlayout.widget.DrawerLayout>