hg
/
FONGMITV
mirror of https://github.com/FongMi/TV.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix bug

Browse Source
pull/137/head
FongMi 3 years ago
parent 7d44daf263
commit d1e47ebf96
10 changed files with 55 additions and 66 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      app/src/leanback/java/com/fongmi/android/tv/ui/adapter/SiteAdapter.java
  2. 10
      app/src/leanback/res/drawable/ic_site_block.xml
  3. 10
      app/src/leanback/res/drawable/ic_site_cancel.xml
  4. 10
      app/src/leanback/res/drawable/ic_site_record.xml
  5. 10
      app/src/leanback/res/drawable/ic_site_select.xml
  6. 53
      app/src/leanback/res/layout/dialog_site.xml
  7. 9
      app/src/main/java/com/fongmi/android/tv/bean/Site.java
  8. 5
      app/src/main/res/values-zh-rCN/strings.xml
  9. 5
      app/src/main/res/values-zh-rTW/strings.xml
  10. 5
      app/src/main/res/values/strings.xml

4
app/src/leanback/java/com/fongmi/android/tv/ui/adapter/SiteAdapter.java
Unescape View File

@ -35,11 +35,11 @@ public class SiteAdapter extends RecyclerView.Adapter<SiteAdapter.ViewHolder> {
}
public void selectAll() {
setEnable(true);
setEnable(type != 3);
}
public void cancelAll() {
setEnable(false);
setEnable(type == 3);
}
@Override

10
app/src/leanback/res/drawable/ic_site_block.xml
Unescape View File

@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#FFFFFF"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM4,12c0,-4.42 3.58,-8 8,-8 1.85,0 3.55,0.63 4.9,1.69L5.69,16.9C4.63,15.55 4,13.85 4,12zM12,20c-1.85,0 -3.55,-0.63 -4.9,-1.69L18.31,7.1C19.37,8.45 20,10.15 20,12c0,4.42 -3.58,8 -8,8z" />
</vector>

10
app/src/leanback/res/drawable/ic_site_cancel.xml
Unescape View File

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#FFFFFF"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="@android:color/white"
android:pathData="M180,840Q156,840 138,822Q120,804 120,780L120,180Q120,156 138,138Q156,120 180,120L780,120Q804,120 822,138Q840,156 840,180L840,780Q840,804 822,822Q804,840 780,840L180,840ZM180,780L780,780Q780,780 780,780Q780,780 780,780L780,180Q780,180 780,180Q780,180 780,180L180,180Q180,180 180,180Q180,180 180,180L180,780Q180,780 180,780Q180,780 180,780Z" />
</vector>

10
app/src/leanback/res/drawable/ic_site_record.xml
Unescape View File

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#FFFFFF"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="m17.06,13c-1.86,0 -3.42,1.33 -3.82,3.1 -0.95,-0.41 -1.82,-0.3 -2.48,-0.01 -0.41,-1.78 -1.97,-3.09 -3.82,-3.09 -2.17,0 -3.94,1.79 -3.94,4s1.77,4 3.94,4c2.06,0 3.74,-1.62 3.9,-3.68 0.34,-0.24 1.23,-0.69 2.32,0.02 0.18,2.05 1.84,3.66 3.9,3.66 2.17,0 3.94,-1.79 3.94,-4s-1.77,-4 -3.94,-4m-10.12,6.86c-1.56,0 -2.81,-1.28 -2.81,-2.86s1.26,-2.86 2.81,-2.86c1.56,0 2.81,1.28 2.81,2.86s-1.25,2.86 -2.81,2.86m10.12,0c-1.56,0 -2.81,-1.28 -2.81,-2.86s1.25,-2.86 2.81,-2.86 2.82,1.28 2.82,2.86 -1.27,2.86 -2.82,2.86m4.94,-9.36h-20v1.5h20zM15.53,2.63c-0.22,-0.49 -0.78,-0.75 -1.31,-0.58l-2.22,0.74 -2.23,-0.74 -0.05,-0.01c-0.53,-0.15 -1.09,0.13 -1.29,0.64l-2.43,6.32h12l-2.44,-6.32z" />
</vector>

10
app/src/leanback/res/drawable/ic_site_select.xml
Unescape View File

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#FFFFFF"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="@android:color/white"
android:pathData="M419,639L708,350L665,307L419,553L300,434L257,477L419,639ZM180,840Q156,840 138,822Q120,804 120,780L120,180Q120,156 138,138Q156,120 180,120L780,120Q804,120 822,138Q840,156 840,180L840,780Q840,804 822,822Q804,840 780,840L180,840ZM180,780L780,780Q780,780 780,780Q780,780 780,780L780,180Q780,180 780,180Q780,180 780,180L180,180Q180,180 180,180Q180,180 180,180L180,780Q180,780 180,780Q180,780 180,780ZM180,180L180,180Q180,180 180,180Q180,180 180,180L180,780Q180,780 180,780Q180,780 180,780L180,780Q180,780 180,780Q180,780 180,780L180,180Q180,180 180,180Q180,180 180,180Z" />
</vector>

53
app/src/leanback/res/layout/dialog_site.xml
Unescape View File

@ -25,69 +25,62 @@
android:visibility="gone"
tools:visibility="visible">
<TextView
<ImageView
android:id="@+id/search"
android:layout_width="wrap_content"
android:layout_width="40dp"
android:layout_height="40dp"
android:background="@drawable/selector_text"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center"
android:text="@string/dialog_site_search"
android:textColor="@color/text"
android:textSize="18sp" />
android:padding="8dp"
android:src="@drawable/ic_site_search"
app:tint="@color/text" />
<TextView
<ImageView
android:id="@+id/change"
android:layout_width="wrap_content"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginTop="16dp"
android:background="@drawable/selector_text"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center"
android:text="@string/dialog_site_change"
android:textColor="@color/text"
android:textSize="18sp" />
android:padding="8dp"
android:src="@drawable/ic_site_change"
app:tint="@color/text" />
<TextView
<ImageView
android:id="@+id/record"
android:layout_width="wrap_content"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginTop="16dp"
android:background="@drawable/selector_text"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center"
android:text="@string/dialog_site_record"
android:textColor="@color/text"
android:textSize="18sp" />
android:padding="8dp"
android:src="@drawable/ic_site_record"
app:tint="@color/text" />
<TextView
<ImageView
android:id="@+id/select"
android:layout_width="wrap_content"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginTop="16dp"
android:background="@drawable/selector_text"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center"
android:text="@string/dialog_site_select"
android:textColor="@color/white"
android:textSize="18sp" />
android:padding="8dp"
android:src="@drawable/ic_site_select" />
<TextView
<ImageView
android:id="@+id/cancel"
android:layout_width="wrap_content"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginTop="16dp"
android:background="@drawable/selector_text"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center"
android:text="@string/dialog_site_cancel"
android:textColor="@color/white"
android:textSize="18sp" />
android:padding="8dp"
android:src="@drawable/ic_site_cancel" />
</LinearLayout>
</LinearLayout>

9
app/src/main/java/com/fongmi/android/tv/bean/Site.java
Unescape View File

@ -6,7 +6,6 @@ import androidx.annotation.NonNull;
import androidx.room.Entity;
import androidx.room.PrimaryKey;
import com.fongmi.android.tv.R;
import com.fongmi.android.tv.db.AppDatabase;
import com.fongmi.android.tv.gson.StringAdapter;
import com.google.gson.JsonElement;
@ -197,14 +196,6 @@ public class Site {
return this;
}
public int getSearchIcon() {
return isSearchable() ? R.drawable.ic_site_search : R.drawable.ic_site_block;
}
public int getChangeIcon() {
return isChangeable() ? R.drawable.ic_site_change : R.drawable.ic_site_block;
}
public static Site find(String key) {
return AppDatabase.get().getSiteDao().find(key);
}

5
app/src/main/res/values-zh-rCN/strings.xml
Unescape View File

@ -90,11 +90,6 @@
<!-- Dialog -->
<string name="dialog_positive">确定</string>
<string name="dialog_negative">取消</string>
<string name="dialog_site_search">搜索</string>
<string name="dialog_site_change">换源</string>
<string name="dialog_site_record">无痕</string>
<string name="dialog_site_select">全选</string>
<string name="dialog_site_cancel">反选</string>
<string name="dialog_config_hint">请输入接口…</string>
<string name="dialog_config_url">请输入地址…</string>

5
app/src/main/res/values-zh-rTW/strings.xml
Unescape View File

@ -90,11 +90,6 @@
<!-- Dialog -->
<string name="dialog_positive">確定</string>
<string name="dialog_negative">取消</string>
<string name="dialog_site_search">搜尋</string>
<string name="dialog_site_change">換源</string>
<string name="dialog_site_record">無痕</string>
<string name="dialog_site_select">全選</string>
<string name="dialog_site_cancel">反選</string>
<string name="dialog_config_hint">請輸入接口…</string>
<string name="dialog_config_url">請輸入網址…</string>

5
app/src/main/res/values/strings.xml
Unescape View File

@ -90,11 +90,6 @@
<!-- Dialog -->
<string name="dialog_positive">OK</string>
<string name="dialog_negative">Cancel</string>
<string name="dialog_site_search">搜尋</string>
<string name="dialog_site_change">換源</string>
<string name="dialog_site_record">無痕</string>
<string name="dialog_site_select">全選</string>
<string name="dialog_site_cancel">反選</string>
<string name="dialog_config_hint">Please enter the config…</string>
<string name="dialog_config_url">Please enter the url…</string>

Write Preview
Loading…
Cancel
Save