From aef5271787fb3b91b74a93efb48c569df0de6575 Mon Sep 17 00:00:00 2001 From: Damyan Ivanov Date: Sun, 17 Feb 2019 21:56:43 +0200 Subject: [PATCH 1/1] Move ProfileDetailActivity under activity/ --- app/src/main/AndroidManifest.xml | 2 +- .../ui/{profiles => activity}/ProfileDetailActivity.java | 7 ++++--- app/src/main/res/layout/activity_profile_detail.xml | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) rename app/src/main/java/net/ktnx/mobileledger/ui/{profiles => activity}/ProfileDetailActivity.java (95%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 83953a0c..eec9d79b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -60,7 +60,7 @@ android:label="@string/title_profile_list" android:theme="@style/AppTheme.NoActionBar"> diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileDetailActivity.java similarity index 95% rename from app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailActivity.java rename to app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileDetailActivity.java index 23d22f55..ccdad2c7 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/ProfileDetailActivity.java @@ -15,14 +15,13 @@ * along with MoLe. If not, see . */ -package net.ktnx.mobileledger.ui.profiles; +package net.ktnx.mobileledger.ui.activity; import android.content.Intent; import android.os.Bundle; import android.support.design.widget.FloatingActionButton; import android.support.design.widget.Snackbar; import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.util.Log; import android.view.Menu; @@ -32,7 +31,9 @@ import android.view.View; import net.ktnx.mobileledger.R; import net.ktnx.mobileledger.model.Data; import net.ktnx.mobileledger.model.MobileLedgerProfile; +import net.ktnx.mobileledger.ui.activity.CrashReportingActivity; import net.ktnx.mobileledger.ui.activity.ProfileListActivity; +import net.ktnx.mobileledger.ui.profiles.ProfileDetailFragment; /** * An activity representing a single Profile detail screen. This @@ -40,7 +41,7 @@ import net.ktnx.mobileledger.ui.activity.ProfileListActivity; * item details are presented side-by-side with a list of items * in a {@link ProfileListActivity}. */ -public class ProfileDetailActivity extends AppCompatActivity { +public class ProfileDetailActivity extends CrashReportingActivity { private MobileLedgerProfile profile; @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/app/src/main/res/layout/activity_profile_detail.xml b/app/src/main/res/layout/activity_profile_detail.xml index 15097e20..71376b93 100644 --- a/app/src/main/res/layout/activity_profile_detail.xml +++ b/app/src/main/res/layout/activity_profile_detail.xml @@ -22,7 +22,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true" - tools:context=".ui.profiles.ProfileDetailActivity" + tools:context=".ui.activity.ProfileDetailActivity" tools:ignore="MergeRootFrame">