Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
77d2def9
Commit
77d2def9
authored
Dec 30, 2019
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow importing profiles.json from URL
parent
3f25eace
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
475 additions
and
0 deletions
+475
-0
core/src/main/java/com/github/shadowsocks/subscription/Subscription.kt
.../java/com/github/shadowsocks/subscription/Subscription.kt
+87
-0
core/src/main/res/values/strings.xml
core/src/main/res/values/strings.xml
+6
-0
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
+2
-0
mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt
.../src/main/java/com/github/shadowsocks/ProfilesFragment.kt
+1
-0
mobile/src/main/java/com/github/shadowsocks/subscription/SubscriptionFragment.kt
...m/github/shadowsocks/subscription/SubscriptionFragment.kt
+342
-0
mobile/src/main/res/layout/dialog_subscription.xml
mobile/src/main/res/layout/dialog_subscription.xml
+20
-0
mobile/src/main/res/menu/navigation_main.xml
mobile/src/main/res/menu/navigation_main.xml
+3
-0
mobile/src/main/res/menu/subscription_menu.xml
mobile/src/main/res/menu/subscription_menu.xml
+14
-0
No files found.
core/src/main/java/com/github/shadowsocks/subscription/Subscription.kt
0 → 100644
View file @
77d2def9
/*******************************************************************************
* *
* Copyright (C) 2017 by Max Lv <max.c.lv@gmail.com> *
* Copyright (C) 2017 by Mygod Studio <contact-shadowsocks-android@mygod.be> *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
* *
*******************************************************************************/
package
com.github.shadowsocks.subscription
import
android.content.Context
import
android.util.Log
import
androidx.recyclerview.widget.SortedList
import
com.crashlytics.android.Crashlytics
import
com.github.shadowsocks.Core
import
com.github.shadowsocks.net.Subnet
import
com.github.shadowsocks.preference.DataStore
import
com.github.shadowsocks.utils.asIterable
import
java.io.File
import
java.io.IOException
import
java.io.Reader
import
java.net.URL
import
java.net.URLConnection
class
Subscription
{
companion
object
{
const
val
SUBSCRIPTION
=
"subscription"
var
instance
:
Subscription
get
()
{
val
sub
=
Subscription
()
val
str
=
DataStore
.
publicStore
.
getString
(
SUBSCRIPTION
)
if
(
str
!=
null
)
sub
.
fromReader
(
str
.
reader
())
return
sub
}
set
(
value
)
=
DataStore
.
publicStore
.
putString
(
SUBSCRIPTION
,
value
.
toString
())
}
private
abstract
class
BaseSorter
<
T
>
:
SortedList
.
Callback
<
T
>()
{
override
fun
onInserted
(
position
:
Int
,
count
:
Int
)
{
}
override
fun
areContentsTheSame
(
oldItem
:
T
?,
newItem
:
T
?):
Boolean
=
oldItem
==
newItem
override
fun
onMoved
(
fromPosition
:
Int
,
toPosition
:
Int
)
{
}
override
fun
onChanged
(
position
:
Int
,
count
:
Int
)
{
}
override
fun
onRemoved
(
position
:
Int
,
count
:
Int
)
{
}
override
fun
areItemsTheSame
(
item1
:
T
?,
item2
:
T
?):
Boolean
=
item1
==
item2
override
fun
compare
(
o1
:
T
?,
o2
:
T
?):
Int
=
if
(
o1
==
null
)
if
(
o2
==
null
)
0
else
1
else
if
(
o2
==
null
)
-
1
else
compareNonNull
(
o1
,
o2
)
abstract
fun
compareNonNull
(
o1
:
T
,
o2
:
T
):
Int
}
private
open
class
DefaultSorter
<
T
:
Comparable
<
T
>>
:
BaseSorter
<
T
>()
{
override
fun
compareNonNull
(
o1
:
T
,
o2
:
T
):
Int
=
o1
.
compareTo
(
o2
)
}
private
object
URLSorter
:
BaseSorter
<
URL
>()
{
private
val
ordering
=
compareBy
<
URL
>({
it
.
host
},
{
it
.
port
},
{
it
.
file
},
{
it
.
protocol
})
override
fun
compareNonNull
(
o1
:
URL
,
o2
:
URL
):
Int
=
ordering
.
compare
(
o1
,
o2
)
}
val
urls
=
SortedList
(
URL
::
class
.
java
,
URLSorter
)
fun
fromReader
(
reader
:
Reader
):
Subscription
{
urls
.
clear
()
reader
.
useLines
{
for
(
line
in
it
)
{
urls
.
add
(
URL
(
line
))
}
}
return
this
}
override
fun
toString
():
String
{
val
result
=
StringBuilder
()
result
.
append
(
urls
.
asIterable
().
joinToString
(
"\n"
))
return
result
.
toString
()
}
}
core/src/main/res/values/strings.xml
View file @
77d2def9
...
...
@@ -135,6 +135,12 @@
<string
name=
"vpn_connected"
>
Connected, tap to check connection
</string>
<string
name=
"not_connected"
>
Not connected
</string>
<!-- subscriptions -->
<string
name=
"subscriptions"
>
Subscriptions
</string>
<string
name=
"add_subscription"
>
Add a subscription
</string>
<string
name=
"edit_subscription"
>
Edit subscription
</string>
<string
name=
"update_subscription"
>
Refresh servers from subscription
</string>
<!-- acl -->
<string
name=
"custom_rules"
>
Custom rules
</string>
<string
name=
"action_add_rule"
>
Add rule(s)…
</string>
...
...
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
View file @
77d2def9
...
...
@@ -48,6 +48,7 @@ import com.github.shadowsocks.aidl.TrafficStats
import
com.github.shadowsocks.bg.BaseService
import
com.github.shadowsocks.preference.DataStore
import
com.github.shadowsocks.preference.OnPreferenceDataStoreChangeListener
import
com.github.shadowsocks.subscription.SubscriptionFragment
import
com.github.shadowsocks.utils.Key
import
com.github.shadowsocks.utils.SingleInstanceActivity
import
com.github.shadowsocks.widget.ListHolderListener
...
...
@@ -215,6 +216,7 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Callback, OnPref
return
true
}
R
.
id
.
customRules
->
displayFragment
(
CustomRulesFragment
())
R
.
id
.
subscriptions
->
displayFragment
(
SubscriptionFragment
())
else
->
return
false
}
item
.
isChecked
=
true
...
...
mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt
View file @
77d2def9
...
...
@@ -257,6 +257,7 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
}.
build
().
loadAd
(
AdRequest
.
Builder
().
apply
{
addTestDevice
(
"B08FC1764A7B250E91EA9D0D5EBEB208"
)
addTestDevice
(
"7509D18EB8AF82F915874FEF53877A64"
)
addTestDevice
(
"F58907F28184A828DD0DB6F8E38189C6"
)
}.
build
())
}
else
if
(
nativeAd
!=
null
)
populateUnifiedNativeAdView
(
nativeAd
!!
,
nativeAdView
!!
)
}
...
...
mobile/src/main/java/com/github/shadowsocks/subscription/SubscriptionFragment.kt
0 → 100644
View file @
77d2def9
/*******************************************************************************
* *
* Copyright (C) 2017 by Max Lv <max.c.lv@gmail.com> *
* Copyright (C) 2017 by Mygod Studio <contact-shadowsocks-android@mygod.be> *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
* *
*******************************************************************************/
package
com.github.shadowsocks.subscription
import
android.annotation.SuppressLint
import
android.content.ClipData
import
android.content.ClipboardManager
import
android.content.DialogInterface
import
android.content.Intent
import
android.content.res.Configuration
import
android.os.Build
import
android.os.Bundle
import
android.os.Parcelable
import
android.text.Editable
import
android.text.TextWatcher
import
android.util.Log
import
android.view.*
import
android.widget.*
import
androidx.appcompat.app.AlertDialog
import
androidx.appcompat.widget.Toolbar
import
androidx.core.content.ContextCompat
import
androidx.core.content.getSystemService
import
androidx.recyclerview.widget.DefaultItemAnimator
import
androidx.recyclerview.widget.ItemTouchHelper
import
androidx.recyclerview.widget.LinearLayoutManager
import
androidx.recyclerview.widget.RecyclerView
import
com.github.shadowsocks.Core
import
com.github.shadowsocks.MainActivity
import
com.github.shadowsocks.R
import
com.github.shadowsocks.ToolbarFragment
import
com.github.shadowsocks.bg.BaseService
import
com.github.shadowsocks.database.ProfileManager
import
com.github.shadowsocks.net.Subnet
import
com.github.shadowsocks.plugin.AlertDialogFragment
import
com.github.shadowsocks.widget.ListHolderListener
import
com.github.shadowsocks.widget.MainListListener
import
com.github.shadowsocks.widget.UndoSnackbarManager
import
com.google.android.material.textfield.TextInputLayout
import
kotlinx.android.parcel.Parcelize
import
me.zhanghai.android.fastscroll.FastScrollerBuilder
import
java.net.IDN
import
java.net.MalformedURLException
import
java.net.URL
import
java.util.*
import
java.util.regex.PatternSyntaxException
import
com.github.shadowsocks.subscription.Subscription
import
com.github.shadowsocks.utils.*
import
kotlinx.coroutines.GlobalScope
import
kotlinx.coroutines.launch
import
java.io.ByteArrayInputStream
import
java.io.IOError
import
java.io.IOException
import
java.io.InputStream
import
java.net.HttpURLConnection
class
SubscriptionFragment
:
ToolbarFragment
(),
Toolbar
.
OnMenuItemClickListener
{
companion
object
{
private
const
val
REQUEST_CODE_ADD
=
1
private
const
val
REQUEST_CODE_EDIT
=
2
private
const
val
SELECTED_URLS
=
"com.github.shadowsocks.acl.subscription.SELECTED_URLS"
}
@Parcelize
data class
SubItem
(
val
item
:
String
=
""
)
:
Parcelable
{
fun
toURL
()
=
URL
(
item
)
}
@Parcelize
data class
SubEditResult
(
val
edited
:
SubItem
,
val
replacing
:
SubItem
)
:
Parcelable
class
SubDialogFragment
:
AlertDialogFragment
<
SubItem
,
SubEditResult
>(),
TextWatcher
,
AdapterView
.
OnItemSelectedListener
{
private
lateinit
var
editText
:
EditText
private
lateinit
var
inputLayout
:
TextInputLayout
private
val
positive
by
lazy
{
(
dialog
as
AlertDialog
).
getButton
(
AlertDialog
.
BUTTON_POSITIVE
)
}
override
fun
AlertDialog
.
Builder
.
prepare
(
listener
:
DialogInterface
.
OnClickListener
)
{
val
activity
=
requireActivity
()
@SuppressLint
(
"InflateParams"
)
val
view
=
activity
.
layoutInflater
.
inflate
(
R
.
layout
.
dialog_subscription
,
null
)
editText
=
view
.
findViewById
(
R
.
id
.
content
)
inputLayout
=
view
.
findViewById
(
R
.
id
.
content_layout
)
editText
.
setText
(
arg
.
item
)
editText
.
addTextChangedListener
(
this
@SubDialogFragment
)
setTitle
(
R
.
string
.
add_subscription
)
setPositiveButton
(
android
.
R
.
string
.
ok
,
listener
)
setNegativeButton
(
android
.
R
.
string
.
cancel
,
null
)
if
(
arg
.
item
.
isNotEmpty
())
setNeutralButton
(
R
.
string
.
delete
,
listener
)
setView
(
view
)
}
override
fun
onStart
()
{
super
.
onStart
()
validate
()
}
override
fun
beforeTextChanged
(
s
:
CharSequence
?,
start
:
Int
,
count
:
Int
,
after
:
Int
)
{
}
override
fun
onTextChanged
(
s
:
CharSequence
?,
start
:
Int
,
before
:
Int
,
count
:
Int
)
{
}
override
fun
afterTextChanged
(
s
:
Editable
)
=
validate
(
value
=
s
)
override
fun
onNothingSelected
(
parent
:
AdapterView
<
*
>?)
=
check
(
false
)
override
fun
onItemSelected
(
parent
:
AdapterView
<
*
>?,
view
:
View
?,
position
:
Int
,
id
:
Long
)
=
validate
()
private
fun
validate
(
value
:
Editable
=
editText
.
text
)
{
var
message
=
""
positive
.
isEnabled
=
try
{
val
url
=
URL
(
value
.
toString
())
if
(
"http"
.
equals
(
url
.
protocol
,
true
))
message
=
getString
(
R
.
string
.
cleartext_http_warning
)
true
}
catch
(
e
:
MalformedURLException
)
{
message
=
e
.
readableMessage
false
}
inputLayout
.
error
=
message
}
override
fun
ret
(
which
:
Int
)
=
when
(
which
)
{
DialogInterface
.
BUTTON_POSITIVE
->
{
SubEditResult
(
editText
.
text
.
toString
().
let
{
text
->
SubItem
(
text
)
},
arg
)
}
DialogInterface
.
BUTTON_NEUTRAL
->
SubEditResult
(
arg
,
arg
)
else
->
null
}
override
fun
onClick
(
dialog
:
DialogInterface
?,
which
:
Int
)
{
if
(
which
!=
DialogInterface
.
BUTTON_NEGATIVE
)
super
.
onClick
(
dialog
,
which
)
}
}
private
inner
class
SubViewHolder
(
view
:
View
)
:
RecyclerView
.
ViewHolder
(
view
),
View
.
OnClickListener
,
View
.
OnLongClickListener
{
lateinit
var
item
:
URL
private
val
text
=
view
.
findViewById
<
TextView
>(
android
.
R
.
id
.
text1
)
init
{
view
.
isFocusable
=
true
view
.
setOnClickListener
(
this
)
view
.
setOnLongClickListener
(
this
)
view
.
setBackgroundResource
(
R
.
drawable
.
background_selectable
)
}
fun
bind
(
url
:
URL
)
{
item
=
url
text
.
text
=
url
.
toString
()
itemView
.
isSelected
=
selectedItems
.
contains
(
url
)
}
override
fun
onClick
(
v
:
View
?)
{
if
(
selectedItems
.
isNotEmpty
())
onLongClick
(
v
)
else
SubDialogFragment
().
withArg
(
SubItem
(
item
.
toString
())).
show
(
this
@SubscriptionFragment
,
REQUEST_CODE_EDIT
)
}
override
fun
onLongClick
(
v
:
View
?):
Boolean
{
if
(!
selectedItems
.
add
(
item
))
selectedItems
.
remove
(
item
)
// toggle
itemView
.
isSelected
=
!
itemView
.
isSelected
return
true
}
}
private
inner
class
SubscriptionAdapter
:
RecyclerView
.
Adapter
<
SubViewHolder
>()
{
private
val
subscription
=
Subscription
.
instance
private
var
savePending
=
false
override
fun
onBindViewHolder
(
holder
:
SubViewHolder
,
i
:
Int
)
{
holder
.
bind
(
subscription
.
urls
[
i
])
}
override
fun
onCreateViewHolder
(
parent
:
ViewGroup
,
viewType
:
Int
)
=
SubViewHolder
(
LayoutInflater
.
from
(
parent
.
context
).
inflate
(
android
.
R
.
layout
.
simple_list_item_1
,
parent
,
false
))
override
fun
getItemCount
():
Int
=
subscription
.
urls
.
size
()
private
fun
apply
()
{
if
(!
savePending
)
{
savePending
=
true
list
.
post
{
Subscription
.
instance
=
subscription
savePending
=
false
}
}
}
fun
add
(
url
:
URL
):
Int
{
val
old
=
subscription
.
urls
.
size
()
val
index
=
subscription
.
urls
.
add
(
url
)
if
(
old
!=
subscription
.
urls
.
size
())
{
notifyItemInserted
(
index
)
apply
()
}
return
index
}
fun
remove
(
i
:
Int
)
{
undoManager
.
remove
(
Pair
(
i
,
subscription
.
urls
[
i
]))
subscription
.
urls
.
removeItemAt
(
i
)
notifyItemRemoved
(
i
)
apply
()
}
fun
remove
(
item
:
Any
)
{
when
(
item
)
{
is
URL
->
{
notifyItemRemoved
(
subscription
.
urls
.
indexOf
(
item
))
subscription
.
urls
.
remove
(
item
)
apply
()
}
}
}
fun
undo
(
actions
:
List
<
Pair
<
Int
,
Any
>>)
{
for
((
_
,
item
)
in
actions
)
when
(
item
)
{
is
URL
->
{
add
(
item
)
}
}
}
}
private
val
isEnabled
get
()
=
(
activity
as
MainActivity
).
state
==
BaseService
.
State
.
Stopped
private
val
selectedItems
=
HashSet
<
Any
>()
private
val
adapter
by
lazy
{
SubscriptionAdapter
()
}
private
lateinit
var
list
:
RecyclerView
private
var
mode
:
ActionMode
?
=
null
private
lateinit
var
undoManager
:
UndoSnackbarManager
<
Any
>
private
fun
fetchServerFromSubscriptions
()
{
// SubscriptionSyncer.schedule()
val
activity
=
activity
as
MainActivity
val
job
=
GlobalScope
.
launch
{
val
subscription
=
Subscription
.
instance
try
{
for
(
url
in
subscription
.
urls
.
asIterable
())
{
val
connection
=
url
.
openConnection
()
as
HttpURLConnection
ProfileManager
.
createProfilesFromJson
(
sequenceOf
(
connection
.
inputStream
))
}
}
catch
(
e
:
Exception
)
{
e
.
printStackTrace
()
activity
.
snackbar
(
e
.
readableMessage
).
show
()
}
}
}
override
fun
onCreateView
(
inflater
:
LayoutInflater
,
container
:
ViewGroup
?,
savedInstanceState
:
Bundle
?):
View
?
=
inflater
.
inflate
(
R
.
layout
.
layout_custom_rules
,
container
,
false
)
override
fun
onViewCreated
(
view
:
View
,
savedInstanceState
:
Bundle
?)
{
super
.
onViewCreated
(
view
,
savedInstanceState
)
view
.
setOnApplyWindowInsetsListener
(
ListHolderListener
)
if
(
savedInstanceState
!=
null
)
{
selectedItems
.
addAll
(
savedInstanceState
.
getStringArray
(
SELECTED_URLS
)
?.
map
{
URL
(
it
)
}
?:
listOf
())
}
toolbar
.
setTitle
(
R
.
string
.
subscriptions
)
toolbar
.
inflateMenu
(
R
.
menu
.
subscription_menu
)
toolbar
.
setOnMenuItemClickListener
(
this
)
val
activity
=
activity
as
MainActivity
list
=
view
.
findViewById
(
R
.
id
.
list
)
list
.
setOnApplyWindowInsetsListener
(
MainListListener
)
list
.
layoutManager
=
LinearLayoutManager
(
activity
,
RecyclerView
.
VERTICAL
,
false
)
list
.
itemAnimator
=
DefaultItemAnimator
()
list
.
adapter
=
adapter
FastScrollerBuilder
(
list
).
useMd2Style
().
build
()
undoManager
=
UndoSnackbarManager
(
activity
,
adapter
::
undo
)
ItemTouchHelper
(
object
:
ItemTouchHelper
.
SimpleCallback
(
0
,
ItemTouchHelper
.
START
or
ItemTouchHelper
.
END
)
{
override
fun
getSwipeDirs
(
recyclerView
:
RecyclerView
,
viewHolder
:
RecyclerView
.
ViewHolder
):
Int
=
if
(
isEnabled
&&
selectedItems
.
isEmpty
())
super
.
getSwipeDirs
(
recyclerView
,
viewHolder
)
else
0
override
fun
onSwiped
(
viewHolder
:
RecyclerView
.
ViewHolder
,
direction
:
Int
)
=
adapter
.
remove
(
viewHolder
.
adapterPosition
)
override
fun
onMove
(
recyclerView
:
RecyclerView
,
viewHolder
:
RecyclerView
.
ViewHolder
,
target
:
RecyclerView
.
ViewHolder
):
Boolean
=
false
}).
attachToRecyclerView
(
list
)
}
override
fun
onBackPressed
():
Boolean
{
val
mode
=
mode
return
if
(
mode
!=
null
)
{
mode
.
finish
()
true
}
else
super
.
onBackPressed
()
}
override
fun
onSaveInstanceState
(
outState
:
Bundle
)
{
super
.
onSaveInstanceState
(
outState
)
outState
.
putStringArray
(
SELECTED_URLS
,
selectedItems
.
filterIsInstance
<
URL
>().
map
(
URL
::
toString
).
toTypedArray
())
}
override
fun
onMenuItemClick
(
item
:
MenuItem
):
Boolean
=
when
(
item
.
itemId
)
{
R
.
id
.
action_manual_settings
->
{
SubDialogFragment
().
withArg
(
SubItem
()).
show
(
this
,
REQUEST_CODE_ADD
)
true
}
R
.
id
.
action_update_subscription
->
{
fetchServerFromSubscriptions
()
true
}
else
->
false
}
override
fun
onActivityResult
(
requestCode
:
Int
,
resultCode
:
Int
,
data
:
Intent
?)
{
val
editing
=
when
(
requestCode
)
{
REQUEST_CODE_ADD
->
false
REQUEST_CODE_EDIT
->
true
else
->
return
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
)
}
val
ret
by
lazy
{
AlertDialogFragment
.
getRet
<
SubEditResult
>(
data
!!
)
}
when
(
resultCode
)
{
DialogInterface
.
BUTTON_POSITIVE
->
{
if
(
editing
)
adapter
.
remove
(
ret
.
replacing
.
toURL
())
adapter
.
add
(
ret
.
edited
.
toURL
())
?.
also
{
list
.
post
{
list
.
scrollToPosition
(
it
)
}
}
}
DialogInterface
.
BUTTON_NEUTRAL
->
ret
.
replacing
.
toURL
().
let
{
item
->
adapter
.
remove
(
item
)
undoManager
.
remove
(
Pair
(-
1
,
item
))
}
}
}
override
fun
onDetach
()
{
undoManager
.
flush
()
mode
?.
finish
()
super
.
onDetach
()
}
}
mobile/src/main/res/layout/dialog_subscription.xml
0 → 100644
View file @
77d2def9
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:orientation=
"vertical"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:padding=
"16dp"
>
<com.google.android.material.textfield.TextInputLayout
android:id=
"@+id/content_layout"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
app:errorEnabled=
"true"
>
<com.google.android.material.textfield.TextInputEditText
android:id=
"@+id/content"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:paddingTop=
"12dp"
android:inputType=
"textNoSuggestions|textMultiLine"
/>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
mobile/src/main/res/menu/navigation_main.xml
View file @
77d2def9
...
...
@@ -5,6 +5,9 @@
<item
android:id=
"@+id/profiles"
android:title=
"@string/profiles"
android:icon=
"@drawable/ic_action_description"
/>
<item
android:id=
"@+id/subscriptions"
android:title=
"@string/subscriptions"
android:icon=
"@drawable/ic_action_description"
/>
<item
android:id=
"@+id/customRules"
android:title=
"@string/custom_rules"
android:icon=
"@drawable/ic_action_assignment"
/>
...
...
mobile/src/main/res/menu/subscription_menu.xml
0 → 100644
View file @
77d2def9
<?xml version="1.0" encoding="utf-8"?>
<menu
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
>
<item
android:title=
"@string/add_subscription"
android:id=
"@+id/action_manual_settings"
android:icon=
"@drawable/ic_av_playlist_add"
android:alphabeticShortcut=
"n"
app:showAsAction=
"always"
/>
<item
android:title=
"@string/update_subscription"
android:id=
"@+id/action_update_subscription"
android:icon=
"@drawable/ic_action_done"
android:alphabeticShortcut=
"r"
app:showAsAction=
"ifRoom"
/>
</menu>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment