Merge branch 'dev' into 1520_app_update_notif
This commit is contained in:
commit
f1aa3d8c90
119 changed files with 420 additions and 688 deletions
|
|
@ -16,7 +16,8 @@
|
|||
android:layout_height="match_parent"
|
||||
android:background="?attr/colorPrimary"
|
||||
android:scaleType="centerCrop"
|
||||
android:src="@drawable/background_header" />
|
||||
android:src="@drawable/background_header"
|
||||
android:contentDescription="TODO" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/drawer_header_np_nude_view"
|
||||
|
|
@ -26,7 +27,8 @@
|
|||
|
||||
android:layout_marginStart="30dp"
|
||||
android:layout_marginTop="30dp"
|
||||
android:src="@drawable/np_logo_nude_shadow" />
|
||||
android:src="@drawable/np_logo_nude_shadow"
|
||||
android:contentDescription="TODO" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/drawer_header_np_text_view"
|
||||
|
|
@ -38,7 +40,7 @@
|
|||
android:layout_toRightOf="@id/drawer_header_np_nude_view"
|
||||
android:gravity="center"
|
||||
android:text="@string/app_name"
|
||||
android:textSize="30dp"
|
||||
android:textSize="30sp"
|
||||
android:textColor="@color/drawer_header_font_color"
|
||||
android:textStyle="bold|italic" />
|
||||
|
||||
|
|
@ -50,7 +52,7 @@
|
|||
android:layout_alignStart="@id/drawer_header_np_text_view"
|
||||
android:layout_below="@id/drawer_header_np_text_view"
|
||||
android:text="YouTube"
|
||||
android:textSize="18dp"
|
||||
android:textSize="18sp"
|
||||
android:textColor="@color/drawer_header_font_color"
|
||||
android:textStyle="italic" />
|
||||
|
||||
|
|
@ -66,6 +68,7 @@
|
|||
android:paddingBottom="20dp"
|
||||
android:paddingEnd="20dp"
|
||||
android:paddingRight="20dp"
|
||||
android:src="@drawable/ic_arrow_down_white" />
|
||||
android:src="@drawable/ic_arrow_down_white"
|
||||
android:contentDescription="TODO" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
|
@ -114,7 +114,8 @@
|
|||
<EditText
|
||||
android:id="@+id/errorCommentBox"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"/>
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/errorReportButton"
|
||||
|
|
|
|||
|
|
@ -16,7 +16,8 @@ android:focusable="true">
|
|||
android:layout_height="match_parent"
|
||||
android:background="?attr/colorPrimary"
|
||||
android:src="@drawable/background_header"
|
||||
android:scaleType="centerCrop"/>
|
||||
android:scaleType="centerCrop"
|
||||
android:contentDescription="TODO" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/drawer_header_np_nude_view"
|
||||
|
|
@ -26,7 +27,8 @@ android:focusable="true">
|
|||
|
||||
android:layout_width="70dp"
|
||||
android:layout_height="70dp"
|
||||
android:src="@drawable/np_logo_nude_shadow"/>
|
||||
android:src="@drawable/np_logo_nude_shadow"
|
||||
android:contentDescription="TODO" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/drawer_header_np_text_view"
|
||||
|
|
@ -38,7 +40,7 @@ android:focusable="true">
|
|||
android:layout_alignTop="@id/drawer_header_np_nude_view"
|
||||
android:layout_alignBottom="@id/drawer_header_np_nude_view"
|
||||
android:gravity="center"
|
||||
android:textSize="30dp"
|
||||
android:textSize="30sp"
|
||||
android:textColor="@color/drawer_header_font_color"
|
||||
android:textStyle="bold|italic"/>
|
||||
|
||||
|
|
@ -50,7 +52,7 @@ android:focusable="true">
|
|||
android:layout_below="@id/drawer_header_np_text_view"
|
||||
android:layout_alignLeft="@id/drawer_header_np_text_view"
|
||||
android:layout_alignStart="@id/drawer_header_np_text_view"
|
||||
android:textSize="18dp"
|
||||
android:textSize="18sp"
|
||||
android:textColor="@color/drawer_header_font_color"
|
||||
android:textStyle="italic"/>
|
||||
|
||||
|
|
@ -66,6 +68,7 @@ android:focusable="true">
|
|||
android:paddingBottom="20dp"
|
||||
android:paddingRight="20dp"
|
||||
android:src="@drawable/ic_arrow_down_white"
|
||||
android:paddingEnd="20dp" />
|
||||
android:paddingEnd="20dp"
|
||||
android:contentDescription="TODO" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
|
@ -21,7 +21,8 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:layout_marginBottom="8dp"
|
||||
app:srcCompat="@mipmap/ic_launcher" />
|
||||
app:srcCompat="@mipmap/ic_launcher"
|
||||
android:contentDescription="TODO" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/app_name"
|
||||
|
|
|
|||
|
|
@ -10,7 +10,8 @@
|
|||
android:paddingBottom="8dp"
|
||||
android:paddingLeft="@dimen/activity_horizontal_margin"
|
||||
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||
android:paddingTop="8dp">
|
||||
android:paddingTop="8dp"
|
||||
android:focusable="true">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/info"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,8 @@
|
|||
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||
android:orientation="vertical"
|
||||
android:background="?attr/selectableItemBackground"
|
||||
android:clickable="true">
|
||||
android:clickable="true"
|
||||
android:focusable="true">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/name"
|
||||
|
|
|
|||
|
|
@ -38,7 +38,8 @@
|
|||
android:layout_centerVertical="true"
|
||||
android:layout_marginRight="1dp"
|
||||
android:src="@drawable/ic_menu_more"
|
||||
android:scaleType="centerInside"/>
|
||||
android:scaleType="centerInside"
|
||||
android:contentDescription="TODO" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
|
|
@ -50,7 +51,8 @@
|
|||
android:layout_centerHorizontal="true"
|
||||
android:scaleType="fitXY"
|
||||
android:gravity="center"
|
||||
android:padding="10dp"/>
|
||||
android:padding="10dp"
|
||||
android:contentDescription="TODO" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_name"
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_margin="2dp"
|
||||
android:background="@color/bluegray">
|
||||
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/item_icon"
|
||||
android:layout_width="72dp"
|
||||
|
|
@ -17,66 +17,60 @@
|
|||
android:layout_centerVertical="true"
|
||||
android:scaleType="fitXY"
|
||||
android:gravity="center"
|
||||
android:padding="15dp"/>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/item_name_and_size"
|
||||
android:padding="15dp"
|
||||
android:contentDescription="TODO" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_name"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_toLeftOf="@+id/item_more"
|
||||
android:layout_toRightOf="@id/item_icon"
|
||||
android:layout_toLeftOf="@+id/item_status"
|
||||
android:layout_centerVertical="true"
|
||||
android:orientation="vertical">
|
||||
android:ellipsize="end"
|
||||
android:padding="6dp"
|
||||
android:text="XXX.xx"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="16sp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_name"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="6dp"
|
||||
android:singleLine="true"
|
||||
android:ellipsize="end"
|
||||
android:text="XXX.xx"
|
||||
android:textSize="16sp"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/white"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_size"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/item_name"
|
||||
android:padding="6dp"
|
||||
android:singleLine="true"
|
||||
android:text="100.00MB"
|
||||
android:textSize="12sp"
|
||||
android:textColor="@color/white"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_size"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_toRightOf="@id/item_icon"
|
||||
android:layout_below="@+id/item_name"
|
||||
android:padding="6dp"
|
||||
android:singleLine="true"
|
||||
android:text="100.00MB"
|
||||
android:textSize="12sp"
|
||||
android:textColor="@color/white"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_status"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_toLeftOf="@+id/item_more"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_below="@+id/item_name"
|
||||
android:layout_marginLeft="6dp"
|
||||
android:layout_marginRight="6dp"
|
||||
android:layout_marginRight="5dp"
|
||||
android:layout_toLeftOf="@+id/item_more"
|
||||
android:layout_toRightOf="@id/item_size"
|
||||
android:padding="6dp"
|
||||
android:singleLine="true"
|
||||
android:text="0%"
|
||||
android:textSize="20sp"
|
||||
android:textColor="@color/white"/>
|
||||
android:textColor="@color/white"
|
||||
android:textSize="12sp" />
|
||||
|
||||
<ImageView
|
||||
style="?attr/buttonBarButtonStyle"
|
||||
android:id="@+id/item_more"
|
||||
android:layout_width="36dp"
|
||||
android:layout_height="36dp"
|
||||
android:layout_width="49dp"
|
||||
android:layout_height="49dp"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginRight="4dp"
|
||||
android:src="@drawable/ic_menu_more"
|
||||
android:scaleType="centerInside"/>
|
||||
android:scaleType="centerInside"
|
||||
android:contentDescription="TODO" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,8 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:background="?attr/selectableItemBackground"
|
||||
android:clickable="true"
|
||||
android:padding="5dp">
|
||||
android:padding="5dp"
|
||||
android:focusable="true">
|
||||
|
||||
<de.hdodenhof.circleimageview.CircleImageView
|
||||
android:id="@+id/itemThumbnailView"
|
||||
|
|
|
|||
|
|
@ -6,7 +6,8 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:background="?attr/selectableItemBackground"
|
||||
android:clickable="true"
|
||||
android:padding="5dp">
|
||||
android:padding="5dp"
|
||||
android:focusable="true">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/itemThumbnailView"
|
||||
|
|
@ -17,7 +18,8 @@
|
|||
android:layout_alignParentTop="true"
|
||||
android:layout_marginRight="5dp"
|
||||
android:src="@drawable/service"
|
||||
tools:ignore="RtlHardcoded"/>
|
||||
tools:ignore="RtlHardcoded"
|
||||
android:contentDescription="TODO" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/itemTitleView"
|
||||
|
|
|
|||
|
|
@ -5,4 +5,7 @@
|
|||
<item android:id="@+id/action_settings"
|
||||
app:showAsAction="never"
|
||||
android:title="@string/settings"/>
|
||||
<item android:id="@+id/switch_mode"
|
||||
app:showAsAction="ifRoom"
|
||||
android:title="@string/switch_view"/>
|
||||
</menu>
|
||||
|
|
@ -7,16 +7,16 @@
|
|||
android:id="@+id/toggleOrientation"
|
||||
android:icon="@drawable/ic_screen_rotation_white"
|
||||
android:title="@string/toggle_orientation"
|
||||
app:showAsAction="always|withText" />
|
||||
app:showAsAction="ifRoom|withText" />
|
||||
<item
|
||||
android:id="@+id/switchPopup"
|
||||
android:icon="@drawable/ic_fullscreen_exit_white"
|
||||
android:title="@string/switch_to_popup"
|
||||
app:showAsAction="always|withText" />
|
||||
app:showAsAction="ifRoom|withText" />
|
||||
<item
|
||||
android:id="@+id/switchBackground"
|
||||
android:icon="?audio"
|
||||
android:title="@string/switch_to_background"
|
||||
app:showAsAction="always|withText" />
|
||||
app:showAsAction="ifRoom|withText" />
|
||||
</menu>
|
||||
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@
|
|||
<string name="msg_url_malform">Hibás URL vagy nincs internet</string>
|
||||
<string name="msg_running">NewPipe letöltés folyamatban</string>
|
||||
<string name="msg_running_detail">Katt a részletekért</string>
|
||||
<string name="msg_wait">Kérlek várj...</string>
|
||||
<string name="msg_wait">Kérlek várj…</string>
|
||||
<string name="msg_copied">Vágólapra másolva.</string>
|
||||
<string name="no_available_dir">Kérlek válassz egy létező könyvtárat a letöltésekhez.</string>
|
||||
|
||||
|
|
|
|||
|
|
@ -414,7 +414,7 @@
|
|||
\n
|
||||
\n만약 모르신다면, 다음을 참고하세요:
|
||||
\n
|
||||
\n1. 모바일 환경이시면 브라우저 설정에서 데스크탑 모드를 활성화해주세요. Chrome 모바일에서는 오른쪽 ... 클릭시 아래쪽에 있습니다.
|
||||
\n1. 모바일 환경이시면 브라우저 설정에서 데스크탑 모드를 활성화해주세요. Chrome 모바일에서는 오른쪽 … 클릭시 아래쪽에 있습니다.
|
||||
\n2. 이 주소로 가세요: %1$s
|
||||
\n3. 로그인이 필요하면 하세요.
|
||||
\n4. 리디렉트된 곳의 URL을 복사하세요. (이 URL이 당신의 프로필 URL 입니다)</string>
|
||||
|
|
|
|||
|
|
@ -105,6 +105,8 @@
|
|||
|
||||
<string name="last_orientation_landscape_key" translatable="false">last_orientation_landscape_key</string>
|
||||
|
||||
<string name="last_resize_mode" translatable="false">last_resize_mode</string>
|
||||
|
||||
<!-- DEBUG ONLY -->
|
||||
<string name="debug_pref_screen_key" translatable="false">debug_pref_screen_key</string>
|
||||
<string name="allow_heap_dumping_key" translatable="false">allow_heap_dumping_key</string>
|
||||
|
|
|
|||
|
|
@ -526,6 +526,7 @@
|
|||
<string name="minimize_on_exit_none_description">None</string>
|
||||
<string name="minimize_on_exit_background_description">Minimize to background player</string>
|
||||
<string name="minimize_on_exit_popup_description">Minimize to popup player</string>
|
||||
<string name="switch_view">Switch View</string>
|
||||
|
||||
<!-- App update notification -->
|
||||
<string name="app_update_notification_content_title">NewPipe Update Available</string>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<paths xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<paths>
|
||||
<external-path name="external_files" path="."/>
|
||||
<root-path name="external_files" path="/storage/" />
|
||||
</paths>
|
||||
Loading…
Add table
Add a link
Reference in a new issue