forked from recloudstream/cloudstream
		
	bump
This commit is contained in:
		
							parent
							
								
									e244a2bac3
								
							
						
					
					
						commit
						43592e64f8
					
				
					 3 changed files with 219 additions and 194 deletions
				
			
		|  | @ -36,7 +36,7 @@ android { | |||
|         targetSdkVersion 30 | ||||
| 
 | ||||
|         versionCode 42 | ||||
|         versionName "2.6.12" | ||||
|         versionName "2.6.13" | ||||
| 
 | ||||
|         resValue "string", "app_version", | ||||
|                 "${defaultConfig.versionName}${versionNameSuffix ?: ""}" | ||||
|  |  | |||
|  | @ -1,220 +1,245 @@ | |||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
| <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||||
|         xmlns:app="http://schemas.android.com/apk/res-auto" | ||||
|         xmlns:tools="http://schemas.android.com/tools" | ||||
|         android:padding="16dp" | ||||
|         android:orientation="vertical" | ||||
| 
 | ||||
|         android:layout_width="match_parent" | ||||
|         android:layout_height="match_parent"> | ||||
| 
 | ||||
|     <TextView | ||||
|             android:textStyle="bold" | ||||
|             android:textSize="16sp" | ||||
|             android:layout_marginBottom="10dp" | ||||
|             android:text="MyAnimeList, AniList" | ||||
|             android:layout_width="wrap_content" | ||||
|             android:layout_height="wrap_content" /> | ||||
| 
 | ||||
|     <LinearLayout | ||||
|             android:visibility="visible" | ||||
|             android:orientation="horizontal" | ||||
|             android:padding="16dp" | ||||
|             android:orientation="vertical" | ||||
|             android:id="@+id/sync_holder" | ||||
|             android:layout_width="match_parent" | ||||
|             android:layout_height="wrap_content"> | ||||
| 
 | ||||
|         <ImageView | ||||
|                 android:padding="10dp" | ||||
|                 android:layout_width="wrap_content" | ||||
|                 android:layout_height="wrap_content" | ||||
|                 android:background="?android:attr/selectableItemBackgroundBorderless" | ||||
|                 android:src="@drawable/baseline_remove_24" | ||||
|                 android:layout_gravity="end|center_vertical" | ||||
|                 android:contentDescription="@string/result_share" | ||||
|                 app:tint="?attr/textColor" /> | ||||
| 
 | ||||
|         <EditText | ||||
|                 style="@style/AppEditStyle" | ||||
|                 android:hint="20" | ||||
|                 android:textSize="20sp" | ||||
|                 android:inputType="number" | ||||
|                 android:layout_width="wrap_content" | ||||
|                 android:layout_height="wrap_content" | ||||
|                 tools:ignore="LabelFor" /> | ||||
|             android:layout_height="match_parent"> | ||||
| 
 | ||||
|         <TextView | ||||
|                 android:layout_gravity="center_vertical" | ||||
|                 android:paddingBottom="1dp" | ||||
|                 android:textSize="20sp" | ||||
|                 android:textColor="?attr/textColor" | ||||
|                 android:text="/30" | ||||
|                 android:textStyle="bold" | ||||
|                 android:textSize="16sp" | ||||
|                 android:layout_marginBottom="10dp" | ||||
|                 android:text="MyAnimeList, AniList" | ||||
|                 android:layout_width="wrap_content" | ||||
|                 android:layout_height="wrap_content" /> | ||||
| 
 | ||||
|         <ImageView | ||||
|         <LinearLayout | ||||
|                 android:visibility="visible" | ||||
|                 android:orientation="horizontal" | ||||
|                 android:layout_width="match_parent" | ||||
|                 android:layout_height="wrap_content"> | ||||
| 
 | ||||
|             <ImageView | ||||
|                     android:padding="10dp" | ||||
|                     android:layout_width="wrap_content" | ||||
|                     android:layout_height="wrap_content" | ||||
|                     android:background="?android:attr/selectableItemBackgroundBorderless" | ||||
|                     android:src="@drawable/baseline_remove_24" | ||||
|                     android:layout_gravity="end|center_vertical" | ||||
|                     android:contentDescription="@string/result_share" | ||||
|                     app:tint="?attr/textColor" /> | ||||
| 
 | ||||
|             <EditText | ||||
|                     style="@style/AppEditStyle" | ||||
|                     android:hint="20" | ||||
|                     android:textSize="20sp" | ||||
|                     android:inputType="number" | ||||
|                     android:layout_width="wrap_content" | ||||
|                     android:layout_height="wrap_content" | ||||
|                     tools:ignore="LabelFor" /> | ||||
| 
 | ||||
|             <TextView | ||||
|                     android:layout_gravity="center_vertical" | ||||
|                     android:paddingBottom="1dp" | ||||
|                     android:textSize="20sp" | ||||
|                     android:textColor="?attr/textColor" | ||||
|                     android:text="/30" | ||||
|                     android:layout_width="wrap_content" | ||||
|                     android:layout_height="wrap_content" /> | ||||
| 
 | ||||
|             <ImageView | ||||
|                     android:padding="10dp" | ||||
|                     android:layout_width="wrap_content" | ||||
|                     android:layout_height="wrap_content" | ||||
|                     android:background="?android:attr/selectableItemBackgroundBorderless" | ||||
|                     android:src="@drawable/ic_baseline_add_24" | ||||
|                     android:layout_gravity="end|center_vertical" | ||||
|                     android:contentDescription="@string/result_share" | ||||
|                     app:tint="?attr/textColor" /> | ||||
| 
 | ||||
|         </LinearLayout> | ||||
| 
 | ||||
|         <androidx.core.widget.ContentLoadingProgressBar | ||||
|                 android:padding="10dp" | ||||
|                 android:layout_width="wrap_content" | ||||
|                 android:layout_height="wrap_content" | ||||
|                 android:background="?android:attr/selectableItemBackgroundBorderless" | ||||
|                 android:src="@drawable/ic_baseline_add_24" | ||||
|                 android:layout_width="match_parent" | ||||
|                 android:layout_height="20dp" | ||||
|                 android:progress="50" | ||||
|                 android:indeterminate="false" | ||||
|                 android:progressBackgroundTint="?attr/colorPrimary" | ||||
|                 style="?android:attr/progressBarStyleHorizontal" | ||||
|                 android:max="100" | ||||
|                 android:layout_gravity="end|center_vertical" | ||||
|                 android:contentDescription="@string/result_share" | ||||
|                 app:tint="?attr/textColor" /> | ||||
| 
 | ||||
|     </LinearLayout> | ||||
| 
 | ||||
|     <androidx.core.widget.ContentLoadingProgressBar | ||||
|             android:padding="10dp" | ||||
|             android:layout_width="match_parent" | ||||
|             android:layout_height="20dp" | ||||
|             android:progress="50" | ||||
|             android:indeterminate="false" | ||||
|             android:progressBackgroundTint="?attr/colorPrimary" | ||||
|             style="?android:attr/progressBarStyleHorizontal" | ||||
|             android:max="100" | ||||
|             android:layout_gravity="end|center_vertical" | ||||
|             tools:visibility="visible" /> | ||||
|                 tools:visibility="visible" /> | ||||
| 
 | ||||
| 
 | ||||
|     <LinearLayout | ||||
|             android:layout_marginBottom="10dp" | ||||
|             android:layout_width="match_parent" | ||||
|             android:layout_height="wrap_content"> | ||||
|         <LinearLayout | ||||
|                 android:layout_marginBottom="10dp" | ||||
|                 android:layout_width="match_parent" | ||||
|                 android:layout_height="wrap_content"> | ||||
| 
 | ||||
| 
 | ||||
|         <TextView | ||||
|                 android:layout_gravity="center_vertical" | ||||
|                 android:padding="10dp" | ||||
|                 android:textSize="17sp" | ||||
|                 android:textColor="?attr/textColor" | ||||
|                 android:text="Status:" | ||||
|                 android:layout_width="wrap_content" | ||||
|             <TextView | ||||
|                     android:layout_gravity="center_vertical" | ||||
|                     android:padding="10dp" | ||||
|                     android:textSize="17sp" | ||||
|                     android:textColor="?attr/textColor" | ||||
|                     android:text="Status:" | ||||
|                     android:layout_width="wrap_content" | ||||
|                     android:layout_height="wrap_content" /> | ||||
| 
 | ||||
|             <com.google.android.material.button.MaterialButton | ||||
|                     android:layout_height="30dp" | ||||
|                     android:text="Watching" | ||||
|                     android:minWidth="0dp" | ||||
|                     android:layout_width="wrap_content" | ||||
|                     android:layout_gravity="center_vertical" | ||||
|                     android:layout_marginStart="0dp" | ||||
|                     style="@style/BlackButton" /> | ||||
|         </LinearLayout> | ||||
| 
 | ||||
|         <GridLayout | ||||
|                 android:orientation="horizontal" | ||||
|                 android:columnCount="2" | ||||
| 
 | ||||
|                 android:layout_width="match_parent" | ||||
|                 android:layout_height="wrap_content"> | ||||
| 
 | ||||
|             <com.google.android.material.button.MaterialButton | ||||
|                     android:id="@+id/sync_completed" | ||||
|                     android:nextFocusRight="@id/sync_on_hold" | ||||
|                     android:nextFocusDown="@id/sync_plan_to_watch" | ||||
| 
 | ||||
|                     android:layout_row="0" | ||||
|                     android:layout_column="0" | ||||
|                     android:text="@string/type_completed" | ||||
|                     style="@style/SyncButton" /> | ||||
| 
 | ||||
|             <com.google.android.material.button.MaterialButton | ||||
|                     android:id="@+id/sync_on_hold" | ||||
|                     android:nextFocusDown="@id/sync_watching" | ||||
|                     android:nextFocusLeft="@id/sync_completed" | ||||
| 
 | ||||
|                     android:layout_row="0" | ||||
|                     android:layout_column="1" | ||||
|                     style="@style/SyncButton" | ||||
|                     android:text="@string/type_on_hold" /> | ||||
| 
 | ||||
|             <com.google.android.material.button.MaterialButton | ||||
|                     android:id="@+id/sync_plan_to_watch" | ||||
|                     android:nextFocusRight="@id/sync_plan_to_watch" | ||||
|                     android:nextFocusDown="@id/sync_dropped" | ||||
|                     android:nextFocusUp="@id/sync_completed" | ||||
| 
 | ||||
|                     android:layout_row="1" | ||||
|                     android:layout_column="0" | ||||
|                     android:text="@string/type_plan_to_watch" | ||||
|                     style="@style/SyncButton" | ||||
|                     /> | ||||
| 
 | ||||
|             <com.google.android.material.button.MaterialButton | ||||
|                     android:id="@+id/sync_watching" | ||||
|                     android:nextFocusLeft="@id/sync_plan_to_watch" | ||||
|                     android:nextFocusDown="@id/sync_dropped" | ||||
|                     android:nextFocusUp="@id/sync_on_hold" | ||||
| 
 | ||||
|                     android:layout_row="1" | ||||
|                     android:layout_column="1" | ||||
| 
 | ||||
|                     style="@style/SyncButton" | ||||
|                     android:text="@string/type_watching" /> | ||||
| 
 | ||||
|         </GridLayout> | ||||
| 
 | ||||
|         <com.google.android.material.button.MaterialButton | ||||
|                 android:id="@+id/sync_dropped" | ||||
|                 android:nextFocusUp="@id/sync_plan_to_watch" | ||||
| 
 | ||||
|                 android:layout_width="match_parent" | ||||
|                 style="@style/SyncButton" | ||||
| 
 | ||||
|                 android:text="@string/type_dropped" /> | ||||
| 
 | ||||
|         <LinearLayout | ||||
|                 android:orientation="horizontal" | ||||
|                 android:layout_width="match_parent" | ||||
|                 android:layout_height="wrap_content"> | ||||
| 
 | ||||
|             <TextView | ||||
|                     android:layout_gravity="center_vertical" | ||||
|                     android:padding="10dp" | ||||
|                     android:textSize="17sp" | ||||
|                     android:textColor="?attr/textColor" | ||||
|                     android:text="Rated:" | ||||
|                     android:layout_width="wrap_content" | ||||
|                     android:layout_height="wrap_content" /> | ||||
| 
 | ||||
|             <com.google.android.material.button.MaterialButton | ||||
|                     android:layout_height="30dp" | ||||
|                     android:text="7/10" | ||||
|                     android:minWidth="0dp" | ||||
|                     android:layout_width="wrap_content" | ||||
|                     android:layout_gravity="center_vertical" | ||||
|                     android:layout_marginStart="0dp" | ||||
|                     style="@style/BlackButton" /> | ||||
|         </LinearLayout> | ||||
| 
 | ||||
|         <com.google.android.material.slider.Slider | ||||
|                 android:valueFrom="0" | ||||
|                 android:valueTo="10" | ||||
|                 android:value="4" | ||||
|                 android:stepSize="1" | ||||
|                 android:paddingStart="-10dp" | ||||
|                 android:paddingEnd="-10dp" | ||||
| 
 | ||||
|                 android:layout_width="match_parent" | ||||
|                 android:layout_height="wrap_content" /> | ||||
| 
 | ||||
|         <FrameLayout | ||||
|                 android:visibility="gone" | ||||
|                 android:paddingTop="12dp" | ||||
|                 android:paddingBottom="12dp" | ||||
|                 android:orientation="horizontal" | ||||
|                 android:layout_width="match_parent" | ||||
|                 android:layout_height="wrap_content"> | ||||
| 
 | ||||
|             <TextView | ||||
|                     android:id="@+id/home_parent_item_title" | ||||
|                     style="@style/WatchHeaderText" | ||||
|                     tools:text="Recommended" /> | ||||
| 
 | ||||
|             <ImageView | ||||
|                     app:tint="?attr/textColor" | ||||
|                     android:layout_marginEnd="5dp" | ||||
|                     android:layout_gravity="end|center_vertical" | ||||
|                     android:src="@drawable/ic_baseline_arrow_forward_24" | ||||
|                     android:layout_width="30dp" | ||||
|                     android:layout_height="match_parent" | ||||
|                     android:contentDescription="@string/home_more_info" /> | ||||
|         </FrameLayout> | ||||
| 
 | ||||
|         <com.google.android.material.button.MaterialButton | ||||
|                 android:layout_height="30dp" | ||||
|                 android:text="Watching" | ||||
|                 android:minWidth="0dp" | ||||
|                 android:layout_width="wrap_content" | ||||
|                 android:layout_gravity="center_vertical" | ||||
|                 android:layout_marginStart="0dp" | ||||
|                 style="@style/BlackButton" /> | ||||
|                 android:layout_marginTop="10dp" | ||||
|                 android:layout_width="match_parent" | ||||
|                 style="@style/SyncButton" | ||||
|                 app:icon="@drawable/baseline_sync_24" | ||||
|                 android:text="@string/upload_sync" /> | ||||
|     </LinearLayout> | ||||
| 
 | ||||
|     <GridLayout | ||||
|             android:orientation="horizontal" | ||||
|             android:columnCount="2" | ||||
| 
 | ||||
|             android:layout_width="match_parent" | ||||
|             android:layout_height="wrap_content"> | ||||
| 
 | ||||
|         <com.google.android.material.button.MaterialButton | ||||
|                 android:id="@+id/sync_completed" | ||||
|                 android:layout_row="0" | ||||
|                 android:layout_column="0" | ||||
|                 android:text="@string/type_completed" | ||||
|                 style="@style/SyncButton" /> | ||||
| 
 | ||||
|         <com.google.android.material.button.MaterialButton | ||||
|                 android:id="@+id/sync_on_hold" | ||||
|                 android:layout_row="0" | ||||
|                 android:layout_column="1" | ||||
|                 style="@style/SyncButton" | ||||
|                 android:text="@string/type_on_hold" /> | ||||
| 
 | ||||
|         <com.google.android.material.button.MaterialButton | ||||
|                 android:id="@+id/sync_plan_to_watch" | ||||
|                 android:nextFocusRight="@id/sync_plan_to_watch" | ||||
| 
 | ||||
|                 android:layout_row="1" | ||||
|                 android:layout_column="0" | ||||
|                 android:text="@string/type_plan_to_watch" | ||||
|                 style="@style/SyncButton" | ||||
|                 android:backgroundTint="?attr/colorPrimaryDark" | ||||
|                 app:strokeColor="@color/colorPrimary" /> | ||||
| 
 | ||||
|         <com.google.android.material.button.MaterialButton | ||||
|                 android:id="@+id/sync_watching" | ||||
|                 android:nextFocusLeft="@id/sync_plan_to_watch" | ||||
| 
 | ||||
|                 android:layout_row="1" | ||||
|                 android:layout_column="1" | ||||
| 
 | ||||
|                 style="@style/SyncButton" | ||||
|                 android:text="@string/type_watching" /> | ||||
| 
 | ||||
|     </GridLayout> | ||||
| 
 | ||||
|     <com.google.android.material.button.MaterialButton | ||||
|             android:id="@+id/sync_dropped" | ||||
|             android:nextFocusUp="@id/sync_plan_to_watch" | ||||
| 
 | ||||
|             android:layout_width="match_parent" | ||||
|             style="@style/SyncButton" | ||||
| 
 | ||||
|             android:text="@string/type_dropped" /> | ||||
| 
 | ||||
|     <LinearLayout | ||||
|             android:orientation="horizontal" | ||||
|             android:layout_width="match_parent" | ||||
|             android:layout_height="wrap_content"> | ||||
| 
 | ||||
|         <TextView | ||||
|                 android:layout_gravity="center_vertical" | ||||
|                 android:padding="10dp" | ||||
|                 android:textSize="17sp" | ||||
|                 android:textColor="?attr/textColor" | ||||
|                 android:text="Rated:" | ||||
|                 android:layout_width="wrap_content" | ||||
|                 android:layout_height="wrap_content" /> | ||||
| 
 | ||||
|         <com.google.android.material.button.MaterialButton | ||||
|                 android:layout_height="30dp" | ||||
|                 android:text="7/10" | ||||
|                 android:minWidth="0dp" | ||||
|                 android:layout_width="wrap_content" | ||||
|                 android:layout_gravity="center_vertical" | ||||
|                 android:layout_marginStart="0dp" | ||||
|                 style="@style/BlackButton" /> | ||||
|     </LinearLayout> | ||||
| 
 | ||||
|     <com.google.android.material.slider.Slider | ||||
|             android:valueFrom="0" | ||||
|             android:valueTo="10" | ||||
|             android:value="4" | ||||
|             android:stepSize="1" | ||||
|             android:paddingStart="-10dp" | ||||
|             android:paddingEnd="-10dp" | ||||
| 
 | ||||
|             android:layout_width="match_parent" | ||||
|             android:layout_height="wrap_content" /> | ||||
| 
 | ||||
|     <FrameLayout | ||||
|             android:visibility="gone" | ||||
|             android:paddingTop="12dp" | ||||
|             android:paddingBottom="12dp" | ||||
|             android:orientation="horizontal" | ||||
|             android:layout_width="match_parent" | ||||
|             android:layout_height="wrap_content"> | ||||
| 
 | ||||
|         <TextView | ||||
|                 android:id="@+id/home_parent_item_title" | ||||
|                 style="@style/WatchHeaderText" | ||||
|                 tools:text="Recommended" /> | ||||
| 
 | ||||
|         <ImageView | ||||
|                 app:tint="?attr/textColor" | ||||
|                 android:layout_marginEnd="5dp" | ||||
|                 android:layout_gravity="end|center_vertical" | ||||
|                 android:src="@drawable/ic_baseline_arrow_forward_24" | ||||
|                 android:layout_width="30dp" | ||||
|                 android:layout_height="match_parent" | ||||
|                 android:contentDescription="@string/home_more_info" /> | ||||
|     </FrameLayout> | ||||
| 
 | ||||
| 
 | ||||
|     <com.google.android.material.button.MaterialButton | ||||
|             android:layout_marginTop="10dp" | ||||
|             android:id="@+id/sync_add_tracking" | ||||
|             android:layout_gravity="center" | ||||
|             android:layout_width="match_parent" | ||||
|             style="@style/SyncButton" | ||||
|             app:icon="@drawable/baseline_sync_24" | ||||
|             android:text="@string/upload_sync" /> | ||||
| </LinearLayout> | ||||
|             app:icon="@drawable/ic_baseline_add_24" | ||||
|             android:text="@string/add_sync" /> | ||||
| </FrameLayout> | ||||
|  | @ -445,10 +445,10 @@ | |||
|         <item name="android:layout_rowWeight">1</item> | ||||
|         <item name="android:layout_width">wrap_content</item> | ||||
|         <item name="android:textColor">?attr/textColor</item> | ||||
|         <item name="backgroundTint">@color/transparent</item> | ||||
|         <item name="backgroundTint">@color/toggle_button</item> | ||||
|         <item name="android:layout_marginBottom">10dp</item> | ||||
|         <item name="strokeWidth">1dp</item> | ||||
|         <item name="strokeColor">?attr/white</item> | ||||
|         <item name="strokeColor">@color/toggle_button_outline</item> | ||||
|     </style> | ||||
| 
 | ||||
|     <style name="VideoButtonTV"> | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue