project structure cleanup

frogermcs · Feb 8, 2015 · 9c62d60 · 9c62d60
1 parent cabb984
commit 9c62d60
Show file tree

Hide file tree

Showing 23 changed files with 53 additions and 35 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -10,19 +10,19 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
         <activity
-            android:name="io.github.froger.instamaterial.MainActivity"
+            android:name=".ui.activity.MainActivity"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity
-            android:name="io.github.froger.instamaterial.CommentsActivity"
+            android:name=".ui.activity.CommentsActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.TransparentActivity" />
         <activity
-            android:name="io.github.froger.instamaterial.UserProfileActivity"
+            android:name=".ui.activity.UserProfileActivity"
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.TransparentActivity" />
     </application>

diff --git a/...ub/froger/instamaterial/BaseActivity.java → ...stamaterial/ui/activity/BaseActivity.java b/...ub/froger/instamaterial/BaseActivity.java → ...stamaterial/ui/activity/BaseActivity.java
@@ -1,4 +1,4 @@
-package io.github.froger.instamaterial;
+package io.github.froger.instamaterial.ui.activity;
 
 import android.os.Handler;
 import android.support.v4.widget.DrawerLayout;
@@ -12,7 +12,10 @@
 
 import butterknife.ButterKnife;
 import butterknife.InjectView;
-import io.github.froger.instamaterial.view.GlobalMenuView;
+import io.github.froger.instamaterial.ui.utils.DrawerLayoutInstaller;
+import io.github.froger.instamaterial.R;
+import io.github.froger.instamaterial.Utils;
+import io.github.froger.instamaterial.ui.view.GlobalMenuView;
 
 /**
  * Created by Miroslaw Stanek on 19.01.15.

diff --git a/...roger/instamaterial/CommentsActivity.java → ...aterial/ui/activity/CommentsActivity.java b/...roger/instamaterial/CommentsActivity.java → ...aterial/ui/activity/CommentsActivity.java
@@ -1,4 +1,4 @@
-package io.github.froger.instamaterial;
+package io.github.froger.instamaterial.ui.activity;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -16,7 +16,10 @@
 import android.widget.LinearLayout;
 
 import butterknife.InjectView;
-import io.github.froger.instamaterial.view.SendCommentButton;
+import io.github.froger.instamaterial.ui.adapter.CommentsAdapter;
+import io.github.froger.instamaterial.R;
+import io.github.froger.instamaterial.Utils;
+import io.github.froger.instamaterial.ui.view.SendCommentButton;
 
 /**
  * Created by froger_mcs on 11.11.14.

diff --git a/...ub/froger/instamaterial/MainActivity.java → ...stamaterial/ui/activity/MainActivity.java b/...ub/froger/instamaterial/MainActivity.java → ...stamaterial/ui/activity/MainActivity.java
@@ -1,4 +1,4 @@
-package io.github.froger.instamaterial;
+package io.github.froger.instamaterial.ui.activity;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -12,8 +12,11 @@
 import android.widget.ImageButton;
 
 import butterknife.InjectView;
-import io.github.froger.instamaterial.view.FeedContextMenu;
+import io.github.froger.instamaterial.ui.adapter.FeedAdapter;
-import io.github.froger.instamaterial.view.FeedContextMenuManager;
+import io.github.froger.instamaterial.R;
+import io.github.froger.instamaterial.Utils;
+import io.github.froger.instamaterial.ui.view.FeedContextMenu;
+import io.github.froger.instamaterial.ui.view.FeedContextMenuManager;
 
 
 public class MainActivity extends BaseActivity implements FeedAdapter.OnFeedItemClickListener,

diff --git a/...er/instamaterial/UserProfileActivity.java → ...rial/ui/activity/UserProfileActivity.java b/...er/instamaterial/UserProfileActivity.java → ...rial/ui/activity/UserProfileActivity.java
@@ -1,4 +1,4 @@
-package io.github.froger.instamaterial;
+package io.github.froger.instamaterial.ui.activity;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -9,7 +9,9 @@
 import android.view.ViewTreeObserver;
 
 import butterknife.InjectView;
-import io.github.froger.instamaterial.view.RevealBackgroundView;
+import io.github.froger.instamaterial.R;
+import io.github.froger.instamaterial.ui.adapter.UserProfileAdapter;
+import io.github.froger.instamaterial.ui.view.RevealBackgroundView;
 
 /**
  * Created by Miroslaw Stanek on 14.01.15.

diff --git a/...froger/instamaterial/CommentsAdapter.java → ...amaterial/ui/adapter/CommentsAdapter.java b/...froger/instamaterial/CommentsAdapter.java → ...amaterial/ui/adapter/CommentsAdapter.java
@@ -1,4 +1,4 @@
-package io.github.froger.instamaterial;
+package io.github.froger.instamaterial.ui.adapter;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -15,6 +15,8 @@
 
 import butterknife.ButterKnife;
 import butterknife.InjectView;
+import io.github.froger.instamaterial.R;
+import io.github.froger.instamaterial.ui.utils.RoundedTransformation;
 
 /**
  * Created by froger_mcs on 11.11.14.

diff --git a/...hub/froger/instamaterial/FeedAdapter.java → ...instamaterial/ui/adapter/FeedAdapter.java b/...hub/froger/instamaterial/FeedAdapter.java → ...instamaterial/ui/adapter/FeedAdapter.java
@@ -1,4 +1,4 @@
-package io.github.froger.instamaterial;
+package io.github.froger.instamaterial.ui.adapter;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -23,6 +23,8 @@
 
 import butterknife.ButterKnife;
 import butterknife.InjectView;
+import io.github.froger.instamaterial.R;
+import io.github.froger.instamaterial.Utils;
 
 /**
  * Created by froger_mcs on 05.11.14.

diff --git a/...oger/instamaterial/GlobalMenuAdapter.java → ...aterial/ui/adapter/GlobalMenuAdapter.java b/...oger/instamaterial/GlobalMenuAdapter.java → ...aterial/ui/adapter/GlobalMenuAdapter.java
@@ -1,4 +1,4 @@
-package io.github.froger.instamaterial;
+package io.github.froger.instamaterial.ui.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -13,6 +13,7 @@
 
 import butterknife.ButterKnife;
 import butterknife.InjectView;
+import io.github.froger.instamaterial.R;
 
 /**
  * Created by Miroslaw Stanek on 30.01.15.

diff --git a/...ger/instamaterial/UserProfileAdapter.java → ...terial/ui/adapter/UserProfileAdapter.java b/...ger/instamaterial/UserProfileAdapter.java → ...terial/ui/adapter/UserProfileAdapter.java
@@ -1,4 +1,4 @@
-package io.github.froger.instamaterial;
+package io.github.froger.instamaterial.ui.adapter;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
@@ -22,6 +22,9 @@
 
 import butterknife.ButterKnife;
 import butterknife.InjectView;
+import io.github.froger.instamaterial.ui.utils.CircleTransformation;
+import io.github.froger.instamaterial.R;
+import io.github.froger.instamaterial.Utils;
 
 /**
  * Created by Miroslaw Stanek on 20.01.15.

diff --git a/...r/instamaterial/CircleTransformation.java → ...terial/ui/utils/CircleTransformation.java b/...r/instamaterial/CircleTransformation.java → ...terial/ui/utils/CircleTransformation.java
@@ -1,4 +1,4 @@
-package io.github.froger.instamaterial;
+package io.github.froger.instamaterial.ui.utils;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapShader;

diff --git a/.../instamaterial/DrawerLayoutInstaller.java → ...erial/ui/utils/DrawerLayoutInstaller.java b/.../instamaterial/DrawerLayoutInstaller.java → ...erial/ui/utils/DrawerLayoutInstaller.java
@@ -1,4 +1,4 @@
-package io.github.froger.instamaterial;
+package io.github.froger.instamaterial.ui.utils;
 
 import android.app.Activity;
 import android.content.res.Resources;

diff --git a/.../instamaterial/RoundedTransformation.java → ...erial/ui/utils/RoundedTransformation.java b/.../instamaterial/RoundedTransformation.java → ...erial/ui/utils/RoundedTransformation.java
@@ -1,4 +1,4 @@
-package io.github.froger.instamaterial;
+package io.github.froger.instamaterial.ui.utils;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapShader;

diff --git a/...r/instamaterial/view/FeedContextMenu.java → ...nstamaterial/ui/view/FeedContextMenu.java b/...r/instamaterial/view/FeedContextMenu.java → ...nstamaterial/ui/view/FeedContextMenu.java
@@ -1,4 +1,4 @@
-package io.github.froger.instamaterial.view;
+package io.github.froger.instamaterial.ui.view;
 
 import android.content.Context;
 import android.view.LayoutInflater;

diff --git a/...material/view/FeedContextMenuManager.java → ...erial/ui/view/FeedContextMenuManager.java b/...material/view/FeedContextMenuManager.java → ...erial/ui/view/FeedContextMenuManager.java
@@ -1,4 +1,4 @@
-package io.github.froger.instamaterial.view;
+package io.github.froger.instamaterial.ui.view;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;

diff --git a/...er/instamaterial/view/GlobalMenuView.java → ...instamaterial/ui/view/GlobalMenuView.java b/...er/instamaterial/view/GlobalMenuView.java → ...instamaterial/ui/view/GlobalMenuView.java
@@ -1,4 +1,4 @@
-package io.github.froger.instamaterial.view;
+package io.github.froger.instamaterial.ui.view;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -9,8 +9,8 @@
 
 import com.squareup.picasso.Picasso;
 
-import io.github.froger.instamaterial.CircleTransformation;
+import io.github.froger.instamaterial.ui.utils.CircleTransformation;
-import io.github.froger.instamaterial.GlobalMenuAdapter;
+import io.github.froger.instamaterial.ui.adapter.GlobalMenuAdapter;
 import io.github.froger.instamaterial.R;
 
 /**

diff --git a/...tamaterial/view/RevealBackgroundView.java → ...aterial/ui/view/RevealBackgroundView.java b/...tamaterial/view/RevealBackgroundView.java → ...aterial/ui/view/RevealBackgroundView.java
@@ -1,4 +1,4 @@
-package io.github.froger.instamaterial.view;
+package io.github.froger.instamaterial.ui.view;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -8,7 +8,6 @@
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
 import android.util.AttributeSet;
 import android.view.View;

diff --git a/...instamaterial/view/SendCommentButton.java → ...tamaterial/ui/view/SendCommentButton.java b/...instamaterial/view/SendCommentButton.java → ...tamaterial/ui/view/SendCommentButton.java
@@ -1,4 +1,4 @@
-package io.github.froger.instamaterial.view;
+package io.github.froger.instamaterial.ui.view;
 
 import android.content.Context;
 import android.util.AttributeSet;

diff --git a/...nstamaterial/view/SquaredFrameLayout.java → ...amaterial/ui/view/SquaredFrameLayout.java b/...nstamaterial/view/SquaredFrameLayout.java → ...amaterial/ui/view/SquaredFrameLayout.java
@@ -1,4 +1,4 @@
-package io.github.froger.instamaterial.view;
+package io.github.froger.instamaterial.ui.view;
 
 import android.annotation.TargetApi;
 import android.content.Context;

diff --git a/.../instamaterial/view/SquaredImageView.java → ...stamaterial/ui/view/SquaredImageView.java b/.../instamaterial/view/SquaredImageView.java → ...stamaterial/ui/view/SquaredImageView.java
@@ -1,4 +1,4 @@
-package io.github.froger.instamaterial.view;
+package io.github.froger.instamaterial.ui.view;
 
 import android.annotation.TargetApi;
 import android.content.Context;

diff --git a/app/src/main/res/layout/activity_comments.xml b/app/src/main/res/layout/activity_comments.xml
@@ -55,7 +55,7 @@
                 android:textColor="#555555"
                 android:textSize="14sp" />
 
-            <io.github.froger.instamaterial.view.SendCommentButton
+            <io.github.froger.instamaterial.ui.view.SendCommentButton
                 android:id="@+id/btnSendComment"
                 android:layout_width="72dp"
                 android:layout_height="match_parent"

diff --git a/app/src/main/res/layout/activity_user_profile.xml b/app/src/main/res/layout/activity_user_profile.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <io.github.froger.instamaterial.view.RevealBackgroundView
+    <io.github.froger.instamaterial.ui.view.RevealBackgroundView
         android:id="@+id/vRevealBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />

diff --git a/app/src/main/res/layout/item_feed.xml b/app/src/main/res/layout/item_feed.xml
@@ -20,7 +20,7 @@
             android:layout_height="wrap_content"
             android:src="@drawable/ic_feed_top" />
 
-        <io.github.froger.instamaterial.view.SquaredFrameLayout
+        <io.github.froger.instamaterial.ui.view.SquaredFrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
@@ -43,7 +43,7 @@
                 android:scaleType="center"
                 android:src="@drawable/ic_heart_outline_white" />
 
-        </io.github.froger.instamaterial.view.SquaredFrameLayout>
+        </io.github.froger.instamaterial.ui.view.SquaredFrameLayout>
 
         <ImageView
             android:id="@+id/ivFeedBottom"

diff --git a/app/src/main/res/layout/item_photo.xml b/app/src/main/res/layout/item_photo.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<io.github.froger.instamaterial.view.SquaredFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<io.github.froger.instamaterial.ui.view.SquaredFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/flRoot"
     android:layout_width="100dp"
     android:layout_height="100dp"
@@ -11,4 +11,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="1dp" />
-</io.github.froger.instamaterial.view.SquaredFrameLayout>
+</io.github.froger.instamaterial.ui.view.SquaredFrameLayout>