Skip to content

Commit

Permalink
multi line preference titles
Browse files Browse the repository at this point in the history
  • Loading branch information
crackededed committed Jan 16, 2024
1 parent 55f7b4e commit 5153601
Show file tree
Hide file tree
Showing 11 changed files with 338 additions and 172 deletions.
19 changes: 12 additions & 7 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ android {
minSdk = 16
targetSdk = 34
versionCode = 121
versionName = "2.27.1"
versionName = "2.27.2"
resourceConfigurations += listOf("ar", "de", "en", "es", "fr", "in", "ja", "pt-rBR", "ru", "tr", "zh-rTW")
}

Expand All @@ -54,12 +54,17 @@ android {
disable += "ContentDescription"
}
configurations.all {
resolutionStrategy {
force("androidx.webkit:webkit:1.9.0-alpha01")
force("com.squareup.okhttp3:logging-interceptor:3.12.13")
force("com.squareup.retrofit2:retrofit:2.6.4")
force("com.squareup.retrofit2:converter-gson:2.6.4")
}
resolutionStrategy.force(listOf(
"androidx.lifecycle:lifecycle-common-java8:2.7.0-alpha03",
"androidx.lifecycle:lifecycle-livedata-ktx:2.7.0-alpha03",
"androidx.lifecycle:lifecycle-process:2.7.0-alpha03",
"androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0-alpha03",
"androidx.webkit:webkit:1.9.0-alpha01",
"com.google.android.material:material:1.11.0",
"com.squareup.okhttp3:logging-interceptor:3.12.13",
"com.squareup.retrofit2:retrofit:2.6.4",
"com.squareup.retrofit2:converter-gson:2.6.4",
))
}
}

Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/xml/api_preferences.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<Preference
android:key="api_token_settings"
android:title="@string/tokens"
app:iconSpaceReserved="false" />
app:iconSpaceReserved="false"
app:singleLineTitle="false" />

</androidx.preference.PreferenceScreen>
30 changes: 20 additions & 10 deletions app/src/main/res/xml/api_token_preferences.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,61 +8,71 @@
android:key="api_login"
android:summary="%s"
android:title="@string/api_login"
app:iconSpaceReserved="false"/>
app:iconSpaceReserved="false"
app:singleLineTitle="false" />

<EditTextPreference
android:defaultValue="ilfexgv3nnljz3isbm257gzwrzr7bi"
android:key="helix_client_id"
android:title="@string/api_helix"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
app:iconSpaceReserved="false"
app:singleLineTitle="false" />

<EditTextPreference
android:defaultValue="https://localhost"
android:key="helix_redirect"
android:title="@string/api_helix_redirect"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
app:iconSpaceReserved="false"
app:singleLineTitle="false" />

<EditTextPreference
android:defaultValue="kd1unb4b3q4t58fwlpcbzcbnm76a8fp"
android:key="gql_client_id2"
android:title="@string/api_gql"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
app:iconSpaceReserved="false"
app:singleLineTitle="false" />

<EditTextPreference
android:defaultValue="https://www.twitch.tv/"
android:key="gql_redirect2"
android:title="@string/api_gql_redirect"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
app:iconSpaceReserved="false"
app:singleLineTitle="false" />

<PreferenceCategory android:title="@string/api_current_login" app:iconSpaceReserved="false"/>
<EditTextPreference
android:key="user_id"
android:title="@string/api_user_id"
app:iconSpaceReserved="false" />
app:iconSpaceReserved="false"
app:singleLineTitle="false" />

<EditTextPreference
android:key="username"
android:title="@string/api_user_login"
app:iconSpaceReserved="false" />
app:iconSpaceReserved="false"
app:singleLineTitle="false" />

<EditTextPreference
android:key="token"
android:title="@string/api_helix_token"
app:iconSpaceReserved="false" />
app:iconSpaceReserved="false"
app:singleLineTitle="false" />

<EditTextPreference
android:key="gql_token2"
android:title="@string/api_gql_token"
app:iconSpaceReserved="false" />
app:iconSpaceReserved="false"
app:singleLineTitle="false" />

<SwitchPreferenceCompat
android:defaultValue="true"
android:key="validate_tokens"
android:title="@string/api_validate_tokens"
app:iconSpaceReserved="false"/>
app:iconSpaceReserved="false"
app:singleLineTitle="false" />

</androidx.preference.PreferenceScreen>
35 changes: 21 additions & 14 deletions app/src/main/res/xml/buffer_preferences.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,61 +7,68 @@
android:singleLine="true"
android:title="@string/player_buffer_min"
app:dialogMessage="@string/player_buffer_min_summary"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
app:iconSpaceReserved="false"
app:singleLineTitle="false"
app:useSimpleSummaryProvider="true" />

<EditTextPreference
android:defaultValue="50000"
android:key="player_buffer_max"
android:singleLine="true"
android:title="@string/player_buffer_max"
app:dialogMessage="@string/player_buffer_max_summary"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
app:iconSpaceReserved="false"
app:singleLineTitle="false"
app:useSimpleSummaryProvider="true" />

<EditTextPreference
android:defaultValue="2000"
android:key="player_buffer_playback"
android:singleLine="true"
android:title="@string/player_buffer_playback"
app:dialogMessage="@string/player_buffer_playback_summary"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
app:iconSpaceReserved="false"
app:singleLineTitle="false"
app:useSimpleSummaryProvider="true" />

<EditTextPreference
android:defaultValue="5000"
android:key="player_buffer_rebuffer"
android:singleLine="true"
android:title="@string/player_buffer_rebuffer"
app:dialogMessage="@string/player_buffer_rebuffer_summary"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
app:iconSpaceReserved="false"
app:singleLineTitle="false"
app:useSimpleSummaryProvider="true" />

<EditTextPreference
android:defaultValue=""
android:key="player_live_min_speed"
android:singleLine="true"
android:title="@string/player_minspeedlive"
app:dialogMessage="@string/player_minspeedlive_summary"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
app:iconSpaceReserved="false"
app:singleLineTitle="false"
app:useSimpleSummaryProvider="true" />

<EditTextPreference
android:defaultValue=""
android:key="player_live_max_speed"
android:singleLine="true"
android:title="@string/player_maxspeedlive"
app:dialogMessage="@string/player_maxspeedlive_summary"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
app:iconSpaceReserved="false"
app:singleLineTitle="false"
app:useSimpleSummaryProvider="true" />

<EditTextPreference
android:defaultValue="5000"
android:key="player_live_target_offset"
android:singleLine="true"
android:title="@string/player_targetoffset"
app:dialogMessage="@string/player_targetoffset_summary"
app:useSimpleSummaryProvider="true"
app:iconSpaceReserved="false" />
app:iconSpaceReserved="false"
app:singleLineTitle="false"
app:useSimpleSummaryProvider="true" />

</androidx.preference.PreferenceScreen>
Loading

0 comments on commit 5153601

Please sign in to comment.