mirror of
https://github.com/iSoron/uhabits.git
synced 2025-12-07 01:28:52 -06:00
Reorganize packages
This commit is contained in:
@@ -22,7 +22,7 @@
|
||||
style="@style/dialogForm"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
tools:context=".ui.habits.edit.BaseDialog"
|
||||
tools:context=".activities.habits.edit.BaseDialog"
|
||||
tools:ignore="MergeRootFrame">
|
||||
|
||||
<LinearLayout
|
||||
|
||||
@@ -30,14 +30,14 @@
|
||||
app:popupTheme="?toolbarPopupTheme"
|
||||
android:layout_alignParentTop="true"/>
|
||||
|
||||
<org.isoron.uhabits.ui.habits.list.views.HeaderView
|
||||
<org.isoron.uhabits.activities.habits.list.views.HeaderView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/toolbar"
|
||||
android:id="@+id/header"
|
||||
style="@style/ListHabits.Header"/>
|
||||
|
||||
<org.isoron.uhabits.ui.habits.list.views.HabitCardListView
|
||||
<org.isoron.uhabits.activities.habits.list.views.HabitCardListView
|
||||
android:id="@+id/listView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
@@ -77,7 +77,7 @@
|
||||
android:visibility="gone"
|
||||
/>
|
||||
|
||||
<org.isoron.uhabits.ui.habits.list.views.HintView
|
||||
<org.isoron.uhabits.activities.habits.list.views.HintView
|
||||
android:id="@+id/hintView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
style="@style/ListHabits.HabitCard"
|
||||
android:layout_width="match_parent">
|
||||
|
||||
<org.isoron.uhabits.ui.common.views.RingView
|
||||
<org.isoron.uhabits.activities.common.views.RingView
|
||||
android:id="@+id/scoreRing"
|
||||
android:layout_width="15dp"
|
||||
android:layout_height="15dp"
|
||||
@@ -42,7 +42,7 @@
|
||||
android:id="@+id/label"
|
||||
style="@style/ListHabits.Label"/>
|
||||
|
||||
<org.isoron.uhabits.ui.habits.list.views.CheckmarkPanelView
|
||||
<org.isoron.uhabits.activities.habits.list.views.CheckmarkPanelView
|
||||
android:id="@+id/checkmarkPanel"
|
||||
style="@style/ListHabits.CheckmarkPanel"/>
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
app:popupTheme="?toolbarPopupTheme"
|
||||
android:layout_alignParentTop="true"/>
|
||||
|
||||
<org.isoron.uhabits.ui.habits.list.views.HeaderView
|
||||
<org.isoron.uhabits.activities.habits.list.views.HeaderView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/toolbar"
|
||||
@@ -48,23 +48,23 @@
|
||||
android:layout_below="@id/header"
|
||||
android:orientation="vertical">
|
||||
|
||||
<org.isoron.uhabits.ui.habits.list.views.HabitCardView
|
||||
<org.isoron.uhabits.activities.habits.list.views.HabitCardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
|
||||
<org.isoron.uhabits.ui.habits.list.views.HabitCardView
|
||||
<org.isoron.uhabits.activities.habits.list.views.HabitCardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
|
||||
<org.isoron.uhabits.ui.habits.list.views.HabitCardView
|
||||
<org.isoron.uhabits.activities.habits.list.views.HabitCardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
|
||||
<org.isoron.uhabits.ui.habits.list.views.HabitCardView
|
||||
<org.isoron.uhabits.activities.habits.list.views.HabitCardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
|
||||
<org.isoron.uhabits.ui.habits.list.views.HabitCardView
|
||||
<org.isoron.uhabits.activities.habits.list.views.HabitCardView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
|
||||
@@ -109,7 +109,7 @@
|
||||
android:visibility="gone"
|
||||
/>
|
||||
|
||||
<org.isoron.uhabits.ui.habits.list.views.HintView
|
||||
<org.isoron.uhabits.activities.habits.list.views.HintView
|
||||
android:id="@+id/hintView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
android:id="@+id/container"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".ui.settings.SettingsActivity"
|
||||
tools:context=".activities.settings.SettingsActivity"
|
||||
tools:ignore="MergeRootFrame">
|
||||
|
||||
<android.support.v7.widget.Toolbar
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
<fragment
|
||||
android:id="@+id/fragment"
|
||||
android:name="org.isoron.uhabits.ui.settings.SettingsFragment"
|
||||
android:name="org.isoron.uhabits.activities.settings.SettingsFragment"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center"
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
style="@style/CardHeader"
|
||||
android:text="@string/frequency"/>
|
||||
|
||||
<org.isoron.uhabits.ui.common.views.FrequencyChart
|
||||
<org.isoron.uhabits.activities.common.views.FrequencyChart
|
||||
android:id="@+id/frequencyChart"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="200dp"/>
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
style="@style/CardHeader"
|
||||
android:text="@string/history"/>
|
||||
|
||||
<org.isoron.uhabits.ui.common.views.HistoryChart
|
||||
<org.isoron.uhabits.activities.common.views.HistoryChart
|
||||
android:id="@+id/historyChart"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="160dp"/>
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
style="@style/CardList"
|
||||
android:clipToPadding="false">
|
||||
|
||||
<org.isoron.uhabits.ui.habits.show.views.SubtitleCard
|
||||
<org.isoron.uhabits.activities.habits.show.views.SubtitleCard
|
||||
android:id="@+id/subtitleCard"
|
||||
style="@style/ShowHabit.Subtitle"/>
|
||||
|
||||
@@ -40,27 +40,27 @@
|
||||
<!--android:id="@+id/headerShadow"-->
|
||||
<!--style="@style/ToolbarShadow"/>-->
|
||||
|
||||
<org.isoron.uhabits.ui.habits.show.views.OverviewCard
|
||||
<org.isoron.uhabits.activities.habits.show.views.OverviewCard
|
||||
android:id="@+id/overviewCard"
|
||||
style="@style/Card"
|
||||
android:paddingTop="12dp"/>
|
||||
|
||||
<org.isoron.uhabits.ui.habits.show.views.ScoreCard
|
||||
<org.isoron.uhabits.activities.habits.show.views.ScoreCard
|
||||
android:id="@+id/scoreCard"
|
||||
style="@style/Card"
|
||||
android:gravity="center"/>
|
||||
|
||||
<org.isoron.uhabits.ui.habits.show.views.HistoryCard
|
||||
<org.isoron.uhabits.activities.habits.show.views.HistoryCard
|
||||
android:id="@+id/historyCard"
|
||||
style="@style/Card"
|
||||
android:gravity="center"
|
||||
android:paddingBottom="0dp"/>
|
||||
|
||||
<org.isoron.uhabits.ui.habits.show.views.StreakCard
|
||||
<org.isoron.uhabits.activities.habits.show.views.StreakCard
|
||||
android:id="@+id/streakCard"
|
||||
style="@style/Card"/>
|
||||
|
||||
<org.isoron.uhabits.ui.habits.show.views.FrequencyCard
|
||||
<org.isoron.uhabits.activities.habits.show.views.FrequencyCard
|
||||
android:id="@+id/frequencyCard"
|
||||
style="@style/Card"/>
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="5">
|
||||
|
||||
<org.isoron.uhabits.ui.common.views.RingView
|
||||
<org.isoron.uhabits.activities.common.views.RingView
|
||||
android:id="@+id/scoreRing"
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="30dp"
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
android:layout_alignParentTop="true"
|
||||
android:text="@string/habit_strength"/>
|
||||
|
||||
<org.isoron.uhabits.ui.common.views.ScoreChart
|
||||
<org.isoron.uhabits.activities.common.views.ScoreChart
|
||||
android:id="@+id/scoreView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="220dp"
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
style="@style/CardHeader"
|
||||
android:text="@string/best_streaks"/>
|
||||
|
||||
<org.isoron.uhabits.ui.common.views.StreakChart
|
||||
<org.isoron.uhabits.activities.common.views.StreakChart
|
||||
android:id="@+id/streakChart"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"/>
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
android:gravity="center"
|
||||
android:orientation="vertical">
|
||||
|
||||
<org.isoron.uhabits.ui.common.views.RingView
|
||||
<org.isoron.uhabits.activities.common.views.RingView
|
||||
android:id="@+id/scoreRing"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
android:previewImage="@drawable/widget_preview_checkmark"
|
||||
android:resizeMode="none"
|
||||
android:updatePeriodMillis="3600000"
|
||||
android:configure="org.isoron.uhabits.ui.widgets.HabitPickerDialog"
|
||||
android:configure="org.isoron.uhabits.widgets.HabitPickerDialog"
|
||||
android:widgetCategory="home_screen">
|
||||
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
android:previewImage="@drawable/widget_preview_frequency"
|
||||
android:resizeMode="vertical|horizontal"
|
||||
android:updatePeriodMillis="3600000"
|
||||
android:configure="org.isoron.uhabits.ui.widgets.HabitPickerDialog"
|
||||
android:configure="org.isoron.uhabits.widgets.HabitPickerDialog"
|
||||
android:widgetCategory="home_screen">
|
||||
|
||||
</appwidget-provider>
|
||||
@@ -27,7 +27,7 @@
|
||||
android:previewImage="@drawable/widget_preview_history"
|
||||
android:resizeMode="vertical|horizontal"
|
||||
android:updatePeriodMillis="3600000"
|
||||
android:configure="org.isoron.uhabits.ui.widgets.HabitPickerDialog"
|
||||
android:configure="org.isoron.uhabits.widgets.HabitPickerDialog"
|
||||
android:widgetCategory="home_screen">
|
||||
|
||||
</appwidget-provider>
|
||||
@@ -27,7 +27,7 @@
|
||||
android:previewImage="@drawable/widget_preview_score"
|
||||
android:resizeMode="vertical|horizontal"
|
||||
android:updatePeriodMillis="3600000"
|
||||
android:configure="org.isoron.uhabits.ui.widgets.HabitPickerDialog"
|
||||
android:configure="org.isoron.uhabits.widgets.HabitPickerDialog"
|
||||
android:widgetCategory="home_screen">
|
||||
|
||||
</appwidget-provider>
|
||||
@@ -27,7 +27,7 @@
|
||||
android:previewImage="@drawable/widget_preview_streaks"
|
||||
android:resizeMode="vertical|horizontal"
|
||||
android:updatePeriodMillis="3600000"
|
||||
android:configure="org.isoron.uhabits.ui.widgets.HabitPickerDialog"
|
||||
android:configure="org.isoron.uhabits.widgets.HabitPickerDialog"
|
||||
android:widgetCategory="home_screen">
|
||||
|
||||
</appwidget-provider>
|
||||
Reference in New Issue
Block a user