sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-20 04:39:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix minor issues

Browse source
This commit is contained in:
Phillip Thelen 2018-12-10 13:36:30 +01:00
parent 69a539662d
commit dde73cf0ae
8 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Habitica/build.gradle
View file

@ -131,8 +131,8 @@ dependencies {
implementation 'androidx.core:core-ktx:1.0.1'
implementation "androidx.lifecycle:lifecycle-extensions:2.0.0"
kapt "androidx.lifecycle:lifecycle-compiler:2.0.0"
implementation 'android.arch.navigation:navigation-fragment-ktx:1.0.0-alpha07'
implementation 'android.arch.navigation:navigation-ui-ktx:1.0.0-alpha07'
implementation 'android.arch.navigation:navigation-fragment-ktx:1.0.0-alpha08'
implementation 'android.arch.navigation:navigation-ui-ktx:1.0.0-alpha08'
implementation 'com.plattysoft.leonids:LeonidsLib:1.3.2'
}
@ -142,12 +142,13 @@ android {
defaultConfig {
minSdkVersion 21
minSdkVersion 16
applicationId "com.habitrpg.android.habitica"
vectorDrawables.useSupportLibrary = true
buildConfigField "String", "STORE", "\"google\""
multiDexEnabled true
versionCode 2042
versionCode 2043
versionName "1.7"
}

11
Habitica/res/layout/dialog_edittext.xml Normal file
View file

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/spacing_medium">
<EditText
android:id="@+id/editText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text" />
</LinearLayout>

1
Habitica/res/values/strings.xml
View file

@ -491,6 +491,7 @@
<string name="payment_method">Payment method</string>
<string name="subscription">Subscription</string>
<string name="active">Active</string>
<string name="due">Due</string>
<string name="cancel_subscription">Cancel Subscription</string>
<string name="cancel_subscription_google.description">No longer want to subscribe? You can find the option to unsubscribe in the “My Apps” section of the Google Play Store.</string>
<string name="cancel_subscription_notgoogle.description">No longer want to subscribe? Due to your payment method, you can only unsubscribe through the website. Click the button below, to open the site in your browser!</string>

1
Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt
View file

@ -15,7 +15,6 @@ import com.habitrpg.android.habitica.receivers.NotificationPublisher
import com.habitrpg.android.habitica.receivers.TaskReceiver
import io.reactivex.Flowable
import io.reactivex.functions.Consumer
import org.greenrobot.eventbus.EventBus
import java.util.*
class TaskAlarmManager(private var context: Context, private var taskRepository: TaskRepository, private var userId: String) {

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
View file

@ -243,7 +243,7 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction {
this.keyboardUtil?.enable()
val navigationController = findNavController(R.id.nav_host_fragment)
navigationController.addOnNavigatedListener { _, destination ->
navigationController.addOnDestinationChangedListener { _, destination, _ ->
if (destination.label.isNullOrEmpty()) {
toolbarTitleTextView.text = user?.profile?.name
} else if (user?.profile != null) {

7
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AuthenticationPreferenceFragment.kt
View file

@ -113,13 +113,12 @@ class AuthenticationPreferenceFragment: BasePreferencesFragment() {
private fun showLoginNameDialog() {
val inflater = context?.layoutInflater
val view = inflater?.inflate(R.layout.dialog_edittext_confirm_pw, null)
val view = inflater?.inflate(R.layout.dialog_edittext, null)
val loginNameEditText = view?.findViewById<EditText>(R.id.editText)
loginNameEditText?.setText(user?.authentication?.localAuthentication?.username)
context.notNull { context ->
var builder = AlertDialog.Builder(context).setTitle(R.string.change_username)
val dialog = builder.setPositiveButton(R.string.change) { thisDialog, _ ->
val builder = AlertDialog.Builder(context).setTitle(R.string.change_username)
val dialog = builder.setPositiveButton(R.string.save) { thisDialog, _ ->
thisDialog.dismiss()
userRepository.updateLoginName(loginNameEditText?.text.toString())
.subscribe(Consumer {

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.kt
View file

@ -210,7 +210,7 @@ open class TaskRecyclerViewFragment : BaseFragment(), androidx.swiperefreshlayou
override fun onScrollStateChanged(recyclerView: androidx.recyclerview.widget.RecyclerView, newState: Int) {
super.onScrollStateChanged(recyclerView, newState)
if (newState == androidx.recyclerview.widget.RecyclerView.SCROLL_STATE_IDLE) {
refreshLayout?.isEnabled = (activity as MainActivity).isAppBarExpanded
refreshLayout?.isEnabled = (activity as? MainActivity)?.isAppBarExpanded ?: false
}
}
})

6
Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
View file

@ -222,8 +222,8 @@ class TaskFilterDialog(context: Context, component: AppComponent?) : AlertDialog
}
})
val deleteButton = wrapper?.findViewById<View>(R.id.delete_button) as Button
deleteButton.setOnClickListener {
val deleteButton = wrapper?.findViewById<View>(R.id.delete_button) as? Button
deleteButton?.setOnClickListener {
deletedTags.add(tag.getId())
if (createdTags.containsKey(tag.getId())) {
createdTags.remove(tag.getId())
@ -276,7 +276,7 @@ class TaskFilterDialog(context: Context, component: AppComponent?) : AlertDialog
Task.TYPE_DAILY -> {
taskTypeTitle.setText(R.string.dailies)
allTaskFilter.setText(R.string.all)
secondTaskFilter.setText(R.string.active)
secondTaskFilter.setText(R.string.due)
thirdTaskFilter.setText(R.string.gray)
}
Task.TYPE_TODO -> {