isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-08 01:58:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

automatic migration

Browse Source
This commit is contained in:
olegivo
2020-01-04 17:00:17 +03:00
parent 895d66b663
commit 9ac1ae9915
189 changed files with 329 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/uhabits-android/src/main/res/layout/about.xml
View File

@@ -25,7 +25,7 @@
android:background="?windowBackgroundColor"
android:fillViewport="true">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
app:popupTheme="?toolbarPopupTheme"
style="@style/Toolbar"/>

6
android/uhabits-android/src/main/res/layout/automation.xml
View File

@@ -24,7 +24,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
android:title="@string/app_name"
@@ -41,7 +41,7 @@
style="@style/dialogFormLabel"
android:text="@string/action"/>
<android.support.v7.widget.AppCompatSpinner
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/actionSpinner"
android:layout_width="wrap_content"
android:layout_height="25dp"
@@ -57,7 +57,7 @@
style="@style/dialogFormLabel"
android:text="@string/habit"/>
<android.support.v7.widget.AppCompatSpinner
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/habitSpinner"
android:layout_width="wrap_content"
android:layout_height="25dp"

2
android/uhabits-android/src/main/res/layout/edit_habit_frequency.xml
View File

@@ -29,7 +29,7 @@
style="@style/dialogFormLabel"
android:text="@string/repeat"/>
<android.support.v7.widget.AppCompatSpinner
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/spinner"
android:layout_width="wrap_content"
android:layout_height="25dp"

8
android/uhabits-android/src/main/res/layout/edit_habit_name.xml
View File

@@ -28,7 +28,7 @@
<LinearLayout
style="@style/dialogFormRow">
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/tilName"
android:layout_width="0dp"
android:layout_height="wrap_content"
@@ -43,7 +43,7 @@
<requestFocus/>
</EditText>
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<ImageButton
android:id="@+id/buttonPickColor"
@@ -54,7 +54,7 @@
</LinearLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -65,6 +65,6 @@
android:layout_height="wrap_content"
android:hint="@string/question"
app:example="@string/example_question_numerical"/>
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>

8
android/uhabits-android/src/main/res/layout/edit_habit_target.xml
View File

@@ -29,7 +29,7 @@
style="@style/dialogFormLabel"
android:text="@string/target"/>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2">
@@ -43,9 +43,9 @@
android:inputType="numberDecimal"
android:text="@string/default_count"
/>
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<android.support.design.widget.TextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2">
@@ -58,5 +58,5 @@
android:hint="@string/unit"
android:inputType="text"
app:example="@string/example_units"/>
</android.support.design.widget.TextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>

2
android/uhabits-android/src/main/res/layout/settings_activity.xml
View File

@@ -26,7 +26,7 @@
tools:context=".activities.settings.SettingsActivity"
tools:ignore="MergeRootFrame">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
app:popupTheme="?toolbarPopupTheme"
style="@style/Toolbar"/>

2
android/uhabits-android/src/main/res/layout/show_habit.xml
View File

@@ -25,7 +25,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
style="@style/Toolbar"
app:popupTheme="?toolbarPopupTheme"

4
android/uhabits-android/src/main/res/layout/show_habit_bar.xml
View File

@@ -23,7 +23,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.AppCompatSpinner
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/numericalSpinner"
android:layout_width="wrap_content"
android:layout_height="22dp"
@@ -33,7 +33,7 @@
android:entries="@array/strengthIntervalNames"
android:theme="@style/SmallSpinner" />
<android.support.v7.widget.AppCompatSpinner
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/boolSpinner"
android:layout_width="wrap_content"
android:layout_height="22dp"

2
android/uhabits-android/src/main/res/layout/show_habit_score.xml
View File

@@ -23,7 +23,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.AppCompatSpinner
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/spinner"
android:layout_width="wrap_content"
android:layout_height="22dp"

2
android/uhabits-android/src/main/res/layout/toolbar.xml
View File

@@ -18,7 +18,7 @@
~ with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<android.support.v7.widget.Toolbar
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"