From b5ca7829719fb6860b6228db8994d00b31cc1abd Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Mon, 7 Aug 2017 16:55:02 -0500
Subject: ProfileList: Load fragment programmatically

This is necessary to replace it with the profile detail fragment later.
---
 app/src/main/java/com/wireguard/android/ProfileActivity.java | 6 ++++++
 app/src/main/res/layout/profile_activity.xml                 | 5 ++---
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'app/src')

diff --git a/app/src/main/java/com/wireguard/android/ProfileActivity.java b/app/src/main/java/com/wireguard/android/ProfileActivity.java
index 5daaf54c..ab4022c1 100644
--- a/app/src/main/java/com/wireguard/android/ProfileActivity.java
+++ b/app/src/main/java/com/wireguard/android/ProfileActivity.java
@@ -1,6 +1,7 @@
 package com.wireguard.android;
 
 import android.app.Activity;
+import android.app.FragmentTransaction;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -35,7 +36,12 @@ public class ProfileActivity extends Activity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        // This layout consists only of containers for fragments.
         setContentView(R.layout.profile_activity);
+        // Fill the layout with the initial set of fragments.
+        FragmentTransaction transaction = getFragmentManager().beginTransaction();
+        transaction.add(R.id.list_fragment_container, new ProfileListFragment());
+        transaction.commit();
         // Ensure the long-running service is started. This only needs to happen once.
         Intent intent = new Intent(this, ProfileService.class);
         startService(intent);
diff --git a/app/src/main/res/layout/profile_activity.xml b/app/src/main/res/layout/profile_activity.xml
index e408985d..d9b6a1f6 100644
--- a/app/src/main/res/layout/profile_activity.xml
+++ b/app/src/main/res/layout/profile_activity.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<fragment xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/profile_list_fragment"
-    android:name="com.wireguard.android.ProfileListFragment"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/list_fragment_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent" />
-- 
cgit v1.2.3