From 455d27aeb3f6c111d072b7ef381e160729184fbc Mon Sep 17 00:00:00 2001 From: Gabriel Calero Date: Tue, 22 Jan 2019 16:18:00 -0300 Subject: [PATCH] Fix merge --- .../io/highfidelity/hifiinterface/fragment/ProfileFragment.java | 0 .../io/highfidelity/hifiinterface/provider/AvatarProvider.java | 0 .../highfidelity/hifiinterface/provider}/view/AvatarAdapter.java | 0 .../{app => apps/interface}/src/main/res/layout/avatar_item.xml | 0 .../interface}/src/main/res/layout/fragment_profile.xml | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename android/{app => apps/interface}/src/main/java/io/highfidelity/hifiinterface/fragment/ProfileFragment.java (100%) rename android/{app => apps/interface}/src/main/java/io/highfidelity/hifiinterface/provider/AvatarProvider.java (100%) rename android/{app/src/main/java/io/highfidelity/hifiinterface => apps/interface/src/main/java/io/highfidelity/hifiinterface/provider}/view/AvatarAdapter.java (100%) rename android/{app => apps/interface}/src/main/res/layout/avatar_item.xml (100%) rename android/{app => apps/interface}/src/main/res/layout/fragment_profile.xml (100%) diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/fragment/ProfileFragment.java b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/fragment/ProfileFragment.java similarity index 100% rename from android/app/src/main/java/io/highfidelity/hifiinterface/fragment/ProfileFragment.java rename to android/apps/interface/src/main/java/io/highfidelity/hifiinterface/fragment/ProfileFragment.java diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/provider/AvatarProvider.java b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/provider/AvatarProvider.java similarity index 100% rename from android/app/src/main/java/io/highfidelity/hifiinterface/provider/AvatarProvider.java rename to android/apps/interface/src/main/java/io/highfidelity/hifiinterface/provider/AvatarProvider.java diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/view/AvatarAdapter.java b/android/apps/interface/src/main/java/io/highfidelity/hifiinterface/provider/view/AvatarAdapter.java similarity index 100% rename from android/app/src/main/java/io/highfidelity/hifiinterface/view/AvatarAdapter.java rename to android/apps/interface/src/main/java/io/highfidelity/hifiinterface/provider/view/AvatarAdapter.java diff --git a/android/app/src/main/res/layout/avatar_item.xml b/android/apps/interface/src/main/res/layout/avatar_item.xml similarity index 100% rename from android/app/src/main/res/layout/avatar_item.xml rename to android/apps/interface/src/main/res/layout/avatar_item.xml diff --git a/android/app/src/main/res/layout/fragment_profile.xml b/android/apps/interface/src/main/res/layout/fragment_profile.xml similarity index 100% rename from android/app/src/main/res/layout/fragment_profile.xml rename to android/apps/interface/src/main/res/layout/fragment_profile.xml