Skip to content

Commit

Permalink
restructuring of project structure
Browse files Browse the repository at this point in the history
  • Loading branch information
andresth committed Feb 8, 2017
1 parent 2bf77d2 commit 83c8fb3
Show file tree
Hide file tree
Showing 21 changed files with 60 additions and 33 deletions.
16 changes: 8 additions & 8 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:name=".MainActivity"
android:name=".ui.MainActivity"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
Expand All @@ -26,9 +26,9 @@
</intent-filter>
</activity>
<activity
android:name=".LoginActivity"
android:name=".ui.LoginActivity"
android:label="@string/title_activity_login"
android:parentActivityName=".MainActivity">
android:parentActivityName=".ui.MainActivity">
<intent-filter>
<action android:name="in.andres.kandroid.LoginActivity" />

Expand All @@ -37,19 +37,19 @@

<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="in.andres.kandroid.SettingsActivity" />
android:value="in.andres.kandroid.ui.SettingsActivity" />
</activity>
<activity
android:name=".AboutActivity"
android:name=".ui.AboutActivity"
android:label="@string/title_activity_about"></activity>
<activity
android:name=".SettingsActivity"
android:name=".ui.SettingsActivity"
android:label="@string/title_activity_settings">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="in.andres.kandroid.MainActivity" />
android:value="in.andres.kandroid.ui.MainActivity" />
</activity>
<activity android:name=".TaskDetailActivity"></activity>
<activity android:name=".ui.TaskDetailActivity"></activity>
</application>

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
public class CompactHtmlRenderer extends CoreHtmlNodeRenderer {
private final HtmlWriter html;

CompactHtmlRenderer(HtmlNodeRendererContext context) {
public CompactHtmlRenderer(HtmlNodeRendererContext context) {
super(context);
this.html = context.getWriter();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package in.andres.kandroid;
package in.andres.kandroid.ui;

import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.view.MenuItem;

import in.andres.kandroid.R;

public class AboutActivity extends AppCompatActivity {

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package in.andres.kandroid;
package in.andres.kandroid.ui;

import android.content.res.Configuration;
import android.os.Bundle;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package in.andres.kandroid;
package in.andres.kandroid.ui;

import android.content.Context;
import android.os.Bundle;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package in.andres.kandroid;
package in.andres.kandroid.ui;

import android.content.Context;
import android.content.Intent;
Expand All @@ -19,6 +19,8 @@
import java.util.Locale;
import java.util.concurrent.TimeUnit;

import in.andres.kandroid.Constants;
import in.andres.kandroid.R;
import in.andres.kandroid.kanboard.KanboardTask;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package in.andres.kandroid;
package in.andres.kandroid.ui;

import android.content.Intent;
import android.os.Bundle;
Expand All @@ -10,6 +10,9 @@
import android.view.ViewGroup;
import android.widget.ExpandableListView;

import in.andres.kandroid.Constants;
import in.andres.kandroid.DashProjectsAdapter;
import in.andres.kandroid.R;
import in.andres.kandroid.kanboard.KanboardDashboard;
import in.andres.kandroid.kanboard.KanboardTask;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package in.andres.kandroid;
package in.andres.kandroid.ui;

import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
Expand Down Expand Up @@ -34,6 +34,8 @@

import javax.net.ssl.HttpsURLConnection;

import in.andres.kandroid.R;

/**
* A login screen to input url/user/password.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package in.andres.kandroid;
package in.andres.kandroid.ui;

import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
Expand Down Expand Up @@ -36,6 +36,10 @@
import java.util.Dictionary;
import java.util.List;

import in.andres.kandroid.ArrayPagerAdapter;
import in.andres.kandroid.BuildConfig;
import in.andres.kandroid.Constants;
import in.andres.kandroid.R;
import in.andres.kandroid.kanboard.KanboardAPI;
import in.andres.kandroid.kanboard.KanboardActivity;
import in.andres.kandroid.kanboard.KanboardCategory;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package in.andres.kandroid;
package in.andres.kandroid.ui;

import android.content.Intent;
import android.os.Bundle;
Expand All @@ -10,6 +10,9 @@
import android.view.ViewGroup;
import android.widget.ExpandableListView;

import in.andres.kandroid.Constants;
import in.andres.kandroid.ProjectTaskAdapter;
import in.andres.kandroid.R;
import in.andres.kandroid.kanboard.KanboardProject;
import in.andres.kandroid.kanboard.KanboardTask;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package in.andres.kandroid;
package in.andres.kandroid.ui;

import android.content.Intent;
import android.os.Bundle;
Expand All @@ -10,6 +10,9 @@
import android.view.ViewGroup;
import android.widget.ExpandableListView;

import in.andres.kandroid.Constants;
import in.andres.kandroid.ProjectTaskAdapter;
import in.andres.kandroid.R;
import in.andres.kandroid.kanboard.KanboardProject;
import in.andres.kandroid.kanboard.KanboardTask;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package in.andres.kandroid;
package in.andres.kandroid.ui;

import android.os.Bundle;
import android.support.annotation.Nullable;
Expand All @@ -19,6 +19,8 @@

import java.util.Collections;

import in.andres.kandroid.CompactHtmlRenderer;
import in.andres.kandroid.R;
import in.andres.kandroid.kanboard.KanboardProject;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package in.andres.kandroid;
package in.andres.kandroid.ui;

import android.content.Intent;
import android.os.Bundle;
Expand All @@ -10,6 +10,9 @@
import android.view.ViewGroup;
import android.widget.ExpandableListView;

import in.andres.kandroid.Constants;
import in.andres.kandroid.ProjectTaskAdapter;
import in.andres.kandroid.R;
import in.andres.kandroid.kanboard.KanboardColumn;
import in.andres.kandroid.kanboard.KanboardProject;
import in.andres.kandroid.kanboard.KanboardTask;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package in.andres.kandroid;
package in.andres.kandroid.ui;

import android.os.Bundle;
import android.preference.PreferenceFragment;
import android.support.v7.app.ActionBar;
import android.view.MenuItem;

import in.andres.kandroid.R;

public class SettingsActivity extends AppCompatPreferenceActivity {

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package in.andres.kandroid;
package in.andres.kandroid.ui;

import android.content.Context;
import android.content.DialogInterface;
Expand All @@ -15,9 +15,7 @@
import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.SwitchCompat;
import android.text.Html;
import android.text.TextUtils;
import android.util.Log;
import android.view.ContextMenu;
import android.view.LayoutInflater;
Expand All @@ -33,13 +31,11 @@
import android.widget.ArrayAdapter;
import android.widget.CheckBox;
import android.widget.EditText;
import android.widget.ListAdapter;
import android.widget.ListView;
import android.widget.ProgressBar;
import android.widget.Spinner;
import android.widget.Switch;
import android.widget.TextView;
import android.widget.ToggleButton;

import org.commonmark.parser.Parser;
import org.commonmark.renderer.NodeRenderer;
Expand All @@ -52,11 +48,14 @@
import java.util.Collections;
import java.util.Dictionary;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Hashtable;
import java.util.List;
import java.util.Locale;

import in.andres.kandroid.BuildConfig;
import in.andres.kandroid.CompactHtmlRenderer;
import in.andres.kandroid.Constants;
import in.andres.kandroid.R;
import in.andres.kandroid.kanboard.KanboardAPI;
import in.andres.kandroid.kanboard.KanboardCategory;
import in.andres.kandroid.kanboard.KanboardColumn;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package in.andres.kandroid;
package in.andres.kandroid.ui;

import android.os.Bundle;
import android.support.annotation.Nullable;
Expand All @@ -8,6 +8,8 @@
import android.view.ViewGroup;
import android.widget.TextView;

import in.andres.kandroid.R;

/**
* Created by Thomas Andres on 04.01.17.
*/
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout-land/activity_task_detail.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context="in.andres.kandroid.TaskDetailActivity"
tools:context="in.andres.kandroid.ui.TaskDetailActivity"
android:id="@+id/root_layout"
android:layout_height="match_parent"
android:layout_width="match_parent">
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_about.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:orientation="vertical"
tools:context="in.andres.kandroid.AboutActivity">
tools:context="in.andres.kandroid.ui.AboutActivity">

<TextView
android:text="@string/txt_about"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_login.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
tools:context="in.andres.kandroid.LoginActivity">
tools:context="in.andres.kandroid.ui.LoginActivity">

<!-- Login progress -->
<ProgressBar
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_task_detail.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context="in.andres.kandroid.TaskDetailActivity"
tools:context="in.andres.kandroid.ui.TaskDetailActivity"
android:id="@+id/root_layout"
android:layout_height="match_parent"
android:layout_width="match_parent">
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/app_bar_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:fitsSystemWindows="true"
tools:context="in.andres.kandroid.MainActivity"
tools:context="in.andres.kandroid.ui.MainActivity"
android:id="@+id/main_view" >

<android.support.design.widget.AppBarLayout
Expand Down

0 comments on commit 83c8fb3

Please sign in to comment.