devol/exodus-privacy-android-app
1
0
Fork 0
mirror of https://github.com/stom79/exodus-android-app synced 2025-02-16 21:40:38 +01:00
Code Issues Releases Wiki Activity

Merge branch 'landscape_mode' into stom79_baseline

Browse Source
This commit is contained in:
stom79 2018-04-14 11:06:26 +02:00
commit 341d0dafe3
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -13,7 +13,7 @@
android:theme="@style/AppTheme" android:theme="@style/AppTheme"
> >
<activity android:name=".MainActivity" <activity android:name=".MainActivity"
android:screenOrientation="portrait" android:configChanges="keyboardHidden|orientation|screenSize"
> >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

6
app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/ReportFragment.java
View File

@ -30,9 +30,6 @@ import android.support.v7.widget.LinearLayoutManager;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.webkit.WebView;
import android.widget.ImageView;
import android.widget.TextView;
import org.eu.exodus_privacy.exodusprivacy.R; import org.eu.exodus_privacy.exodusprivacy.R;
import org.eu.exodus_privacy.exodusprivacy.adapters.PermissionListAdapter; import org.eu.exodus_privacy.exodusprivacy.adapters.PermissionListAdapter;
@ -44,7 +41,6 @@ import org.eu.exodus_privacy.exodusprivacy.objects.Report;
import org.eu.exodus_privacy.exodusprivacy.objects.Tracker; import org.eu.exodus_privacy.exodusprivacy.objects.Tracker;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@ -121,6 +117,7 @@ public class ReportFragment extends Fragment {
reportBinding.permissions.setLayoutManager(new LinearLayoutManager(context)); reportBinding.permissions.setLayoutManager(new LinearLayoutManager(context));
PermissionListAdapter permissionAdapter = new PermissionListAdapter(requestedPermissions); PermissionListAdapter permissionAdapter = new PermissionListAdapter(requestedPermissions);
reportBinding.permissions.setNestedScrollingEnabled(false);
reportBinding.permissions.setAdapter(permissionAdapter); reportBinding.permissions.setAdapter(permissionAdapter);
@ -147,6 +144,7 @@ public class ReportFragment extends Fragment {
//setup trackers lists //setup trackers lists
reportBinding.trackers.setLayoutManager(new LinearLayoutManager(context)); reportBinding.trackers.setLayoutManager(new LinearLayoutManager(context));
TrackerListAdapter trackerAdapter = new TrackerListAdapter(trackers,R.layout.tracker_item); TrackerListAdapter trackerAdapter = new TrackerListAdapter(trackers,R.layout.tracker_item);
reportBinding.trackers.setNestedScrollingEnabled(false);
reportBinding.trackers.setAdapter(trackerAdapter); reportBinding.trackers.setAdapter(trackerAdapter);
//setup creator //setup creator

8
app/src/main/res/layout/report.xml
View File

@ -1,11 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout xmlns:tools="http://schemas.android.com/tools" <layout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
> >
<data/> <data/>
<RelativeLayout <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:id="@+id/base_info" android:id="@+id/base_info"
@ -123,4 +126,5 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
</ScrollView>
</layout> </layout>